Merge pull request #102 from ryanhertz/remove-provided_search-method

removed unnecessary and broken provided_search? method in SavedSearch

Author: ryanhertz

lib/spark_api/models/saved_search.rb

@@ -24,9 +24,6 @@ def self.provided()
         Class.new(self).tap do |provided|
           provided.element_name = '/savedsearches'
           provided.prefix = '/provided'
-          def provided_search?
-            true
-          end
           SparkApi.logger.info("#{self.name}.path: #{provided.path}")
         end
       end
@@ -70,7 +67,7 @@ def contacts
 
       def listings(args = {})
         arguments = {:_filter => "SavedSearch Eq '#{self.Id}'"}
-        arguments.merge!(:RequestMode => 'permissive') if provided_search?
+        arguments.merge!(:RequestMode => 'permissive') if Provided?
         @listings ||= Listing.collect(connection.get("/listings", arguments.merge(args)))
       end
 
@@ -79,10 +76,6 @@ def newsfeeds
           :_expand => "NewsFeeds").first["NewsFeeds"])
       end
 
-      def provided_search?
-        false
-      end
-
       def can_have_newsfeed?
 
         return true  if has_active_newsfeed? || has_inactive_newsfeed?

spec/fixtures/saved_searches/get.json

@@ -9,7 +9,8 @@
               "Filter": "City Eq 'Moorhead' And MlsStatus Eq 'Active' And PropertyType Eq 'A'",
               "ContactIds": [
                 "20100815220615294367000000"
-              ]
+              ],
+              "Provided": false
             },
             { 
               "ResourceUri": "/v1/savedsearches/20100615220615292711000000",

spec/fixtures/saved_searches/get_provided.json

@@ -0,0 +1,22 @@
+{
+    "D": {
+        "Success": true,
+        "Results": [
+            { 
+              "ResourceUri": "/v1/savedsearches/20100815220615294367000000",
+              "Id":  "20100815220615294367000000",
+              "Name": "Search name here",
+              "Filter": "City Eq 'Moorhead' And MlsStatus Eq 'Active' And PropertyType Eq 'A'",
+              "ContactIds": [
+                "20100815220615294367000000"
+              ],
+              "Provided": true
+            },
+            { 
+              "ResourceUri": "/v1/savedsearches/20100615220615292711000000",
+              "Id":  "20100615220615292711000000",
+              "Name": "Second search name here" 
+            }
+        ]
+    }
+}

spec/unit/spark_api/models/saved_search_spec.rb

@@ -111,7 +111,7 @@
       end
 
       it "should include the permissive parameter for provided searches" do
-        stub_api_get("/provided/savedsearches/#{id}", 'saved_searches/get.json')
+        stub_api_get("/provided/savedsearches/#{id}", 'saved_searches/get_provided.json')
         resource = subject.class.provided.find(id)
         expect(SparkApi.client).to receive(:get).with("/listings", 
           {:_filter => "SavedSearch Eq '#{id}'", :RequestMode => 'permissive'})
@@ -121,7 +121,6 @@
       it "should not include the permissive parameter for saved searches" do
         stub_api_get("/#{subject.class.element_name}/#{id}", 'saved_searches/get.json')
         resource = subject.class.find(id)
-        resource.stub(:provided_search?) { false }
         expect(SparkApi.client).to receive(:get).with("/listings", {:_filter => "SavedSearch Eq '#{id}'"})
         resource.listings
       end
@@ -191,7 +190,6 @@
     it "should return true with three filter parameters" do
       stub_api_get("/#{subject.class.element_name}/#{id}", 'saved_searches/get.json')
       resource = subject.class.find(id)
-      resource.stub(:provided_search?) { false }
       resource.stub(:has_active_newsfeed?) { false }
       resource.stub(:has_inactive_newsfeed?) { false }
       resource.can_have_newsfeed?.should == true
@@ -205,7 +203,6 @@
       stub_api_get("/#{subject.class.element_name}/#{id}", 'saved_searches/with_newsfeed.json',
         { "_expand" => "NewsFeedSubscriptionSummary" } )
       resource = subject.class.find(id)
-      resource.stub(:provided_search?) { false }
       resource.has_active_newsfeed?.should == true
     end
 
@@ -214,7 +211,6 @@
       stub_api_get("/#{subject.class.element_name}/#{id}", 'saved_searches/without_newsfeed.json',
         { "_expand" => "NewsFeedSubscriptionSummary" } )
       resource = subject.class.find(id)
-      resource.stub(:provided_search?) { false }
       resource.has_active_newsfeed?.should == false
     end
   end
@@ -225,7 +221,6 @@
       stub_api_get("/#{subject.class.element_name}/#{id}", 'saved_searches/with_inactive_newsfeed.json',
         { "_expand" => "NewsFeedSubscriptionSummary" } )
       resource = subject.class.find(id)
-      resource.stub(:provided_search?) { false }
       resource.has_inactive_newsfeed?.should == true
     end
 
@@ -234,7 +229,6 @@
       stub_api_get("/#{subject.class.element_name}/#{id}", 'saved_searches/without_newsfeed.json',
         { "_expand" => "NewsFeedSubscriptionSummary, NewsFeeds" } )
       resource = subject.class.find(id)
-      # resource.stub(:provided_search?) { false }
       resource.has_inactive_newsfeed?.should == false
     end