omniauth 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ccca6a859c1cf14b111691d6447c4fda9e6a392
-  data.tar.gz: 9b5e43d88cdc536a6e2e31111ea81f547d18abe9
+  metadata.gz: db04fc4ab8d9dba42728ba79989f142dcd82bac6
+  data.tar.gz: 911610ee6a8e350ea53daeffa0f37d4d2a7997b5
 SHA512:
-  metadata.gz: cae2202a6cfd9bbd4f0f5bc5b68d613e4890458ac14cdd6e919e1e53db3cb5835b17c3b0d426a4cce305b4508943534e7ebde9b2638fa1864cf3e929b3393603
-  data.tar.gz: 4ea31502c6e79c25aa73e39340becc0302d4001fad09b0921ad08f211e6467a9b2a9982be5cadf63975b6f0e8af85291500492de52913af240d38da9a6de7e99
+  metadata.gz: 2de66181c46fc2e4a669606e5335fa21e64a317020847835832b204a5a5e382056c2c6244b02fa91359f0214bbe773f0520371b4fea51a65af3c6e95b3ea043b
+  data.tar.gz: 254628c583eed6e57ccd6e75e029a9686f7470abc1fe08e011f6170dc6f8a80becb5a4c036b0c7e1419197b61e4d9432f72997eb68823a097ea9eb3609ad613f

data/.gitignore

@@ -4,6 +4,7 @@
 .rvmrc
 .yardoc
 Gemfile.lock
+Gemfile.*.lock
 coverage/*
 doc/*
 log/*

data/.rubocop.yml

@@ -1,81 +1,57 @@
-AllCops:
-  Include:
-    - 'Gemfile'
-    - 'Rakefile'
-    - 'omniauth.gemspec'
-
-# Avoid long parameter lists
-ParameterLists:
-  Max: 4
-  CountKeywordArgs: true
+Lint/HandleExceptions:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Max: 2
+
+Metrics/LineLength:
+  AllowURI: true
+  Enabled: false
 
-MethodLength:
+Metrics/MethodLength:
   CountComments: false
   Max: 15
 
-# Avoid more than `Max` levels of nesting.
-BlockNesting:
-  Max: 2
+Metrics/ParameterLists:
+  Max: 4
+  CountKeywordArgs: true
+
+Metrics/AbcSize:
+  Enabled: false
 
-# Align with the style guide.
-CollectionMethods:
+Style/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Style/CollectionMethods:
   PreferredMethods:
     map:      'collect'
     reduce:   'inject'
     find:     'detect'
     find_all: 'select'
 
-# Limit line length
-LineLength:
-  Enabled: false
-
-# Disable documentation checking until a class needs to be documented once
-Documentation:
+Style/Documentation:
   Enabled: false
 
-# Enforce Ruby 1.8-compatible hash syntax
-HashSyntax:
-  EnforcedStyle: hash_rockets
-
-# No spaces inside hash literals
-SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
+Style/DotPosition:
+  EnforcedStyle: trailing
 
-# Allow dots at the end of lines
-DotPosition:
+Style/DoubleNegation:
   Enabled: false
 
-# Don't require magic comment at the top of every file
-Encoding:
+Style/EachWithObject:
   Enabled: false
 
-# Enforce outdenting of access modifiers (i.e. public, private, protected)
-AccessModifierIndentation:
-  EnforcedStyle: outdent
-
-EmptyLinesAroundAccessModifier:
-  Enabled: true
-
-# Align ends correctly
-EndAlignment:
-  AlignWith: variable
-
-# Indentation of when/else
-CaseIndentation:
-  IndentWhenRelativeTo: end
-  IndentOneStep: false
-
-Lambda:
+Style/Encoding:
   Enabled: false
 
-HandleExceptions:
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/Lambda:
   Enabled: false
 
-RaiseArgs:
+Style/RaiseArgs:
   EnforcedStyle: compact
 
-TrailingComma:
-  Enabled: false
-
-EachWithObject:
-  Enabled: false
+Style/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space

data/.travis.yml

@@ -1,37 +1,33 @@
 bundler_args: --without development
+before_install: gem install bundler
+cache: bundler
+env:
+  global:
+    - JRUBY_OPTS="$JRUBY_OPTS --debug"
 gemfile:
   - Gemfile
   - Gemfile.rack-1.3.x
 language: ruby
 rvm:
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-9000
   - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
+  - 2.2
+  - jruby-head
   - rbx-2
   - ruby-head
 matrix:
   include:
-    - rvm: jruby-18mode
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
-      gemfile: Gemfile
-    - rvm: jruby-18mode
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
-      gemfile: Gemfile.rack-1.3.x
-    - rvm: jruby-19mode
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
-      gemfile: Gemfile
-    - rvm: jruby-19mode
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
-      gemfile: Gemfile.rack-1.3.x
-    - rvm: jruby-head
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
-      gemfile: Gemfile
-    - rvm: jruby-head
-      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
-      gemfile: Gemfile.rack-1.3.x
+    - rvm: 2.2.2
+      gemfile: Gemfile.rack-master
   allow_failures:
     - rvm: jruby-head
+    - rvm: rbx-2
     - rvm: ruby-head
+    - gemfile: Gemfile.rack-master
   fast_finish: true
+sudo: false

data/Gemfile

@@ -5,29 +5,20 @@ gem 'rake'
 gem 'yard'
 
 group :development do
-  gem 'growl'
-  platforms :ruby_19, :ruby_20 do
-    gem 'guard'
-    gem 'guard-bundler'
-    gem 'guard-rspec'
-  end
   gem 'kramdown'
-  gem 'plymouth', :platforms => [:ruby_19, :ruby_20, :ruby_21]
   gem 'pry'
-  gem 'pry-debugger', :platforms => [:mri_19, :mri_20]
-  gem 'pry-byebug', :platforms => [:mri_21]
-  gem 'rb-fsevent'
 end
 
 group :test do
-  gem 'coveralls', :require => false
-  gem 'json', '>= 1.8.1', :platforms => [:jruby, :ruby_18, :ruby_19]
-  gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
+  gem 'coveralls'
+  gem 'hashie', '~> 2.0.5', :platforms => [:jruby_18, :ruby_18]
+  gem 'json', '>= 1.8.1', :platforms => [:jruby_18, :jruby_19, :ruby_18, :ruby_19]
+  gem 'mime-types', '~> 1.25', :platforms => [:jruby_18, :ruby_18]
   gem 'rack-test'
-  gem 'rest-client', '~> 1.6.0', :platforms => [:jruby, :ruby_18]
+  gem 'rest-client', '~> 1.6.0', :platforms => [:jruby_18, :ruby_18]
   gem 'rspec', '~> 3.0'
-  gem 'rubocop', '>= 0.23', :platforms => [:ruby_19, :ruby_20, :ruby_21]
-  gem 'simplecov', :require => false
+  gem 'rubocop', '>= 0.25', :platforms => [:ruby_19, :ruby_20, :ruby_21, :ruby_22]
+  gem 'simplecov', '>= 0.9'
 end
 
 gemspec

data/Gemfile.rack-1.3.x

@@ -6,20 +6,15 @@ gem 'rake'
 gem 'yard'
 
 group :test do
-  gem 'coveralls', :require => false
-  gem 'json', '>= 1.8.1', :platforms => [:jruby, :rbx, :ruby_18, :ruby_19]
-  gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
+  gem 'coveralls'
+  gem 'hashie', '~> 2.0.5', :platforms => [:jruby_18, :ruby_18]
+  gem 'json', '>= 1.8.1', :platforms => [:jruby_18, :jruby_18, :ruby_18, :ruby_19]
+  gem 'mime-types', '~> 1.25', :platforms => [:jruby_18, :ruby_18]
   gem 'rack-test'
-  gem 'rest-client', '~> 1.6.0', :platforms => [:jruby, :ruby_18]
-  gem 'rspec', '>= 2.14'
-  gem 'rubocop', '>= 0.23', :platforms => [:ruby_19, :ruby_20, :ruby_21]
-  gem 'simplecov', :require => false
-end
-
-platforms :rbx do
-  gem 'racc'
-  gem 'rubinius-coverage', '~> 2.0'
-  gem 'rubysl', '~> 2.0'
+  gem 'rest-client', '~> 1.6.0', :platforms => [:jruby_18, :ruby_18]
+  gem 'rspec', '~> 3.0'
+  gem 'rubocop', '>= 0.25', :platforms => [:ruby_19, :ruby_20, :ruby_21]
+  gem 'simplecov', '>= 0.9'
 end
 
 gemspec

data/Gemfile.rack-master

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+gem 'jruby-openssl', :platforms => :jruby
+gem 'rack', :git => 'https://github.com/rack/rack.git'
+gem 'rake'
+gem 'yard'
+
+group :test do
+  gem 'coveralls'
+  gem 'rack-test'
+  gem 'rspec', '~> 3.0'
+  gem 'rubocop', '>= 0.25'
+  gem 'simplecov', '>= 0.9'
+end
+
+gemspec

data/README.md

@@ -143,7 +143,7 @@ your first stop if you are wondering about a more in-depth look at
 OmniAuth, how it works, and how to use it.
 
 ## Supported Ruby Versions
-OmniAuth is tested under 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.0, JRuby, and Rubinius.
+OmniAuth is tested under 1.8.7, 1.9.3, 2.0.0, 2.1.0, JRuby, and Rubinius.
 
 ## Versioning
 This library aims to adhere to [Semantic Versioning 2.0.0][semver]. Violations

data/lib/omniauth.rb

@@ -82,19 +82,15 @@ module OmniAuth
       end
     end
 
-    def add_mock(provider, mock = {})
-      # Stringify keys recursively one level.
-      mock.keys.each do |key|
-        mock[key.to_s] = mock.delete(key)
-      end
-      mock.each_pair do |_key, val|
-        if val.is_a? Hash
-          val.keys.each do |subkey|
-            val[subkey.to_s] = val.delete(subkey)
-          end
-        else
-          next
-        end
+    def add_mock(provider, original = {})
+      # Create key-stringified new hash from given auth hash
+      mock = {}
+      original.each_pair do |key, val|
+        mock[key.to_s] = if val.is_a? Hash
+                           Hash[val.each_pair { |k, v| [k.to_s, v] }]
+                         else
+                           val
+                         end
       end
 
       # Merge with the default mock and ensure provider is correct.
@@ -136,7 +132,7 @@ module OmniAuth
   end
 
   module Utils
-    module_function
+  module_function
 
     def form_css
       "<style type='text/css'>#{OmniAuth.config.form_css}</style>"
@@ -161,7 +157,7 @@ module OmniAuth
       return OmniAuth.config.camelizations[word.to_s] if OmniAuth.config.camelizations[word.to_s]
 
       if first_letter_in_uppercase
-        word.to_s.gsub(/\/(.?)/) { '::' + Regexp.last_match[1].upcase }.gsub(/(^|_)(.)/) { Regexp.last_match[2].upcase }
+        word.to_s.gsub(%r{/(.?)}) { '::' + Regexp.last_match[1].upcase }.gsub(/(^|_)(.)/) { Regexp.last_match[2].upcase }
       else
         word.first + camelize(word)[1..-1]
       end

data/lib/omniauth/auth_hash.rb

@@ -40,7 +40,7 @@ module OmniAuth
       end
 
       def name?
-        !!name # rubocop:disable DoubleNegation
+        !!name
       end
       alias_method :valid?, :name?
 

data/lib/omniauth/builder.rb

@@ -2,7 +2,7 @@ module OmniAuth
   class Builder < ::Rack::Builder
     def initialize(app, &block)
       @options = nil
-      if rack14?
+      if rack14? || rack2?
         super
       else
         @app = app
@@ -12,7 +12,11 @@ module OmniAuth
     end
 
     def rack14?
-      Rack.release.split('.')[1].to_i >= 4
+      Rack.release.start_with?('1.') && (Rack.release.split('.')[1].to_i >= 4)
+    end
+
+    def rack2?
+      Rack.release.start_with? '2.'
     end
 
     def on_failure(&block)

data/lib/omniauth/form.rb

@@ -1,5 +1,5 @@
 module OmniAuth
-  class Form # rubocop:disable ClassLength
+  class Form
     DEFAULT_CSS = File.read(File.expand_path('../form.css', __FILE__))
 
     attr_accessor :options

data/lib/omniauth/strategies/developer.rb

@@ -37,7 +37,7 @@ module OmniAuth
       def request_phase
         form = OmniAuth::Form.new(:title => 'User Info', :url => callback_path)
         options.fields.each do |field|
-          form.text_field field.to_s.capitalize.gsub('_', ' '), field.to_s
+          form.text_field field.to_s.capitalize.tr('_', ' '), field.to_s
         end
         form.button 'Sign In'
         form.to_response

data/lib/omniauth/strategy.rb

@@ -6,7 +6,7 @@ module OmniAuth
   # wrangle multiple providers. Each strategy provided by
   # OmniAuth includes this mixin to gain the default functionality
   # necessary to be compatible with the OmniAuth library.
-  module Strategy
+  module Strategy # rubocop:disable ModuleLength
     def self.included(base)
       OmniAuth.strategies << base
 
@@ -169,7 +169,7 @@ module OmniAuth
     # the request path is recognized.
     #
     # @param env [Hash] The Rack environment.
-    def call!(env) # rubocop:disable CyclomaticComplexity
+    def call!(env) # rubocop:disable CyclomaticComplexity, PerceivedComplexity
       unless env['rack.session']
         error = OmniAuth::NoSessionError.new('You must provide a session to use OmniAuth.')
         fail(error)
@@ -194,7 +194,7 @@ module OmniAuth
     end
 
     # Performs the steps necessary to run the request phase of a strategy.
-    def request_call # rubocop:disable CyclomaticComplexity, MethodLength
+    def request_call # rubocop:disable CyclomaticComplexity, MethodLength, PerceivedComplexity
       setup_phase
       log :info, 'Request phase initiated.'
       # store query params from the request url, extracted in the callback_phase
@@ -278,14 +278,14 @@ module OmniAuth
 
     def mock_callback_call
       setup_phase
+      @env['omniauth.origin'] = session.delete('omniauth.origin')
+      @env['omniauth.origin'] = nil if env['omniauth.origin'] == ''
       mocked_auth = OmniAuth.mock_auth_for(name.to_s)
       if mocked_auth.is_a?(Symbol)
         fail!(mocked_auth)
       else
         @env['omniauth.auth'] = mocked_auth
         @env['omniauth.params'] = session.delete('omniauth.params') || {}
-        @env['omniauth.origin'] = session.delete('omniauth.origin')
-        @env['omniauth.origin'] = nil if env['omniauth.origin'] == ''
         OmniAuth.config.before_callback_phase.call(@env) if OmniAuth.config.before_callback_phase
         call_app!
       end
@@ -377,23 +377,27 @@ module OmniAuth
     end
 
     def request_path
-      options[:request_path].is_a?(String) ? options[:request_path] : "#{path_prefix}/#{name}"
+      @request_path ||= options[:request_path].is_a?(String) ? options[:request_path] : "#{path_prefix}/#{name}"
     end
 
     def callback_path
-      path = options[:callback_path] if options[:callback_path].is_a?(String)
-      path ||= current_path if options[:callback_path].respond_to?(:call) && options[:callback_path].call(env)
-      path ||= custom_path(:request_path)
-      path ||= "#{path_prefix}/#{name}/callback"
-      path
+      @callback_path ||= begin
+        path = options[:callback_path] if options[:callback_path].is_a?(String)
+        path ||= current_path if options[:callback_path].respond_to?(:call) && options[:callback_path].call(env)
+        path ||= custom_path(:request_path)
+        path ||= "#{path_prefix}/#{name}/callback"
+        path
+      end
     end
 
     def setup_path
       options[:setup_path] || "#{path_prefix}/#{name}/setup"
     end
 
+    CURRENT_PATH_REGEX = %r{/$}
+    EMPTY_STRING       = ''.freeze
     def current_path
-      request.path_info.downcase.sub(/\/$/, '')
+      @current_path ||= request.path_info.downcase.sub(CURRENT_PATH_REGEX, EMPTY_STRING)
     end
 
     def query_string
@@ -475,6 +479,12 @@ module OmniAuth
       OmniAuth.config.on_failure.call(env)
     end
 
+    def dup
+      super.tap do
+        @options = @options.dup
+      end
+    end
+
     class Options < Hashie::Mash; end
 
   protected
@@ -488,10 +498,10 @@ module OmniAuth
 
     def ssl?
       request.env['HTTPS'] == 'on' ||
-      request.env['HTTP_X_FORWARDED_SSL'] == 'on' ||
-      request.env['HTTP_X_FORWARDED_SCHEME'] == 'https' ||
-      (request.env['HTTP_X_FORWARDED_PROTO'] && request.env['HTTP_X_FORWARDED_PROTO'].split(',')[0] == 'https') ||
-      request.env['rack.url_scheme'] == 'https'
+        request.env['HTTP_X_FORWARDED_SSL'] == 'on' ||
+        request.env['HTTP_X_FORWARDED_SCHEME'] == 'https' ||
+        (request.env['HTTP_X_FORWARDED_PROTO'] && request.env['HTTP_X_FORWARDED_PROTO'].split(',')[0] == 'https') ||
+        request.env['rack.url_scheme'] == 'https'
     end
   end
 end