omniauth-shibboleth 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Mzk2YmNiYmFkMWM4YzA5ZGFkMWJkNzYzNzFhNjM4MTY2MjI1Y2IzZQ==
-  data.tar.gz: !binary |-
-    NmU0MzE3ZDc4YzBjMjA4ZDZhNjhkMGI1MmZmZDkyNGRjMTU2ZDcyOA==
+SHA1:
+  metadata.gz: 20c1c77307a9603a5313733f2c8475852f2727d1
+  data.tar.gz: 313fae3b26554a22341ab31ac26870737e82fed2
 SHA512:
-  metadata.gz: !binary |-
-    ZWNhNDI1ZTg2YTNhNjRhMjJkNDU4ZmJjMGE3MDM0OTZlZWVhMGNkZTVjZWJk
-    ZWFmNTJjYWYzOWE1YTA1ODFjMjUxY2ZmYmExOTU4MTdlOWU4OWNiMDFhZjJk
-    NzY2MmY4NTFmODUxNTNlZGMzODkwN2MxMTc0NzRiMTgzMjQwNTE=
-  data.tar.gz: !binary |-
-    MGJjY2RmZWQzZjJlNzgzYmQ3YTdiNTA2YTNjMzFhYjZkYmYzMGUzYWMyNWM4
-    Yjc2NTkyNmYxYjU2NWI3OTdkODIyN2RkZjBjYzc4MWEyZGIyMTAzN2VlOTUz
-    NzE1NWRkNWZhNDUyNjQ3NTEzN2MyNTNhYzQyMmUzNGQ3NTM5MWY=
+  metadata.gz: 072bf6b32382982a02d9f7f6d95e9a38549eac6ca3d1f3001b2dd95d97fa50fb82fc9532bd7c617698e7e1f1a43010c3603b6a39dbbffaf0984d78da5fcf34ce
+  data.tar.gz: 685f71cc782f3ebfed15676c55b498be3cde4b94a1ebe3be39b4f9dfa8bad5ce6710f5c78202ee1f7573e85ac09cffa2e661835ab9cf05db9a1fc4d57216f501

data/lib/omniauth-shibboleth/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Shibboleth
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/lib/omniauth/strategies/shibboleth.rb

@@ -25,20 +25,20 @@ module OmniAuth
 
       def request_params
         case options[:request_type]
-        when :env, :header
+        when :env, 'env', :header, 'header'
           request.env
-        when :params
+        when :params, 'params'
           request.params
         end
       end
 
       def request_param(key)
         case options[:request_type]
-        when :env
+        when :env, 'env'
           request.env[key]
-        when :header
+        when :header, 'header'
           request.env["HTTP_#{key.upcase.gsub('-', '_')}"]
-        when :params
+        when :params, 'params'
           request.params[key]
         end
       end

data/spec/omniauth/strategies/shibboleth_spec.rb

@@ -29,9 +29,9 @@ describe OmniAuth::Strategies::Shibboleth do
       get '/auth/shibboleth'
     end
 
-    it 'should redirect to callback_url' do
-      last_response.status.should == 302
-      last_response.location.should == '/auth/shibboleth/callback'
+    it 'is expected to redirect to callback_url' do
+      expect(last_response.status).to eq(302)
+      expect(last_response.location).to eq('/auth/shibboleth/callback')
     end
   end
 
@@ -41,22 +41,22 @@ describe OmniAuth::Strategies::Shibboleth do
         get '/auth/shibboleth/callback'
       end
 
-      it 'should fail to get Shib-Session-ID environment variable' do
-        last_response.status.should == 302
-        last_response.location.should == failure_path
+      it 'is expected to fail to get Shib-Session-ID environment variable' do
+        expect(last_response.status).to eq(302)
+        expect(last_response.location).to eq(failure_path)
       end
     end
 
     context 'with Shibboleth session' do
       let(:strategy){ OmniAuth::Strategies::Shibboleth.new(app, {}) }
 
-      it 'should set default omniauth.auth fields' do
+      it 'is expected to set default omniauth.auth fields' do
         @dummy_id = 'abcdefg'
         @eppn = 'test@example.com'
         @display_name = 'Test User'
         strategy.call!(make_env('/auth/shibboleth/callback', 'Shib-Session-ID' => @dummy_id, 'eppn' => @eppn, 'displayName' => @display_name))
-        strategy.env['omniauth.auth']['uid'].should == @eppn
-        strategy.env['omniauth.auth']['info']['name'].should == @display_name
+        expect(strategy.env['omniauth.auth']['uid']).to eq(@eppn)
+        expect(strategy.env['omniauth.auth']['info']['name']).to eq(@display_name)
       end
     end
 
@@ -71,15 +71,15 @@ describe OmniAuth::Strategies::Shibboleth do
       let(:app){ lambda{|env| [404, {}, ['Awesome']]}}
       let(:strategy){ OmniAuth::Strategies::Shibboleth.new(app, options) }
 
-      it 'should set specified omniauth.auth fields' do
+      it 'is expected to set specified omniauth.auth fields' do
         @dummy_id = 'abcdefg'
         @uid = 'test'
         @organization = 'Test Corporation'
         @affiliation = 'faculty'
         strategy.call!(make_env('/auth/shibboleth/callback', 'Shib-Session-ID' => @dummy_id, 'uid' => @uid, 'o' => @organization, 'affiliation' => @affiliation))
-        strategy.env['omniauth.auth']['uid'].should == @uid
-        strategy.env['omniauth.auth']['extra']['raw_info']['o'].should == @organization
-        strategy.env['omniauth.auth']['extra']['raw_info']['affiliation'].should == @affiliation
+        expect(strategy.env['omniauth.auth']['uid']).to eq(@uid)
+        expect(strategy.env['omniauth.auth']['extra']['raw_info']['o']).to eq(@organization)
+        expect(strategy.env['omniauth.auth']['extra']['raw_info']['affiliation']).to eq(@affiliation)
       end
     end
 
@@ -87,13 +87,13 @@ describe OmniAuth::Strategies::Shibboleth do
       let(:options){ { :debug => true} }
       let(:strategy){ OmniAuth::Strategies::Shibboleth.new(app, options) }
 
-      it 'should raise environment variables' do
+      it 'is expected to raise environment variables' do
         @dummy_id = 'abcdefg'
         @eppn = 'test@example.com'
         @display_name = 'Test User'
         env = make_env('/auth/shibboleth/callback', 'Shib-Session-ID' => @dummy_id, 'eppn' => @eppn, 'displayName' => @display_name)
         response = strategy.call!(env)
-        response[0].should == 200
+        expect(response[0]).to eq(200)
       end
     end
 
@@ -108,7 +108,7 @@ describe OmniAuth::Strategies::Shibboleth do
         :extra_fields => [:o, :affiliation] } }
       let(:strategy){ OmniAuth::Strategies::Shibboleth.new(app, options) }
 
-      it 'should handle header variables' do
+      it 'is expected to handle header variables' do
         @dummy_id = 'abcdefg'
         @display_name = 'Test User'
         @uid = 'test'
@@ -116,10 +116,36 @@ describe OmniAuth::Strategies::Shibboleth do
         @affiliation = 'faculty'
         env = make_env('/auth/shibboleth/callback', 'HTTP_SHIB_SESSION_ID' => @dummy_id, 'HTTP_DISPLAYNAME' => @display_name, 'HTTP_UID' => @uid, 'HTTP_O' => @organization, 'HTTP_AFFILIATION' => @affiliation)
         response = strategy.call!(env)
-        strategy.env['omniauth.auth']['uid'].should == @uid
-        strategy.env['omniauth.auth']['info']['name'].should == @display_name
-        strategy.env['omniauth.auth']['extra']['raw_info']['o'].should == @organization
-        strategy.env['omniauth.auth']['extra']['raw_info']['affiliation'].should == @affiliation
+        expect(strategy.env['omniauth.auth']['uid']).to eq(@uid)
+        expect(strategy.env['omniauth.auth']['info']['name']).to eq(@display_name)
+        expect(strategy.env['omniauth.auth']['extra']['raw_info']['o']).to eq(@organization)
+        expect(strategy.env['omniauth.auth']['extra']['raw_info']['affiliation']).to eq(@affiliation)
+      end
+    end
+    
+    context "with request_type = 'header'" do
+      let(:options){ {
+        :request_type => 'header',
+        :shib_session_id_field => 'Shib-Session-ID',
+        :shib_application_id_field => 'Shib-Application-ID',
+        :uid_field => :uid,
+        :name_field => :displayName,
+        :info_fields => {},
+        :extra_fields => [:o, :affiliation] } }
+      let(:strategy){ OmniAuth::Strategies::Shibboleth.new(app, options) }
+
+      it 'is expected to handle header variables' do
+        @dummy_id = 'abcdefg'
+        @display_name = 'Test User'
+        @uid = 'test'
+        @organization = 'Test Corporation'
+        @affiliation = 'faculty'
+        env = make_env('/auth/shibboleth/callback', 'HTTP_SHIB_SESSION_ID' => @dummy_id, 'HTTP_DISPLAYNAME' => @display_name, 'HTTP_UID' => @uid, 'HTTP_O' => @organization, 'HTTP_AFFILIATION' => @affiliation)
+        response = strategy.call!(env)
+        expect(strategy.env['omniauth.auth']['uid']).to eq(@uid)
+        expect(strategy.env['omniauth.auth']['info']['name']).to eq(@display_name)
+        expect(strategy.env['omniauth.auth']['extra']['raw_info']['o']).to eq(@organization)
+        expect(strategy.env['omniauth.auth']['extra']['raw_info']['affiliation']).to eq(@affiliation)
       end
     end
 
@@ -134,7 +160,7 @@ describe OmniAuth::Strategies::Shibboleth do
         :extra_fields => [:o, :affiliation] } }
       let(:strategy){ OmniAuth::Strategies::Shibboleth.new(app, options) }
 
-      it 'should handle params variables' do
+      it 'is expected to handle params variables' do
         @dummy_id = 'abcdefg'
         @display_name = 'Test User'
         @uid = 'test'
@@ -142,10 +168,10 @@ describe OmniAuth::Strategies::Shibboleth do
         @affiliation = 'faculty'
         env = make_env('/auth/shibboleth/callback', 'QUERY_STRING' => "Shib-Session-ID=#{@dummy_id}&uid=#{@uid}&displayName=#{@display_name}&o=#{@organization}&affiliation=#{@affiliation}")
         response = strategy.call!(env)
-        strategy.env['omniauth.auth']['uid'].should == @uid
-        strategy.env['omniauth.auth']['info']['name'].should == @display_name
-        strategy.env['omniauth.auth']['extra']['raw_info']['o'].should == @organization
-        strategy.env['omniauth.auth']['extra']['raw_info']['affiliation'].should == @affiliation
+        expect(strategy.env['omniauth.auth']['uid']).to eq(@uid)
+        expect(strategy.env['omniauth.auth']['info']['name']).to eq(@display_name)
+        expect(strategy.env['omniauth.auth']['extra']['raw_info']['o']).to eq(@organization)
+        expect(strategy.env['omniauth.auth']['extra']['raw_info']['affiliation']).to eq(@affiliation)
       end
     end
   end

data/spec/spec_helper.rb

@@ -6,5 +6,5 @@ require 'omniauth-shibboleth'
 
 RSpec.configure do |config|
     config.include Rack::Test::Methods
-    config.color_enabled = true
+    config.color = true
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-shibboleth
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Toyokazu Akiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.8'
 description: OmniAuth Shibboleth strategies for OmniAuth 1.x
@@ -74,12 +74,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- lib/omniauth/strategies/shibboleth.rb
-- lib/omniauth-shibboleth/version.rb
+- README.md
+- Rakefile
 - lib/omniauth-shibboleth.rb
+- lib/omniauth-shibboleth/version.rb
+- lib/omniauth/strategies/shibboleth.rb
 - omniauth-shibboleth.gemspec
-- Rakefile
-- README.md
 - spec/omniauth/strategies/shibboleth_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -92,20 +92,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: OmniAuth Shibboleth strategies for OmniAuth 1.x
 test_files:
 - spec/omniauth/strategies/shibboleth_spec.rb
 - spec/spec_helper.rb
+has_rdoc: