omniauth 1.1.1 → 1.1.2

data/spec/omniauth_spec.rb

@@ -1,25 +1,27 @@
 require 'spec_helper'
 
 describe OmniAuth do
-  describe '.strategies' do
-    it 'should increase when a new strategy is made' do
-      lambda{ class ExampleStrategy
-        include OmniAuth::Strategy
-      end }.should change(OmniAuth.strategies, :size).by(1)
-      OmniAuth.strategies.last.should == ExampleStrategy
+  describe ".strategies" do
+    it "increases when a new strategy is made" do
+      expect{
+        class ExampleStrategy
+          include OmniAuth::Strategy
+        end
+      }.to change(OmniAuth.strategies, :size).by(1)
+      expect(OmniAuth.strategies.last).to eq(ExampleStrategy)
     end
   end
 
-  context 'configuration' do
-    describe '.defaults' do
-      it 'should be a hash of default configuration' do
-        OmniAuth::Configuration.defaults.should be_kind_of(Hash)
+  context "configuration" do
+    describe ".defaults" do
+      it "is a hash of default configuration" do
+        expect(OmniAuth::Configuration.defaults).to be_kind_of(Hash)
       end
     end
 
-    it 'should be callable from .configure' do
+    it "is callable from .configure" do
       OmniAuth.configure do |c|
-        c.should be_kind_of(OmniAuth::Configuration)
+        expect(c).to be_kind_of(OmniAuth::Configuration)
       end
     end
 
@@ -35,76 +37,74 @@ describe OmniAuth do
       end
     end
 
-    it 'should be able to set the path' do
+    it "is able to set the path" do
       OmniAuth.configure do |config|
         config.path_prefix = '/awesome'
       end
 
-      OmniAuth.config.path_prefix.should == '/awesome'
+      expect(OmniAuth.config.path_prefix).to eq('/awesome')
     end
 
-    it 'should be able to set the on_failure rack app' do
+    it "is able to set the on_failure rack app" do
       OmniAuth.configure do |config|
         config.on_failure do
           'yoyo'
         end
       end
 
-      OmniAuth.config.on_failure.call.should == 'yoyo'
+      expect(OmniAuth.config.on_failure.call).to eq('yoyo')
     end
-    describe 'mock auth' do
+    describe "mock auth" do
       before do
         OmniAuth.config.add_mock(:facebook, :uid => '12345',:info=>{:name=>'Joe', :email=>'joe@example.com'})
       end
-      it 'default should be AuthHash' do
+      it "default should be AuthHash" do
         OmniAuth.configure do |config|
-          config.mock_auth[:default].should be_kind_of(OmniAuth::AuthHash)
+          expect(config.mock_auth[:default]).to be_kind_of(OmniAuth::AuthHash)
         end
       end
-      it 'facebook should be AuthHash' do
+      it "facebook should be AuthHash" do
         OmniAuth.configure do |config|
-          config.mock_auth[:facebook].should be_kind_of(OmniAuth::AuthHash)
-        end        
+          expect(config.mock_auth[:facebook]).to be_kind_of(OmniAuth::AuthHash)
+        end
       end
-      it 'should set facebook attributes' do
+      it "sets facebook attributes" do
         OmniAuth.configure do |config|
-          config.mock_auth[:facebook].uid.should eq('12345')
-          config.mock_auth[:facebook].info.name.should eq('Joe')
-          config.mock_auth[:facebook].info.email.should eq('joe@example.com')
+          expect(config.mock_auth[:facebook].uid).to eq('12345')
+          expect(config.mock_auth[:facebook].info.name).to eq('Joe')
+          expect(config.mock_auth[:facebook].info.email).to eq('joe@example.com')
         end
       end
     end
   end
 
-  describe '.logger' do
-    it 'should call through to the configured logger' do
+  describe ".logger" do
+    it "calls through to the configured logger" do
       OmniAuth.stub(:config => mock(:logger => "foo"))
-      OmniAuth.logger.should == "foo"
+      expect(OmniAuth.logger).to eq("foo")
     end
   end
 
-  describe '::Utils' do
-    describe '.deep_merge' do
-      it 'should combine hashes' do
-        OmniAuth::Utils.deep_merge({'abc' => {'def' => 123}}, {'abc' => {'foo' => 'bar'}}).should == {
-          'abc' => {'def' => 123, 'foo' => 'bar'}
-        }
+  describe "::Utils" do
+    describe ".deep_merge" do
+      it "combines hashes" do
+        expect(OmniAuth::Utils.deep_merge({'abc' => {'def' => 123}}, {'abc' => {'foo' => 'bar'}})).to eq({'abc' => {'def' => 123, 'foo' => 'bar'}})
       end
     end
 
-    describe '.camelize' do
-      it 'should work on normal cases' do
+    describe ".camelize" do
+      it "works on normal cases" do
         {
           'some_word' => 'SomeWord',
           'AnotherWord' => 'AnotherWord',
           'one' => 'One',
           'three_words_now' => 'ThreeWordsNow'
-        }.each_pair{ |k,v| OmniAuth::Utils.camelize(k).should == v }
+        }.each_pair{ |k,v| expect(OmniAuth::Utils.camelize(k)).to eq(v) }
       end
 
-      it 'should work in special cases that have been added' do
+      it "works in special cases that have been added" do
         OmniAuth.config.add_camelization('oauth', 'OAuth')
-        OmniAuth::Utils.camelize(:oauth).should == 'OAuth'
+        expect(OmniAuth::Utils.camelize(:oauth)).to eq('OAuth')
       end
     end
   end

data/spec/spec_helper.rb

@@ -15,6 +15,9 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,25 +9,36 @@ authors:
 - Erik Michaels-Ober
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+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-08 00:00:00.000000000 Z
 dependencies:
-- !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: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -45,62 +56,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: maruku
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -109,13 +72,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,23 +86,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: A generalized Rack framework for multiple-provider authentication.
 email:
 - michael@intridea.com
@@ -148,30 +95,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
-- .gitignore
-- .rspec
-- .travis.yml
 - .yardopts
-- Gemfile
-- Gemfile.rack-1.3.x
-- Guardfile
-- LICENSE
+- LICENSE.md
 - README.md
 - Rakefile
-- lib/omniauth.rb
+- omniauth.gemspec
 - lib/omniauth/auth_hash.rb
 - lib/omniauth/builder.rb
 - lib/omniauth/failure_endpoint.rb
 - lib/omniauth/form.rb
 - lib/omniauth/strategies/developer.rb
 - lib/omniauth/strategy.rb
-- lib/omniauth/test.rb
 - lib/omniauth/test/phony_session.rb
 - lib/omniauth/test/strategy_macros.rb
 - lib/omniauth/test/strategy_test_case.rb
+- lib/omniauth/test.rb
 - lib/omniauth/version.rb
-- omniauth.gemspec
+- lib/omniauth.rb
 - spec/omniauth/auth_hash_spec.rb
 - spec/omniauth/builder_spec.rb
 - spec/omniauth/failure_endpoint_spec.rb
@@ -181,7 +121,8 @@ files:
 - spec/omniauth_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/intridea/omniauth
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -213,4 +154,3 @@ test_files:
 - spec/omniauth/strategy_spec.rb
 - spec/omniauth_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/Gemfile

@@ -1,17 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'growl'
-gem 'guard'
-gem 'guard-bundler'
-gem 'guard-rspec'
-gem 'rack', '~> 1.4'
-gem 'rb-fsevent'
-#gem 'plymouth'
-#gem 'pry'
-#gem 'pry-nav'
-
-platforms :jruby do
-  gem 'jruby-openssl'
-end
-
-gemspec

data/Gemfile.rack-1.3.x

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rack', '~> 1.3.0'
-gemspec

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