mit-ldap 0.0.1 → 0.2.0

data/lib/mit/ldap/version.rb

@@ -1,5 +1,5 @@
 module MIT
   module LDAP
-    VERSION = "0.0.1"
+    VERSION = "0.2.0"
   end
 end

data/lib/mit/ldap.rb

@@ -1,2 +1,23 @@
-require 'mit/ldap/version'
-require 'mit/ldap/search'
+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')
+        singleton_class.send(:include,
+          Ldaptic::Module(
+            adapter: :ldap_conn,
+            connection: connection,
+            host: 'ldap-too.mit.edu',
+            base: 'dc=mit,dc=edu',
+          )
+        )
+      end
+      return !self.connection.nil?
+    end
+  end
+end

data/lib/mit-ldap.rb

@@ -1,14 +1,26 @@
+require 'rbconfig'
+require 'ldap'
+require 'ldaptic'
+
 module MIT
 
-  def self.on_campus_network?
-    !(hostname =~ /\.mit\.edu$/i).nil?
-  end
+  class << self
+
+    def on_campus?
+      ip_addresses.split(/\n/).map { |ip| !(ip =~ /^18\./).nil? }.any?
+    end
 
-  private
+    private
 
-  def self.hostname
-    @hostname ||= `hostname`
+    def ip_addresses
+      if RbConfig::CONFIG['host_os'] =~ /darwin/
+        `ifconfig | awk '/inet / {print $2}'`
+       else
+         `ifconfig | sed -rn 's/.*r:([^ ]+) .*/\1/p'`
+       end
+    end
   end
 end
 
 require 'mit/ldap'
+require 'mit/ldap/version'

data/mit-ldap.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |s|
   s.version     = MIT::LDAP::VERSION
   s.authors     = ["Eduardo Gutierrez"]
   s.email       = ["edd_d@mit.edu"]
-  s.homepage    = ""
-  s.summary     = %q{Wrapper for MIT LDAP server}
-  s.description = %q{Configure Ldaptic to search MIT LDAP server}
+  s.homepage    = "https://github.com/ecbypi/mit-ldap"
+  s.summary     = %q{Ruby interface for querying MIT LDAP server}
+  s.description = %q{Ruby interface for querying MIT LDAP server (only if you're on MITnet)}
 
   s.rubyforge_project = "mit-ldap"
 

data/spec/ldap_spec.rb

@@ -0,0 +1,54 @@
+require 'mit-ldap'
+
+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
+    def stub_ldap_connection
+      @connection = ::LDAP::Conn.new('ldap.mit.edu')
+      ::LDAP::Conn.stub(:new).and_return(@connection)
+    end
+
+    def stub_ldaptic_include
+      Ldaptic.stub(:Module).and_return(MIT::LDAP)
+    end
+
+    describe ".connect!" do
+      describe "when off campus" do
+        it "returns false" do
+          MIT.stub(:on_campus?).and_return(false)
+          LDAP.connect!.should be_false
+        end
+      end
+
+      describe "when on campus" do
+        before :each do
+          MIT.stub(:on_campus?).and_return(true)
+          stub_ldap_connection
+          stub_ldaptic_include
+        end
+
+        it "sets up ldap connection" do
+          ::LDAP::Conn.should_receive(:new).with('ldap-too.mit.edu')
+          LDAP.connect!
+        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!
+        end
+      end
+    end
+  end
+end

data/spec/mit_spec.rb

@@ -0,0 +1,16 @@
+require 'mit-ldap'
+
+describe MIT do
+
+  describe ".on_campus?" do
+    it "returns true if IP starts with 18" do
+      MIT.stub(:ip_addresses).and_return("18.0.0.0\n127.0.0.1")
+      MIT.on_campus?.should be_true
+    end
+
+    it "returns false if no network device has a campus address" do
+      MIT.stub(:ip_addresses).and_return("192.168.1.2\n127.0.0.1")
+      MIT.on_campus?.should be_false
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mit-ldap
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000 Z
+date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ldaptic
-  requirement: &70209240826340 !ruby/object:Gem::Requirement
+  requirement: &70244886779820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70209240826340
+  version_requirements: *70244886779820
 - !ruby/object:Gem::Dependency
   name: ruby-ldap
-  requirement: &70209240825840 !ruby/object:Gem::Requirement
+  requirement: &70244886779300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70209240825840
+  version_requirements: *70244886779300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70209240825380 !ruby/object:Gem::Requirement
+  requirement: &70244886778820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,8 +43,8 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70209240825380
-description: Configure Ldaptic to search MIT LDAP server
+  version_requirements: *70244886778820
+description: Ruby interface for querying MIT LDAP server (only if you're on MITnet)
 email:
 - edd_d@mit.edu
 executables: []
@@ -59,12 +59,11 @@ files:
 - Rakefile
 - lib/mit-ldap.rb
 - lib/mit/ldap.rb
-- lib/mit/ldap/search.rb
 - lib/mit/ldap/version.rb
 - mit-ldap.gemspec
-- spec/lib/ldap/search_spec.rb
-- spec/lib/mit_spec.rb
-homepage: ''
+- spec/ldap_spec.rb
+- spec/mit_spec.rb
+homepage: https://github.com/ecbypi/mit-ldap
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -87,8 +86,7 @@ rubyforge_project: mit-ldap
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Wrapper for MIT LDAP server
+summary: Ruby interface for querying MIT LDAP server
 test_files:
-- spec/lib/ldap/search_spec.rb
-- spec/lib/mit_spec.rb
-has_rdoc: 
+- spec/ldap_spec.rb
+- spec/mit_spec.rb

data/lib/mit/ldap/search.rb

@@ -1,27 +0,0 @@
-require 'ldap'
-require 'ldaptic'
-
-module MIT
-  module LDAP
-    module Search
-      if MIT.on_campus_network?
-        include Ldaptic::Module(
-          host: 'ldap-too.mit.edu',
-          base: 'dc=mit,dc=edu',
-          adapter: :ldap_conn
-        )
-      else
-        class InetOrgPerson
-        end
-
-        def self.search(*args)
-          []
-        end
-
-        def self.find(*args)
-          InetOrgPerson.new
-        end
-      end
-    end
-  end
-end

data/spec/lib/ldap/search_spec.rb

@@ -1,19 +0,0 @@
-require 'mit-ldap'
-
-module MIT
-  module LDAP
-    describe Search do
-      if MIT.on_campus_network?
-        it "includes Ldaptic::Module" do
-          should respond_to :search
-          should respond_to :find
-        end
-      else
-        it "defines stubs that return empty arrays" do
-          Search.search.should eq []
-          Search.find.should be_instance_of Search::InetOrgPerson
-        end
-      end
-    end
-  end
-end

data/spec/lib/mit_spec.rb

@@ -1,15 +0,0 @@
-require 'mit-ldap'
-
-describe MIT do
-
-  describe ".on_campus_network?" do
-    it "confirms if we're on the campus network meaning we have a .mit.edu hostname" do
-
-      MIT.stub(:hostname).and_return('localhost')
-      MIT.on_campus_network?.should eq false
-
-      MIT.stub(:hostname).and_return('server.mit.edu')
-      MIT.on_campus_network?.should eq true
-    end
-  end
-end