omniauth-cas 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTE0MmRjNzI2MDhhMzNlMDBjZTMwY2RiM2ZhMzM4MGQ0MTEwYmYxOA==
+  data.tar.gz: !binary |-
+    MzJmY2E3ZGExZTQ2MzE3MWEwMGEyNWFmYjExYzEzNDY3NGJhOTA5ZQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZDM2M2ZiZmVjY2NjNjQ1OTg1NDEyNDU5ZjFjNzcwMjg1M2IxZTQ0ZmE4NzBh
+    ZTQ5ZmQ3ODU2NmJkNTQ2Y2VkOTQ2YWJjNzc1MzgyYTc1YjZlY2UzMjBiOWIx
+    NDQ4ZGUyMTJiMzNiZWY0YTA5ODZhZjQ4MDlhYWYzYTFlYjA4ZDQ=
+  data.tar.gz: !binary |-
+    OTQ2Y2QwYTkxNjhmM2M2ZjQ3ZmNkNDY1NzA4NzZiNGQyZDQ1ZmM3YTBiNmVk
+    MjljZjI2OGFiZjNlNDM0ZDY1MzI2MDIxNjg1NGQ3NWUzOTBmNzExMjEzZDI0
+    NjY2YTUyZWI3M2Q4OGIyZTgyZTAxMWRmYTlhYTk3Y2JhZjQ1NWQ=

data/.gitignore

@@ -15,6 +15,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor
 
 # RSpec
 .rspec

data/README.md

@@ -1,9 +1,9 @@
-# OmniAuth CAS Strategy [![Build Status][travis_status]][travis]
+# OmniAuth CAS Strategy [![Gem Version][version_badge]][version] [![Build Status][travis_status]][travis]
 
+[version_badge]: https://badge.fury.io/rb/omniauth-cas.png
+[version]: http://badge.fury.io/rb/omniauth-cas
 [travis]: http://travis-ci.org/dlindahl/omniauth-cas
 [travis_status]: https://secure.travis-ci.org/dlindahl/omniauth-cas.png
-[gemnasium]: https://gemnasium.com/dlindahl/omniauth-cas
-[gemnasium_status]: https://gemnasium.com/dlindahl/omniauth-cas.png?travis
 
 This is a OmniAuth 1.0 compatible port of the previously available
 [OmniAuth CAS strategy][old_omniauth_cas] that was bundled with OmniAuth 0.3.
@@ -34,6 +34,10 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 end
 ```
 
+### Configuration Options
+
+#### Required
+
 OmniAuth CAS requires at least one of the following two configuration options:
 
   * `url` - Defines the URL of your CAS server (i.e. `http://example.org:8080`)
@@ -41,6 +45,8 @@ OmniAuth CAS requires at least one of the following two configuration options:
   * `login_url` - Defines the URL used to prompt users for their login information. Defaults to `/login`
     If no `host` is configured, the host application's domain will be used.
 
+#### Optional
+
 Other configuration options:
 
   * `port` - The port to use for your configured CAS `host`. Optional if using `url`
@@ -68,7 +74,7 @@ provider :cas,
   	     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).  
+If you encounter problems wih SSL certificates you may want to set the `ca_path` parameter or activate `disable_ssl_verification` (not recommended).
 
 ## Contributing
 
@@ -88,4 +94,4 @@ Special thanks go out to the following people
 
 [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/
-[net_http]: http://ruby-doc.org/stdlib-1.9.3/libdoc/net/http/rdoc/Net/HTTP.html
+[net_http]: http://ruby-doc.org/stdlib-1.9.3/libdoc/net/http/rdoc/Net/HTTP.html

data/lib/omniauth/cas/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Cas
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/lib/omniauth/strategies/cas.rb

@@ -16,10 +16,11 @@ module OmniAuth
       attr_accessor :raw_info
       alias_method :user_info, :raw_info
 
-      option :name, :cas # TODO: Why do I need to specify this?
+      option :name, :cas # Required property by OmniAuth::Strategy
 
       option :host, nil
       option :port, nil
+      option :path, nil
       option :ssl,  true
       option :service_validate_url, '/serviceValidate'
       option :login_url,            '/login'
@@ -87,12 +88,15 @@ module OmniAuth
       # Build a CAS host with protocol and port
       #
       #
-      def cas_host
-        @host ||= begin
-          host = @options.ssl ? "https" : "http"
-          port = @options.port ? ":#{@options.port}" : ''
-
-          "#{host}://#{@options.host}#{port}"
+      def cas_url
+        @cas_url ||= begin
+          uri = Addressable::URI.new
+          uri.host   = @options.host
+          uri.scheme = @options.ssl ? 'https' : 'http'
+          uri.port   = @options.port
+          uri.path   = @options.path
+
+          uri.to_s
         end
       end
 
@@ -109,8 +113,7 @@ module OmniAuth
         service_url = Addressable::URI.parse( service_url )
         service_url.query_values = service_url.query_values.tap { |qs| qs.delete('ticket') }
 
-        # cas_host + append_params(@options.service_validate_url, { :service => service_url.to_s, :ticket => ticket })
-        cas_host + append_params(@options.service_validate_url, { :service => service_url.to_s, :ticket => ticket })
+        cas_url + append_params(@options.service_validate_url, { :service => service_url.to_s, :ticket => ticket })
       end
 
       # Build a CAS login URL from +service+.
@@ -119,7 +122,7 @@ module OmniAuth
       #
       # @return [String] a URL like `http://cas.mycompany.com/login?service=...`
       def login_url(service)
-        cas_host + append_params( @options.login_url, { :service => service })
+        cas_url + append_params( @options.login_url, { :service => service })
       end
 
       # Adds URL-escaped +parameters+ to +base+.
@@ -141,7 +144,7 @@ module OmniAuth
       # Deletes Hash pairs with `nil` values.
       # From https://github.com/mkdynamic/omniauth-facebook/blob/972ed5e3456bcaed7df1f55efd7c05c216c8f48e/lib/omniauth/strategies/facebook.rb#L122-127
       def prune!(hash)
-        hash.delete_if do |_, value| 
+        hash.delete_if do |_, value|
           prune!(value) if value.is_a?(Hash)
           value.nil? || (value.respond_to?(:empty?) && value.empty?)
         end

data/lib/omniauth/strategies/cas/configuration.rb

@@ -17,6 +17,7 @@ module OmniAuth
           @options.merge!(
             'host' => url.host,
             'port' => url.port,
+            'path' => url.path,
             'ssl'  => url.scheme == 'https'
           )
         end

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

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe OmniAuth::Strategies::CAS::Configuration do
   subject { described_class.new }
 
@@ -13,7 +15,7 @@ describe OmniAuth::Strategies::CAS::Configuration do
   describe '#initialize' do
     let(:params) do
       {
-        'url'       => 'http://example.org:8080',
+        'url'       => 'http://example.org:8080/my_cas',
         'login_url' => '/'
       }
     end
@@ -31,6 +33,7 @@ describe OmniAuth::Strategies::CAS::Configuration do
       it 'should parse the URL' do
         subject.host.should eq 'example.org'
         subject.port.should eq 8080
+        subject.path.should eq '/my_cas'
         subject.ssl.should  be_false
       end
     end

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

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe OmniAuth::Strategies::CAS::ServiceTicketValidator do
   let(:strategy_stub) do
     stub('strategy stub',

data/spec/omniauth/strategies/cas_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe OmniAuth::Strategies::CAS, type: :strategy do
   include Rack::Test::Methods
 
@@ -5,7 +7,7 @@ describe OmniAuth::Strategies::CAS, type: :strategy do
   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', ssl: false, port: 8080, uid_key: :employeeid
       run lambda { |env| [404, {'Content-Type' => 'text/plain'}, [env.key?('omniauth.auth').to_s]] }
     }.to_app
   end
@@ -21,10 +23,15 @@ describe OmniAuth::Strategies::CAS, type: :strategy do
     it { should be_redirect }
 
     it 'should redirect to the CAS server' do
-      subject.headers['Location'].should == 'https://cas.example.org/login?' + redirect_params
+      subject.headers['Location'].should == 'http://cas.example.org:8080/login?' + redirect_params
     end
   end
 
+  describe 'defaults' do
+    subject { MyCasProvider.default_options.to_hash }
+    it { should include('ssl' => true) }
+  end
+
   describe 'GET /auth/cas' do
     let(:return_url) { 'http://myapp.com/admin/foo' }
 
@@ -59,7 +66,7 @@ describe OmniAuth::Strategies::CAS, type: :strategy do
 
   describe 'GET /auth/cas/callback with an invalid ticket' do
     before do
-      stub_request(:get, /^https:\/\/cas.example.org(:443)?\/serviceValidate\?([^&]+&)?ticket=9391d/).
+      stub_request(:get, /^http:\/\/cas.example.org:8080?\/serviceValidate\?([^&]+&)?ticket=9391d/).
          to_return( body: File.read('spec/fixtures/cas_failure.xml') )
       get '/auth/cas/callback?ticket=9391d'
     end
@@ -77,7 +84,7 @@ describe OmniAuth::Strategies::CAS, type: :strategy do
     let(:return_url) { 'http://127.0.0.10/?some=parameter' }
 
     before do
-      stub_request(:get, /^https:\/\/cas.example.org(:443)?\/serviceValidate\?([^&]+&)?ticket=593af/)
+      stub_request(:get, /^http:\/\/cas.example.org:8080?\/serviceValidate\?([^&]+&)?ticket=593af/)
         .with { |request| @request_uri = request.uri.to_s }
         .to_return( body: File.read('spec/fixtures/cas_success.xml') )
 
@@ -89,7 +96,7 @@ describe OmniAuth::Strategies::CAS, type: :strategy do
     end
 
     it 'should properly encode the service URL' do
-      WebMock.should have_requested(:get, 'https://cas.example.org/serviceValidate')
+      WebMock.should have_requested(:get, 'http://cas.example.org:8080/serviceValidate')
         .with(query: {
           ticket:  '593af',
           service: 'http://example.org/auth/cas/callback?url=' + Rack::Utils.escape('http://127.0.0.10/?some=parameter')
@@ -143,4 +150,4 @@ describe OmniAuth::Strategies::CAS, type: :strategy do
     end
   end
 
-end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-cas
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Derek Lindahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -185,33 +166,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/dlindahl/omniauth-cas
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3594521613564365784
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3594521613564365784
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CAS Strategy for OmniAuth
 test_files:
 - spec/fixtures/cas_failure.xml