omniauth-cas 0.0.7 → 1.0.0

data/.rvmrc

@@ -1,55 +1 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.2-p290@omniauth-cas"
-
-#
-# Uncomment following line if you want options to be set only for given project.
-#
-# PROJECT_JRUBY_OPTS=( --1.9 )
-
-#
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-#
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-
-  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
-  then
-    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
-  fi
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  if ! rvm --create use  "$environment_id"
-  then
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  fi
-fi
-
-#
-# If you use an RVM gemset file to install a list of gems (*.gems), you can have
-# it be automatically loaded. Uncomment the following and adjust the filename if
-# necessary.
-#
-# filename=".gems"
-# if [[ -s "$filename" ]]
-# then
-#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
-# fi
-
-# If you use bundler, this might be useful to you:
-# if command -v bundle && [[ -s Gemfile ]]
-# then
-#   bundle install
-# fi
-
-
+rvm --create use ruby-1.9.3-p194@omniauth-cas > /dev/null

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+ruby '1.9.3'
 
 # Specify your gem's dependencies in omniauth-cas.gemspec
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# OmniAuth CAS Strategy [![Build Status][travis_status]][travis] [![Dependency Status][gemnasium_status]][gemnasium]
+# OmniAuth CAS Strategy [![Build Status][travis_status]][travis]
 
 [travis]: http://travis-ci.org/dlindahl/omniauth-cas
 [travis_status]: https://secure.travis-ci.org/dlindahl/omniauth-cas.png
@@ -30,7 +30,7 @@ Use like any other OmniAuth strategy:
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :cas, :host => 'cas.yourdomain.com'
+  provider :cas, host: 'cas.yourdomain.com'
 end
 ```
 
@@ -48,6 +48,26 @@ Other configuration options:
   * `logout_url` - The URL to use to logout a user. Defaults to `'/logout'`
   * `uid_key` - The user data attribute to use as your user's unique identifier. Defaults to `'user'` (which usually contains the user's login name)
   * `ca_path` - Optional when `ssl` is `true`. Sets path of a CA certification directory. See [Net::HTTP][net_http] for more details
+  * `disable_ssl_verification``- Optional when `ssl` is true. Disables verification.
+
+## Migrating from OmniAuth 0.3
+
+Given the following OmniAuth 0.3 configuration:
+
+```ruby
+provider :CAS, cas_server: 'https://cas.example.com/cas/'
+```
+
+Your new settings should look similar to this:
+
+```ruby
+provider :cas,
+         host:      'cas.example.com',
+         login_url: '/cas/login',
+  	     service_validate_url: '/cas/serviceValidate'
+```
+
+If you encounter problems wih SSL certificates you may want to set the `ca_path` parameter or activate `disable_ssl_verification` (not recommended).  
 
 ## Contributing
 
@@ -62,6 +82,8 @@ Other configuration options:
 Special thanks go out to the following people
 
   * Phillip Aldridge (@iterateNZ) and JB Barth (@jbbarth) for helping out with Issue #3
+  * Elber Ribeiro (@dynaum) for Ubuntu SSL configuration support
+  * @rbq for README updates and OmniAuth 0.3 migration guide
 
 [old_omniauth_cas]: https://github.com/intridea/omniauth/blob/0-3-stable/oa-enterprise/lib/omniauth/strategies/cas.rb
 [document_up]: http://dlindahl.github.com/omniauth-cas/

data/lib/omniauth/cas/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Cas
-    VERSION = "0.0.7"
+    VERSION = '1.0.0'
   end
 end

data/omniauth-cas.gemspec

@@ -17,14 +17,13 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'omniauth',                '~> 1.1.0'
   gem.add_dependency 'nokogiri',                '~> 1.5'
-  gem.add_dependency 'addressable',             '~> 2.2'
+  gem.add_dependency 'addressable',             '~> 2.3'
 
   gem.add_development_dependency 'rake',        '~> 0.9'
-  gem.add_development_dependency 'webmock',     '~> 1.8.6'
-  gem.add_development_dependency 'simplecov',   '~> 0.6.2'
-  gem.add_development_dependency 'rspec',       '~> 2.10'
+  gem.add_development_dependency 'webmock',     '~> 1.8.11'
+  gem.add_development_dependency 'simplecov',   '~> 0.7.1'
+  gem.add_development_dependency 'rspec',       '~> 2.11'
   gem.add_development_dependency 'rack-test',   '~> 0.6'
-  gem.add_development_dependency 'bourne',      '~> 1.1.2'
 
   gem.add_development_dependency 'awesome_print'
 

data/spec/omniauth/strategies/cas/service_ticket_validator_spec.rb

@@ -1,32 +1,31 @@
-require 'ostruct'
-require 'awesome_print'
-require File.expand_path( 'spec/spec_helper' )
-
 describe OmniAuth::Strategies::CAS::ServiceTicketValidator do
   let(:strategy_stub) do
     stub('strategy stub',
-      :service_validate_url => "https://example.org/serviceValidate"
+      service_validate_url: 'https://example.org/serviceValidate'
     )
   end
 
   let(:provider_options) do
     stub('provider options',
-      :disable_ssl_verification? => false,
-      :ca_path => '/etc/ssl/certsZOMG'
+      disable_ssl_verification?: false,
+      ca_path: '/etc/ssl/certsZOMG'
     )
   end
 
   let(:validator) do
-    OmniAuth::Strategies::CAS::ServiceTicketValidator.new( strategy_stub, provider_options, "/foo", nil )
+    OmniAuth::Strategies::CAS::ServiceTicketValidator.new( strategy_stub, provider_options, '/foo', nil )
   end
 
-  describe "#user_info" do
-    before do
-      stub_request(:get, "https://example.org/serviceValidate?").to_return(:status => 200, :body => '')
+  describe '#user_info' do
+    subject do
+      stub_request(:get, 'https://example.org/serviceValidate?').to_return(status: 200, body: '')
       validator.user_info
     end
-    it "should use the configured CA path" do
-      provider_options.should have_received(:ca_path)
+
+    it 'should use the configured CA path' do
+      provider_options.should_receive :ca_path
+
+      subject
     end
   end
 end

data/spec/omniauth/strategies/cas_spec.rb

@@ -1,80 +1,85 @@
-require File.expand_path( 'spec/spec_helper' )
-
-describe OmniAuth::Strategies::CAS, :type => :strategy do
+describe OmniAuth::Strategies::CAS, type: :strategy do
   include Rack::Test::Methods
 
   class MyCasProvider < OmniAuth::Strategies::CAS; end # TODO: Not really needed. just an alias but it requires the :name option which might confuse users...
   def app
     Rack::Builder.new {
       use OmniAuth::Test::PhonySession
-      use MyCasProvider, :name => :cas, :host => 'cas.example.org', :uid_key => :employeeid
+      use MyCasProvider, name: :cas, host: 'cas.example.org', uid_key: :employeeid
       run lambda { |env| [404, {'Content-Type' => 'text/plain'}, [env.key?('omniauth.auth').to_s]] }
     }.to_app
   end
 
   # TODO: Verify that these are even useful tests
-  shared_examples_for "a CAS redirect response" do
-    let(:redirect_params) { "service=" + Rack::Utils.escape("http://example.org/auth/cas/callback?url=#{Rack::Utils.escape(return_url)}") }
-    before do
-      get url, nil, request_env
-    end
+  shared_examples_for 'a CAS redirect response' do
+    let(:redirect_params) { 'service=' + Rack::Utils.escape("http://example.org/auth/cas/callback?url=#{Rack::Utils.escape(return_url)}") }
+
+    before { get url, nil, request_env }
+
     subject { last_response }
+
     it { should be_redirect }
-    it "should redirect to the CAS server" do
-      subject.headers['Location'].should == "https://cas.example.org/login?" + redirect_params
+
+    it 'should redirect to the CAS server' do
+      subject.headers['Location'].should == 'https://cas.example.org/login?' + redirect_params
     end
   end
 
   describe 'GET /auth/cas' do
     let(:return_url) { 'http://myapp.com/admin/foo' }
 
-    context "with a referer" do
+    context 'with a referer' do
       let(:url) { '/auth/cas' }
+
       let(:request_env) { { 'HTTP_REFERER' => return_url } }
-      it_behaves_like "a CAS redirect response"
+
+      it_behaves_like 'a CAS redirect response'
     end
-    context "with an explicit return URL" do
+
+    context 'with an explicit return URL' do
       let(:url) { "/auth/cas?url=#{return_url}" }
+
       let(:request_env) { {} }
 
-      it_behaves_like "a CAS redirect response"
+      it_behaves_like 'a CAS redirect response'
     end
   end
 
   describe 'GET /auth/cas/callback without a ticket' do
-    before do
-      get '/auth/cas/callback'
-    end
+    before { get '/auth/cas/callback' }
 
     subject { last_response }
 
     it { should be_redirect }
-    it "should have a failure message" do
-      subject.headers['Location'].should == "/auth/failure?message=no_ticket&strategy=cas"
+
+    it 'should have a failure message' do
+      subject.headers['Location'].should == '/auth/failure?message=no_ticket&strategy=cas'
     end
   end
 
   describe 'GET /auth/cas/callback with an invalid ticket' do
     before do
       stub_request(:get, /^https:\/\/cas.example.org(:443)?\/serviceValidate\?([^&]+&)?ticket=9391d/).
-         to_return( :body => File.read('spec/fixtures/cas_failure.xml') )
+         to_return( body: File.read('spec/fixtures/cas_failure.xml') )
       get '/auth/cas/callback?ticket=9391d'
     end
 
     subject { last_response }
 
     it { should be_redirect }
+
     it 'should have a failure message' do
-      subject.headers['Location'].should == "/auth/failure?message=invalid_ticket&strategy=cas"
+      subject.headers['Location'].should == '/auth/failure?message=invalid_ticket&strategy=cas'
     end
   end
 
   describe 'GET /auth/cas/callback with a valid ticket' do
-    let(:return_url) { "http://127.0.0.10/?some=parameter" }
+    let(:return_url) { 'http://127.0.0.10/?some=parameter' }
+
     before do
-      stub_request(:get, /^https:\/\/cas.example.org(:443)?\/serviceValidate\?([^&]+&)?ticket=593af/).
-         with { |request| @request_uri = request.uri.to_s }.
-         to_return( :body => File.read('spec/fixtures/cas_success.xml') )
+      stub_request(:get, /^https:\/\/cas.example.org(:443)?\/serviceValidate\?([^&]+&)?ticket=593af/)
+        .with { |request| @request_uri = request.uri.to_s }
+        .to_return( body: File.read('spec/fixtures/cas_success.xml') )
 
       get "/auth/cas/callback?ticket=593af&url=#{return_url}"
     end
@@ -83,42 +88,53 @@ describe OmniAuth::Strategies::CAS, :type => :strategy do
       @request_uri.scan('ticket=').length.should == 1
     end
 
-    it "should properly encode the service URL" do
-      WebMock.should have_requested(:get, "https://cas.example.org/serviceValidate")
-        .with(:query => {
-          :ticket => "593af",
-          :service => "http://example.org/auth/cas/callback?url=" + Rack::Utils.escape("http://127.0.0.10/?some=parameter")
+    it 'should properly encode the service URL' do
+      WebMock.should have_requested(:get, 'https://cas.example.org/serviceValidate')
+        .with(query: {
+          ticket:  '593af',
+          service: 'http://example.org/auth/cas/callback?url=' + Rack::Utils.escape('http://127.0.0.10/?some=parameter')
         })
     end
 
     context "request.env['omniauth.auth']" do
       subject { last_request.env['omniauth.auth'] }
+
       it { should be_kind_of Hash }
+
       its(:provider) { should == :cas }
+
       its(:uid) { should == '54'}
 
-      context "the info hash" do
+      context 'the info hash' do
         subject { last_request.env['omniauth.auth']['info'] }
+
         it { should have(6).items }
-        its('name') { should == 'Peter Segel' }
-        its('first_name') { should == 'Peter' }
-        its('last_name') { should == 'Segel' }
-        its('email') { should == 'psegel@intridea.com' }
-        its('location') { should == 'Washington, D.C.' }
-        its('image') { should == '/images/user.jpg' }
-        its('phone') { should == '555-555-5555' }
+
+        its(:name)       { should == 'Peter Segel' }
+        its(:first_name) { should == 'Peter' }
+        its(:last_name)  { should == 'Segel' }
+        its(:email)      { should == 'psegel@intridea.com' }
+        its(:location)   { should == 'Washington, D.C.' }
+        its(:image)      { should == '/images/user.jpg' }
+        its(:phone)      { should == '555-555-5555' }
       end
-      context "the extra hash" do
+
+      context 'the extra hash' do
         subject { last_request.env['omniauth.auth']['extra'] }
+
         it { should have(3).items }
-        its('user') { should == 'psegel' }
-        its('employeeid') { should == '54' }
-        its('hire_date') { should == '2004-07-13' }
+
+        its(:user)       { should == 'psegel' }
+        its(:employeeid) { should == '54' }
+        its(:hire_date)  { should == '2004-07-13' }
       end
-      context "the credentials hash" do
+
+      context 'the credentials hash' do
         subject { last_request.env['omniauth.auth']['credentials'] }
+
         it { should have(1).items }
-        its('ticket') { should == '593af' }
+
+        its(:ticket) { should == '593af' }
       end
     end
 
@@ -127,22 +143,4 @@ describe OmniAuth::Strategies::CAS, :type => :strategy do
     end
   end
 
-  # unless RUBY_VERSION =~ /^1\.8\.\d$/
-  #   describe 'GET /auth/cas/callback with a valid ticket and gzipped response from the server on ruby >1.8' do
-  #     before do
-  #       zipped = StringIO.new
-  #       Zlib::GzipWriter.wrap zipped do |io|
-  #         io.write File.read(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'cas_success.xml'))
-  #       end
-  #       stub_request(:get, /^https:\/\/cas.example.org(:443)?\/serviceValidate\?([^&]+&)?ticket=593af/).
-  #          with { |request| @request_uri = request.uri.to_s }.
-  #          to_return(:body => zipped.string, :headers => { 'content-encoding' => 'gzip' })
-  #       get '/auth/cas/callback?ticket=593af'
-  #     end
-  # 
-  #     it 'should call through to the master app when response is gzipped' do
-  #         last_response.body.should == 'true'
-  #     end
-  #   end
-  # end
 end

data/spec/spec_helper.rb

@@ -1,20 +1,17 @@
 require 'bundler/setup'
-require 'bourne'
+require 'awesome_print'
 
 RSpec.configure do |c|
   c.filter_run focus: true
   c.run_all_when_everything_filtered = true
   c.treat_symbols_as_metadata_keys_with_true_values = true
-  c.mock_with :mocha
 end
 
 require 'simplecov'
 SimpleCov.start
 
 require 'rack/test'
-# TODO: Remove this.
-# https://github.com/bblimke/webmock/issues/64
-# https://github.com/bblimke/webmock/commit/9d255f118a6a39d297856fa83302aca1577b2c03#commitcomment-192888
-require 'rspec/expectations'
 require 'webmock/rspec'
 require 'omniauth-cas'
+
+OmniAuth.config.logger = Logger.new( '/dev/null' )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-cas
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000Z
+date: 2012-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &2151833720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151833720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2151832920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +37,31 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2151832920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2151832180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2151832180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151831280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,43 +69,63 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2151831280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2151830460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: 1.8.11
   type: :development
   prerelease: false
-  version_requirements: *2151830460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.11
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2151829660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *2151829660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151828800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *2151828800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2151828000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,21 +133,15 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *2151828000
-- !ruby/object:Gem::Dependency
-  name: bourne
-  requirement: &2151826620 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
-  type: :development
-  prerelease: false
-  version_requirements: *2151826620
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2151825020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +149,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151825020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - dlindahl@customink.com
@@ -168,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: CAS Strategy for OmniAuth