spark_api 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/spark_api/client.rb

@@ -16,8 +16,7 @@ module SparkApi
     
     # Constructor bootstraps the client with configuration and authorization class.
     # options - see Configuration::VALID_OPTION_KEYS
-    # auth_klass - subclass of Authentication::BaseAuth Defaults to the original api auth system.
-    def initialize(options={}, auth_klass=ApiAuth)
+    def initialize(options={})
       options = SparkApi.options.merge(options)
       Configuration::VALID_OPTION_KEYS.each do |key|
         send("#{key}=", options[key])

data/lib/spark_api/connection.rb

@@ -11,7 +11,6 @@ module SparkApi
       opts = {
         :headers => headers
       }
-      domain = @endpoint 
       if(force_ssl || self.ssl)
         opts[:ssl] = {:verify => false }
         opts[:url] = @endpoint.sub /^http:/, "https:"

data/lib/spark_api/models/finders.rb

@@ -15,6 +15,10 @@ module SparkApi
           else             find_single(scope, options)
         end
       end
+
+      def all(*arguments)
+        find(:all, *arguments)
+      end
       
       def first(*arguments)
         find(:first, *arguments)

data/lib/spark_api/models/subresource.rb

@@ -1,7 +1,7 @@
 module SparkApi
   module Models
-    module Subresource 
-    
+    module Subresource
+
       def build_subclass
         Class.new(self)
       end
@@ -9,31 +9,51 @@ module SparkApi
       def find_by_listing_key(key, arguments={})
         collect(connection.get("/listings/#{key}#{self.path}", arguments))
       end
-      
+
       def find_by_id(id, parent_id, arguments={})
         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'
+            formatted_date = "#{attributes['Date']}T#{attributes[time]}"
+            datetime = nil
+
+            begin
+              datetime = DateTime.strptime(formatted_date, '%m/%d/%YT%l:%M %P')
+            rescue => ex
+              ; # Do nothing; doesn't matter
+            end
+
+            unless datetime
+              other_formats = ['%m/%d/%YT%H:%M%z', '%m/%d/%YT%H:%M:%S%z']
+              other_formats.each_with_index do |format, i|
+                begin
+                  datetime = DateTime.strptime(formatted_date, format)
+                  datetime = datetime.new_offset DateTime.now.offset
+                  break
+                rescue => ex
+                  next
+                end
+              end
+            end
+
+            # if we still don't have a valid time, raise an error
+            unless datetime
+              raise ArgumentError.new('invalid date')
             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)
+
+            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/spec/fixtures/finders.json

@@ -0,0 +1,14 @@
+{"D": {
+            "Success": true, 
+            "Results": [{
+              "Id": 1,
+              "Name": "My Example", 
+              "Test": true
+            },
+            {
+              "Id": 2, 
+              "Name": "My Example2", 
+              "Test": false
+            }]}
+            }
+

data/spec/fixtures/listings/open_houses.json

@@ -6,8 +6,8 @@
                 "ResourceUri": "/v1/listings/20060412165917817933000000/openhouses/20101127153422574618000000",
                 "Id": "20101127153422574618000000",
                 "Date": "10/01/2010",
-                "StartTime": "09:00-07:00",
-                "EndTime": "12:00-07:00"
+                "StartTime": "9:00 am",
+                "EndTime": "12:00 pm"
             },
             {
                 "ResourceUri": "/v1/listings/20060412165917817933000000/openhouses/20101127153422174618000000",
@@ -18,4 +18,4 @@
             }
         ]
     }
-}
+}

data/spec/mock_helper.rb

@@ -113,7 +113,7 @@ def test_connection(stubs)
 end
 
 def stub_auth_request()
-  stub_request(:post, "https://api.sparkapi.com/#{SparkApi.version}/session").
+  stub_request(:post, "#{SparkApi.endpoint}/#{SparkApi.version}/session").
               with(:query => {:ApiKey => "", :ApiSig => "806737984ab19be2fd08ba36030549ac"}).
               to_return(:body => fixture("session.json"))
 end

data/spec/spec_helper.rb

@@ -31,7 +31,7 @@ end
 
 SparkApi.logger.info("Setup gem for rspec testing")
 
-def reset_config()
+def reset_config
   SparkApi.reset
   SparkApi.configure do |config|
     config.api_user = "foobar"

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

@@ -0,0 +1,32 @@
+require './spec/spec_helper'
+
+class MyResource < Base
+  extend Finders
+  self.element_name = "my_resource"
+end
+
+describe Finders, "Finders model" do
+
+  before(:each) do
+    stub_auth_request
+  end
+
+  it "should get all results" do
+    stub_api_get("/my_resource", 'finders.json')
+    resources = MyResource.all
+    resources.size.should eq(2)
+  end
+
+  it "should get first result" do
+    stub_api_get("/my_resource", 'finders.json')
+    resource = MyResource.first
+    resource.Id.should eq(1)
+  end
+
+  it "should get last result" do
+    stub_api_get("/my_resource", 'finders.json')
+    resource = MyResource.last
+    resource.Id.should eq(2)
+  end
+
+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-07:00",
-      'EndTime'=>"12:00-07:00"
+      'StartTime'=>"9:00 am",
+      'EndTime'=>"12:00 pm"
     )
   end
 
@@ -17,20 +17,6 @@ describe OpenHouse do
     subject.class.should respond_to(:find_by_listing_key)
   end
 
-  it "should return date and times" 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))
-    # 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
     on_get_it "should get open house for a listing" do
       stub_auth_request

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

@@ -0,0 +1,74 @@
+require './spec/spec_helper'
+
+require 'time'
+
+describe Subresource do
+  let(:dummy_class) do
+    Class.new do
+      extend(Subresource)
+    end
+  end
+
+  it "should handle times without tz offset" do
+    times = {'Date' => '10/01/2012', 'StartTime' => '9:00 am', 'EndTime' => '12:00 pm'}
+    start_time = Time.local(2012,10,1,9,0,0)
+    end_time = Time.local(2012,10,1,12,0,0)
+    date = Date.new(2012,10,1)
+
+    dummy_class.parse_date_start_and_end_times(times)
+
+    times['Date'].should eq(date)
+
+    if RUBY_VERSION < '1.9'
+      times['StartTime'].should eq(Time.parse(start_time.to_s))
+      times['EndTime'].should eq(Time.parse(end_time.to_s))
+    else
+      times['StartTime'].should eq(start_time.to_time)
+      times['EndTime'].should eq(end_time.to_time)
+    end
+  end
+
+  it "should handle times with tz offset" do
+    times = {'Date' => '10/01/2012', 'StartTime' => '09:00-0700', 'EndTime' => '12:00-0700'}
+    start_time = DateTime.new(2012,10,1,9,0,0,'-0700')
+    end_time = DateTime.new(2012,10,1,12,0,0,'-0700')
+    date = Date.new(2012,10,1)
+
+    dummy_class.parse_date_start_and_end_times(times)
+
+    times['Date'].should eq(date)
+
+    if RUBY_VERSION < '1.9'
+      times['StartTime'].should eq(Time.parse(start_time.to_s))
+      times['EndTime'].should eq(Time.parse(end_time.to_s))
+    else
+      times['StartTime'].should eq(start_time.to_time)
+      times['EndTime'].should eq(end_time.to_time)
+    end
+  end
+
+  it "should handle times with tz offset and seconds" do
+    times = {'Date' => '10/01/2012', 'StartTime' => '09:12:34-0700', 'EndTime' => '12:43:21-0700'}
+    start_time = DateTime.new(2012,10,1,9,12,34,'-0700')
+    end_time = DateTime.new(2012,10,1,12,43,21,'-0700')
+    date = Date.new(2012,10,1)
+
+    dummy_class.parse_date_start_and_end_times(times)
+
+    times['Date'].should eq(date)
+
+    if RUBY_VERSION < '1.9'
+      times['StartTime'].should eq(Time.parse(start_time.to_s))
+      times['EndTime'].should eq(Time.parse(end_time.to_s))
+    else
+      times['StartTime'].should eq(start_time.to_time)
+      times['EndTime'].should eq(end_time.to_time)
+    end
+  end
+
+  it "should raise an exception for unsupported formats" do
+    times = {'Date' => '10/01/2012', 'StartTime' => '_9:00_ _am_', 'EndTime' => '_12:00_ _pm_'}
+
+    expect {dummy_class.parse_date_start_and_end_times(times)}.to raise_error(ArgumentError)
+  end
+end

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

@@ -8,8 +8,8 @@ describe TourOfHome do
       'ResourceUri'=>"/listings/20060725224713296297000000/tourofhomes/20101127153422574618000000",
       'Id'=>"20101127153422574618000000",
       'Date'=>"10/01/2010",
-      'StartTime'=>"09:00:00-07:00",
-      'EndTime'=>"23:00:00-07:00",
+      'StartTime'=>"9:00 am",
+      'EndTime'=>"11:00 pm",
       'Comments'=>"Wonderful home; must see!",
       'AdditionalInfo'=> [{"Hosted By"=>"Joe Smith"}, {"Host Phone"=>"123-456-7890"}, {"Tour Area"=>"North-Central"}]
     )
@@ -19,20 +19,6 @@ describe TourOfHome do
     subject.class.should respond_to(:find_by_listing_key)
   end
 
-  it "should return tour date and times" 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))
-# 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
     on_get_it "should get home tours for a listing" do
       stub_auth_request

data/spec/unit/spark_api/multi_client_spec.rb

@@ -51,6 +51,10 @@ describe SparkApi::MultiClient do
       SparkApi.client.api_key.should eq('demo_key')
     end
   end
+
+  after(:all) do
+    reset_config
+  end
   
 end
 

data/spec/unit/spark_api/paginate_spec.rb

@@ -128,7 +128,7 @@ describe SparkApi::Paginate do
   
   # non unit-y real world test of paginations with listings
   context "paginating listings" do
-    before do
+    before(:each) do
       stub_auth_request
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spark_api
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Brandon Hornseth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-31 00:00:00 Z
+date: 2012-09-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -387,6 +387,7 @@ files:
 - spec/fixtures/listings/virtual_tours_index.json
 - spec/fixtures/listings/document_index.json
 - spec/fixtures/listings/constraints.json
+- spec/fixtures/finders.json
 - spec/fixtures/notifications/notifications.json
 - spec/fixtures/notifications/new_empty.json
 - spec/fixtures/notifications/unread.json
@@ -428,9 +429,11 @@ files:
 - spec/unit/spark_api/models/shared_listing_spec.rb
 - spec/unit/spark_api/models/note_spec.rb
 - spec/unit/spark_api/models/connect_prefs_spec.rb
+- spec/unit/spark_api/models/subresource_spec.rb
 - spec/unit/spark_api/models/photo_spec.rb
 - spec/unit/spark_api/models/base_spec.rb
 - spec/unit/spark_api/models/tour_of_home_spec.rb
+- spec/unit/spark_api/models/finders_spec.rb
 - spec/unit/spark_api/models/system_info_spec.rb
 - spec/unit/spark_api/models/standard_fields_spec.rb
 - spec/unit/spark_api/faraday_middleware_spec.rb
@@ -550,6 +553,7 @@ test_files:
 - spec/fixtures/listings/virtual_tours_index.json
 - spec/fixtures/listings/document_index.json
 - spec/fixtures/listings/constraints.json
+- spec/fixtures/finders.json
 - spec/fixtures/notifications/notifications.json
 - spec/fixtures/notifications/new_empty.json
 - spec/fixtures/notifications/unread.json
@@ -591,9 +595,11 @@ test_files:
 - spec/unit/spark_api/models/shared_listing_spec.rb
 - spec/unit/spark_api/models/note_spec.rb
 - spec/unit/spark_api/models/connect_prefs_spec.rb
+- spec/unit/spark_api/models/subresource_spec.rb
 - spec/unit/spark_api/models/photo_spec.rb
 - spec/unit/spark_api/models/base_spec.rb
 - spec/unit/spark_api/models/tour_of_home_spec.rb
+- spec/unit/spark_api/models/finders_spec.rb
 - spec/unit/spark_api/models/system_info_spec.rb
 - spec/unit/spark_api/models/standard_fields_spec.rb
 - spec/unit/spark_api/faraday_middleware_spec.rb