spark_api 1.3.28 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDM4YWU2MmViMjdlY2JmYTMyM2I3M2I0MWRmNTMwYTM5N2Q1M2NhOQ==
+    MDdhMWQ2ZjA4NTI5NzZhNmIwNTZmZGM2MzgxZjM2MDI2NjIzN2RiZQ==
   data.tar.gz: !binary |-
-    MzZkZTM3YmJiOGZjZWU1ZDJjN2FlNGE2OTdjZTI4M2M4YTA5MWNhNw==
+    ZGU5OTFlNzRlY2Q5YzBkYjczOTBhOGFkZTJjYzhlNDQyOTM0ZDMwYg==
 SHA512:
   metadata.gz: !binary |-
-    MzA5NDdmMjExNWQyMzhiMzM2ZTkxMTYxN2VjMzljYTZmZWE1YzdiNDk4NzVl
-    ZGU3NmQ1MDY2NjU3OGZjYjhjY2ZmMWI5YjljN2Y0NGZlNjE4NTViYTE0ZTM5
-    NWQwZTM2NmYyY2EyYmM0OWI1YjA4MDBlZmVmZDQzOTEyOGE0MGU=
+    MDg3YzY1OWFjNDI3OGQzOTQyMmQ1YmJjNjI0OWU5Y2Q0MzdhM2UzOTNjMzk0
+    MTA3OWJkYTIwOGYxMzk0YzQ3MGUzNWVjYzBiZjVlOTBhMGJjZDNiMTg0NTE3
+    NGFhMDNjZjc0MjVhMjVmYmI3NzQ2M2YxNzAyNzFhYTU0MmFlMzg=
   data.tar.gz: !binary |-
-    NDdhMjU4MGRlNjdlZTZjODJhNDYxYTFiNGE1ZmE1ODg2OTMyNWU4ZDBlNWZm
-    NGQ2ZGQ3MGQ4OGExMzUzMmIyZTVhMTIzYzIyMDQ3MTM5YTRhZTY3MGRlYjg5
-    OGY5ZGU4Mzk0ZWUwNjg2OGE4ZWIyZjE2MDE2NTZmNDBhMjdjZjM=
+    N2Y3NGNkZGVjZjhlNzA2Y2FmYmVmNGUyNDhlZjlmZmVkY2Y0OWJmMzQ2MWJm
+    NDVjYzFlNWJlMGQwZjUxYTIwNjJhYjYzMzgzOGJiMzMwZWQzOTUwNzA4ODhl
+    NjllNjc4YzI4MGE3MDBlYjVlOThkNTEwOTM0YjA1Zjc5ZWZjYjE=

data/VERSION

@@ -1 +1 @@
-1.3.28
+1.4.0

data/lib/spark_api/models/news_feed_meta.rb

@@ -2,23 +2,16 @@ 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
 
@@ -26,15 +19,21 @@ module SparkApi
       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

data/lib/spark_api/models/saved_search.rb

@@ -6,15 +6,9 @@ module SparkApi
       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 @@ module SparkApi
       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 @@ module SparkApi
         end
       end
 
-      def news_feed_meta
-        @news_feed_meta ||= NewsFeedMeta.new
-      end
-
     end
 
   end

data/spec/unit/spark_api/models/saved_search_spec.rb

@@ -176,32 +176,6 @@ describe SavedSearch do
     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')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spark_api
 version: !ruby/object:Gem::Version
-  version: 1.3.28
+  version: 1.4.0
 platform: ruby
 authors:
 - Brandon Hornseth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday