spark_api 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/spark_api/authentication/api_auth.rb

@@ -38,12 +38,12 @@ module SparkApi
       # specifically for signing a request.
       def build_param_string(param_hash)
         return "" if param_hash.nil?
-          sorted = param_hash.sort do |a,b|
+          sorted = param_hash.keys.sort do |a,b|
             a.to_s <=> b.to_s
           end
           params = ""
-          sorted.each do |key,val|
-            params += key.to_s + val.to_s
+          sorted.each do |key|
+            params += key.to_s + param_hash[key].to_s
           end
           params
       end

data/lib/spark_api/authentication/oauth2_impl/grant_type_code.rb

@@ -32,13 +32,14 @@ module SparkApi
 
         private 
         def token_params
-          params = {
-            "client_id" => @provider.client_id,
-            "client_secret" => @provider.client_secret,
-            "grant_type" => "authorization_code",
-            "code" => @provider.code,
-            "redirect_uri" => @provider.redirect_uri
-          }.to_json 
+          hash = {
+           "client_id" => @provider.client_id,
+           "client_secret" => @provider.client_secret,
+           "code" => @provider.code,
+           "grant_type" => "authorization_code",
+           "redirect_uri" => @provider.redirect_uri
+         }
+         MultiJson.dump(hash)
         end
         
       end

data/lib/spark_api/authentication/oauth2_impl/grant_type_password.rb

@@ -26,13 +26,14 @@ module SparkApi
 
         private 
         def token_params
-          params = {
+          hash = {
             "client_id" => @provider.client_id,
             "client_secret" => @provider.client_secret,
             "grant_type" => "password",
-            "username" => @provider.username,
             "password" => @provider.password,
-          }.to_json 
+            "username" => @provider.username
+          }
+          MultiJson.dump(hash)
         end
       end
     end

data/lib/spark_api/authentication/oauth2_impl/grant_type_refresh.rb

@@ -20,12 +20,13 @@ module SparkApi
         
         private 
         def token_params
-          @params.merge({
+          hash = @params.merge({
             "client_id" => @provider.client_id,
             "client_secret" => @provider.client_secret,
             "grant_type" => "refresh_token",
             "refresh_token"=> session.refresh_token,
-          }).to_json 
+          }) 
+          MultiJson.dump(hash)
         end
       end
       

data/lib/spark_api/configuration/yaml.rb

@@ -31,13 +31,15 @@ module SparkApi
         @name
       end
       def api_env
-        current_env = "development"
-        if env.include?("SPARK_API_ENV")
-          current_env = env["SPARK_API_ENV"]
-        elsif env.include?("RAILS_ENV")
-          current_env = env["RAILS_ENV"]
+        if env.include? "SPARK_API_ENV"
+          env["SPARK_API_ENV"]
+        elsif env.include? "RAILS_ENV"
+          env["RAILS_ENV"]
+        elsif env.include? "RACK_ENV"
+          env["RACK_ENV"]
+        else
+          "development"
         end
-        return current_env
       end
       
       # Used to specify the root of where to look for SparkApi config files

data/lib/spark_api/models/listing_cart.rb

@@ -63,7 +63,7 @@ module SparkApi
         true
       end
       def update!(arguments={})
-        results = connection.put "#{self.class.path}/#{self.Id}", {"ListingCarts" => [ {"Name" => attributes["Name"], "ListingIds" => attributes["ListingIds"]} ] }, arguments
+        results = connection.put "#{self.class.path}/#{self.Id}", {"ListingCarts" => [ {"ListingIds" => attributes["ListingIds"],"Name" => attributes["Name"]} ] }, arguments
         true
       end
 

data/lib/spark_api/models/open_house.rb

@@ -9,18 +9,10 @@ module SparkApi
       self.element_name = "openhouses"
       
       def initialize(attributes={})
-        # Transform the date strings
-        unless attributes['Date'].nil?
-          date = Date.parse(attributes['Date'])
-          attributes['Date'] = date
-          attributes['StartTime'] = Time.parse("#{date}T#{attributes['StartTime']}") unless attributes['StartTime'].nil?
-          attributes['EndTime'] = Time.parse("#{date}T#{attributes['EndTime']}") unless attributes['EndTime'].nil?
-        end
-        
+        self.class.parse_date_start_and_end_times attributes
         if attributes["Comments"].nil?
           attributes["Comments"] = ""
         end
-        
         super(attributes)
       end
       

data/lib/spark_api/models/subresource.rb

@@ -14,6 +14,26 @@ module SparkApi
         collect(connection.get("/listings/#{parent_id}#{self.path}/#{id}", arguments)).first
       end
       
+      def parse_date_start_and_end_times(attributes)
+        # Transform the date strings
+        unless attributes['Date'].nil?
+          date = Date.strptime attributes['Date'], '%m/%d/%Y'
+          ['StartTime','EndTime'].each do |time|
+            next if attributes[time].nil?
+            format = '%m/%d/%YT%H:%M%z'
+            if attributes[time].split(':').size > 3
+              format = '%m/%d/%YT%H:%M:%S%z'
+            end
+            formatted_date = "#{attributes['Date']}T#{attributes[time]} FORMAT: #{format}"
+            datetime = DateTime.strptime(formatted_date, format)
+            datetime = datetime.new_offset DateTime.now.offset 
+            attributes[time] = Time.local(datetime.year, datetime.month, datetime.day, datetime.hour, datetime.min,
+                                          datetime.sec)
+          end
+          attributes['Date'] = date
+        end
+      end
+      
     end
   end
 end

data/lib/spark_api/models/tour_of_home.rb

@@ -9,13 +9,7 @@ module SparkApi
       self.element_name = "tourofhomes"
       
       def initialize(attributes={})
-        # Transform the date strings
-        unless attributes['Date'].nil?
-          date = Date.parse(attributes['Date'])
-          attributes['Date'] = date
-          attributes['StartTime'] = Time.parse("#{date}T#{attributes['StartTime']}") unless attributes['StartTime'].nil?
-          attributes['EndTime'] = Time.parse("#{date}T#{attributes['EndTime']}") unless attributes['EndTime'].nil?
-        end
+        self.class.parse_date_start_and_end_times attributes
         super(attributes)
       end
       

data/spec/fixtures/contacts/new.json

@@ -1,11 +1,11 @@
 {
 	"D": {
-		"Notify": false,
 		"Contacts": [
 			{
 				"DisplayName": "Contact Four",
 				"PrimaryEmail": "contact4@fbsdata.com"
 			}
-		]
+		],
+		"Notify": false
 	}
 }

data/spec/fixtures/contacts/new_empty.json

@@ -1,8 +1,8 @@
 {
 	"D": {
-		"Notify": false,
 		"Contacts": [
 			{ }
-		]
+		],
+		"Notify": false
 	}
 }

data/spec/fixtures/listing_carts/new.json

@@ -1,12 +1,12 @@
 {
     "D": {
       "ListingCarts": [{
-        "Name": "My Cart's Name",
         "ListingIds": [
             "20110112234857732941000000",
             "20110302120238448431000000",
             "20110510011212354751000000"
-        ]
+        ],
+        "Name": "My Cart's Name"
       }]
   }
 }

data/spec/fixtures/listings/photos/new.json

@@ -2,10 +2,10 @@
     "D": {
         "Photos": [
             {
-                "Caption": "Creators of flexMLS!",
-                "Name": "FBS Logo",
+                "Picture": "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",
                 "FileName": "logo_fbs.png",
-                "Picture": "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"
+                "Name": "FBS Logo",
+                "Caption": "Creators of flexMLS!"
             }
         ]
     }

data/spec/fixtures/listings/tour_of_homes.json

@@ -4,16 +4,16 @@
 	        {"ResourceUri":"/listings/20060725224713296297000000/tourofhomes/20101127153422574618000000",
 	         "Id": "20101127153422574618000000",
 	         "Date": "10/01/2010",
-	         "StartTime": "09:00 AM",
-	         "EndTime": "12:00 PM",
+	         "StartTime": "09:00-07:00",
+	         "EndTime": "12:00-07:00",
 	         "Comments": "Wonderful home; must see!",
 	         "AdditionalInfo": [{"Hosted By": "Joe Smith"}, {"Host Phone": "123-456-7890"}, {"Tour Area": "North-Central"}]
 	        },
 	        {"ResourceUri":"/listings/20060725224713296297000000/tourofhomes/20101127153422174618000000",
 	         "Id": "20101127153422174618000000",
 	         "Date": "10/08/2010",
-	         "StartTime": "09:00 AM",
-	         "EndTime": "12:00 PM",
+	         "StartTime": "09:00-07:00",
+	         "EndTime": "12:00-07:00",
 	         "Comments": "Wonderful home; must see!",
 	         "AdditionalInfo": [{"Hosted By": "Joe Smith"}, {"Host Phone": "123-456-7890"}, {"Tour Area": "North-Central"}]
 	        }        

data/spec/json_hash_test_support.rb

@@ -0,0 +1,251 @@
+# Several workarounds to get our test setup working in multiple ruby environments credit is 
+# attributed to all the projects that found solutions to these test headaches! 
+
+
+module SparkApiTest
+# directly taken from Rails 3.1's OrderedHash
+# see https://github.com/rails/rails/blob/master/activesupport/lib/active_support/ordered_hash.rb
+
+# The order of iteration over hashes in Ruby 1.8 is undefined. For example, you do not know the
+# order in which +keys+ will return keys, or +each+ yield pairs. <tt>ActiveSupport::OrderedHash</tt>
+# implements a hash that preserves insertion order, as in Ruby 1.9:
+#
+#   oh = ActiveSupport::OrderedHash.new
+#   oh[:a] = 1
+#   oh[:b] = 2
+#   oh.keys # => [:a, :b], this order is guaranteed
+#
+# <tt>ActiveSupport::OrderedHash</tt> is namespaced to prevent conflicts with other implementations.
+class OrderedHash < ::Hash #:nodoc:
+  def to_yaml_type
+    "!tag:yaml.org,2002:omap"
+  end
+
+  def encode_with(coder)
+    coder.represent_seq '!omap', map { |k,v| { k => v } }
+  end
+
+  def to_yaml(opts = {})
+    if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck?
+      return super
+    end
+
+    YAML.quick_emit(self, opts) do |out|
+      out.seq(taguri) do |seq|
+        each do |k, v|
+          seq.add(k => v)
+        end
+      end
+    end
+  end
+
+  def nested_under_indifferent_access
+    self
+  end
+
+  # Hash is ordered in Ruby 1.9!
+  if RUBY_VERSION < '1.9'
+
+    # In MRI the Hash class is core and written in C. In particular, methods are
+    # programmed with explicit C function calls and polymorphism is not honored.
+    #
+    # For example, []= is crucial in this implementation to maintain the @keys
+    # array but hash.c invokes rb_hash_aset() originally. This prevents method
+    # reuse through inheritance and forces us to reimplement stuff.
+    #
+    # For instance, we cannot use the inherited #merge! because albeit the algorithm
+    # itself would work, our []= is not being called at all by the C code.
+
+    def initialize(*args, &block)
+      super
+      @keys = []
+    end
+
+    def self.[](*args)
+      ordered_hash = new
+
+      if (args.length == 1 && args.first.is_a?(Array))
+        args.first.each do |key_value_pair|
+          next unless (key_value_pair.is_a?(Array))
+          ordered_hash[key_value_pair[0]] = key_value_pair[1]
+        end
+
+        return ordered_hash
+      end
+
+      unless (args.size % 2 == 0)
+        raise ArgumentError.new("odd number of arguments for Hash")
+      end
+
+      args.each_with_index do |val, ind|
+        next if (ind % 2 != 0)
+        ordered_hash[val] = args[ind + 1]
+      end
+
+      ordered_hash
+    end
+
+    def initialize_copy(other)
+      super
+      # make a deep copy of keys
+      @keys = other.keys
+    end
+
+    def []=(key, value)
+      @keys << key unless has_key?(key)
+      super
+    end
+
+    def delete(key)
+      if has_key? key
+        index = @keys.index(key)
+        @keys.delete_at index
+      end
+      super
+    end
+
+    def delete_if
+      super
+      sync_keys!
+      self
+    end
+
+    def reject!
+      super
+      sync_keys!
+      self
+    end
+
+    def reject(&block)
+      dup.reject!(&block)
+    end
+
+    def keys
+      @keys.dup
+    end
+
+    def values
+      @keys.collect { |key| self[key] }
+    end
+
+    def to_hash
+      self
+    end
+
+    def to_a
+      @keys.map { |key| [ key, self[key] ] }
+    end
+
+    def each_key
+      return to_enum(:each_key) unless block_given?
+      @keys.each { |key| yield key }
+      self
+    end
+
+    def each_value
+      return to_enum(:each_value) unless block_given?
+      @keys.each { |key| yield self[key]}
+      self
+    end
+
+    def each
+      return to_enum(:each) unless block_given?
+      @keys.each {|key| yield [key, self[key]]}
+      self
+    end
+
+    alias_method :each_pair, :each
+
+    alias_method :select, :find_all
+
+    def clear
+      super
+      @keys.clear
+      self
+    end
+
+    def shift
+      k = @keys.first
+      v = delete(k)
+      [k, v]
+    end
+
+    def merge!(other_hash)
+      if block_given?
+        other_hash.each { |k, v| self[k] = key?(k) ? yield(k, self[k], v) : v }
+      else
+        other_hash.each { |k, v| self[k] = v }
+      end
+      self
+    end
+
+    alias_method :update, :merge!
+
+    def merge(other_hash, &block)
+      dup.merge!(other_hash, &block)
+    end
+
+    # When replacing with another hash, the initial order of our keys must come from the other hash -ordered or not.
+    def replace(other)
+      super
+      @keys = other.keys
+      self
+    end
+
+    def invert
+      OrderedHash[self.to_a.map!{|key_value_pair| key_value_pair.reverse}]
+    end
+
+    private
+      def sync_keys!
+        @keys.delete_if {|k| !has_key?(k)}
+      end
+  end
+end
+end
+
+# Originally based on a fix found in Koala, a facebook client gem that has compatibile licensing.
+# See: https://raw.github.com/arsduo/koala/master/spec/support/json_testing_fix.rb
+#
+# when testing across Ruby versions, we found that JSON string creation inconsistently ordered keys
+# which is a problem because our mock testing service ultimately matches strings to see if requests are mocked
+# this fix solves that problem by ensuring all hashes are created with a consistent key order every time
+module MultiJson
+
+  class << self
+    def dump_with_ordering(object)
+      # if it's a hash, recreate it with k/v pairs inserted in sorted-by-key order
+      # (for some reason, REE fails if we don't assign the ternary result as a local variable
+      # separately from calling encode_original)
+      dump_original(sort_object(object))
+    end
+
+    alias_method :dump_original, :dump
+    alias_method :dump, :dump_with_ordering
+  
+    def load_with_ordering(string)
+      sort_object(load_original(string))
+    end
+
+    alias_method :load_original, :load
+    alias_method :load, :load_with_ordering
+    
+    private 
+  
+    def sort_object(object)
+      if object.is_a?(Hash)
+        sort_hash(object)
+      elsif object.is_a?(Array)
+        object.collect {|item| item.is_a?(Hash) ? sort_hash(item) : item}
+      else
+        object
+      end
+    end
+  
+    def sort_hash(unsorted_hash)
+      sorted_hash = SparkApiTest::OrderedHash.new(sorted_hash)
+      unsorted_hash.keys.sort {|a, b| a.to_s <=> b.to_s}.inject(sorted_hash) {|hash, k| hash[k] = unsorted_hash[k]; hash}
+    end
+  end
+end
+

data/spec/mock_helper.rb

@@ -22,7 +22,7 @@ def stub_api_delete(service_path, stub_fixture="success.json", opts={})
   sig = $test_client.authenticator.sign_token("/#{SparkApi.version}#{service_path}", params)
   s=stub_request(:delete, "#{SparkApi.endpoint}/#{SparkApi.version}#{service_path}").
       with(:query => {
-        :ApiSig => sig        
+        :ApiSig => sig
         }.merge(params))
   if(block_given?)
     yield s
@@ -32,8 +32,8 @@ def stub_api_delete(service_path, stub_fixture="success.json", opts={})
   log_stub(s)
 end
 def stub_api_post(service_path, body, stub_fixture="success.json", opts={})
-  body_hash = JSON.parse(fixture(body).read)
-  body_str = body_hash.to_json
+  body_hash = MultiJson.load(fixture(body).read)
+  body_str = MultiJson.dump(body_hash)
   params = {:ApiUser => "foobar", :AuthToken => "c401736bf3d3f754f07c04e460e09573"}.merge(opts)
   sig = $test_client.authenticator.sign_token("/#{SparkApi.version}#{service_path}", params, body_str)
   s=stub_request(:post, "#{SparkApi.endpoint}/#{SparkApi.version}#{service_path}").
@@ -50,8 +50,8 @@ def stub_api_post(service_path, body, stub_fixture="success.json", opts={})
   log_stub(s)
 end
 def stub_api_put(service_path, body, stub_fixture="success.json", opts={})
-  body_hash = JSON.parse(fixture(body).read)
-  body_str = body_hash.to_json
+  body_hash = MultiJson.load(fixture(body).read)
+  body_str = MultiJson.dump(body_hash)
   params = {:ApiUser => "foobar", :AuthToken => "c401736bf3d3f754f07c04e460e09573"}.merge(opts)
   sig = $test_client.authenticator.sign_token("/#{SparkApi.version}#{service_path}", params, body_str)
   s=stub_request(:put, "#{SparkApi.endpoint}/#{SparkApi.version}#{service_path}").

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ require path + '/spark_api'
 require 'spark_api'
 require File.expand_path('../mock_helper', __FILE__)
 require File.expand_path('../json_helper', __FILE__)
+require File.expand_path('../json_hash_test_support', __FILE__)
 
 
 FileUtils.mkdir 'log' unless File.exists? 'log'
@@ -47,3 +48,4 @@ RSpec.configure do |config|
   config.alias_example_to :on_post_it, :method => 'POST'
   config.alias_example_to :on_delete_it, :method => 'DELETE'
 end
+

data/spec/unit/spark_api/authentication/oauth2_spec.rb

@@ -15,7 +15,7 @@ describe SparkApi::Authentication::OAuth2  do
     it "should authenticate the api credentials" do
       stub_request(:post, provider.access_uri).
         with(:body => 
-            '{"code":"my_code","client_secret":"example-password","client_id":"example-id","redirect_uri":"https://exampleapp.fbsdata.com/oauth-callback","grant_type":"authorization_code"}' 
+          '{"client_id":"example-id","client_secret":"example-password","code":"my_code","grant_type":"authorization_code","redirect_uri":"https://exampleapp.fbsdata.com/oauth-callback"}' 
         ).
         to_return(:body => fixture("oauth2/access.json"), :status=>200)
       subject.authenticate.access_token.should eq("04u7h-4cc355-70k3n")
@@ -25,7 +25,7 @@ describe SparkApi::Authentication::OAuth2  do
     it "should raise an error when api credentials are invalid" do
       s=stub_request(:post, provider.access_uri).
         with(:body => 
-             '{"code":"my_code","client_secret":"example-password","client_id":"example-id","redirect_uri":"https://exampleapp.fbsdata.com/oauth-callback","grant_type":"authorization_code"}'
+          '{"client_id":"example-id","client_secret":"example-password","code":"my_code","grant_type":"authorization_code","redirect_uri":"https://exampleapp.fbsdata.com/oauth-callback"}'
         ).
         to_return(:body => fixture("oauth2/error.json"), :status=>400)
       expect {subject.authenticate()}.to raise_error(SparkApi::ClientError){ |e| e.status.should == 400 }
@@ -103,22 +103,24 @@ describe SparkApi::Authentication::OAuth2  do
         count = 0
         refresh_count = 0
         stub_request(:post, provider.access_uri).
-          with(:body => '{"code":"my_code","client_secret":"example-password","client_id":"example-id","redirect_uri":"https://exampleapp.fbsdata.com/oauth-callback","grant_type":"authorization_code"}'). 
-          to_return do
+          with(:body => 
+            '{"client_id":"example-id","client_secret":"example-password","code":"my_code","grant_type":"authorization_code","redirect_uri":"https://exampleapp.fbsdata.com/oauth-callback"}'
+          ).to_return do
             count += 1
             {:body => fixture("oauth2/access_with_old_refresh.json"), :status=>200}
           end
         stub_request(:post, provider.access_uri).
-          with(:body => '{"client_id":"example-id","client_secret":"example-password","grant_type":"refresh_token","redirect_uri":"https://exampleapp.fbsdata.com/oauth-callback","refresh_token":"0ld-r3fr35h-70k3n"}'). 
-          to_return do
+          with(:body => 
+            '{"client_id":"example-id","client_secret":"example-password","grant_type":"refresh_token","redirect_uri":"https://exampleapp.fbsdata.com/oauth-callback","refresh_token":"0ld-r3fr35h-70k3n"}'
+          ).to_return do
             refresh_count += 1
             {:body => fixture("oauth2/access_with_refresh.json"), :status=>200}
           end
         # Make sure the auth request goes out twice.
         # Fail the first time, but then return the correct value after reauthentication
         stub_request(:get, "https://api.sparkapi.com/#{SparkApi.version}/listings/1234").
-            to_return(:body => fixture('errors/expired.json'), :status => 401).times(1).then.
-            to_return(:body => fixture('listings/with_documents.json'))
+          to_return(:body => fixture('errors/expired.json'), :status => 401).times(1).then.
+          to_return(:body => fixture('listings/with_documents.json'))
         client.get("/listings/1234")
         count.should eq(1)
         refresh_count.should eq(1)
@@ -129,16 +131,17 @@ describe SparkApi::Authentication::OAuth2  do
       it "should reset the session and reauthenticate" do
         count = 0
         stub_request(:post, provider.access_uri).
-          with(:body => '{"code":"my_code","client_secret":"example-password","client_id":"example-id","redirect_uri":"https://exampleapp.fbsdata.com/oauth-callback","grant_type":"authorization_code"}'). 
-          to_return do
+          with(:body =>
+            '{"client_id":"example-id","client_secret":"example-password","code":"my_code","grant_type":"authorization_code","redirect_uri":"https://exampleapp.fbsdata.com/oauth-callback"}' 
+          ).to_return do
             count += 1
             {:body => fixture("oauth2/access.json"), :status=>200}
           end
         # Make sure the auth request goes out twice.
         # Fail the first time, but then return the correct value after reauthentication
         stub_request(:get, "https://api.sparkapi.com/#{SparkApi.version}/listings/1234").
-            to_return(:body => fixture('errors/expired.json'), :status => 401).times(1).then.
-            to_return(:body => fixture('listings/with_documents.json'))
+          to_return(:body => fixture('errors/expired.json'), :status => 401).times(1).then.
+          to_return(:body => fixture('listings/with_documents.json'))
               
         client.get("/listings/1234")
         count.should eq(2)
@@ -234,10 +237,9 @@ describe "password authentication" do
   subject {client.authenticator }  
   it "should authenticate the api credentials with username and password" do
     stub_request(:post, provider.access_uri).
-      with(:body => 
-        '{"username":"example-user","client_secret":"example-secret","client_id":"example-id","password":"example-password","grant_type":"password"}' 
-      ).
-      to_return(:body => fixture("oauth2/access.json"), :status=>200)
+      with(:body =>
+        '{"client_id":"example-id","client_secret":"example-secret","grant_type":"password","password":"example-password","username":"example-user"}' 
+      ).to_return(:body => fixture("oauth2/access.json"), :status=>200)
     subject.authenticate.access_token.should eq("04u7h-4cc355-70k3n")
     subject.authenticate.expires_in.should eq(60)
   end

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

@@ -47,11 +47,10 @@ describe ListingCart do
       stub_api_get("/#{subject.class.element_name}", 'listing_carts/listing_cart.json')
       resource = subject.class.get.first
       stub_api_put("/#{subject.class.element_name}/#{resource.Id}", 'listing_carts/new.json', 'success.json')
+      resource.Name = "My Cart's Name"
       resource.ListingIds = ['20110112234857732941000000',
                              '20110302120238448431000000',
                              '20110510011212354751000000']
-
-      resource.Name = "My Cart's Name"
       resource.save.should be(true)
       resource.ResourceUri.should eq("/v1/listingcarts/20100912153422758914000000")
     end

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

@@ -8,8 +8,8 @@ describe OpenHouse do
       'ResourceUri'=>"/v1/listings/20060412165917817933000000/openhouses/20101127153422574618000000",
       'Id'=>"20060412165917817933000000",
       'Date'=>"10/01/2010",
-      'StartTime'=>"09:00:00-07:00",
-      'EndTime'=>"12:00:00-07:00"
+      'StartTime'=>"09:00-07:00",
+      'EndTime'=>"12:00-07:00"
     )
   end
 
@@ -21,8 +21,14 @@ describe OpenHouse do
     start_time = DateTime.new(2010,10,1,9,0,0, "-0700")
     end_time = DateTime.new(2010,10,1,12,0,0, "-0700")
     subject.Date.should eq(Date.new(2010,10,1))
-    subject.StartTime.should eq(Time.parse(start_time.to_s))
-    subject.EndTime.should eq(Time.parse(end_time.to_s))
+    # TRYING TO MAKE THIS BACKWARDS COMPATIBLE AND NOT HAPPY ABOUT IT
+    if RUBY_VERSION < '1.9'
+      subject.StartTime.should eq(Time.parse(start_time.to_s))
+      subject.EndTime.should eq(Time.parse(end_time.to_s))
+    else
+      subject.StartTime.should eq(start_time.to_time)
+      subject.EndTime.should eq(end_time.to_time)
+    end
   end
 
   context "/listings/<listing_id>/openhouses", :support do

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

@@ -23,8 +23,14 @@ describe TourOfHome do
     start_time = DateTime.new(2010,10,1,9,0,0, "-0700")
     end_time = DateTime.new(2010,10,1,23,0,0, "-0700")
     subject.Date.should eq(Date.new(2010,10,1))
-    subject.StartTime.should eq(Time.parse(start_time.to_s))
-    subject.EndTime.should eq(Time.parse(end_time.to_s))
+# TRYING TO MAKE THIS BACKWARDS COMPATIBLE AND NOT HAPPY ABOUT IT
+if RUBY_VERSION < '1.9'
+  subject.StartTime.should eq(Time.parse(start_time.to_s))
+  subject.EndTime.should eq(Time.parse(end_time.to_s))
+else
+  subject.StartTime.should eq(start_time.to_time)
+  subject.EndTime.should eq(end_time.to_time)
+end
   end
 
   context "/listings/<listing_id>/tourofhomes", :support do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spark_api
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Brandon Hornseth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-07 00:00:00 Z
+date: 2012-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -151,12 +151,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 35
         segments: 
         - 2
-        - 8
+        - 11
         - 0
-        version: 2.8.0
+        version: 2.11.0
   requirement: *id008
   prerelease: false
   name: rspec
@@ -199,12 +199,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 11
         segments: 
         - 1
-        - 6
-        - 3
-        version: 1.6.3
+        - 7
+        - 0
+        version: 1.7.0
   requirement: *id011
   prerelease: false
   name: ci_reporter
@@ -444,6 +444,7 @@ files:
 - spec/spec_helper.rb
 - spec/oauth2_helper.rb
 - spec/json_helper.rb
+- spec/json_hash_test_support.rb
 - spec/mock_helper.rb
 homepage: https://github.com/sparkapi/spark_api
 licenses: []
@@ -606,4 +607,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/oauth2_helper.rb
 - spec/json_helper.rb
+- spec/json_hash_test_support.rb
 - spec/mock_helper.rb