omniauth-zenpayroll 0.0.9 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjBiMzBkYjAzMDgyZDAwN2EwNjBlNjlhZjNjZTNlMWRhMGE5NzA3NA==
-  data.tar.gz: !binary |-
-    ODJkNTkyYjM2NTIzYWMzOTIwOGQ3YzJiNmQ3MTU5ZTNmZjdmOTAxMw==
+SHA1:
+  metadata.gz: 97c55cf7f69277c91d0ffdff83579b0829d0c9b6
+  data.tar.gz: 957cc37d144f7fc46843041aed3b17c87ee02446
 SHA512:
-  metadata.gz: !binary |-
-    ZTAyYjFlZDEwZjZjMjJiY2ZlZTczMmQ0N2VhZGM2YTNhZjZhODhhNTRmMzI3
-    OWIzMzE0MjUzZWYyMGQ0M2FlY2RhNTgwYjRjOTlkM2EyMWRiNzZiZWQyMzdl
-    OTQxNjk4MDcwMTllOTg1NTk2Y2JhYWY3YTdiNzVhYzY4ZjFiYmY=
-  data.tar.gz: !binary |-
-    Y2FlNGY1ZDZjNWI0M2EwZmI4ZDUzN2Q3ZjFhN2IxZTQ4ZjhmNDY5MzMyOGM5
-    MzI1MmRkOTE1ZjYwNTMxNjg2YjQxMGY0N2QwNjE0OTFkNDA3NWRhYzZmZGQ1
-    ZjhjMmE4MWFhYWJmYjc3ZjFiN2ZjOTU2NThmNjhiY2NkYTVjZDA=
+  metadata.gz: b343ae6ec69ef022f8f402fc5f4e3fcd3c6753c6603f83c68e32c3babef1ad787713bae7be493ef2a7397e6f4101cb7d4085592cb4a54ed5015997ca774717ff
+  data.tar.gz: 0266452622b7b39879c0e4c4a6a3f11feca8ef66736ba68805fc408d2293582438afa12a2377e72d6e775bfad48abcd22fccd73a3e50fcfa00cd4d76af5aaadd

data/README.md

@@ -20,6 +20,8 @@ your application will use these to authenticate against the ZenPayroll API.
 
 ## Using This Strategy
 
+##### Installation
+
 Add the gem to your Gemfile:
 
 ```ruby
@@ -32,6 +34,8 @@ If you need to use the latest HEAD version, you can do so with:
 gem 'omniauth-zenpayroll', :github => 'shiftdock/omniauth-zenpayroll'
 ```
 
+##### Usage
+
 Next, tell OmniAuth about this provider. For a Rails app, your `config/initializers/omniauth.rb` file should look like this:
 
 ```ruby
@@ -42,15 +46,35 @@ end
 
 Replace `CLIENT_ID` and `CLIENT_SECRET` with the appropriate values you obtained from ZenPayroll earlier.
 
+##### Configuration: The Redirect URI
+
 If you need to override the Redirect URI (i.e. if yours deviates from the default) you can do so by setting it as the
 `callback_url` in an `authorize_params` options hash. 
 
 ```ruby
 Rails.application.config.middleware.user OmniAuth:Builder do
-  provider :zenpayroll, "CLIENT_ID", "CLIENT_SECRET", :authorize_params => {:callback_url => '/my/app/callback/url'}
+  provider :zenpayroll, "CLIENT_ID", "CLIENT_SECRET", 
+           :authorize_params => {:callback_url => '/my/app/callback/url'}
 end
 ```
 
+##### Configuration: Live vs. Demo
+
+ZenPayroll provide a demo site at `zenpayroll-demo.com` for all testing. You'll usually want every environment but 
+the production environment to use this API instead of the live one. The `setup` option allows you to use a `lambda` to
+pick which API you want based on the Rails environment:
+
+```ruby
+Rails.application.config.middleware.user OmniAuth:Builder do
+  provider :zenpayroll, "CLIENT_ID", "CLIENT_SECRET", 
+           :authorize_params => {:callback_url => '/my/app/callback/url'},
+           :setup => lambda { |env| env['omniauth.strategy'].options[:client_options][:site] = Rails.env.production? ? 'https://zenpayroll.com/' : 'https://zenpayroll-demo.com/' }
+end
+```
+
+Of course you could use anything; e.g. a global configuration file or environment variables, but this is probably the
+most common use case.
+
 #### UID Gotcha
 
 As the ZenPayroll API doesn't expose a unique ID for the user being authenticated we have to use their email address 

data/lib/omniauth-zenpayroll/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module ZenPayroll
-    VERSION = "0.0.9"
+    VERSION = "0.1.0"
   end
 end

data/lib/omniauth/strategies/zenpayroll.rb

@@ -6,19 +6,15 @@ module OmniAuth
     class ZenPayroll < OmniAuth::Strategies::OAuth2
       
       option :name, 'zenpayroll'
-<<<<<<< HEAD
+
       option :client_options, { authorize_url: '/oauth/authorize',
                                 token_url:     '/oauth/token',
                                 site:          'https://zenpayroll.com/' }
-                     
+
       option :token_params, {
         parse:      :json,
         grant_type: 'authorization_code'
       }
-=======
-      option :client_options, {:authorize_path => '/oauth/authorize',
-                               :site => 'https://zenpayroll-demo.com'}
->>>>>>> df6131f... First stage authentication routing works
 
       option :auth_token_params, {
         param_name: 'access_token',
@@ -36,13 +32,13 @@ module OmniAuth
       extra do
         { :raw_info => raw_info }
       end
-      
+
       # ZenPayroll are strict on redirect_uri.
       # Pass 'origin=...' as parameter to provider url to pass through. 
       def callback_url
         options.authorize_params.callback_url or super
       end
-      
+
       def request_phase
         redirect client.auth_code.authorize_url({:redirect_uri => callback_url}.merge(options.authorize_params))
       end
@@ -64,7 +60,7 @@ module OmniAuth
             client_id:     client.id,
             client_secret: client.secret
           })
-        
+
         client.get_token(token_params, deep_symbolize(options.auth_token_params))
       end
      end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-zenpayroll
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - John M. Hope
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: OmniAuth strategy for ZenPayroll
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -105,17 +105,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: omniauth-zenpayroll
-rubygems_version: 2.1.5
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for ZenPayroll