mit-ldap 0.2.1 → 0.2.2

data/README.md

@@ -12,6 +12,6 @@ gem 'mit-ldap'
 
 ```ruby
 require 'mit-ldap'
-MIT::LDAP.connect!
-MIT::LDAP.search(:filter => '(uid=mrhalp)') # any Ldaptic syntax
+MIT::LDAP.connect!                          # true
+MIT::LDAP.search(:filter => '(uid=mrhalp)') # any Ldaptic options/methods
 ```

data/lib/mit-ldap.rb

@@ -15,9 +15,9 @@ module MIT
     def ip_addresses
       if RbConfig::CONFIG['host_os'] =~ /darwin/
         `ifconfig | awk '/inet / {print $2}'`
-       else
-         `ifconfig | sed -rn 's/.*r:([^ ]+) .*/\1/p'`
-       end
+      else
+        `ifconfig | sed -rn 's/.*r:([^ ]+) .*/\1/p'`
+      end
     end
   end
 end

data/lib/mit/ldap.rb

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

data/lib/mit/ldap/version.rb

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

data/spec/ldap_spec.rb

@@ -1,4 +1,5 @@
 require 'mit-ldap'
+require 'ldaptic/adapters/ldap_conn_adapter'
 
 module MIT
   describe LDAP do
@@ -9,10 +10,18 @@ module MIT
     # 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
+    # ldap-too only being accessible from campus)
+    let!(:connection) { ::LDAP::Conn.new('ldap.mit.edu') }
+
     def stub_ldap_connection
-      @connection = ::LDAP::Conn.new('ldap.mit.edu')
-      ::LDAP::Conn.stub(:new).and_return(@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
@@ -21,6 +30,7 @@ module MIT
 
     describe ".connect!" do
       describe "when off campus" do
+
         it "returns false" do
           MIT.stub(:on_campus?).and_return(false)
           LDAP.connect!.should be_false
@@ -43,7 +53,7 @@ module MIT
           Ldaptic.should_receive(:Module).
             with(:adapter => :ldap_conn,
                  :base => 'dc=mit,dc=edu',
-                 :connection => @connection,
+                 :connection => connection,
                  :host => 'ldap-too.mit.edu'
                 )
           LDAP.connect!

metadata

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