oa-enterprise 0.2.4 → 0.2.5

data/lib/omniauth/strategies/cas.rb

@@ -4,19 +4,19 @@ module OmniAuth
   module Strategies
     class CAS
       include OmniAuth::Strategy
-      
+
       autoload :Configuration, 'omniauth/strategies/cas/configuration'
       autoload :ServiceTicketValidator, 'omniauth/strategies/cas/service_ticket_validator'
-      
+
       def initialize(app, options = {}, &block)
         super(app, options[:name] || :cas, options.dup, &block)
         @configuration = OmniAuth::Strategies::CAS::Configuration.new(options)
       end
-      
+
       protected
-      
+
       def request_phase
-        [ 
+        [
           302,
           {
             'Location' => @configuration.login_url(callback_url),
@@ -34,7 +34,7 @@ module OmniAuth
         return fail!(:invalid_ticket, 'Invalid CAS Ticket') if @user_info.nil? || @user_info.empty?
         super
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => @user_info.delete('user'),

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

@@ -4,7 +4,7 @@ module OmniAuth
   module Strategies
     class CAS
       class Configuration
-        
+
         DEFAULT_LOGIN_URL = "%s/login"
 
         DEFAULT_SERVICE_VALIDATE_URL = "%s/serviceValidate"
@@ -27,7 +27,7 @@ module OmniAuth
         # Build a CAS login URL from +service+.
         #
         # @param [String] service the service (a.k.a. return-to) URL
-        # 
+        #
         # @return [String] a URL like `http://cas.mycompany.com/login?service=...`
         def login_url(service)
           append_service @login_url, service
@@ -91,7 +91,7 @@ module OmniAuth
           result << 'service='
           result << Rack::Utils.escape(service)
         end
-        
+
       end
     end
   end

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

@@ -5,7 +5,7 @@ require 'nokogiri'
 module OmniAuth
   module Strategies
     class CAS
-      class ServiceTicketValidator        
+      class ServiceTicketValidator
 
         VALIDATION_REQUEST_HEADERS = { 'Accept' => '*/*' }
 
@@ -47,7 +47,7 @@ module OmniAuth
             hash
           end
         end
-        
+
         # finds an `<cas:authenticationSuccess>` node in
         # a `<cas:serviceResponse>` body if present; returns nil
         # if the passed body is nil or if there is no such node.
@@ -64,11 +64,11 @@ module OmniAuth
             nil
           end
         end
-        
+
         # retrieves the `<cas:serviceResponse>` XML from the CAS server
         def get_service_response_body
           result = ''
-          http = Net::HTTP.new(@uri.host, @uri.port)
+          http = ::Net::HTTP.new(@uri.host, @uri.port)
           http.use_ssl = @uri.port == 443 || @uri.instance_of?(URI::HTTPS)
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE if http.use_ssl? && @configuration.disable_ssl_verification?
           http.start do |c|
@@ -77,7 +77,7 @@ module OmniAuth
           end
           result
         end
-        
+
       end
     end
   end

data/lib/omniauth/strategies/ldap.rb

@@ -7,9 +7,9 @@ module OmniAuth
   module Strategies
     class LDAP
       include OmniAuth::Strategy
-      
+
       autoload :Adaptor, 'omniauth/strategies/ldap/adaptor'
-      @@config   = {'name' => 'cn', 
+      @@config   = {'name' => 'cn',
                     'first_name' => 'givenName',
                     'last_name' => 'sn',
                     'email' => ['mail', "email", 'userPrincipalName'],
@@ -32,9 +32,9 @@ module OmniAuth
         @name_proc = (@options.delete(:name_proc) || Proc.new {|name| name})
         @adaptor = OmniAuth::Strategies::LDAP::Adaptor.new(options)
       end
-      
+
       protected
-      
+
       def request_phase
         if env['REQUEST_METHOD'] == 'GET'
           get_credentials
@@ -51,15 +51,16 @@ module OmniAuth
         end.to_response
       end
 
-      def callback_phase 
+      def callback_phase
       	begin
-        creds = session.delete 'omniauth.ldap'
+        creds = session['omniauth.ldap']
+        session.delete 'omniauth.ldap'
 				@ldap_user_info = {}
-        begin 
-        	(@adaptor.bind(:allow_anonymous => true) unless @adaptor.bound?) 
-        rescue Exception => e 
+        begin
+        	(@adaptor.bind(:allow_anonymous => true) unless @adaptor.bound?)
+        rescue Exception => e
         	puts "failed to bind with the default credentials: " + e.message
-       	end          
+       	end
         @ldap_user_info = @adaptor.search(:filter => Net::LDAP::Filter.eq(@adaptor.uid, @name_proc.call(creds['username'])),:limit => 1) if @adaptor.bound?
 				bind_dn = creds['username']
 				bind_dn = @ldap_user_info[:dn].to_a.first if @ldap_user_info[:dn]
@@ -68,13 +69,13 @@ module OmniAuth
     	  @user_info = self.class.map_user(@@config, @ldap_user_info)
 
         @env['omniauth.auth'] = auth_hash
-	
+
       	rescue Exception => e
       	  return fail!(:invalid_credentials, e)
       	end
 	      call_app!
-      end      
-      
+      end
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => @user_info["uid"],
@@ -82,7 +83,7 @@ module OmniAuth
           'extra' => @ldap_user_info
         })
       end
-      
+
 	  def self.map_user(mapper, object)
 		user = {}
 		mapper.each do |key, value|
@@ -97,14 +98,14 @@ module OmniAuth
 			  value1.each_with_index do |v,i|
 			    part = '';
 			    v.each {|v1| (part = object[v1.downcase.to_sym].to_s; break;) if object[v1.downcase.to_sym]}
-			    pattern.gsub!("%#{i}",part||'') 
-			  end	
+			    pattern.gsub!("%#{i}",part||'')
+			  end
 			  user[key] = pattern
 		    end
 		  end
 		end
 		user
-	  end       
+	  end
     end
   end
 end

data/lib/omniauth/strategies/ldap/adaptor.rb

@@ -9,50 +9,49 @@ module OmniAuth
   module Strategies
     class LDAP
       class Adaptor
-		class LdapError < StandardError; end
-		class ConfigurationError < StandardError; end
-		class AuthenticationError < StandardError; end
-		class ConnectionError < StandardError; end
-	      
+        class LdapError < StandardError; end
+        class ConfigurationError < StandardError; end
+        class AuthenticationError < StandardError; end
+        class ConnectionError < StandardError; end
+
         VALID_ADAPTER_CONFIGURATION_KEYS = [:host, :port, :method, :bind_dn, :password,
 	                                        :try_sasl, :sasl_mechanisms, :uid, :base, :allow_anonymous]
-	      
+
         MUST_HAVE_KEYS = [:host, :port, :method, :uid, :base]
-	      
+
         METHOD = {
-	      :ssl => :simple_tls,
-	      :tls => :start_tls,
-	      :plain => nil
-	    }     
-	      
-    attr_accessor :bind_dn, :password                                     
-		attr_reader :connection, :uid, :base
-
-	    def initialize(configuration={})
-	      @connection = nil
-	      @disconnected = false
-	      @bound = false
-	      @configuration = configuration.dup
-        @configuration[:allow_anonymous] ||= false          
-        @logger = @configuration.delete(:logger)
-        message = []
-        MUST_HAVE_KEYS.each do |name|
-            message << name if configuration[name].nil? 
-        end
-        raise ArgumentError.new(message.join(",") +" MUST be provided") unless message.empty?
+	        :ssl => :simple_tls,
+	        :tls => :start_tls,
+          :plain => nil,
+        }
+
+        attr_accessor :bind_dn, :password
+        attr_reader :connection, :uid, :base
+
+        def initialize(configuration={})
+          @connection = nil
+          @disconnected = false
+          @bound = false
+          @configuration = configuration.dup
+          @configuration[:allow_anonymous] ||= false
+          @logger = @configuration.delete(:logger)
+          message = []
+          MUST_HAVE_KEYS.each do |name|
+              message << name if configuration[name].nil?
+          end
+          raise ArgumentError.new(message.join(",") +" MUST be provided") unless message.empty?
           VALID_ADAPTER_CONFIGURATION_KEYS.each do |name|
             instance_variable_set("@#{name}", configuration[name])
           end
+        end
 
-	    end
-	
-		def connect(options={})
-	      host = options[:host] || @host
-	      method = ensure_method(options[:method] || @method || :plain)
-	      port = options[:port] || @port || ensure_port(method)
-	      @disconnected = false
-	      @bound = false
-	      @bind_tried = false
+        def connect(options={})
+          host = options[:host] || @host
+          method = ensure_method(options[:method] || @method || :plain)
+          port = options[:port] || @port || ensure_port(method)
+          @disconnected = false
+          @bound = false
+          @bind_tried = false
 
           config = {
             :host => host,
@@ -60,7 +59,7 @@ module OmniAuth
           }
 
           config[:encryption] = {:method => method} if method
-          
+
           @connection, @uri, @with_start_tls = begin
             uri = construct_uri(host, port, method == :simple_tls)
             with_start_tls = method == :start_tls
@@ -69,78 +68,74 @@ module OmniAuth
           rescue Net::LDAP::LdapError
             raise ConnectionError, $!.message
           end
+        end
 
-	    end
-	
-	    def unbind(options={})
-	      @connection.close # Net::LDAP doesn't implement unbind.
-	    end
-	
-	    def bind(options={})
-	      connect(options) unless connecting?
-	      begin
-		    @bind_tried = true
-
-		    bind_dn = (options[:bind_dn] || @bind_dn).to_s
-		    try_sasl = options.has_key?(:try_sasl) ? options[:try_sasl] : @try_sasl
-		    if options.has_key?(:allow_anonymous)
-          allow_anonymous = options[:allow_anonymous]
-        else
-          allow_anonymous = @allow_anonymous
+        def unbind(options={})
+          @connection.close # Net::LDAP doesn't implement unbind.
+        end
+
+        def bind(options={})
+          connect(options) unless connecting?
+          begin
+          @bind_tried = true
+
+          bind_dn = (options[:bind_dn] || @bind_dn).to_s
+          try_sasl = options.has_key?(:try_sasl) ? options[:try_sasl] : @try_sasl
+          if options.has_key?(:allow_anonymous)
+            allow_anonymous = options[:allow_anonymous]
+          else
+            allow_anonymous = @allow_anonymous
+          end
+          # Rough bind loop:
+          # Attempt 1: SASL if available
+          # Attempt 2: SIMPLE with credentials if password block
+          # Attempt 3: SIMPLE ANONYMOUS if 1 and 2 fail and allow anonymous is set to true
+          if try_sasl and sasl_bind(bind_dn, options)
+              puts "bound with sasl"
+          elsif simple_bind(bind_dn, options)
+              puts "bound with simple"
+          elsif allow_anonymous and bind_as_anonymous(options)
+            puts "bound as anonymous"
+          else
+            message = yield if block_given?
+            message ||= ('All authentication methods for %s exhausted.') % target
+            raise AuthenticationError, message
+          end
+          @bound = true
+          rescue Net::LDAP::LdapError
+            raise AuthenticationError, $!.message
+          end
+        end
+
+        def disconnect!(options={})
+          unbind(options)
+          @connection = @uri = @with_start_tls = nil
+          @disconnected = true
+        end
+
+        def rebind(options={})
+          unbind(options) if bound?
+          connect(options)
+        end
+
+        def connecting?
+          !@connection.nil? and !@disconnected
         end
-            # Rough bind loop:
-            # Attempt 1: SASL if available
-            # Attempt 2: SIMPLE with credentials if password block
-        		# Attempt 3: SIMPLE ANONYMOUS if 1 and 2 fail and allow anonymous is set to true            
-            if try_sasl and sasl_bind(bind_dn, options)
-                puts "bound with sasl"
-            elsif simple_bind(bind_dn, options)
-                puts "bound with simple"
-						elsif allow_anonymous and bind_as_anonymous(options)
-							puts "bound as anonymous"
-            else
-              message = yield if block_given?
-              message ||= ('All authentication methods for %s exhausted.') % target
-              raise AuthenticationError, message
-            end
-    
-            @bound = true
-	      rescue Net::LDAP::LdapError
-	        raise AuthenticationError, $!.message
-	      end
-	    end
-	
-	    def disconnect!(options={})
-	      unbind(options)
-	      @connection = @uri = @with_start_tls = nil
-	      @disconnected = true
-	    end
-	
-	    def rebind(options={})
-	      unbind(options) if bound?
-	      connect(options)
-	    end
-	
-	    def connecting?
-	      !@connection.nil? and !@disconnected
-	    end
-	
-	    def bound?
-	      connecting? and @bound
-	    end
-				
-		def search(options={}, &block)
-	      base = options[:base]
-	      filter = options[:filter]
-	      limit = options[:limit]
-	
-	      args = {
-	        :base => @base,
-	        :filter => filter,
-	        :size => limit
-	      }
-		  
-          puts args.inspect
+
+        def bound?
+          connecting? and @bound
+        end
+
+        def search(options={}, &block)
+          base = options[:base]
+          filter = options[:filter]
+          limit = options[:limit]
+
+          args = {
+            :base => @base,
+            :filter => filter,
+            :size => limit
+          }
 
           attributes = {}
           execute(:search, args) do |entry|
@@ -151,11 +146,11 @@ module OmniAuth
           attributes
         end
 
-	    private
-	    
+        private
+
         def execute(method, *args, &block)
-	      result = @connection.send(method, *args, &block)
-	      message = nil
+          result = @connection.send(method, *args, &block)
+          message = nil
 
           if result.is_a?(Hash)
             message = result[:errorMessage]
@@ -166,117 +161,118 @@ module OmniAuth
             message = [Net::LDAP.result2string(result), message].compact.join(": ")
             raise LdapError, message
           end
-	    end	      
-	      
-	    def ensure_port(method)
-	      if method == :ssl
-	        URI::LDAPS::DEFAULT_PORT
-	      else
-	        URI::LDAP::DEFAULT_PORT
-	      end
-	    end
-	
-	    def prepare_connection(options)
-	    end
-	
-	    def ensure_method(method)
-          method ||= "plain"
-          normalized_method = method.to_s.downcase.to_sym
-          return METHOD[normalized_method] if METHOD.has_key?(normalized_method)
-  
-          available_methods = METHOD.keys.collect {|m| m.inspect}.join(", ")
-          format = "%s is not one of the available connect methods: %s"
-          raise ConfigurationError, format % [method.inspect, available_methods]
-      end
-      
-      def sasl_bind(bind_dn, options={})
-        sasl_mechanisms = options[:sasl_mechanisms] || @sasl_mechanisms
-          sasl_mechanisms.each do |mechanism|
-            begin
-              normalized_mechanism = mechanism.downcase.gsub(/-/, '_')
-              sasl_bind_setup = "sasl_bind_setup_#{normalized_mechanism}"
-              next unless respond_to?(sasl_bind_setup, true)
-              initial_credential, challenge_response = send(sasl_bind_setup, bind_dn, options)
-
-              args = {
-                :method => :sasl,
-                :initial_credential => initial_credential,
-                :mechanism => mechanism,
-                :challenge_response => challenge_response,
-              }
-              
-              info = {
-                :name => "bind: SASL", :dn => bind_dn, :mechanism => mechanism,
-              }
-              puts info.inspect
-
-              execute(:bind, args)
-              return true
-              
-            rescue Exception => e
-              puts e.message
+        end
+
+        def ensure_port(method)
+          if method == :ssl
+            URI::LDAPS::DEFAULT_PORT
+          else
+            URI::LDAP::DEFAULT_PORT
+          end
+        end
+
+        def prepare_connection(options)
+        end
+
+        def ensure_method(method)
+            method ||= "plain"
+            normalized_method = method.to_s.downcase.to_sym
+            return METHOD[normalized_method] if METHOD.has_key?(normalized_method)
+
+            available_methods = METHOD.keys.collect {|m| m.inspect}.join(", ")
+            format = "%s is not one of the available connect methods: %s"
+            raise ConfigurationError, format % [method.inspect, available_methods]
+        end
+
+        def sasl_bind(bind_dn, options={})
+          sasl_mechanisms = options[:sasl_mechanisms] || @sasl_mechanisms
+            sasl_mechanisms.each do |mechanism|
+              begin
+                normalized_mechanism = mechanism.downcase.gsub(/-/, '_')
+                sasl_bind_setup = "sasl_bind_setup_#{normalized_mechanism}"
+                next unless respond_to?(sasl_bind_setup, true)
+                initial_credential, challenge_response = send(sasl_bind_setup, bind_dn, options)
+
+                args = {
+                  :method => :sasl,
+                  :initial_credential => initial_credential,
+                  :mechanism => mechanism,
+                  :challenge_response => challenge_response,
+                }
+
+                info = {
+                  :name => "bind: SASL", :dn => bind_dn, :mechanism => mechanism,
+                }
+
+                execute(:bind, args)
+                return true
+
+              rescue Exception => e
+                puts e.message
+              end
             end
+          false
+        end
+
+        def sasl_bind_setup_digest_md5(bind_dn, options)
+          initial_credential = ""
+          challenge_response = Proc.new do |cred|
+            pref = SASL::Preferences.new :digest_uri => "ldap/#{@host}", :username => bind_dn, :has_password? => true, :password => options[:password]||@password
+            sasl = SASL.new("DIGEST-MD5", pref)
+            response = sasl.receive("challenge", cred)
+            response[1]
           end
+          [initial_credential, challenge_response]
+        end
 
-        false
-      end
+        def sasl_bind_setup_gss_spnego(bind_dn, options)
+          puts options.inspect
+          user,psw = [bind_dn, options[:password]||@password]
+          raise LdapError.new( "invalid binding information" ) unless (user && psw)
 
-      def sasl_bind_setup_digest_md5(bind_dn, options)
-        initial_credential = ""
-        challenge_response = Proc.new do |cred|
-          pref = SASL::Preferences.new :digest_uri => "ldap/#{@host}", :username => bind_dn, :has_password? => true, :password => options[:password]||@password
-          sasl = SASL.new("DIGEST-MD5", pref)
-          response = sasl.receive("challenge", cred)
-          response[1]
+          nego = proc {|challenge|
+            t2_msg = Net::NTLM::Message.parse( challenge )
+            user, domain = user.split('\\').reverse
+            t2_msg.target_name = Net::NTLM::encode_utf16le(domain) if domain
+            t3_msg = t2_msg.response( {:user => user, :password => psw}, {:ntlmv2 => true} )
+            t3_msg.serialize
+          }
+          [Net::NTLM::Message::Type1.new.serialize, nego]
         end
-        [initial_credential, challenge_response]
-      end
 
-      def sasl_bind_setup_gss_spnego(bind_dn, options)
-        puts options.inspect
-        user,psw = [bind_dn, options[:password]||@password]
-        raise LdapError.new( "invalid binding information" ) unless (user && psw)
-
-        nego = proc {|challenge|
-          t2_msg = Net::NTLM::Message.parse( challenge )
-          user, domain = user.split('\\').reverse
-          t2_msg.target_name = Net::NTLM::encode_utf16le(domain) if domain
-          t3_msg = t2_msg.response( {:user => user, :password => psw}, {:ntlmv2 => true} )
-          t3_msg.serialize
-        }        
-        [Net::NTLM::Message::Type1.new.serialize, nego]        
-      end
-      
-	    def simple_bind(bind_dn, options={})
-	      args = {
-                  :method => :simple,
-                  :username => bind_dn,
-                  :password => (options[:password]||@password).to_s,
-                 }
-        begin
-          execute(:bind, args)
+        def simple_bind(bind_dn, options={})
+          args = {
+            :method => :simple,
+            :username => bind_dn,
+            :password => (options[:password]||@password).to_s,
+          }
+          begin
+            raise AuthenticationError if args[:password] == ""
+            execute(:bind, args)
+            true
+          rescue Exception
+            false
+          end
+        end
+
+        def bind_as_anonymous(options={})
+          execute(:bind, {:method => :anonymous})
           true
-        rescue Exception
-          false
         end
-      end
-      def bind_as_anonymous(options={})
-        execute(:bind, {:method => :anonymous})
-        true
-      end	      
-      def construct_uri(host, port, ssl)
-        protocol = ssl ? "ldaps" : "ldap"
-        URI.parse("#{protocol}://#{host}:#{port}").to_s
-      end
 
-      def target
-        return nil if @uri.nil?
-        if @with_start_tls
-          "#{@uri}(StartTLS)"
-        else
-          @uri
+        def construct_uri(host, port, ssl)
+          protocol = ssl ? "ldaps" : "ldap"
+          URI.parse("#{protocol}://#{host}:#{port}").to_s
+        end
+
+        def target
+          return nil if @uri.nil?
+          if @with_start_tls
+            "#{@uri}(StartTLS)"
+          else
+            @uri
+          end
         end
-      end	
       end
     end
   end

data/lib/omniauth/version.rb

@@ -0,0 +1,19 @@
+module OmniAuth
+  module Version
+    unless defined?(::OmniAuth::Version::MAJOR)
+      MAJOR = 0
+    end
+    unless defined?(::OmniAuth::Version::MINOR)
+      MINOR = 2
+    end
+    unless defined?(::OmniAuth::Version::PATCH)
+      PATCH = 5
+    end
+    unless defined?(::OmniAuth::Version::PRE)
+      PRE   = nil
+    end
+    unless defined?(::OmniAuth::Version::STRING)
+      STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
+    end
+  end
+end

data/oa-enterprise.gemspec

@@ -1,23 +1,26 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../../omniauth/lib/omniauth/version', __FILE__)
+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 'oa-core', Omniauth::VERSION.dup
+  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.1.1'
-  gem.add_runtime_dependency 'rubyntlm', '~> 0.1.1'
+  gem.add_runtime_dependency 'net-ldap', '~> 0.2.2'
+  gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
   gem.add_runtime_dependency 'pyu-ruby-sasl', '~> 0.0.3.1'
+  gem.add_runtime_dependency 'rubyntlm', '~> 0.1.1'
+  gem.add_development_dependency 'maruku', '~> 0.6'
   gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'rack-test', '~> 0.5'
   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 'ZenTest', '~> 4.5'
   gem.name = 'oa-enterprise'
-  gem.version = Omniauth::VERSION.dup
-  gem.summary = %q{Enterprise strategies for OmniAuth.}
+  gem.version = OmniAuth::Version::STRING
   gem.description = %q{Enterprise strategies for OmniAuth.}
+  gem.summary = gem.description
   gem.email = ['james.a.rosen@gmail.com', 'ping@intridea.com', 'michael@intridea.com', 'sferik@gmail.com']
   gem.homepage = 'http://github.com/intridea/omniauth'
   gem.authors = ['James A. Rosen', 'Ping Yu', 'Michael Bleigh', 'Erik Michaels-Ober']

data/spec/omniauth/strategies/cas_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper', __FILE__)
 require 'cgi'
 
 describe OmniAuth::Strategies::CAS, :type => :strategy do
@@ -86,8 +86,8 @@ describe OmniAuth::Strategies::CAS, :type => :strategy do
         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' 
+      it 'should call through to the master app when response is gzipped' do
+          last_response.body.should == 'true'
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
 require 'simplecov'
 SimpleCov.start
 require 'rspec'
-require 'rspec/autorun'
-require 'webmock/rspec'
 require 'rack/test'
+require 'webmock/rspec'
 require 'omniauth/core'
 require 'omniauth/test'
 require 'omniauth/enterprise'
@@ -13,5 +12,3 @@ RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
 end
-
-WebMock.disable_net_connect!

metadata

@@ -2,7 +2,7 @@
 name: oa-enterprise
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - James A. Rosen
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 Z
+date: 2011-04-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -27,126 +27,148 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: oa-core
+  name: nokogiri
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.4
+        version: 1.4.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: net-ldap
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.4.2
+        version: 0.2.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: net-ldap
+  name: oa-core
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.2.5
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rubyntlm
+  name: pyu-ruby-sasl
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.0.3.1
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: pyu-ruby-sasl
+  name: rubyntlm
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.0.3.1
+        version: 0.1.1
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: maruku
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.4"
+        version: "0.6"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: simplecov
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.5"
+        version: "0.4"
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rack-test
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        version: "0.5"
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.5"
+        version: "0.8"
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: webmock
+  name: rspec
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.6"
+        version: "2.5"
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: webmock
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.6"
+        version: "1.6"
   type: :development
   version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.6"
+  type: :development
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "4.5"
+  type: :development
+  version_requirements: *id014
 description: Enterprise strategies for OmniAuth.
 email: 
 - james.a.rosen@gmail.com
@@ -163,7 +185,6 @@ files:
 - .gemtest
 - .rspec
 - .yardopts
-- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -174,6 +195,7 @@ files:
 - lib/omniauth/strategies/cas/service_ticket_validator.rb
 - lib/omniauth/strategies/ldap.rb
 - lib/omniauth/strategies/ldap/adaptor.rb
+- lib/omniauth/version.rb
 - oa-enterprise.gemspec
 - spec/fixtures/cas_failure.xml
 - spec/fixtures/cas_success.xml

data/Gemfile

@@ -1,3 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec