omniauth 1.1.3 → 1.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e2de96580841043efbf6ce867bbe6b574482e1e3
+  data.tar.gz: df751e517e48515d401fc11b2552cf87d75b278a
+SHA512:
+  metadata.gz: 459fee400c08cffb08c4518bb70d323ff6705bb434a085a3a9ea74097437275d58d61cd631055573c66d8e973d764513f4d783ce4eb2d95e88c93c8babe29774
+  data.tar.gz: 4bff6e3d866ccc5dcb62ecaaf2d878378b9618978f3cc7c8100b40f70258ed99f955e6f0533512304cbd2b0646fd2ba71e2c87f903f475ea8a23a85268edee6b

data/README.md

@@ -1,13 +1,17 @@
 # OmniAuth: Standardized Multi-Provider Authentication
+
 [![Gem Version](https://badge.fury.io/rb/omniauth.png)][gem]
 [![CI Build Status](https://secure.travis-ci.org/intridea/omniauth.png?branch=master)][travis]
 [![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]
+
 
 [gem]: https://rubygems.org/gems/omniauth
 [travis]: http://travis-ci.org/intridea/omniauth
 [gemnasium]: https://gemnasium.com/intridea/omniauth
 [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

data/lib/omniauth/builder.rb

@@ -3,6 +3,7 @@ require 'omniauth'
 module OmniAuth
   class Builder < ::Rack::Builder
     def initialize(app, &block)
+      @options = nil
       if rack14?
         super
       else

data/lib/omniauth/form.rb

@@ -95,6 +95,7 @@ module OmniAuth
 
       @html = ""
       @with_custom_button = false
+      @footer = nil
       header(options[:title],options[:header_info])
     end
 
@@ -141,7 +142,7 @@ module OmniAuth
 
     def fieldset(legend, options = {}, &block)
       @html << "\n<fieldset#{" style='#{options[:style]}'" if options[:style]}#{" id='#{options[:id]}'" if options[:id]}>\n  <legend>#{legend}</legend>\n"
-      self.instance_eval &block
+      self.instance_eval(&block)
       @html << "\n</fieldset>"
       self
     end
@@ -182,7 +183,7 @@ module OmniAuth
 
     def to_response
       footer
-      Rack::Response.new(@html).finish
+      Rack::Response.new(@html, 200, {"content-type" => "text/html"}).finish
     end
 
     protected

data/lib/omniauth/strategy.rb

@@ -13,8 +13,6 @@ module OmniAuth
 
       base.extend ClassMethods
       base.class_eval do
-        attr_reader :app, :env, :options, :response
-
         option :setup, false
         option :skip_info, false
       end
@@ -24,7 +22,7 @@ module OmniAuth
       # Returns an inherited set of default options set at the class-level
       # for each strategy.
       def default_options
-        return @default_options if @default_options
+        return @default_options if instance_variable_defined?(:@default_options) && @default_options
         existing = superclass.respond_to?(:default_options) ? superclass.default_options : {}
         @default_options = OmniAuth::Strategy::Options.new(existing)
       end
@@ -52,8 +50,11 @@ module OmniAuth
       #     configure foo: 'bar'
       #   end
       def configure(options = nil)
-        yield default_options and return unless options
-        default_options.deep_merge!(options)
+        if block_given?
+          yield default_options
+        else
+          default_options.deep_merge!(options)
+        end
       end
 
       # Directly declare a default option for your class. This is a useful from
@@ -79,9 +80,12 @@ module OmniAuth
       # recorded as. This takes care of 90% of the use cases for overriding
       # the initializer in OmniAuth Strategies.
       def args(args = nil)
-        @args = Array(args) and return if args
+        if args
+          @args = Array(args)
+          return
+        end
         existing = superclass.respond_to?(:args) ? superclass.args : []
-        return @args || existing
+        return (instance_variable_defined?(:@args) && @args) || existing
       end
 
       %w(uid info extra credentials).each do |fetcher|
@@ -106,6 +110,8 @@ module OmniAuth
       end
     end
 
+    attr_reader :app, :env, :options, :response
+
     # Initializes the strategy by passing in the Rack endpoint,
     # the unique URL segment name for this strategy, and any
     # additional arguments. An `options` hash is automatically
@@ -123,6 +129,7 @@ module OmniAuth
     # @yield [Options] Yields options to block for further configuration.
     def initialize(app, *args, &block)
       @app = app
+      @env = nil
       @options = self.class.default_options.dup
 
       options.deep_merge!(args.pop) if args.last.is_a?(Hash)

data/lib/omniauth/version.rb

@@ -1,3 +1,3 @@
 module OmniAuth
-  VERSION = "1.1.3" unless defined?(OmniAuth::VERSION)
+  VERSION = "1.1.4" unless defined?(OmniAuth::VERSION)
 end

data/omniauth.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'omniauth/version'
 
 Gem::Specification.new do |spec|
-  spec.add_dependency 'hashie', '~> 1.2'
+  spec.add_dependency 'hashie', ['>= 1.2', '< 3']
   spec.add_dependency 'rack'
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.authors       = ['Michael Bleigh', 'Erik Michaels-Ober']

data/spec/{spec_helper.rb → helper.rb}

@@ -1,9 +1,11 @@
-unless ENV['CI']
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter 'spec'
-  end
-end
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
 
 require 'rspec'
 require 'rack/test'
@@ -25,6 +27,10 @@ class ExampleStrategy
   option :name, 'test'
   def call(env); self.call!(env) end
   attr_reader :last_env
+  def initialize(*args, &block)
+    super
+    @fail = nil
+  end
   def request_phase
     @fail = fail!(options[:failure]) if options[:failure]
     @last_env = env

data/spec/omniauth/auth_hash_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 describe OmniAuth::AuthHash do
   subject{ OmniAuth::AuthHash.new }

data/spec/omniauth/builder_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'helper'
 
 describe OmniAuth::Builder do
   describe "#provider" do

data/spec/omniauth/failure_endpoint_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 describe OmniAuth::FailureEndpoint do
   subject{ OmniAuth::FailureEndpoint }
@@ -29,24 +29,24 @@ describe OmniAuth::FailureEndpoint do
                 'omniauth.error.strategy' => ExampleStrategy.new({}) } }
 
     it "is a redirect" do
-      status, head, body = *subject.call(env)
+      status, _, _ = *subject.call(env)
       expect(status).to eq(302)
     end
 
     it "includes the SCRIPT_NAME" do
-      status, head, body = *subject.call(env.merge('SCRIPT_NAME' => '/random'))
+      _, head, _ = *subject.call(env.merge('SCRIPT_NAME' => '/random'))
       expect(head['Location']).to eq('/random/auth/failure?message=invalid_request&strategy=test')
     end
 
     it "respects the configured path prefix" do
       OmniAuth.config.stub(:path_prefix => '/boo')
-      status, head, body = *subject.call(env)
+      _, head, _ = *subject.call(env)
       expect(head["Location"]).to eq('/boo/failure?message=invalid_request&strategy=test')
     end
 
     it "includes the origin (escaped) if one is provided" do
       env.merge! 'omniauth.origin' => '/origin-example'
-      status, head, body = *subject.call(env)
+      _, head, _ = *subject.call(env)
       expect(head['Location']).to be_include('&origin=%2Forigin-example')
     end
   end

data/spec/omniauth/form_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 describe OmniAuth::Form do
   describe ".build" do

data/spec/omniauth/strategies/developer_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
+require 'helper'
 
 describe OmniAuth::Strategies::Developer do
   let(:app){ Rack::Builder.new do |b|
-    b.use Rack::Session::Cookie
+    b.use Rack::Session::Cookie, {:secret => "abc123"}
     b.use OmniAuth::Strategies::Developer
     b.run lambda{|env| [200, {}, ['Not Found']]}
   end.to_app }
@@ -47,7 +47,7 @@ describe OmniAuth::Strategies::Developer do
 
     context "with custom options" do
       let(:app){ Rack::Builder.new do |b|
-        b.use Rack::Session::Cookie
+        b.use Rack::Session::Cookie, {:secret => "abc123"}
         b.use OmniAuth::Strategies::Developer, :fields => [:first_name, :last_name], :uid_field => :last_name
         b.run lambda{|env| [200, {}, ['Not Found']]}
       end.to_app }

data/spec/omniauth/strategy_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 def make_env(path = '/auth/test', props = {})
   {
@@ -28,11 +28,22 @@ describe OmniAuth::Strategy do
 
   describe ".configure" do
     subject { klass = Class.new; klass.send :include, OmniAuth::Strategy; klass }
-    it "takes a block and allow for default options setting" do
-      subject.configure do |c|
-        c.wakka = 'doo'
+    context "when block is passed" do
+      it "allows for default options setting" do
+        subject.configure do |c|
+          c.wakka = 'doo'
+        end
+        expect(subject.default_options["wakka"]).to eq("doo")
+      end
+
+      it "works when block doesn't evaluate to true" do
+        environment_variable = nil
+        subject.configure do |c|
+          c.abc = '123'
+          c.hgi = environment_variable
+        end
+        expect(subject.default_options["abc"]).to eq("123")
       end
-      expect(subject.default_options["wakka"]).to eq("doo")
     end
 
     it "takes a hash and deep merge it" do
@@ -246,6 +257,10 @@ describe OmniAuth::Strategy do
   end
 
   describe "#call" do
+    before(:all) do
+      @options = nil
+    end
+
     let(:strategy){ ExampleStrategy.new(app, @options || {}) }
 
     context "omniauth.origin" do

data/spec/omniauth_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 describe OmniAuth do
   describe ".strategies" do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.1.4
 platform: ruby
 authors:
 - Michael Bleigh
@@ -10,71 +9,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURMakNDQWhhZ0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE5TVE4d0RRWURWUVFEREFaelpt
-  VnkKYVdzeEZUQVRCZ29Ka2lhSmsvSXNaQUVaRmdWbmJXRnBiREVUTUJFR0Nn
-  bVNKb21UOGl4a0FSa1dBMk52YlRBZQpGdzB4TXpBeU1ETXhNREF5TWpkYUZ3
-  MHhOREF5TURNeE1EQXlNamRhTUQweER6QU5CZ05WQkFNTUJuTm1aWEpwCmF6
-  RVZNQk1HQ2dtU0pvbVQ4aXhrQVJrV0JXZHRZV2xzTVJNd0VRWUtDWkltaVpQ
-  eUxHUUJHUllEWTI5dE1JSUIKSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4
-  QU1JSUJDZ0tDQVFFQWwweDVkeDh1S3hpN1Rrckl1eUJVVEpWQgp2MW85M25V
-  QjlqL3k0TTk2Z1Yycll3QWNpMUpQQnNlTmQ2RnliempvM1lHdUhsN0VRSHVT
-  SE5hZjFwMmx4ZXcvCnk2MEpYSUpCQmdQY0RLL0tDUDROVUhvZm0wamZvWUQr
-  SDV1TkpmSENOcTcvWnNUeE90RTNSYTkyczBCQ01UcG0Kd0JNTWxXUjVNdGRF
-  aElZdUJPNFhobmVqWWdIMEwvN0JMMmx5bW50Vm5zci9hZ2RRb29qUUNOMUlR
-  bXNSSnZyUgpkdVpSTzN0WnZvSW8xcEJjNEpFZWhEdXFDZXlCZ1BMT3FNb0t0
-  UWxvbGQxVFFzMWtXVUJLN0tXTUZFaEtDL0tnCnp5ektSSFFvOXlEWXdPdllu
-  Z29CTFkrVC9sd0NUNGR5c3NkaHpSYmZueEFoYUt1NFNBc3NJd2FDMDF5Vm93
-  SUQKQVFBQm96a3dOekFKQmdOVkhSTUVBakFBTUIwR0ExVWREZ1FXQkJTMHJ1
-  RGZSYWs1Y2kxT3BETlgvWmRERWtJcwppVEFMQmdOVkhROEVCQU1DQkxBd0RR
-  WUpLb1pJaHZjTkFRRUZCUUFEZ2dFQkFISFNNcy9NUDBzT2FMa0V2NEpvCnp2
-  a20zcW41QTZ0MHZhSHg3NzRjbWVqeU1VKzV3eVN4UmV6c3BMN1VMaDlOZXVL
-  Mk9oVStPZTNUcHFyQWc1VEsKUjhHUUlMblZ1MkZlbUdBNnNBa1BEbGNQdGdB
-  NmllSTE5UFpPRjZIVkxtYy9JRC9kUC9OZ1pXV3pFZXFRS21jSwoyK0hNK1NF
-  RURoWmtTY1lla3c0Wk9lMTY0WnRaRzgxNm9BdjV4MHBHaXRTSWt1bVVwN1Y4
-  aUVaLzZlaHI3WTllClhPZzRlZXVuNUwvSmptakFSb1cya05kdmtSRDNjMkVl
-  U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
-  cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
-  cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-02-14 00:00:00.000000000 Z
+- |
+  -----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-----
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -82,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -112,6 +105,7 @@ files:
 - lib/omniauth/test.rb
 - lib/omniauth/version.rb
 - lib/omniauth.rb
+- spec/helper.rb
 - spec/omniauth/auth_hash_spec.rb
 - spec/omniauth/builder_spec.rb
 - spec/omniauth/failure_endpoint_spec.rb
@@ -119,33 +113,32 @@ files:
 - spec/omniauth/strategies/developer_spec.rb
 - spec/omniauth/strategy_spec.rb
 - spec/omniauth_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/intridea/omniauth
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A generalized Rack framework for multiple-provider authentication.
 test_files:
+- spec/helper.rb
 - spec/omniauth/auth_hash_spec.rb
 - spec/omniauth/builder_spec.rb
 - spec/omniauth/failure_endpoint_spec.rb
@@ -153,5 +146,4 @@ test_files:
 - spec/omniauth/strategies/developer_spec.rb
 - spec/omniauth/strategy_spec.rb
 - spec/omniauth_spec.rb
-- spec/spec_helper.rb
 has_rdoc: