mit-ldap 0.2.2 → 0.3.0

data/lib/mit/ldap.rb

@@ -1,27 +1,40 @@
 module MIT
   module LDAP
 
-    def self.connect!
-      if MIT.on_campus?
-        ldap_connection = ::LDAP::Conn.new('ldap-too.mit.edu')
-        singleton_class.send(:include,
-          Ldaptic::Module(
+    class << self
+      def connect!
+        if MIT.on_campus?
+          include Ldaptic::Module(
             :adapter => :ldap_conn,
-            :connection => ldap_connection,
+            :connection => ::LDAP::Conn.new('ldap-too.mit.edu'),
             :host => 'ldap-too.mit.edu',
             :base => 'dc=mit,dc=edu',
           )
-        )
+        end
+        return connected?
       end
-      return connected?
-    end
 
-    def self.connection
-      respond_to?(:adapter) ? adapter.instance_variable_get(:@connection) : nil
-    end
+      def connected?
+        !connection.nil?
+      end
+
+      def reconnect!
+        if adapter_present? && !connected?
+          adapter.instance_variable_set(:@connection, ::LDAP::Conn.new('ldap-too.mit.edu'))
+        elsif !adapter_present?
+          connect!
+        end
+      end
 
-    def self.connected?
-      !self.connection.nil?
+      private
+
+      def connection
+        adapter.instance_variable_get(:@connection) if adapter_present?
+      end
+
+      def adapter_present?
+        respond_to?(:adapter)
+      end
     end
   end
 end

data/lib/mit/ldap/version.rb

@@ -1,5 +1,5 @@
 module MIT
   module LDAP
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

data/spec/ldap_spec.rb

@@ -1,36 +1,10 @@
 require 'mit-ldap'
-require 'ldaptic/adapters/ldap_conn_adapter'
 
 module MIT
   describe LDAP do
-
-    # Use the legacy MIT ldap server that is accessible from off campus
-    # so we can use a LDAP::Conn instance for stubbing tests
-    #
-    # Server is not properly configured so the attributes required
-    # by Ldaptic when configuring class hierarchy do not exist resulting
-    # searches failing (i.e., this method should only be used to get around
-    # ldap-too only being accessible from campus)
-    let!(:connection) { ::LDAP::Conn.new('ldap.mit.edu') }
-
-    def stub_ldap_connection
-      ::LDAP::Conn.stub(:new).and_return(connection)
-      stub_ldaptic_adapter(connection)
-    end
-
-    def stub_ldaptic_adapter(connection = nil)
-      adapter = double('adapter')
-      adapter.stub(:instance_variable_get).with(:@connection).and_return(connection)
-      LDAP.stub(:adapter).and_return(adapter)
-    end
-
-    def stub_ldaptic_include
-      Ldaptic.stub(:Module).and_return(MIT::LDAP)
-    end
-
     describe ".connect!" do
-      describe "when off campus" do
 
+      describe "when off campus" do
         it "returns false" do
           MIT.stub(:on_campus?).and_return(false)
           LDAP.connect!.should be_false
@@ -38,27 +12,32 @@ module MIT
       end
 
       describe "when on campus" do
-        before :each do
-          MIT.stub(:on_campus?).and_return(true)
-          stub_ldap_connection
-          stub_ldaptic_include
+        before :all do
+          LDAP.connect!
         end
 
-        it "sets up ldap connection" do
-          ::LDAP::Conn.should_receive(:new).with('ldap-too.mit.edu')
-          LDAP.connect!
+        it ":connected? is true" do
+          LDAP.connected?.should be_true
         end
 
-        it "includes Ldaptic::Module" do
-          Ldaptic.should_receive(:Module).
-            with(:adapter => :ldap_conn,
-                 :base => 'dc=mit,dc=edu',
-                 :connection => connection,
-                 :host => 'ldap-too.mit.edu'
-                )
-          LDAP.connect!
+        it "an Ldaptic::Adapter is set" do
+          LDAP.adapter.should be_a Ldaptic::Adapters::LDAPConnAdapter
         end
       end
     end
+
+    describe ".reconnect!" do
+      it "reloads connection object if nil" do
+        LDAP.adapter.instance_variable_set(:@connection, nil)
+        LDAP.reconnect!
+        LDAP.adapter.instance_variable_get(:@connection).should be_a ::LDAP::Conn
+      end
+
+      it "calls .connect! if not connected" do
+        LDAP.stub(:adapter_present?).and_return(false)
+        LDAP.should_receive(:connect!)
+        LDAP.reconnect!
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mit-ldap
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ldaptic
-  requirement: &70184617094400 !ruby/object:Gem::Requirement
+  requirement: &70320703308640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70184617094400
+  version_requirements: *70320703308640
 - !ruby/object:Gem::Dependency
   name: ruby-ldap
-  requirement: &70184617093880 !ruby/object:Gem::Requirement
+  requirement: &70320703308140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70184617093880
+  version_requirements: *70320703308140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70184617093400 !ruby/object:Gem::Requirement
+  requirement: &70320703307680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70184617093400
+  version_requirements: *70320703307680
 description: Ruby interface for querying MIT LDAP server (only if you're on MITnet)
 email:
 - edd_d@mit.edu