omniauth 1.1.4 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2de96580841043efbf6ce867bbe6b574482e1e3
-  data.tar.gz: df751e517e48515d401fc11b2552cf87d75b278a
+  metadata.gz: 3f39a414c0faa20fa73d5154f76f3a99197aceda
+  data.tar.gz: 071d7f140c3910a94348999054d2b401c2a534dd
 SHA512:
-  metadata.gz: 459fee400c08cffb08c4518bb70d323ff6705bb434a085a3a9ea74097437275d58d61cd631055573c66d8e973d764513f4d783ce4eb2d95e88c93c8babe29774
-  data.tar.gz: 4bff6e3d866ccc5dcb62ecaaf2d878378b9618978f3cc7c8100b40f70258ed99f955e6f0533512304cbd2b0646fd2ba71e2c87f903f475ea8a23a85268edee6b
+  metadata.gz: 08d531039bef8a998707e80adcf913155b8a1d54d6e673dc878c754abb64dd33adbe91d357bec0e63d3b8b784353d032e68ea347d10487c16d36a4517b528040
+  data.tar.gz: 636a8819d05c07c3636745731dea74c39e31945ca2a09f138d3ee84fa6b876c00f2596f93e915748c05940b6536d3a9a487462f1ecf97adbb94d4194bc8dc730

data/.gitignore

@@ -0,0 +1,11 @@
+*.gem
+*~
+.bundle
+.rvmrc
+.yardoc
+Gemfile.lock
+coverage/*
+doc/*
+log/*
+measurement/*
+pkg/*

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--order random

data/.rubocop.yml

@@ -0,0 +1,82 @@
+AllCops:
+  Includes:
+    - 'Gemfile'
+    - 'Rakefile'
+    - 'omniauth.gemspec'
+
+# Avoid long parameter lists
+ParameterLists:
+  Max: 4
+  CountKeywordArgs: true
+
+MethodLength:
+  CountComments: false
+  Max: 14
+
+# Avoid more than `Max` levels of nesting.
+BlockNesting:
+  Max: 2
+
+# Align with the style guide.
+CollectionMethods:
+  PreferredMethods:
+    map:      'collect'
+    reduce:   'inject'
+    find:     'detect'
+    find_all: 'select'
+
+# Do not force public/protected/private keyword to be indented at the same
+# level as the def keyword. My personal preference is to outdent these keywords
+# because I think when scanning code it makes it easier to identify the
+# sections of code and visually separate them. When the keyword is at the same
+# level I think it sort of blends in with the def keywords and makes it harder
+# to scan the code and see where the sections are.
+AccessModifierIndentation:
+  Enabled: false
+
+# Limit line length
+LineLength:
+  Enabled: false
+
+# Disable documentation checking until a class needs to be documented once
+Documentation:
+  Enabled: false
+
+# Enforce Ruby 1.8-compatible hash syntax
+HashSyntax:
+  EnforcedStyle: hash_rockets
+
+# No spaces inside hash literals
+SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+# Allow dots at the end of lines
+DotPosition:
+  Enabled: false
+
+# Don't require magic comment at the top of every file
+Encoding:
+  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:
+  Enabled: false
+
+HandleExceptions:
+  Exclude:
+    - 'spec'

data/.travis.yml

@@ -0,0 +1,42 @@
+before_install:
+  - gem update bundler
+  - bundle --version
+  - gem update --system 2.1.11
+  - gem --version
+bundler_args: --without development
+gemfile:
+  - Gemfile
+  - Gemfile.rack-1.3.x
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - rbx
+  - 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
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: ruby-head
+  fast_finish: true

data/Gemfile

@@ -0,0 +1,37 @@
+source 'https://rubygems.org'
+
+gem 'jruby-openssl', :platforms => :jruby
+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, :mri_21]
+  gem 'rb-fsevent'
+end
+
+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 'rack-test'
+  gem 'rspec', '>= 2.14'
+  gem 'rubocop', '>= 0.16', :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'
+end
+
+gemspec

data/Gemfile.rack-1.3.x

@@ -0,0 +1,24 @@
+source 'https://rubygems.org'
+
+gem 'jruby-openssl', :platforms => :jruby
+gem 'rack', '~> 1.3.0'
+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 'rack-test'
+  gem 'rspec', '>= 2.14'
+  gem 'rubocop', '>= 0.16', :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'
+end
+
+gemspec

data/Guardfile

@@ -0,0 +1,10 @@
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec/" }
+end
+
+guard 'bundler' do
+  watch('Gemfile')
+  watch(/^.+\.gemspec/)
+end

data/README.md

@@ -5,7 +5,7 @@
 [![Dependency Status](https://gemnasium.com/intridea/omniauth.png?travis)][gemnasium]
 [![Code Climate](https://codeclimate.com/github/intridea/omniauth.png)][codeclimate]
 [![Coverage Status](https://coveralls.io/repos/intridea/omniauth/badge.png?branch=master)][coveralls]
-
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/intridea/omniauth/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
 [gem]: https://rubygems.org/gems/omniauth
 [travis]: http://travis-ci.org/intridea/omniauth
@@ -13,6 +13,7 @@
 [codeclimate]: https://codeclimate.com/github/intridea/omniauth
 [coveralls]: https://coveralls.io/r/intridea/omniauth
 
+
 **OmniAuth 1.0 has several breaking changes from version 0.x. You can set
 the dependency to `~> 0.3.2` if you do not wish to make the more difficult
 upgrade. See [the wiki](https://github.com/intridea/omniauth/wiki/Upgrading-to-1.0)
@@ -93,7 +94,7 @@ steps are necessary for your application. For example, in a Rails app I
 would add a line in my `routes.rb` file like this:
 
 ```ruby
-match '/auth/:provider/callback', to: 'sessions#create'
+get '/auth/:provider/callback', to: 'sessions#create'
 ```
 
 And I might then have a `SessionsController` with code that looks
@@ -143,8 +144,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, JRuby (1.8 mode), and Rubinius
-(1.8 and 1.9 modes).
+OmniAuth is tested under 1.8.7, 1.9.2, 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/Rakefile

@@ -1,6 +1,17 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
 task :test => :spec
+
+begin
+  require 'rubocop/rake_task'
+  Rubocop::RakeTask.new
+rescue LoadError
+  task :rubocop do
+    $stderr.puts 'Rubocop is disabled'
+  end
+end
+
+task :default => [:spec, :rubocop]

data/certs/sferik.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQ8wDQYDVQQDDAZzZmVy
+aWsxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2NvbTAe
+Fw0xMzAyMDMxMDAyMjdaFw0xNDAyMDMxMDAyMjdaMD0xDzANBgNVBAMMBnNmZXJp
+azEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29tMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl0x5dx8uKxi7TkrIuyBUTJVB
+v1o93nUB9j/y4M96gV2rYwAci1JPBseNd6Fybzjo3YGuHl7EQHuSHNaf1p2lxew/
+y60JXIJBBgPcDK/KCP4NUHofm0jfoYD+H5uNJfHCNq7/ZsTxOtE3Ra92s0BCMTpm
+wBMMlWR5MtdEhIYuBO4XhnejYgH0L/7BL2lymntVnsr/agdQoojQCN1IQmsRJvrR
+duZRO3tZvoIo1pBc4JEehDuqCeyBgPLOqMoKtQlold1TQs1kWUBK7KWMFEhKC/Kg
+zyzKRHQo9yDYwOvYngoBLY+T/lwCT4dyssdhzRbfnxAhaKu4SAssIwaC01yVowID
+AQABozkwNzAJBgNVHRMEAjAAMB0GA1UdDgQWBBS0ruDfRak5ci1OpDNX/ZdDEkIs
+iTALBgNVHQ8EBAMCBLAwDQYJKoZIhvcNAQEFBQADggEBAHHSMs/MP0sOaLkEv4Jo
+zvkm3qn5A6t0vaHx774cmejyMU+5wySxRezspL7ULh9NeuK2OhU+Oe3TpqrAg5TK
+R8GQILnVu2FemGA6sAkPDlcPtgA6ieI19PZOF6HVLmc/ID/dP/NgZWWzEeqQKmcK
+2+HM+SEEDhZkScYekw4ZOe164ZtZG816oAv5x0pGitSIkumUp7V8iEZ/6ehr7Y9e
+XOg4eeun5L/JjmjARoW2kNdvkRD3c2EeSLqWvQRsBlypHfhs6JJuLlyZPGhU3R/v
+Sf3lVKpBCWgRpGTvy45XVpB+59y33PJmEuQ1PTEOYvQyao9UKMAAaAN/7qWQtjl0
+hlw=
+-----END CERTIFICATE-----

data/lib/omniauth.rb

@@ -17,7 +17,7 @@ module OmniAuth
   autoload :FailureEndpoint, 'omniauth/failure_endpoint'
 
   def self.strategies
-    @@strategies ||= []
+    @strategies ||= []
   end
 
   class Configuration
@@ -25,35 +25,29 @@ module OmniAuth
 
     def self.default_logger
       logger = Logger.new(STDOUT)
-      logger.progname = "omniauth"
+      logger.progname = 'omniauth'
       logger
     end
 
-    @@defaults = {
-      :camelizations => {},
-      :path_prefix => '/auth',
-      :on_failure => OmniAuth::FailureEndpoint,
-      :form_css => Form::DEFAULT_CSS,
-      :test_mode => false,
-      :logger => default_logger,
-      :allowed_request_methods => [:get, :post],
-      :mock_auth => {
-        :default => AuthHash.new(
-          'provider' => 'default',
-          'uid' => '1234',
-          'info' => {
-            'name' => 'Bob Example'
-          }
-        )
-      }
-    }
-
     def self.defaults
-      @@defaults
+      @defaults ||= {
+        :camelizations => {},
+        :path_prefix => '/auth',
+        :on_failure => OmniAuth::FailureEndpoint,
+        :failure_raise_out_environments => ['development'],
+        :before_request_phase   => nil,
+        :before_callback_phase  => nil,
+        :before_options_phase   => nil,
+        :form_css => Form::DEFAULT_CSS,
+        :test_mode => false,
+        :logger => default_logger,
+        :allowed_request_methods => [:get, :post],
+        :mock_auth => {:default => AuthHash.new('provider' => 'default', 'uid' => '1234', 'info' => {'name' => 'Example User'})}
+      }
     end
 
     def initialize
-      @@defaults.each_pair{|k,v| self.send("#{k}=",v)}
+      self.class.defaults.each_pair { |k, v| send("#{k}=", v) }
     end
 
     def on_failure(&block)
@@ -64,7 +58,31 @@ module OmniAuth
       end
     end
 
-    def add_mock(provider, mock={})
+    def before_callback_phase(&block)
+      if block_given?
+        @before_callback_phase = block
+      else
+        @before_callback_phase
+      end
+    end
+
+    def before_options_phase(&block)
+      if block_given?
+        @before_options_phase = block
+      else
+        @before_options_phase
+      end
+    end
+
+    def before_request_phase(&block)
+      if block_given?
+        @before_request_phase = block
+      else
+        @before_request_phase
+      end
+    end
+
+    def add_mock(provider, mock = {})
       # Stringify keys recursively one level.
       mock.keys.each do |key|
         mock[key.to_s] = mock.delete(key)
@@ -78,11 +96,11 @@ module OmniAuth
       end
 
       # Merge with the default mock and ensure provider is correct.
-      mock = self.mock_auth[:default].dup.merge(mock)
-      mock["provider"] = provider.to_s
+      mock = mock_auth[:default].dup.merge(mock)
+      mock['provider'] = provider.to_s
 
       # Add it to the mocks.
-      self.mock_auth[provider.to_sym] = mock
+      mock_auth[provider.to_sym] = mock
     end
 
     # This is a convenience method to be used by strategy authors
@@ -92,11 +110,11 @@ module OmniAuth
     # @param name [String] The underscored name, e.g. `oauth`
     # @param camelized [String] The properly camelized name, e.g. 'OAuth'
     def add_camelization(name, camelized)
-      self.camelizations[name.to_s] = camelized.to_s
+      camelizations[name.to_s] = camelized.to_s
     end
 
-    attr_writer :on_failure
-    attr_accessor :path_prefix, :allowed_request_methods, :form_css, :test_mode, :mock_auth, :full_host, :camelizations, :logger
+    attr_writer   :on_failure, :before_callback_phase, :before_options_phase, :before_request_phase
+    attr_accessor :failure_raise_out_environments, :path_prefix, :allowed_request_methods, :form_css, :test_mode, :mock_auth, :full_host, :camelizations, :logger
   end
 
   def self.config
@@ -126,8 +144,8 @@ module OmniAuth
       target = hash.dup
 
       other_hash.keys.each do |key|
-        if other_hash[key].is_a? ::Hash and hash[key].is_a? ::Hash
-          target[key] = deep_merge(target[key],other_hash[key])
+        if other_hash[key].is_a?(::Hash) && hash[key].is_a?(::Hash)
+          target[key] = deep_merge(target[key], other_hash[key])
           next
         end
 
@@ -141,7 +159,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(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+        word.to_s.gsub(/\/(.?)/) { '::' + Regexp.last_match[1].upcase }.gsub(/(^|_)(.)/) { Regexp.last_match[2].upcase }
       else
         word.first + camelize(word)[1..-1]
       end