omnicontacts 0.2.2 → 0.2.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omnicontacts (0.2.2)
+    omnicontacts (0.2.3)
       json
       rack
 

data/README.md

@@ -36,7 +36,7 @@ On the other hand it makes things much easier to leave the default value for `:r
 
 ## Integrating with your Application
 
-To use the Gem you first need to redirect your users to `/contacts/:importer`, where `:importer` can be google, yahoo or hotmail. 
+To use the Gem you first need to redirect your users to `/contacts/:importer`, where `:importer` can be gmail, yahoo or hotmail. 
 No changes to `config/routes.rb` are needed for this step since OmniContacts will be listening on that path and redirect the user to the email provider's website in order to authorize your app to access his contact list.
 Once that is done the user will be redirected back to your application, to the path specified in `:redirect_path` (or `:callback_path` for yahoo).
 If nothing is specified the default value is `/contacts/:importer/callback` (e.g. `/contacts/yahoo/callback`). This makes things simpler and you can just add the following line to `config/routes.rb`:

data/lib/omnicontacts.rb

@@ -1,6 +1,6 @@
 module OmniContacts
   
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 
   autoload :Builder, "omnicontacts/builder"
   autoload :Importer, "omnicontacts/importer"

data/lib/omnicontacts/authorization/oauth2.rb

@@ -30,8 +30,8 @@ module OmniContacts
             :client_id => client_id,
             :scope => encode(scope),
             :response_type => "code",
-            :access_type => "offline",
-            :approval_prompt => "force",
+            :access_type => "online",
+            :approval_prompt => "auto",
             :redirect_uri => encode(redirect_uri)
           })
       end

data/lib/omnicontacts/middleware/base_oauth.rb

@@ -84,7 +84,7 @@ module OmniContacts
 
       def handle_error error_type, exception
         logger << ("Error #{error_type} while processing #{@env["PATH_INFO"]}: #{exception.message}") if logger
-        [302, {"location" => "/contacts/failure?error_message=#{error_type}"}, []]
+        [302, {"location" => "/contacts/failure?error_message=#{error_type}&importer=#{class_name}"}, []]
       end
 
       def session

data/spec/omnicontacts/authorization/oauth2_spec.rb

@@ -22,7 +22,7 @@ describe OmniContacts::Authorization::OAuth2 do
     it { should include("client_id=#{test_target.client_id}") }
     it { should include("scope=#{test_target.scope}") }
     it { should include("redirect_uri=#{test_target.redirect_uri}") }
-    it { should include("access_type=offline") }
+    it { should include("access_type=online") }
     it { should include("response_type=code") }
   end
 

data/spec/omnicontacts/middleware/base_oauth_spec.rb

@@ -36,7 +36,7 @@ describe OmniContacts::Middleware::BaseOAuth do
     get "/contacts/testprovider"
     get "/contacts/testprovider/callback"
     last_response.should be_redirect
-    last_response.headers["location"].should eq("/contacts/failure?error_message=internal_error")
+    last_response.headers["location"].should eq("/contacts/failure?error_message=internal_error&importer=testprovider")
   end
   
   after(:all) do 

data/spec/omnicontacts/middleware/oauth1_spec.rb

@@ -50,7 +50,7 @@ describe OmniContacts::Middleware::OAuth1 do
       OAuth1Middleware.mock_auth_token_resp.should_receive(:body).and_raise("Request failed")
       get "contacts/oauth1middleware"
       last_response.should be_redirect
-      last_response.headers["location"].should eq("/contacts/failure?error_message=internal_error")
+      last_response.headers["location"].should eq("/contacts/failure?error_message=internal_error&importer=oauth1middleware")
     end
   end
 
@@ -66,7 +66,7 @@ describe OmniContacts::Middleware::OAuth1 do
       OAuth1Middleware.mock_session.should_receive(:[]).and_return(nil)
       get "/contacts/oauth1middleware/callback?oauth_token=token&oauth_verifier=verifier"
       last_response.should be_redirect
-      last_response.headers["location"].should eq("/contacts/failure?error_message=not_authorized")
+      last_response.headers["location"].should eq("/contacts/failure?error_message=not_authorized&importer=oauth1middleware")
     end
   end
 end

data/spec/omnicontacts/middleware/oauth2_spec.rb

@@ -56,7 +56,7 @@ describe OmniContacts::Middleware::OAuth2 do
     it "should redirect to failure page because user did not allow access to contacts list" do
       get '/redirect_path?error=not_authorized'
       last_response.should be_redirect
-      last_response.headers["location"].should eq("/contacts/failure?error_message=not_authorized")
+      last_response.headers["location"].should eq("/contacts/failure?error_message=not_authorized&importer=oauth2middleware")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnicontacts
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &3692640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *3692640
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &3692410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *3692410
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &3692200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *3692200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &3691980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *3691980
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &3691770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *3691770
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &3691540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,12 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *3691540
 description: A generalized Rack middleware for importing contacts from major email
   providers.
 email:
@@ -165,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A generalized Rack middleware for importing contacts from major email providers.