spark_api 1.0.2 → 1.0.4

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

@@ -148,6 +148,72 @@ describe SparkApi::Authentication::OAuth2  do
   end
 end
 
+describe SparkApi::Authentication::OpenIdOAuth2Hybrid do
+  let(:provider) do 
+    SparkApi::Authentication::SimpleProvider.new({
+      :access_uri    => "https://mygrantsite.com",
+      :client_id     => "mykey",
+      :client_secret => "mysecret",
+      :authorization_uri => "https://sparkplatform.com",
+      :redirect_uri  => "https://mycallback.com"
+    })
+  end
+  let(:client) do 
+    SparkApi::Client.new({:authentication_mode => SparkApi::Authentication::OpenIdOAuth2Hybrid,:oauth2_provider => provider}) 
+  end
+  describe "plugin" do
+    it "should load the hybrid authenticator" do
+      client.authenticator.class.should eq(SparkApi::Authentication::OpenIdOAuth2Hybrid)
+    end
+  end
+
+  describe "#authorization_url" do
+    it "should include combined flow parameter" do
+      client.authenticator.authorization_url.should match("openid.spark.combined_flow=true")
+    end
+    it "should allow custom parameters" do
+      client.authenticator.authorization_url({"joshua" => "iscool"}).should match("joshua=iscool")
+    end
+  end
+end
+
+describe SparkApi::Authentication::OpenId do
+  let(:provider) do 
+    SparkApi::Authentication::SimpleProvider.new({
+      :access_uri    => "https://mygrantsite.com",
+      :client_id     => "mykey",
+      :client_secret => "mysecret",
+      :authorization_uri => "https://sparkplatform.com",
+      :redirect_uri  => "https://mycallback.com"
+    })
+  end
+
+  let(:client) {SparkApi::Client.new({:authentication_mode => SparkApi::Authentication::OpenId, :oauth2_provider => provider}) }
+
+  describe "plugin" do
+    it "should not include combined flow parameter" do
+      client.authenticator.authorization_url.should_not match("openid.spark.combined_flow=true")
+    end
+    it "should load the oauth2 authenticator" do
+      client.authenticator.class.should eq(SparkApi::Authentication::OpenId)
+    end
+  end
+
+  describe "#authorization_url" do
+    it "should allow custom parameters" do
+      client.authenticator.authorization_url({"joshua" => "iscool"}).should match("joshua=iscool")
+    end
+  end
+
+  describe "forbidden methods" do
+    it "should not allow authentication" do
+      lambda {
+        client.authenticate
+      }.should raise_error(RuntimeError)
+    end
+  end
+end
+
 describe SparkApi::Authentication::BaseOAuth2Provider  do
   context "session_timeout" do
     it "should provide a default" do
@@ -200,6 +266,18 @@ describe SparkApi::Authentication::OAuthSession do
     session = SparkApi::Authentication::OAuthSession.new(args)
     session.start_time.should eq(DateTime.parse(args["start_time"]))
     JSON.parse(session.to_json).should eq(args)
-    
+  end
+
+  it "should accept symbolized parameters" do
+    args = {
+      :access_token => "abc", 
+      :expires_in => 3600, 
+      :refresh_token => "123", 
+      :refresh_timeout => 10000,
+      :start_time => "2012-01-01T00:00:00+00:00"
+    }
+    session = SparkApi::Authentication::OAuthSession.new(args)
+    session.start_time.should eq(DateTime.parse(args[:start_time]))
+    JSON.parse(session.to_json).should eq(JSON.parse(args.to_json))
   end
 end

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

@@ -257,6 +257,13 @@ describe Listing do
           l.photos.length.should == 0
           l.documents.length.should == 0
         end
+
+        on_get_it "should return an array of rental calendars" do
+          stub_api_get("/listings/1234", 'listings/with_rental_calendar.json', { :_expand => "RentalCalendar" })
+
+          l = Listing.find('1234', :_expand => "RentalCalendar")
+          l.rental_calendars.length.should == 2
+        end
         
         ## TourOfHomes: Not implemented yet ##
         #on_get_it "should return tour of homes" do

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

@@ -0,0 +1,30 @@
+require './spec/spec_helper'
+
+describe RentalCalendar do
+
+  describe "/listings/<listing_id>/rentalcalendar", :support do
+    before do
+      stub_auth_request
+      stub_api_get('/listings/1234/rentalcalendar','listings/rental_calendar.json')
+    end
+
+    on_get_it "should get an array of rental calendars" do
+      p = RentalCalendar.find_by_listing_key('1234')
+      p.should be_an(Array)
+      p.length.should == 2
+    end
+
+  end
+  
+  describe "test include_date method" do
+    cal = RentalCalendar.new
+    cal.StartDate = Date.parse("2012-07-12")
+    cal.EndDate = Date.parse("2012-07-18")
+    cal.include_date?(Date.parse("2012-06-01")).should == false
+    cal.include_date?(Date.parse("2012-07-12")).should == true
+    cal.include_date?(Date.parse("2012-07-15")).should == true
+    cal.include_date?(Date.parse("2012-07-18")).should == true
+    cal.include_date?(Date.parse("2012-08-01")).should == false
+  end
+
+end

data/spec/unit/spark_api/options_hash_spec.rb

@@ -0,0 +1,14 @@
+require './spec/spec_helper'
+
+describe SparkApi::OptionsHash do
+  it "should convert symbol parameters to a string" do
+    h = {:parameter_one => 1,
+         "parameter_two" => 2,
+         3 => 3}
+    o_h = SparkApi::OptionsHash.new(h)
+    o_h.keys.size.should eq(3)
+    o_h["parameter_one"].should eq(1)
+    o_h["parameter_two"].should eq(2)
+    o_h[3].should eq(3)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spark_api
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Brandon Hornseth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-11 00:00:00 Z
+date: 2012-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -286,61 +286,33 @@ files:
 - Rakefile
 - README.md
 - VERSION
-- bin/spark_api~
 - bin/spark_api
-- lib/spark_api/primary_array.rb~
 - lib/spark_api/authentication/api_auth.rb
 - lib/spark_api/authentication/oauth2_impl/middleware.rb
 - lib/spark_api/authentication/oauth2_impl/grant_type_base.rb
-- lib/spark_api/authentication/oauth2_impl/password_provider.rb~
-- lib/spark_api/authentication/oauth2_impl/middleware.rb~
-- lib/spark_api/authentication/oauth2_impl/grant_type_base.rb~
 - lib/spark_api/authentication/oauth2_impl/password_provider.rb
 - lib/spark_api/authentication/oauth2_impl/grant_type_code.rb
-- lib/spark_api/authentication/oauth2_impl/grant_type_code.rb~
 - lib/spark_api/authentication/oauth2_impl/grant_type_refresh.rb
 - lib/spark_api/authentication/oauth2_impl/simple_provider.rb
-- lib/spark_api/authentication/oauth2_impl/grant_type_password.rb~
 - lib/spark_api/authentication/oauth2_impl/grant_type_password.rb
-- lib/spark_api/authentication/oauth2_impl/grant_type_refresh.rb~
 - lib/spark_api/authentication/oauth2.rb
-- lib/spark_api/authentication/base_auth.rb~
-- lib/spark_api/authentication/oauth2.rb~
 - lib/spark_api/authentication/base_auth.rb
-- lib/spark_api/authentication/api_auth.rb~
 - lib/spark_api/client.rb
 - lib/spark_api/primary_array.rb
 - lib/spark_api/version.rb
 - lib/spark_api/response.rb
-- lib/spark_api/version.rb~
 - lib/spark_api/models.rb
-- lib/spark_api/paginate.rb~
 - lib/spark_api/connection.rb
 - lib/spark_api/multi_client.rb
-- lib/spark_api/models.rb~
-- lib/spark_api/faraday.rb~
-- lib/spark_api/cli.rb~
-- lib/spark_api/request.rb~
 - lib/spark_api/models/document.rb
-- lib/spark_api/models/standard_fields.rb~
-- lib/spark_api/models/custom_fields.rb~
-- lib/spark_api/models/account.rb~
-- lib/spark_api/models/property_types.rb~
-- lib/spark_api/models/base.rb~
+- lib/spark_api/models/rental_calendar.rb
 - lib/spark_api/models/finders.rb
-- lib/spark_api/models/notification.rb~
 - lib/spark_api/models/subresource.rb
-- lib/spark_api/models/idx_link.rb~
 - lib/spark_api/models/photo.rb
 - lib/spark_api/models/contact.rb
-- lib/spark_api/models/tour_of_home.rb~
 - lib/spark_api/models/video.rb
-- lib/spark_api/models/constraint.rb~
-- lib/spark_api/models/document.rb~
 - lib/spark_api/models/idx_link.rb
-- lib/spark_api/models/market_statistics.rb~
 - lib/spark_api/models/message.rb
-- lib/spark_api/models/video.rb~
 - lib/spark_api/models/system_info.rb
 - lib/spark_api/models/listing.rb
 - lib/spark_api/models/constraint.rb
@@ -348,55 +320,34 @@ files:
 - lib/spark_api/models/listing_cart.rb
 - lib/spark_api/models/saved_search.rb
 - lib/spark_api/models/open_house.rb
-- lib/spark_api/models/system_info.rb~
-- lib/spark_api/models/message.rb~
 - lib/spark_api/models/connect_prefs.rb
 - lib/spark_api/models/shared_listing.rb
-- lib/spark_api/models/contact.rb~
-- lib/spark_api/models/virtual_tour.rb~
 - lib/spark_api/models/standard_fields.rb
-- lib/spark_api/models/note.rb~
-- lib/spark_api/models/subresource.rb~
 - lib/spark_api/models/market_statistics.rb
 - lib/spark_api/models/note.rb
-- lib/spark_api/models/finders.rb~
-- lib/spark_api/models/saved_search.rb~
 - lib/spark_api/models/custom_fields.rb
 - lib/spark_api/models/account.rb
-- lib/spark_api/models/photo.rb~
 - lib/spark_api/models/notification.rb
-- lib/spark_api/models/listing_cart.rb~
-- lib/spark_api/models/open_house.rb~
 - lib/spark_api/models/property_types.rb
-- lib/spark_api/models/listing.rb~
-- lib/spark_api/models/connect_prefs.rb~
 - lib/spark_api/models/virtual_tour.rb
-- lib/spark_api/models/shared_listing.rb~
 - lib/spark_api/models/tour_of_home.rb
 - lib/spark_api/paginate.rb
-- lib/spark_api/response.rb~
 - lib/spark_api/cli/api_auth.rb
 - lib/spark_api/cli/setup.rb
-- lib/spark_api/cli/setup.rb~
 - lib/spark_api/cli/oauth2.rb
-- lib/spark_api/cli/oauth2.rb~
-- lib/spark_api/cli/api_auth.rb~
 - lib/spark_api/faraday.rb
 - lib/spark_api/request.rb
-- lib/spark_api/multi_client.rb~
+- lib/spark_api/options_hash.rb
 - lib/spark_api/cli.rb
 - lib/spark_api/authentication.rb
-- lib/spark_api/configuration.rb~
 - lib/spark_api/configuration.rb
-- lib/spark_api/configuration/yaml.rb~
 - lib/spark_api/configuration/oauth2_configurable.rb
 - lib/spark_api/configuration/yaml.rb
 - lib/spark_api.rb
-- script/console~
 - script/console
 - script/example.rb
-- script/example.rb~
 - script/oauth2_example.rb
+- script/combined_flow_example.rb
 - spec/fixtures/oauth2_error.json
 - spec/fixtures/errors/failure_with_constraint.json
 - spec/fixtures/errors/expired.json
@@ -442,9 +393,11 @@ files:
 - spec/fixtures/authentication_failure.json
 - spec/fixtures/listings/put_expiration_date.json
 - spec/fixtures/listings/no_subresources.json
+- spec/fixtures/listings/rental_calendar.json
 - spec/fixtures/listings/saved_search.json
 - spec/fixtures/listings/shared_listing_get.json
 - spec/fixtures/listings/constraints_with_pagination.json
+- spec/fixtures/listings/with_rental_calendar.json
 - spec/fixtures/listings/multiple.json
 - spec/fixtures/listings/open_houses.json
 - spec/fixtures/listings/photos/new.json
@@ -483,58 +436,40 @@ files:
 - spec/fixtures/messages/post.json
 - spec/fixtures/logo_fbs.png
 - spec/unit/spark_api_spec.rb
-- spec/unit/flexmls_api_spec.rb~
-- spec/unit/spark_api/authentication_spec.rb~
-- spec/unit/spark_api/authentication/base_auth_spec.rb~
-- spec/unit/spark_api/authentication/api_auth_spec.rb~
-- spec/unit/spark_api/authentication/oauth2_spec.rb~
 - spec/unit/spark_api/authentication/base_auth_spec.rb
-- spec/unit/spark_api/authentication/oauth2_impl/grant_type_base_spec.rb~
 - spec/unit/spark_api/authentication/oauth2_impl/grant_type_base_spec.rb
 - spec/unit/spark_api/authentication/oauth2_spec.rb
 - spec/unit/spark_api/authentication/api_auth_spec.rb
 - spec/unit/spark_api/faraday_spec.rb
 - spec/unit/spark_api/authentication_spec.rb
-- spec/unit/spark_api/paginate_spec.rb~
-- spec/unit/spark_api/request_spec.rb~
-- spec/unit/spark_api/configuration_spec.rb~
-- spec/unit/spark_api/multi_client_spec.rb~
 - spec/unit/spark_api/models/open_house_spec.rb
 - spec/unit/spark_api/models/account_spec.rb
-- spec/unit/spark_api/models/note_spec.rb~
 - spec/unit/spark_api/models/virtual_tour_spec.rb
-- spec/unit/spark_api/models/listing_spec.rb~
 - spec/unit/spark_api/models/constraint_spec.rb
 - spec/unit/spark_api/models/notification_spec.rb
 - spec/unit/spark_api/models/saved_search_spec.rb
 - spec/unit/spark_api/models/contact_spec.rb
 - spec/unit/spark_api/models/listing_cart_spec.rb
 - spec/unit/spark_api/models/video_spec.rb
+- spec/unit/spark_api/models/rental_calendar_spec.rb
 - spec/unit/spark_api/models/document_spec.rb
-- spec/unit/spark_api/models/shared_listing_spec.rb~
 - spec/unit/spark_api/models/property_types_spec.rb
-- spec/unit/spark_api/models/notification_spec.rb~
 - spec/unit/spark_api/models/message_spec.rb
 - spec/unit/spark_api/models/listing_spec.rb
 - spec/unit/spark_api/models/shared_listing_spec.rb
-- spec/unit/spark_api/models/listing_cart_spec.rb~
 - spec/unit/spark_api/models/note_spec.rb
 - spec/unit/spark_api/models/connect_prefs_spec.rb
 - spec/unit/spark_api/models/photo_spec.rb
 - spec/unit/spark_api/models/base_spec.rb
-- spec/unit/spark_api/models/message_spec.rb~
 - spec/unit/spark_api/models/tour_of_home_spec.rb
 - spec/unit/spark_api/models/system_info_spec.rb
 - spec/unit/spark_api/models/standard_fields_spec.rb
-- spec/unit/spark_api/models/contact_spec.rb~
-- spec/unit/spark_api/faraday_spec.rb~
+- spec/unit/spark_api/options_hash_spec.rb
 - spec/unit/spark_api/paginate_spec.rb
 - spec/unit/spark_api/primary_array_spec.rb
 - spec/unit/spark_api/configuration_spec.rb
 - spec/unit/spark_api/request_spec.rb
-- spec/unit/spark_api/primary_array_spec.rb~
 - spec/unit/spark_api/configuration/yaml_spec.rb
-- spec/unit/spark_api/configuration/yaml_spec.rb~
 - spec/unit/spark_api/multi_client_spec.rb
 - spec/spec_helper.rb
 - spec/oauth2_helper.rb
@@ -620,9 +555,11 @@ test_files:
 - spec/fixtures/authentication_failure.json
 - spec/fixtures/listings/put_expiration_date.json
 - spec/fixtures/listings/no_subresources.json
+- spec/fixtures/listings/rental_calendar.json
 - spec/fixtures/listings/saved_search.json
 - spec/fixtures/listings/shared_listing_get.json
 - spec/fixtures/listings/constraints_with_pagination.json
+- spec/fixtures/listings/with_rental_calendar.json
 - spec/fixtures/listings/multiple.json
 - spec/fixtures/listings/open_houses.json
 - spec/fixtures/listings/photos/new.json
@@ -661,58 +598,40 @@ test_files:
 - spec/fixtures/messages/post.json
 - spec/fixtures/logo_fbs.png
 - spec/unit/spark_api_spec.rb
-- spec/unit/flexmls_api_spec.rb~
-- spec/unit/spark_api/authentication_spec.rb~
-- spec/unit/spark_api/authentication/base_auth_spec.rb~
-- spec/unit/spark_api/authentication/api_auth_spec.rb~
-- spec/unit/spark_api/authentication/oauth2_spec.rb~
 - spec/unit/spark_api/authentication/base_auth_spec.rb
-- spec/unit/spark_api/authentication/oauth2_impl/grant_type_base_spec.rb~
 - spec/unit/spark_api/authentication/oauth2_impl/grant_type_base_spec.rb
 - spec/unit/spark_api/authentication/oauth2_spec.rb
 - spec/unit/spark_api/authentication/api_auth_spec.rb
 - spec/unit/spark_api/faraday_spec.rb
 - spec/unit/spark_api/authentication_spec.rb
-- spec/unit/spark_api/paginate_spec.rb~
-- spec/unit/spark_api/request_spec.rb~
-- spec/unit/spark_api/configuration_spec.rb~
-- spec/unit/spark_api/multi_client_spec.rb~
 - spec/unit/spark_api/models/open_house_spec.rb
 - spec/unit/spark_api/models/account_spec.rb
-- spec/unit/spark_api/models/note_spec.rb~
 - spec/unit/spark_api/models/virtual_tour_spec.rb
-- spec/unit/spark_api/models/listing_spec.rb~
 - spec/unit/spark_api/models/constraint_spec.rb
 - spec/unit/spark_api/models/notification_spec.rb
 - spec/unit/spark_api/models/saved_search_spec.rb
 - spec/unit/spark_api/models/contact_spec.rb
 - spec/unit/spark_api/models/listing_cart_spec.rb
 - spec/unit/spark_api/models/video_spec.rb
+- spec/unit/spark_api/models/rental_calendar_spec.rb
 - spec/unit/spark_api/models/document_spec.rb
-- spec/unit/spark_api/models/shared_listing_spec.rb~
 - spec/unit/spark_api/models/property_types_spec.rb
-- spec/unit/spark_api/models/notification_spec.rb~
 - spec/unit/spark_api/models/message_spec.rb
 - spec/unit/spark_api/models/listing_spec.rb
 - spec/unit/spark_api/models/shared_listing_spec.rb
-- spec/unit/spark_api/models/listing_cart_spec.rb~
 - spec/unit/spark_api/models/note_spec.rb
 - spec/unit/spark_api/models/connect_prefs_spec.rb
 - spec/unit/spark_api/models/photo_spec.rb
 - spec/unit/spark_api/models/base_spec.rb
-- spec/unit/spark_api/models/message_spec.rb~
 - spec/unit/spark_api/models/tour_of_home_spec.rb
 - spec/unit/spark_api/models/system_info_spec.rb
 - spec/unit/spark_api/models/standard_fields_spec.rb
-- spec/unit/spark_api/models/contact_spec.rb~
-- spec/unit/spark_api/faraday_spec.rb~
+- spec/unit/spark_api/options_hash_spec.rb
 - spec/unit/spark_api/paginate_spec.rb
 - spec/unit/spark_api/primary_array_spec.rb
 - spec/unit/spark_api/configuration_spec.rb
 - spec/unit/spark_api/request_spec.rb
-- spec/unit/spark_api/primary_array_spec.rb~
 - spec/unit/spark_api/configuration/yaml_spec.rb
-- spec/unit/spark_api/configuration/yaml_spec.rb~
 - spec/unit/spark_api/multi_client_spec.rb
 - spec/spec_helper.rb
 - spec/oauth2_helper.rb

data/bin/spark_api~

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# File: bin/flexmls_api
-
-require File.dirname(__FILE__) + '/../lib/flexmls_api/cli'
-
-FlexmlsApi::CLI::ConsoleCLI.execute(STDOUT, ARGV)
-
-