oa-enterprise 0.2.5 → 0.2.6

data/Gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+platforms :jruby do
+  gem 'jruby-openssl', '~> 0.7'
+end
+
+gemspec

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

@@ -38,14 +38,21 @@ module OmniAuth
         # returns nil if given nil
         def parse_user_info(node)
           return nil if node.nil?
-          node.children.inject({}) do |hash, child|
-            unless child.kind_of?(Nokogiri::XML::Text) ||
-                   child.name == 'cas:proxies' ||
-                   child.name == 'proxies'
-              hash[child.name.sub(/^cas:/, '')] = child.content
+          hash = {}
+          node.children.each do |e|
+            unless e.kind_of?(Nokogiri::XML::Text) ||
+                   e.name == 'cas:proxies' ||
+                   e.name == 'proxies'
+              # There are no child elements
+              if e.element_children.count == 0
+                hash[e.name.sub(/^cas:/, '')] = e.content
+              elsif e.element_children.count
+                hash[e.name.sub(/^cas:/, '')] = [] if hash[e.name.sub(/^cas:/, '')].nil?
+                hash[e.name.sub(/^cas:/, '')].push parse_user_info e
+              end
             end
-            hash
           end
+          hash
         end
 
         # finds an `<cas:authenticationSuccess>` node in

data/lib/omniauth/version.rb

@@ -7,7 +7,7 @@ module OmniAuth
       MINOR = 2
     end
     unless defined?(::OmniAuth::Version::PATCH)
-      PATCH = 5
+      PATCH = 6
     end
     unless defined?(::OmniAuth::Version::PRE)
       PRE   = nil

data/oa-enterprise.gemspec

@@ -3,7 +3,6 @@ require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'addressable', '2.2.4'
-  gem.add_runtime_dependency 'jruby-openssl', '~> 0.7.3' if RUBY_PLATFORM == 'java'
   gem.add_runtime_dependency 'nokogiri', '~> 1.4.2'
   gem.add_runtime_dependency 'net-ldap', '~> 0.2.2'
   gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
@@ -15,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rspec', '~> 2.5'
   gem.add_development_dependency 'webmock', '~> 1.6'
-  gem.add_development_dependency 'yard', '~> 0.6'
+  gem.add_development_dependency 'yard', '~> 0.7'
   gem.add_development_dependency 'ZenTest', '~> 4.5'
   gem.name = 'oa-enterprise'
   gem.version = OmniAuth::Version::STRING

data/spec/omniauth/strategies/ldap_spec.rb

@@ -0,0 +1,41 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'cgi'
+
+describe OmniAuth::Strategies::LDAP, :type => :strategy do
+
+  include OmniAuth::Test::StrategyTestCase
+
+  def strategy
+    @ldap_server ||= 'ldap.example.org'
+    [OmniAuth::Strategies::LDAP, {
+      :host => @ldap_server,
+      :port => 636,
+      :method => :ssl,
+      :uid => 'jeremyf',
+      :base => 'o="University of OmniAuth", st=Sublime, c=RubyNation',
+    }]
+  end
+
+  describe 'GET /auth/ldap' do
+    before do
+      get '/auth/ldap'
+    end
+
+    # TODO: Add checks that page has authentication form; I attempted
+    # to use `should have_tag` but that was not working.
+    it 'should get authentication page' do
+      last_response.status.should == 200
+    end
+  end
+
+  describe 'POST /auth/ldap' do
+    before do
+      post '/auth/ldap', {:username => 'jeremy', :password => 'valid_password' }
+    end
+
+    it 'should redirect us to /auth/ldap/callback' do
+      last_response.should be_redirect
+      last_response.location.should == '/auth/ldap/callback'
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: oa-enterprise
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - James A. Rosen
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 Z
+date: 2011-05-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -56,7 +56,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.5
+        version: 0.2.6
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -155,7 +155,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.6"
+        version: "0.7"
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -185,6 +185,7 @@ files:
 - .gemtest
 - .rspec
 - .yardopts
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -200,6 +201,7 @@ files:
 - spec/fixtures/cas_failure.xml
 - spec/fixtures/cas_success.xml
 - spec/omniauth/strategies/cas_spec.rb
+- spec/omniauth/strategies/ldap_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/intridea/omniauth
 licenses: []
@@ -224,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Enterprise strategies for OmniAuth.
@@ -232,5 +234,5 @@ test_files:
 - spec/fixtures/cas_failure.xml
 - spec/fixtures/cas_success.xml
 - spec/omniauth/strategies/cas_spec.rb
+- spec/omniauth/strategies/ldap_spec.rb
 - spec/spec_helper.rb
-has_rdoc: