OmniAuth is now compatible with 1.3 and 1.4 Rack. Closes #562
This commit is contained in:
parent
966a4653a5
commit
21739ee956
|
@ -5,3 +5,6 @@ rvm:
|
||||||
- jruby
|
- jruby
|
||||||
- rbx
|
- rbx
|
||||||
- ree
|
- ree
|
||||||
|
gemfiles:
|
||||||
|
- Gemfile
|
||||||
|
- Gemfile.rack-1.3.x
|
1
Gemfile
1
Gemfile
|
@ -1,3 +1,4 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
|
gem 'rack', '~> 1.4'
|
||||||
gemspec
|
gemspec
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
|
gem 'rack', '~> 1.3.0'
|
||||||
|
gemspec
|
|
@ -2,6 +2,19 @@ require 'omniauth'
|
||||||
|
|
||||||
module OmniAuth
|
module OmniAuth
|
||||||
class Builder < ::Rack::Builder
|
class Builder < ::Rack::Builder
|
||||||
|
def initialize(app, &block)
|
||||||
|
if rack14?
|
||||||
|
super
|
||||||
|
else
|
||||||
|
@app = app
|
||||||
|
super(&block)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def rack14?
|
||||||
|
Rack.release.split('.')[1].to_i >= 4
|
||||||
|
end
|
||||||
|
|
||||||
def on_failure(&block)
|
def on_failure(&block)
|
||||||
OmniAuth.config.on_failure = block
|
OmniAuth.config.on_failure = block
|
||||||
end
|
end
|
||||||
|
@ -25,6 +38,7 @@ module OmniAuth
|
||||||
end
|
end
|
||||||
|
|
||||||
def call(env)
|
def call(env)
|
||||||
|
@ins << @app unless rack14? || @ins.include?(@app)
|
||||||
to_app.call(env)
|
to_app.call(env)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
|
||||||
gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
|
gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
|
||||||
gem.email = ['michael@intridea.com', 'sferik@gmail.com']
|
gem.email = ['michael@intridea.com', 'sferik@gmail.com']
|
||||||
|
|
||||||
gem.add_runtime_dependency 'rack', '~> 1.4'
|
gem.add_runtime_dependency 'rack'
|
||||||
gem.add_runtime_dependency 'hashie', '~> 1.2'
|
gem.add_runtime_dependency 'hashie', '~> 1.2'
|
||||||
|
|
||||||
gem.add_development_dependency 'growl'
|
gem.add_development_dependency 'growl'
|
||||||
|
@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
|
||||||
gem.add_development_dependency 'rake'
|
gem.add_development_dependency 'rake'
|
||||||
gem.add_development_dependency 'rb-fsevent'
|
gem.add_development_dependency 'rb-fsevent'
|
||||||
gem.add_development_dependency 'rdiscount'
|
gem.add_development_dependency 'rdiscount'
|
||||||
gem.add_development_dependency 'rspec'
|
gem.add_development_dependency 'rspec', '~> 2.8'
|
||||||
gem.add_development_dependency 'yard'
|
gem.add_development_dependency 'yard'
|
||||||
|
|
||||||
gem.version = OmniAuth::VERSION
|
gem.version = OmniAuth::VERSION
|
||||||
|
|
Loading…
Reference in New Issue