removed news_feed_meta and can_have_newsfeed? from SavedSearch

Author: ryanhertz

lib/spark_api/models/news_feed_meta.rb

@@ -2,39 +2,38 @@ module SparkApi
   module Models
     class NewsFeedMeta < Base
 
-      attr_accessor :data
-
       self.element_name = "newsfeeds/meta"
 
-      def initialize
-        super
-        @data = connection.get(self.path).first
-      end
-
       def minimum_core_fields
-        @data['Subscriptions']['SavedSearches']['MinimumCoreFields']
+        data['Subscriptions']['SavedSearches']['MinimumCoreFields']
       end
 
       def core_field_names
-        fields = @data['Subscriptions']['SavedSearches']['CoreSearchFields']
+        fields = data['Subscriptions']['SavedSearches']['CoreSearchFields']
 
-        @data['Subscriptions']['SavedSearches']['CoreStandardFields'].each do |field|
+        data['Subscriptions']['SavedSearches']['CoreStandardFields'].each do |field|
           fields << field[1]['Label']
         end
 
         fields
       end
 
       def core_fields
-        fields = @data['Subscriptions']['SavedSearches']['CoreSearchFields']
+        fields = data['Subscriptions']['SavedSearches']['CoreSearchFields']
 
-        @data['Subscriptions']['SavedSearches']['CoreStandardFields'].each do |field|
+        data['Subscriptions']['SavedSearches']['CoreStandardFields'].each do |field|
           fields << field.first
         end
 
         fields
       end
 
+      private
+
+      def data
+        @data ||= connection.get(self.path).first
+      end
+
     end
   end
 end

lib/spark_api/models/saved_search.rb

@@ -6,15 +6,9 @@ class SavedSearch < Base
       include Concerns::Savable,
               Concerns::Destroyable
 
-      attr_accessor :newsfeeds
 
       self.element_name="savedsearches"
 
-      def initialize(attributes={})
-        @newsfeeds = nil
-        super(attributes)
-      end
-
       def self.provided()
         Class.new(self).tap do |provided|
           provided.element_name = '/savedsearches'
@@ -67,22 +61,12 @@ def listings(args = {})
       end
 
       def newsfeeds
-        Newsfeed.collect(connection.get("#{self.class.path}/#{@attributes["Id"]}", 
-          :_expand => "NewsFeeds").first["NewsFeeds"])
-      end
-
-      def can_have_newsfeed?
-
-        return true  if has_active_newsfeed? || has_inactive_newsfeed?
-
-        number_of_filters = 0
-
-        news_feed_meta.core_fields.each do |field|
-          number_of_filters += 1 if self.Filter.include? field
-        end
-        
-        number_of_filters >= news_feed_meta.minimum_core_fields
-
+        @newsfeeds ||=  if attributes.key?("NewsFeeds")
+                          Newsfeed.collect(attributes["NewsFeeds"])
+                        else
+                          Newsfeed.collect(connection.get("#{self.class.path}/#{@attributes["Id"]}", 
+                            :_expand => "NewsFeeds").first["NewsFeeds"])
+                        end
       end
 
       def has_active_newsfeed?
@@ -119,10 +103,6 @@ def update_contacts(method, contact_id)
         end
       end
 
-      def news_feed_meta
-        @news_feed_meta ||= NewsFeedMeta.new
-      end
-
     end
 
   end

spec/unit/spark_api/models/saved_search_spec.rb

@@ -176,32 +176,6 @@
     end
   end
 
-  describe "can_have_newsfeed?" do
-
-    before do
-      stub_api_get("/newsfeeds/meta", "newsfeeds/meta.json")
-    end
-
-    it "should return false without at least three filter parameters" do
-      stub_api_get("/#{subject.class.element_name}/#{id}", 'saved_searches/get.json')
-      resource = subject.class.find(id)
-      resource.stub(:has_active_newsfeed?) { false }
-      resource.stub(:has_inactive_newsfeed?) { false }
-      resource.Filter = "MlsStatus Eq 'Active' And PropertyType Eq 'A'"
-      resource.can_have_newsfeed?.should == false
-    end
-
-    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(:has_active_newsfeed?) { false }
-      resource.stub(:has_inactive_newsfeed?) { false }
-      resource.Filter = "MlsStatus Eq 'Active' And PropertyType Eq 'A' And ListPrice Eq 1000000"
-      resource.can_have_newsfeed?.should == true
-    end
-
-  end
-
   describe "has_active_newsfeed?" do
     it "should return true if the search already has a newsfeed" do
       stub_api_get("/#{subject.class.element_name}/#{id}", 'saved_searches/get.json')