spark_api 1.3.17 → 1.3.18

data/VERSION

@@ -1 +1 @@
-1.3.17
+1.3.18

data/lib/spark_api/cli.rb

@@ -15,7 +15,7 @@ module SparkApi
     class ConsoleCLI
       OPTIONS_ENV = {
         :endpoint => "API_ENDPOINT",
-        :no_verify => "NO_VERIFY",
+        :ssl_verify => "SSL_VERIFY",
         # OAUTH2 Options
         :access_uri  => "ACCESS_URI",
         :authorization_uri => "AUTHORIZATION_URI",
@@ -68,7 +68,7 @@ module SparkApi
           :api_key => ENV[OPTIONS_ENV[:api_key]], 
           :api_secret => ENV[OPTIONS_ENV[:api_secret]],
           :api_user => ENV[OPTIONS_ENV[:api_user]],
-          :no_verify => ENV.fetch(OPTIONS_ENV[:no_verify], false),
+          :ssl_verify => ENV.fetch(OPTIONS_ENV[:ssl_verify], true),
           :console => ENV[OPTIONS_ENV[:console]]
         }
         cli_options = {}
@@ -133,7 +133,7 @@ module SparkApi
           opts.on("-f", "--file FILE",
                   "Load configuration for yaml file.") { |arg| file_options = parse_file_options(arg) }
           opts.on("--no_verify",
-                  "Disable SSL Certificate verification. This is useful for development servers.") { |arg| cli_options[:no_verify] = arg }
+                  "Disable SSL Certificate verification. This is useful for development servers.") { |arg| cli_options[:ssl_verify] = !arg }
           opts.on("-d", "--debug",
                   "Show detailed request logging information.") { |arg| cli_options[:debug] = arg }
           opts.on("-v", "--version",
@@ -146,7 +146,7 @@ module SparkApi
         options = env_options.merge(file_options.merge(cli_options))
         return options
       end
-      
+
       def self.setup_api_auth
         " -r #{File.dirname(__FILE__) + '/../../lib/spark_api/cli/api_auth.rb'}"
       end

data/lib/spark_api/cli/api_auth.rb

@@ -5,5 +5,5 @@ SparkApi.configure do |config|
   config.api_secret = ENV["API_SECRET"]
   config.api_user = ENV["API_USER"] if ENV["API_USER"]
   config.endpoint = ENV["API_ENDPOINT"] if ENV["API_ENDPOINT"]
-  config.ssl_verify = ! (ENV["NO_VERIFY"].downcase=='true') if ENV["NO_VERIFY"]
+  config.ssl_verify = ENV["SSL_VERIFY"].downcase != 'false' if ENV["SSL_VERIFY"]
 end

data/lib/spark_api/cli/oauth2.rb

@@ -18,7 +18,7 @@ SparkApi.configure do |config|
   end
   config.authentication_mode = SparkApi::Authentication::OAuth2
   config.endpoint = ENV["API_ENDPOINT"] if ENV["API_ENDPOINT"]
-  config.ssl_verify = ! (ENV["NO_VERIFY"].downcase=='true') if ENV["NO_VERIFY"]
+  config.ssl_verify = ENV["SSL_VERIFY"].downcase != 'false' if ENV["SSL_VERIFY"]
 end
 
 # Enables saving and loading serialized oauth2 sessions for the system user. 
@@ -26,4 +26,4 @@ def persist_sessions! my_alias = nil
   warn "Warning: persistent session mode saves access tokens in clear text on the filesystem."
   SparkApi.client.oauth2_provider.session_alias = my_alias unless my_alias.nil?
   SparkApi.client.oauth2_provider.persistent_sessions = true
-end
+end

data/lib/spark_api/models/listing.rb

@@ -15,53 +15,52 @@ module SparkApi
         @rental_calendars = []
         @documents = []
         @constraints = []
-        #@tour_of_homes = []
-        
+        @tour_of_homes = []
+        @open_houses = []
+
         if attributes.has_key?('StandardFields')
           pics, vids, tours, docs, ohouses, tourhomes = attributes['StandardFields'].values_at('Photos','Videos', 'VirtualTours', 'Documents', 'OpenHouses', 'TourOfHomes')
         end
-        
+
         if attributes.has_key?('RentalCalendar')
           rentalcalendars = attributes['RentalCalendar']
         end
-        
+
         if pics != nil
-          pics.collect { |pic| @photos.push(Photo.new(pic)) } 
+          setup_attribute(@photos, pics, Photo)
           attributes['StandardFields'].delete('Photos')
         end
-        
+
         if vids != nil
-          vids.collect { |vid| @videos.push(Video.new(vid)) } 
+          setup_attribute(@videos, vids, Video)
           attributes['StandardFields'].delete('Videos')
         end
 
         if tours != nil
-          tours.collect { |tour| @virtual_tours.push(VirtualTour.new(tour)) }
+          setup_attribute(@virtual_tours, tours, VirtualTour)
           attributes['StandardFields'].delete('VirtualTours')
         end
 
         if docs != nil
-          docs.collect { |doc| @documents.push(Document.new(doc)) }
+          setup_attribute(@documents, docs, Document)
           attributes['StandardFields'].delete('Documents')
         end
-        
+
         if ohouses != nil
-          @open_houses = []
-          ohouses.collect { |ohouse| @open_houses.push(OpenHouse.new(ohouse)) }
+          setup_attribute(@open_houses, ohouses, OpenHouse)
           attributes['StandardFields'].delete('OpenHouses')
         end
-        
+
         if tourhomes != nil
-          @tour_of_homes = []
-          tourhomes.collect { |tourhome| @tour_of_homes.push(TourOfHome.new(tourhome)) }
+          setup_attribute(@tour_of_homes, tourhomes, TourOfHome)
           attributes['StandardFields'].delete('TourOfHomes')
         end
-        
+
         if rentalcalendars != nil
-          rentalcalendars.collect { |rentalcalendar| @rental_calendars.push(RentalCalendar.new(rentalcalendar)) }
+          setup_attribute(@rental_calendars, rentalcalendars, RentalCalendar)
           attributes.delete('RentalCalendar')
-        end        
-        
+        end
+
         super(attributes)
       end
 
@@ -106,7 +105,7 @@ module SparkApi
         @open_houses ||= OpenHouse.find_by_listing_key(self.Id, arguments)
         return @open_houses unless @open_houses.nil?
       end
-      
+
       def my_notes
         Note.build_subclass.tap do |note|
           note.prefix = "/listings/#{self.ListingKey}"
@@ -161,6 +160,7 @@ module SparkApi
         end
         false
       end
+
       def save!(arguments={})
         writable_changed_keys = changed & WRITEABLE_FIELDS
         if writable_changed_keys.empty?
@@ -200,7 +200,7 @@ module SparkApi
         end
         editable
       end
-      
+
       def ExpirationDate
         attributes["ExpirationDate"]
       end
@@ -215,7 +215,7 @@ module SparkApi
           attributes['StandardFields'].include?(method_symbol.to_s) rescue false
         end
       end
-      
+
       private
 
       # TODO trim this down so we're only overriding the StandardFields access
@@ -236,7 +236,7 @@ module SparkApi
           super # GTFO
         end
       end
-      
+
       def build_hash(keys)
         hash = {}
         keys.each do |key|
@@ -244,7 +244,15 @@ module SparkApi
         end
         hash
       end
-      
+
+      # Determine if passed a model or hash and push instance of Klass onto attributes array
+      def setup_attribute(attributes, collection, klass)
+        collection.collect do |c|
+          attribute = (c.instance_of? klass) ? c : klass.new(c)
+          attributes.push(attribute)
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spark_api
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 1
   - 3
-  - 17
-  version: 1.3.17
+  - 18
+  version: 1.3.18
 platform: ruby
 authors: 
 - Brandon Hornseth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-11-07 00:00:00 Z
+date: 2014-11-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime