omniauth-paypal-oauth2 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b007aef77c717793786b58de2e91d263c31663a2
-  data.tar.gz: d1b44cf1261d9e381f976e4b00d5316e0ad42840
+  metadata.gz: f496baba52d3379ce046ae4ff2d9de74fd034dbd
+  data.tar.gz: e6a0a3ba604b957893497d3230627a5c87fc66fe
 SHA512:
-  metadata.gz: a6314646cc1cf649cd6e1020499ec72b395ce034bcd7809937a5be2d2e4765e11100082692082f53d4d998628e8009097e448d2f916e8bb11decdbccf21699cf
-  data.tar.gz: 24ac1d6d0e8fd7acf732447e1ac94c0b965c0ec3f2090c092034532195e6e8c9e800e892a1fd5ff50400a514a79bf4a33bb3f3192baa42a830aeae17f422b1a1
+  metadata.gz: 9a487349f65691e079eff850bc5059c08c61d2271ec6db797ec8079ec0c6c01f9a58506c27d7081445e38c4ad35dfd3925f696ab35cfb6a0054ce37934faa9ef
+  data.tar.gz: 1ff3a3aa9f6323d10db483f913efef97bc5f9e324d374f2766f1e3b6b64cef73d83a616f2ac6736e54421835be9b4e468c4a16d0b1ce01a89c7956e717d7213a

data/Gemfile

@@ -3,4 +3,4 @@ source "http://rubygems.org"
 gemspec
 
 gem 'omniauth-oauth2', "~> 1.4.0"
-gem 'json'
+gem 'json', '~> 2.0', '>= 2.0.3'

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    omniauth-paypal-oauth2 (1.4.2)
+    omniauth-paypal-oauth2 (1.4.4)
+      json (~> 2.0, >= 2.0.3)
       omniauth-oauth2 (~> 1.4.0)
 
 GEM
@@ -44,11 +45,11 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
-  json
+  json (~> 2.0, >= 2.0.3)
   omniauth-oauth2 (~> 1.4.0)
   omniauth-paypal-oauth2!
   rake
-  rspec (~> 2.14)
+  rspec (~> 2.99.0)
 
 BUNDLED WITH
    1.11.2

data/README.md

@@ -44,7 +44,7 @@ Here's an example for adding the middleware to a Rails app in `config/initialize
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
-    provider :paypal_oauth2, ENV["PAYPAL_CLIENT_ID"], ENV["PAYPAL_CLIENT_SECRET"]
+    provider :paypal_oauth2, ENV["PAYPAL_CLIENT_ID"], ENV["PAYPAL_CLIENT_SECRET"], :strategy_class => OmniAuth::Strategies::PayPalOauth2
 end
 ```
 
@@ -137,7 +137,8 @@ First define your application id and secret in `config/initializers/devise.rb`.
 Configuration options can be passed as the last parameter here as key/value pairs.
 
 ```ruby
-config.omniauth :paypal_oauth2, "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", { }
+require "omniauth-paypal-oauth2"
+config.omniauth :paypal_oauth2, "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", :strategy_class => OmniAuth::Strategies::PayPalOauth2, { }
 ```
 
 Then add the following to 'config/routes.rb' so the callback routes are defined.

data/examples/shared_examples.rb

@@ -0,0 +1,36 @@
+shared_examples 'an oauth2 strategy' do
+    describe '#client' do
+        it 'should be initialized with symbolized client_options' do
+            @options = { :client_options => { 'authorize_url' => 'https://example.com' } }
+            expect(subject.client.options[:authorize_url]).to eq('https://example.com')
+        end
+    end
+
+    describe '#authorize_params' do
+        it 'should include any authorize params passed in the :authorize_params option' do
+            @options = { :authorize_params => { :foo => 'bar', :baz => 'zip' } }
+            expect(subject.authorize_params['foo']).to eq('bar')
+            expect(subject.authorize_params['baz']).to eq('zip')
+        end
+
+        it 'should include top-level options that are marked as :authorize_options' do
+            @options = { :authorize_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
+            expect(subject.authorize_params['scope']).to eq('bar')
+            expect(subject.authorize_params['foo']).to eq('baz')
+        end
+    end
+
+    describe '#token_params' do
+        it 'should include any token params passed in the :token_params option' do
+            @options = { :token_params => { :foo => 'bar', :baz => 'zip' } }
+            expect(subject.token_params['foo']).to eq('bar')
+            expect(subject.token_params['baz']).to eq('zip')
+        end
+
+        it 'should include top-level options that are marked as :token_options' do
+            @options = { :token_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
+            expect(subject.token_params['scope']).to eq('bar')
+            expect(subject.token_params['foo']).to eq('baz')
+        end
+    end
+end

data/lib/omniauth/paypal_oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
-  module PayPalOauth2
-    VERSION = "1.3"
-  end
+    module PayPalOauth2
+        VERSION = "1.3"
+    end
 end

data/lib/omniauth/strategies/paypal_oauth2.rb

@@ -1,90 +1,93 @@
 require 'omniauth-oauth2'
 
 module OmniAuth
-  module Strategies
-    class PayPalOauth2 < OmniAuth::Strategies::OAuth2
-      DEFAULT_SCOPE = "email,profile"
-      DEFAULT_RESPONSE_TYPE = "code"
-      SANDBOX_SITE = "https://api.sandbox.paypal.com"
-      SANDBOX_AUTHORIZE_URL = 'https://www.sandbox.paypal.com/webapps/auth/protocol/openidconnect/v1/authorize'
+    module Strategies
+        class PayPalOauth2 < OmniAuth::Strategies::OAuth2
+            DEFAULT_SCOPE = "email,profile"
+            DEFAULT_RESPONSE_TYPE = "code"
+            SANDBOX_SITE = "https://api.sandbox.paypal.com"
+            SANDBOX_AUTHORIZE_URL = 'https://www.sandbox.paypal.com/webapps/auth/protocol/openidconnect/v1/authorize'
 
-      option :client_options, {
-        :site          => 'https://api.paypal.com',
-        :authorize_url => 'https://www.paypal.com/webapps/auth/protocol/openidconnect/v1/authorize',
-        :token_url     => '/v1/identity/openidconnect/tokenservice',
-        :setup         => true
-      }
+            option :name, "paypal_oauth2"
 
-      option :authorize_options, [:scope, :response_type]
-      option :provider_ignores_state, true
-      option :sandbox, false
+            option :client_options, {
+                :site          => 'https://api.paypal.com',
+                :authorize_url => 'https://www.paypal.com/webapps/auth/protocol/openidconnect/v1/authorize',
+                :token_url     => '/v1/identity/openidconnect/tokenservice',
+                :setup         => true
+            }
 
-      uid { @parsed_uid ||= (/\/([^\/]+)\z/.match raw_info['user_id'])[1] } #https://www.paypal.com/webapps/auth/identity/user/baCNqjGvIxzlbvDCSsfhN3IrQDtQtsVr79AwAjMxekw => baCNqjGvIxzlbvDCSsfhN3IrQDtQtsVr79AwAjMxekw
+            option :authorize_options, [:scope, :response_type]
+            option :provider_ignores_state, true
+            option :sandbox, false
 
-      info do
-        prune!({
-                   'name' => raw_info['name'],
-                   'email' => raw_info['email'],
-                   'first_name' => raw_info['given_name'],
-                   'last_name' => raw_info['family_name'],
-                   'given_name' => raw_info['given_name'],
-                   'family_name' => raw_info['family_name'],
-                   'location' => (raw_info['address'] || {})['locality'],
-                   'phone' => raw_info['phone_number']
-               })
-      end
+            uid { @parsed_uid ||= (/\/([^\/]+)\z/.match raw_info['user_id'])[1] } #https://www.paypal.com/webapps/auth/identity/user/baCNqjGvIxzlbvDCSsfhN3IrQDtQtsVr79AwAjMxekw => baCNqjGvIxzlbvDCSsfhN3IrQDtQtsVr79AwAjMxekw
 
-      extra do
-        prune!({
-                   'account_type' => raw_info['account_type'],
-                   'user_id' => raw_info['user_id'],
-                   'address' => raw_info['address'],
-                   'verified_account' => (raw_info['verified_account'] == 'true'),
-                   'language' => raw_info['language'],
-                   'zoneinfo' => raw_info['zoneinfo'],
-                   'locale' => raw_info['locale'],
-                   'account_creation_date' => raw_info['account_creation_date'],
-                   'age_range' => raw_info['age_range'],
-                   'birthday' => raw_info['birthday']
-               })
-      end
+            info do
+                prune!({
+                    'name' => raw_info['name'],
+                    'email' => raw_info['email'],
+                    'first_name' => raw_info['given_name'],
+                    'last_name' => raw_info['family_name'],
+                    'given_name' => raw_info['given_name'],
+                    'family_name' => raw_info['family_name'],
+                    'location' => (raw_info['address'] || {})['locality'],
+                    'phone' => raw_info['phone_number']
+                })
+            end
 
-      def setup_phase
-        if options.sandbox
-          options.client_options[:site] = SANDBOX_SITE
-          options.client_options[:authorize_url] = SANDBOX_AUTHORIZE_URL
-        end
-        super
-      end
+            extra do
+                prune!({
+                    'account_type' => raw_info['account_type'],
+                    'user_id' => raw_info['user_id'],
+                    'address' => raw_info['address'],
+                    'verified_account' => (raw_info['verified_account'] == 'true'),
+                    'language' => raw_info['language'],
+                    'zoneinfo' => raw_info['zoneinfo'],
+                    'locale' => raw_info['locale'],
+                    'account_creation_date' => raw_info['account_creation_date'],
+                    'age_range' => raw_info['age_range'],
+                    'birthday' => raw_info['birthday']
+                })
+            end
 
-      def raw_info
-        @raw_info ||= load_identity()
-      end
+            def setup_phase
+                if options.sandbox
+                    options.client_options[:site] = SANDBOX_SITE
+                    options.client_options[:authorize_url] = SANDBOX_AUTHORIZE_URL
+                end
+                super
+            end
 
-      def authorize_params
-        super.tap do |params|
-          params[:scope] ||= DEFAULT_SCOPE
-          params[:response_type] ||= DEFAULT_RESPONSE_TYPE
-        end
-      end
+            def raw_info
+                @raw_info ||= load_identity()
+            end
 
-      private
-        def load_identity
-          access_token.options[:mode] = :query
-          access_token.options[:param_name] = :access_token
-          access_token.options[:grant_type] = :authorization_code
-          access_token.get('/v1/identity/openidconnect/userinfo', { :params => { :schema => 'openid'}}).parsed || {}
-        end
+            def authorize_params
+                super.tap do |params|
+                    params[:scope] ||= DEFAULT_SCOPE
+                    params[:response_type] ||= DEFAULT_RESPONSE_TYPE
+                end
+            end
 
-        def prune!(hash)
-          hash.delete_if do |_, value|
-            prune!(value) if value.is_a?(Hash)
-            value.nil? || (value.respond_to?(:empty?) && value.empty?)
-          end
-        end
+            private
 
+            def load_identity
+                access_token.options[:mode] = :query
+                access_token.options[:param_name] = :access_token
+                access_token.options[:grant_type] = :authorization_code
+                access_token.get('/v1/identity/openidconnect/userinfo', { :params => { :schema => 'openid'}}).parsed || {}
+            end
+
+            def prune!(hash)
+                hash.delete_if do |_, value|
+                    prune!(value) if value.is_a?(Hash)
+                    value.nil? || (value.respond_to?(:empty?) && value.empty?)
+                end
+            end
+
+        end
     end
-  end
 end
 
-OmniAuth.config.add_camelization '', 'PayPalOauth2'
+OmniAuth.config.add_camelization('oauth', 'OAuth')

data/omniauth-paypal-oauth2.gemspec

@@ -3,21 +3,22 @@ $:.push File.expand_path('../lib', __FILE__)
 require 'omniauth/paypal_oauth2/version'
 
 Gem::Specification.new do |s|
-  s.name     = 'omniauth-paypal-oauth2'
-  s.version  = '1.4.4'
-  s.authors  = ['Jonas Hübotter']
-  s.email    = ['jonas.huebotter@gmail.com']
-  s.summary  = 'A PayPal OAuth2 strategy for OmniAuth 1.x'
-  s.homepage = 'http://omniauth-paypal-oauth2.jonhue.me'
-  s.license  = 'MIT'
+    s.name     = 'omniauth-paypal-oauth2'
+    s.version  = '1.4.5'
+    s.authors  = ['Jonas Hübotter']
+    s.email    = ['jonas@slooob.com']
+    s.summary  = 'A PayPal OAuth2 strategy for OmniAuth 1.x'
+    s.homepage = 'https://github.com/jonhue/omniauth-paypal-oauth2'
+    s.license  = 'MIT'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  s.require_paths = ['lib']
+    s.files         = `git ls-files`.split("\n")
+    s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+    s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+    s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'omniauth-oauth2', '~> 1.4.0'
+    s.add_runtime_dependency 'omniauth-oauth2', '~> 1.4.0'
+    s.add_runtime_dependency 'json', '~> 2.0', '>= 2.0.3'
 
-  s.add_development_dependency 'rspec', '~> 2.14'
-  s.add_development_dependency 'rake'
+    s.add_development_dependency 'rspec', '~> 2.99.0'
+    s.add_development_dependency 'rake'
 end

data/spec/omniauth/strategies/paypal_oauth2_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require 'omniauth-paypal-oauth2'
+
+describe OmniAuth::Strategies::PayPalOauth2 do
+    subject do
+        OmniAuth::Strategies::PayPalOauth2.new(nil, @options || {})
+    end
+
+    it_should_behave_like 'an oauth2 strategy'
+
+    describe '#client' do
+        it 'has correct PayPal site' do
+            expect(subject.client.site).to eq('https://api.paypal.com')
+        end
+
+        it 'has correct PayPal sandbox site' do
+            @options = { :sandbox => true }
+            subject.setup_phase
+            expect(subject.client.site).to eq('https://api.sandbox.paypal.com')
+        end
+
+        it 'has correct authorize url' do
+            expect(subject.client.options[:authorize_url]).to eq('https://www.paypal.com/webapps/auth/protocol/openidconnect/v1/authorize')
+        end
+
+        it 'has correct sandbox authorize url' do
+            @options = { :sandbox => true }
+            subject.setup_phase
+            expect(subject.client.options[:authorize_url]).to eq('https://www.sandbox.paypal.com/webapps/auth/protocol/openidconnect/v1/authorize')
+        end
+
+        it 'has correct token url' do
+            expect(subject.client.options[:token_url]).to eq('/v1/identity/openidconnect/tokenservice')
+        end
+
+        it 'runs the setup block if passed one' do
+            counter = ''
+            @options = { :setup => Proc.new { |env| counter = 'ok' } }
+            subject.setup_phase
+            expect(counter).to eq("ok")
+        end
+    end
+
+    describe '#callback_path' do
+        it "has the correct callback path" do
+            expect(subject.callback_path).to eq('/auth/paypal_oauth2/callback')
+        end
+    end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-require 'bundler/setup'
+require File.join('bundler', 'setup')
 require 'rspec'
-require 'omniauth'
+require 'omniauth-oauth2'
 Dir[File.expand_path('../support/**/*', __FILE__)].each { |f| require f }
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-paypal-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Jonas Hübotter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -24,20 +24,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 2.99.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -54,28 +74,27 @@ dependencies:
         version: '0'
 description: 
 email:
-- jonas.huebotter@gmail.com
+- jonas@slooob.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- CNAME
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - _config.yml
+- examples/shared_examples.rb
 - lib/omniauth-paypal-oauth2.rb
 - lib/omniauth/paypal_oauth2.rb
 - lib/omniauth/paypal_oauth2/version.rb
 - lib/omniauth/strategies/paypal_oauth2.rb
 - omniauth-paypal-oauth2.gemspec
-- spec/omniauth/strategies/paypal_spec.rb
+- spec/omniauth/strategies/paypal_oauth2_spec.rb
 - spec/spec_helper.rb
-- spec/support/shared_examples.rb
-homepage: http://omniauth-paypal-oauth2.jonhue.me
+homepage: https://github.com/jonhue/omniauth-paypal-oauth2
 licenses:
 - MIT
 metadata: {}

data/CNAME

@@ -1 +0,0 @@
-omniauth-paypal-oauth2.jonhue.me

data/spec/omniauth/strategies/paypal_spec.rb

@@ -1,50 +0,0 @@
-require 'spec_helper'
-require 'omniauth-paypal-oauth2'
-
-describe OmniAuth::Strategies::PayPalOauth2 do
-  subject do
-    OmniAuth::Strategies::PayPalOauth2.new(nil, @options || {})
-  end
-
-  it_should_behave_like 'an oauth2 strategy'
-
-  describe '#client' do
-    it 'has correct PayPal site' do
-      expect(subject.client.site).to eq('https://api.paypal.com')
-    end
-
-    it 'has correct PayPal sandbox site' do
-      @options = { :sandbox => true }
-      subject.setup_phase
-      expect(subject.client.site).to eq('https://api.sandbox.paypal.com')
-    end
-
-    it 'has correct authorize url' do
-      expect(subject.client.options[:authorize_url]).to eq('https://www.paypal.com/webapps/auth/protocol/openidconnect/v1/authorize')
-    end
-
-    it 'has correct sandbox authorize url' do
-      @options = { :sandbox => true }
-      subject.setup_phase
-      expect(subject.client.options[:authorize_url]).to eq('https://www.sandbox.paypal.com/webapps/auth/protocol/openidconnect/v1/authorize')
-    end
-
-    it 'has correct token url' do
-      expect(subject.client.options[:token_url]).to eq('/v1/identity/openidconnect/tokenservice')
-    end
-
-    it 'runs the setup block if passed one' do
-      counter = ''
-      @options = { :setup => Proc.new { |env| counter = 'ok' } }
-      subject.setup_phase
-      expect(counter).to eq("ok")
-    end
-  end
-
-  describe '#callback_path' do
-    it "has the correct callback path" do
-      expect(subject.callback_path).to eq('/auth/paypal_oauth2/callback')
-    end
-  end
-
-end

data/spec/support/shared_examples.rb

@@ -1,37 +0,0 @@
-# NOTE it would be useful if this lived in omniauth-oauth2 eventually
-shared_examples 'an oauth2 strategy' do
-  describe '#client' do
-    it 'should be initialized with symbolized client_options' do
-      @options = { :client_options => { 'authorize_url' => 'https://example.com' } }
-      expect(subject.client.options[:authorize_url]).to eq('https://example.com')
-    end
-  end
-
-  describe '#authorize_params' do
-    it 'should include any authorize params passed in the :authorize_params option' do
-      @options = { :authorize_params => { :foo => 'bar', :baz => 'zip' } }
-      expect(subject.authorize_params['foo']).to eq('bar')
-      expect(subject.authorize_params['baz']).to eq('zip')
-    end
-
-    it 'should include top-level options that are marked as :authorize_options' do
-      @options = { :authorize_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
-      expect(subject.authorize_params['scope']).to eq('bar')
-      expect(subject.authorize_params['foo']).to eq('baz')
-    end
-  end
-
-  describe '#token_params' do
-    it 'should include any token params passed in the :token_params option' do
-      @options = { :token_params => { :foo => 'bar', :baz => 'zip' } }
-      expect(subject.token_params['foo']).to eq('bar')
-      expect(subject.token_params['baz']).to eq('zip')
-    end
-
-    it 'should include top-level options that are marked as :token_options' do
-      @options = { :token_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
-      expect(subject.token_params['scope']).to eq('bar')
-      expect(subject.token_params['foo']).to eq('baz')
-    end
-  end
-end