omniauth 1.2.2 → 1.3.0

data/lib/omniauth/version.rb

@@ -1,3 +1,3 @@
 module OmniAuth
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end

data/omniauth.gemspec

@@ -5,18 +5,17 @@ require 'omniauth/version'
 
 Gem::Specification.new do |spec|
   spec.add_dependency 'hashie', ['>= 1.2', '< 4']
-  spec.add_dependency 'rack', '~> 1.0'
+  spec.add_dependency 'rack', ['>= 1.0', '< 2.0']
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.authors       = ['Michael Bleigh', 'Erik Michaels-Ober', 'Tom Milewski']
   spec.description   = 'A generalized Rack framework for multiple-provider authentication.'
   spec.email         = ['michael@intridea.com', 'sferik@gmail.com', 'tmilewski@gmail.com']
-  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.start_with?('spec/') }
   spec.homepage      = 'http://github.com/intridea/omniauth'
   spec.licenses      = %w(MIT)
   spec.name          = 'omniauth'
   spec.require_paths = %w(lib)
   spec.required_rubygems_version = '>= 1.3.5'
   spec.summary       = spec.description
-  spec.test_files    = spec.files.grep(/^spec\//)
   spec.version       = OmniAuth::VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -36,16 +36,22 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +75,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemtest"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -77,7 +82,7 @@ files:
 - ".yardopts"
 - Gemfile
 - Gemfile.rack-1.3.x
-- Guardfile
+- Gemfile.rack-master
 - LICENSE.md
 - README.md
 - Rakefile
@@ -95,14 +100,6 @@ files:
 - lib/omniauth/test/strategy_test_case.rb
 - lib/omniauth/version.rb
 - omniauth.gemspec
-- spec/helper.rb
-- spec/omniauth/auth_hash_spec.rb
-- spec/omniauth/builder_spec.rb
-- spec/omniauth/failure_endpoint_spec.rb
-- spec/omniauth/form_spec.rb
-- spec/omniauth/strategies/developer_spec.rb
-- spec/omniauth/strategy_spec.rb
-- spec/omniauth_spec.rb
 homepage: http://github.com/intridea/omniauth
 licenses:
 - MIT
@@ -123,17 +120,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 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
-- spec/omniauth/form_spec.rb
-- spec/omniauth/strategies/developer_spec.rb
-- spec/omniauth/strategy_spec.rb
-- spec/omniauth_spec.rb
+test_files: []
 has_rdoc: 

data/Guardfile

@@ -1,10 +0,0 @@
-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/spec/helper.rb

@@ -1,55 +0,0 @@
-require 'simplecov'
-require 'coveralls'
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-SimpleCov.start do
-  add_filter '/spec/'
-  minimum_coverage(93.05)
-end
-
-require 'rspec'
-require 'rack/test'
-require 'omniauth'
-require 'omniauth/test'
-
-OmniAuth.config.logger = Logger.new('/dev/null')
-
-RSpec.configure do |config|
-  config.include Rack::Test::Methods
-  config.extend OmniAuth::Test::StrategyMacros, :type => :strategy
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-end
-
-class ExampleStrategy
-  include OmniAuth::Strategy
-  attr_reader :last_env
-  option :name, 'test'
-
-  def call(env)
-    self.call!(env)
-  end
-
-  def initialize(*args, &block)
-    super
-    @fail = nil
-  end
-
-  def request_phase
-    @fail = fail!(options[:failure]) if options[:failure]
-    @last_env = env
-    return @fail if @fail
-    fail('Request Phase')
-  end
-
-  def callback_phase
-    @fail = fail!(options[:failure]) if options[:failure]
-    @last_env = env
-    return @fail if @fail
-    fail('Callback Phase')
-  end
-end

data/spec/omniauth/auth_hash_spec.rb

@@ -1,111 +0,0 @@
-require 'helper'
-
-describe OmniAuth::AuthHash do
-  subject { OmniAuth::AuthHash.new }
-  it 'converts a supplied info key into an InfoHash object' do
-    subject.info = {:first_name => 'Awesome'}
-    expect(subject.info).to be_kind_of(OmniAuth::AuthHash::InfoHash)
-    expect(subject.info.first_name).to eq('Awesome')
-  end
-
-  describe '#valid?' do
-    subject { OmniAuth::AuthHash.new(:uid => '123', :provider => 'example', :info => {:name => 'Steven'}) }
-
-    it 'is valid with the right parameters' do
-      expect(subject).to be_valid
-    end
-
-    it 'requires a uid' do
-      subject.uid = nil
-      expect(subject).not_to be_valid
-    end
-
-    it 'requires a provider' do
-      subject.provider = nil
-      expect(subject).not_to be_valid
-    end
-
-    it 'requires a name in the user info hash' do
-      subject.info.name = nil
-      expect(subject).not_to be_valid
-    end
-  end
-
-  describe '#name' do
-    subject do
-      OmniAuth::AuthHash.new(
-        :info => {
-          :name => 'Phillip J. Fry',
-          :first_name => 'Phillip',
-          :last_name => 'Fry',
-          :nickname => 'meatbag',
-          :email => 'fry@planetexpress.com',
-        }
-      )
-    end
-
-    it 'defaults to the name key' do
-      expect(subject.info.name).to eq('Phillip J. Fry')
-    end
-
-    it 'falls back to go to first_name last_name concatenation' do
-      subject.info.name = nil
-      expect(subject.info.name).to eq('Phillip Fry')
-    end
-
-    it 'displays only a first or last name if only that is available' do
-      subject.info.name = nil
-      subject.info.first_name = nil
-      expect(subject.info.name).to eq('Fry')
-    end
-
-    it 'displays the nickname if no name, first, or last is available' do
-      subject.info.name = nil
-      %w(first_name last_name).each { |k| subject.info[k] = nil }
-      expect(subject.info.name).to eq('meatbag')
-    end
-
-    it 'displays the email if no name, first, last, or nick is available' do
-      subject.info.name = nil
-      %w(first_name last_name nickname).each { |k| subject.info[k] = nil }
-      expect(subject.info.name).to eq('fry@planetexpress.com')
-    end
-  end
-
-  describe '#to_hash' do
-    subject { OmniAuth::AuthHash.new(:uid => '123', :provider => 'test', :name => 'Example User') }
-    let(:hash) { subject.to_hash }
-
-    it 'is a plain old hash' do
-      expect(hash.class).to eq(::Hash)
-    end
-
-    it 'has string keys' do
-      expect(hash.keys).to be_include('uid')
-    end
-
-    it 'converts an info hash as well' do
-      subject.info = {:first_name => 'Example', :last_name => 'User'}
-      expect(subject.info.class).to eq(OmniAuth::AuthHash::InfoHash)
-      expect(subject.to_hash['info'].class).to eq(::Hash)
-    end
-
-    it 'supplies the calculated name in the converted hash' do
-      subject.info = {:first_name => 'Examplar', :last_name => 'User'}
-      expect(hash['info']['name']).to eq('Examplar User')
-    end
-
-    it "does not pollute the URL hash with 'name' etc" do
-      subject.info = {'urls' => {'Homepage' => 'http://homepage.com'}}
-      expect(subject.to_hash['info']['urls']).to eq('Homepage' => 'http://homepage.com')
-    end
-  end
-
-  describe OmniAuth::AuthHash::InfoHash do
-    describe '#valid?' do
-      it 'is valid if there is a name' do
-        expect(OmniAuth::AuthHash::InfoHash.new(:name => 'Awesome')).to be_valid
-      end
-    end
-  end
-end

data/spec/omniauth/builder_spec.rb

@@ -1,50 +0,0 @@
-require 'helper'
-
-describe OmniAuth::Builder do
-  describe '#provider' do
-    it 'translates a symbol to a constant' do
-      expect(OmniAuth::Strategies).to receive(:const_get).with('MyStrategy').and_return(Class.new)
-      OmniAuth::Builder.new(nil) do
-        provider :my_strategy
-      end
-    end
-
-    it 'accepts a class' do
-      class ExampleClass; end
-
-      expect do
-        OmniAuth::Builder.new(nil) do
-          provider ::ExampleClass
-        end
-      end.not_to raise_error
-    end
-
-    it "raises a helpful LoadError message if it can't find the class" do
-      expect do
-        OmniAuth::Builder.new(nil) do
-          provider :lorax
-        end
-      end.to raise_error(LoadError, 'Could not find matching strategy for :lorax. You may need to install an additional gem (such as omniauth-lorax).')
-    end
-  end
-
-  describe '#options' do
-    it 'merges provided options in' do
-      k = Class.new
-      b = OmniAuth::Builder.new(nil)
-      expect(b).to receive(:use).with(k, :foo => 'bar', :baz => 'tik')
-
-      b.options :foo => 'bar'
-      b.provider k, :baz => 'tik'
-    end
-
-    it 'adds an argument if no options are provided' do
-      k = Class.new
-      b = OmniAuth::Builder.new(nil)
-      expect(b).to receive(:use).with(k, :foo => 'bar')
-
-      b.options :foo => 'bar'
-      b.provider k
-    end
-  end
-end

data/spec/omniauth/failure_endpoint_spec.rb

@@ -1,58 +0,0 @@
-require 'helper'
-
-describe OmniAuth::FailureEndpoint do
-  subject { OmniAuth::FailureEndpoint }
-
-  context 'raise-out environment' do
-    before do
-      @rack_env = ENV['RACK_ENV']
-      ENV['RACK_ENV'] = 'test'
-
-      @default = OmniAuth.config.failure_raise_out_environments
-      OmniAuth.config.failure_raise_out_environments = ['test']
-    end
-
-    it 'raises out the error' do
-      expect do
-        subject.call('omniauth.error' => StandardError.new('Blah'))
-      end.to raise_error(StandardError, 'Blah')
-    end
-
-    it 'raises out an OmniAuth::Error if no omniauth.error is set' do
-      expect { subject.call('omniauth.error.type' => 'example') }.to raise_error(OmniAuth::Error, 'example')
-    end
-
-    after do
-      ENV['RACK_ENV'] = @rack_env
-      OmniAuth.config.failure_raise_out_environments = @default
-    end
-  end
-
-  context 'non-raise-out environment' do
-    let(:env) do
-      {'omniauth.error.type' => 'invalid_request', 'omniauth.error.strategy' => ExampleStrategy.new({})}
-    end
-
-    it 'is a redirect' do
-      status, _, _ = *subject.call(env)
-      expect(status).to eq(302)
-    end
-
-    it 'includes the SCRIPT_NAME' do
-      _, 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
-      allow(OmniAuth.config).to receive(:path_prefix).and_return('/boo')
-      _, 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'
-      _, head, _ = *subject.call(env)
-      expect(head['Location']).to be_include('&origin=%2Forigin-example')
-    end
-  end
-end

data/spec/omniauth/form_spec.rb

@@ -1,23 +0,0 @@
-require 'helper'
-
-describe OmniAuth::Form do
-  describe '.build' do
-    it 'yields the instance when called with a block and argument' do
-      OmniAuth::Form.build { |f| expect(f).to be_kind_of(OmniAuth::Form) }
-    end
-
-    it 'evaluates in the instance when called with a block and no argument' do
-      OmniAuth::Form.build { |f| expect(f.class).to eq(OmniAuth::Form) }
-    end
-  end
-
-  describe '#initialize' do
-    it 'sets the form action to the passed :url option' do
-      expect(OmniAuth::Form.new(:url => '/awesome').to_html).to be_include("action='/awesome'")
-    end
-
-    it 'sets an H1 tag from the passed :title option' do
-      expect(OmniAuth::Form.new(:title => 'Something Cool').to_html).to be_include('<h1>Something Cool</h1>')
-    end
-  end
-end

data/spec/omniauth/strategies/developer_spec.rb

@@ -1,73 +0,0 @@
-require 'helper'
-
-describe OmniAuth::Strategies::Developer do
-  let(:app) do
-    Rack::Builder.new do |b|
-      b.use Rack::Session::Cookie, :secret => 'abc123'
-      b.use OmniAuth::Strategies::Developer
-      b.run lambda { |_env| [200, {}, ['Not Found']] }
-    end.to_app
-  end
-
-  context 'request phase' do
-    before(:each) { get '/auth/developer' }
-
-    it 'displays a form' do
-      expect(last_response.status).to eq(200)
-      expect(last_response.body).to be_include('<form')
-    end
-
-    it 'has the callback as the action for the form' do
-      expect(last_response.body).to be_include("action='/auth/developer/callback'")
-    end
-
-    it 'has a text field for each of the fields' do
-      expect(last_response.body.scan('<input').size).to eq(2)
-    end
-  end
-
-  context 'callback phase' do
-    let(:auth_hash) { last_request.env['omniauth.auth'] }
-
-    context 'with default options' do
-      before do
-        post '/auth/developer/callback', :name => 'Example User', :email => 'user@example.com'
-      end
-
-      it 'sets the name in the auth hash' do
-        expect(auth_hash.info.name).to eq('Example User')
-      end
-
-      it 'sets the email in the auth hash' do
-        expect(auth_hash.info.email).to eq('user@example.com')
-      end
-
-      it 'sets the uid to the email' do
-        expect(auth_hash.uid).to eq('user@example.com')
-      end
-    end
-
-    context 'with custom options' do
-      let(:app) do
-        Rack::Builder.new do |b|
-          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
-      end
-
-      before do
-        @options = {:uid_field => :last_name, :fields => [:first_name, :last_name]}
-        post '/auth/developer/callback', :first_name => 'Example', :last_name => 'User'
-      end
-
-      it 'sets info fields properly' do
-        expect(auth_hash.info.name).to eq('Example User')
-      end
-
-      it 'sets the uid properly' do
-        expect(auth_hash.uid).to eq('User')
-      end
-    end
-  end
-end