omniauth-cas 1.0.0 → 1.0.1

data/.travis.yml

@@ -1,5 +1,8 @@
-rvm: 1.9.2
+rvm:
+  - 1.9.2
+  - 1.9.3
 branches:
   only:
     - master
-
+before_install:
+  - gem install bundler

data/Gemfile

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

data/README.md

@@ -36,19 +36,20 @@ end
 
 OmniAuth CAS requires at least one of the following two configuration options:
 
-  * `host` - Defines the host of your CAS server. A default login URL of `/login` will be assumed.
-  * `login_url` - Defines the URL used to prompt users for their login information.
+  * `url` - Defines the URL of your CAS server (i.e. `http://example.org:8080`)
+  * `host` - Defines the host of your CAS server. Optional if using `url`
+  * `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.
 
 Other configuration options:
 
-  * `port` - The port to use for your configured CAS `host`
-  * `ssl` - TRUE to connect to your CAS server over SSL.
+  * `port` - The port to use for your configured CAS `host`. Optional if using `url`
+  * `ssl` - TRUE to connect to your CAS server over SSL. Optional if using `url`
   * `service_validate_url` - The URL to use to validate a user. Defaults to `'/serviceValidate'`
   * `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.
+  * `disable_ssl_verification` - Optional when `ssl` is true. Disables verification.
 
 ## Migrating from OmniAuth 0.3
 

data/Rakefile

@@ -1,12 +1,14 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
 desc 'Default: run specs.'
-task :default => :spec
+task default: :spec
 
-desc "Run specs"
-RSpec::Core::RakeTask.new
+desc 'Run specs'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--require spec_helper --color --order rand'
+end
 
 task :test do
   fail %q{This application uses RSpec. Try running "rake spec"}

data/lib/omniauth/cas/version.rb

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

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

@@ -6,11 +6,23 @@ module OmniAuth
         def initialize( options )
           @options = options
 
+          extract_url if @options['url']
+
           validate_cas_setup
         end
 
+        def extract_url
+          url = Addressable::URI.parse( @options.delete('url') )
+
+          @options.merge!(
+            'host' => url.host,
+            'port' => url.port,
+            'ssl'  => url.scheme == 'https'
+          )
+        end
+
         def validate_cas_setup
-          if @options.host.nil? or @options.login_url.nil?
+          if @options.host.nil? || @options.login_url.nil?
             raise ArgumentError.new(":host and :login_url MUST be provided")
           end
         end

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

@@ -0,0 +1,57 @@
+describe OmniAuth::Strategies::CAS::Configuration do
+  subject { described_class.new }
+
+  let(:options) { Hashie::Mash.new params }
+
+  let(:params) do
+    {
+      'host' => 'example.org',
+      'login_url' => '/'
+    }
+  end
+
+  describe '#initialize' do
+    let(:params) do
+      {
+        'url'       => 'http://example.org:8080',
+        'login_url' => '/'
+      }
+    end
+
+    it 'should initialize the configuration' do
+      described_class.any_instance.should_receive(:extract_url)
+      described_class.any_instance.should_receive(:validate_cas_setup)
+
+      described_class.new options
+    end
+
+    context 'with a URL property' do
+      subject { described_class.new( options ).instance_variable_get('@options') }
+
+      it 'should parse the URL' do
+        subject.host.should eq 'example.org'
+        subject.port.should eq 8080
+        subject.ssl.should  be_false
+      end
+    end
+
+    context 'without a URL property' do
+      let(:params) do
+        {
+          'host'      => 'example.org',
+          'login_url' => '/'
+        }
+      end
+
+      subject { described_class.new( options ) }
+
+      it 'should not parse the url' do
+        described_class.any_instance
+          .should_receive(:extract_url)
+          .never
+
+        described_class.new options
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-cas
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -179,6 +179,7 @@ files:
 - omniauth-cas.gemspec
 - spec/fixtures/cas_failure.xml
 - spec/fixtures/cas_success.xml
+- spec/omniauth/strategies/cas/configuration_spec.rb
 - spec/omniauth/strategies/cas/service_ticket_validator_spec.rb
 - spec/omniauth/strategies/cas_spec.rb
 - spec/spec_helper.rb
@@ -194,12 +195,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !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
@@ -209,6 +216,7 @@ summary: CAS Strategy for OmniAuth
 test_files:
 - spec/fixtures/cas_failure.xml
 - spec/fixtures/cas_success.xml
+- spec/omniauth/strategies/cas/configuration_spec.rb
 - spec/omniauth/strategies/cas/service_ticket_validator_spec.rb
 - spec/omniauth/strategies/cas_spec.rb
 - spec/spec_helper.rb