cornell_ldap 1.2.0 → 1.3.0

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/aepstein/cornell_ldap"
     gem.authors = ["Ari Epstein"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "activeldap", ">= 1.2.0"
+    gem.add_dependency "net-ldap", '>= 0.1.1'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/cornell_ldap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cornell_ldap}
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Epstein"]
-  s.date = %q{2009-11-05}
+  s.date = %q{2010-07-27}
   s.description = %q{Using ActiveLdap, this library provides an easy interface for communicating with the Cornell University LDAP directory.  Use of this directory is restricted to purposes authorized by the university.}
   s.email = %q{aepstein607@gmail.com}
   s.extra_rdoc_files = [
@@ -32,11 +32,11 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/aepstein/cornell_ldap}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Toolkit for accessing information about people through the Cornell University LDAP directory.}
   s.test_files = [
-    "spec/cornell_ldap_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+     "spec/cornell_ldap_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -45,14 +45,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<activeldap>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<net-ldap>, [">= 0.1.1"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<activeldap>, [">= 1.2.0"])
+      s.add_dependency(%q<net-ldap>, [">= 0.1.1"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<activeldap>, [">= 1.2.0"])
+    s.add_dependency(%q<net-ldap>, [">= 0.1.1"])
   end
 end
 

data/lib/cornell_ldap.rb

@@ -1,10 +1,74 @@
 require 'rubygems' unless defined? Gem
-require 'active_ldap' unless defined? ActiveLdap
+require 'net/ldap' unless defined? Net::LDAP
 
 module CornellLdap
-  class Record < ActiveLdap::Base
-    ldap_mapping :dn_attribute => 'uid',
-                 :prefix => 'ou=People'
+  class Record < Object
+
+    MAPPINGS = {
+      :cornelledutype          => :status,
+      :cornelleduwrkngtitle1   => :status_title1,
+      :cornelleduwrkngtitle2   => :status_title2,
+      :cornelleduacadcollege   => :college,
+      :cornelleducampusaddress => :campus_address,
+      :cornelledulocaladdress  => :local_address,
+      :homepostaladdress       => :home_address,
+      :givenname               => :first_name,
+      :cornelledumiddlename    => :middle_name,
+      :sn                      => :last_name
+    }
+
+    CONNECTION_PARAMETERS = [ :port, :host, :auth ]
+
+    def self.setup_connection( params )
+      @@connection_params = params
+      con = {}
+      CONNECTION_PARAMETERS.each do |setting|
+        con[setting] = @@connection_params[setting] if params.key? setting
+      end
+      @@connection = Net::LDAP.new( con )
+    end
+
+    def self.connection
+      @@connection
+    end
+
+    def self.find( subject )
+      r = connection.search(
+        :base => 'ou=People,' + @@connection_params[:base], :size => 1,
+        :filter => Net::LDAP::Filter.eq( 'uid', subject ),
+        :scope => Net::LDAP::SearchScope_SingleLevel
+      )
+      return CornellLdap::Record.new( r.first ) if r && r.length > 0
+      nil
+    end
+
+    # Takes an address string and converts it to a hash representation:
+    #
+    # [street] Street address
+    # [city]   City
+    # [state]  State
+    # [zip]    Zip code
+    def self.address_attributes(string_address)
+      return if string_address.nil?
+      array_address = string_address.split(',').map! { |x| x.strip }
+      state = false
+      array_address.each_index { |i| state = i if array_address[i] =~ /^[A-Za-z]{2,2}$/ }
+      return unless state && state > 1
+      attributes = { :street => array_address[0..(state-2)].join(', '),
+        :city => array_address[state - 1],
+        :state => array_address[state] }
+      attributes[:zip] = array_address[state + 1] unless array_address[state + 1].nil?
+      attributes
+    end
+
+    attr_accessor :attributes
+
+    def initialize( record )
+      self.attributes = Hash.new
+      MAPPINGS.each do |ldap, local|
+        self.attributes[local] = record[ldap].first unless record[ldap].nil? || record[ldap].empty?
+      end
+    end
 
     # Returns a string representation of the person's status with the university
     # of one of the following types:
@@ -15,26 +79,26 @@ module CornellLdap
     # [grad]      graduate or professional student
     # [alumni]    alumnus
     # [temporary] temporary or casual employee
-    # [unknown]   unable to determine status from LDAP record
+    # false       status unknown
     def status
       return @status unless @status.nil?
-      return unless attribute_present?('type')
-      @status = case self['type']
+      return unless attributes.key?( :status )
+      @status = case attributes[:status]
         when /^staff/ then 'staff'
         when /^acad/ then
-          if ( attribute_present?('cornelleduwrkngtitle1') && cornelleduwrkngtitle1 =~ /^Prof/ ) ||
-             ( attribute_present?('cornelleduwrkngtitle2') && cornelleduwrkngtitle2 =~ /^Prof/ ) then
+          if ( attributes.key?(:status_title1) && attributes[:status_title1] =~ /^Prof/ ) ||
+             ( attributes.key?(:status_title2) && attributes[:status_title2] =~ /^Prof/ ) then
              'faculty'
           else
             'staff'
           end
-        when /^student/ then case cornelleduacadcollege
+        when /^student/ then case attributes[:college]
           when 'AS', 'AR', 'AG', 'IL', 'HE', 'EN', 'UN' then 'undergrad'
           else 'grad'
         end
         when /^alumni/ then 'alumni'
         when /^temp/ then 'temporary'
-        else 'unknown'
+        else false
       end
     end
 
@@ -45,8 +109,8 @@ module CornellLdap
       unless @campus_address.nil?
         return @campus_address
       end
-      @campus_address = false unless attribute_present?('cornelleducampusaddress') &&
-        @campus_address = { :street => cornelleducampusaddress.strip,
+      @campus_address = false unless attributes.key?(:campus_address) &&
+        @campus_address = { :street => attributes[:campus_address].strip,
                             :on_campus => true }
       return campus_address
     end
@@ -57,8 +121,8 @@ module CornellLdap
       unless @local_address.nil?
         return @local_address
       end
-      @local_address = false unless attribute_present?('cornelledulocaladdress') &&
-        @local_address = Record.address_attributes(cornelledulocaladdress)
+      @local_address = false unless attributes.key?(:local_address) &&
+        @local_address = Record.address_attributes(attributes[:local_address])
       return local_address
     end
 
@@ -68,47 +132,19 @@ module CornellLdap
       unless @home_address.nil?
         return @home_address
       end
-      @home_address = false unless attribute_present?('homePostalAddress') &&
-        @home_address = Record.address_attributes(homePostalAddress)
+      @home_address = false unless attributes.key?(:home_address) &&
+        @home_address = Record.address_attributes(attributes[:home_address])
       return home_address
     end
 
-    # Takes an address string and converts it to a hash representation:
-    #
-    # [street] Street address
-    # [city]   City
-    # [state]  State
-    # [zip]    Zip code
-    def self.address_attributes(string_address)
-      return if string_address.nil?
-      array_address = string_address.split(',').map! { |x| x.strip }
-      state = false
-      array_address.each_index { |i| state = i if array_address[i] =~ /^[A-Za-z]{2,2}$/ }
-      return unless state && state > 1
-      attributes = { :street => array_address[0..(state-2)].join(', '),
-        :city => array_address[state - 1],
-        :state => array_address[state] }
-      attributes[:zip] = array_address[state + 1] unless array_address[state + 1].nil?
-      attributes
-    end
-
     # Returns first name of person
-    def first_name
-      return nil unless attribute_present?('givenName')
-      self.givenName
-    end
+    def first_name; attributes[:first_name]; end
 
     # Returns middle name of person
-    def middle_name
-      return nil unless attribute_present?('cornelledumiddlename')
-      self.cornelledumiddlename
-    end
+    def middle_name; attributes[:middle_name]; end
 
     # Returns last name of person
-    def last_name
-      return nil unless attribute_present?('sn')
-      self.sn
-    end
+    def last_name; attributes[:last_name]; end
   end
 end
 

data/spec/cornell_ldap_spec.rb

@@ -2,9 +2,8 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 require 'cornell_ldap'
 
-ActiveLdap::Base.setup_connection :host => 'directory.cornell.edu',
-                                  :port => 389,
-                                  :base => 'o=Cornell University,c=US'
+CornellLdap::Record.setup_connection :host => 'directory.cornell.edu',
+  :port => 389, :base => 'o=Cornell University,c=US'
 
 
 describe "CornellLdap" do
@@ -18,7 +17,7 @@ describe "CornellLdap" do
       ['student', 'GR', nil, nil, 'grad'],
       ['alumni', nil, nil, nil, 'alumni'],
       ['temp', nil, nil, nil, 'temporary'],
-      ['blah', nil, nil, nil, 'unknown']
+      ['blah', nil, nil, nil, false]
     ]
   end
 
@@ -27,13 +26,12 @@ describe "CornellLdap" do
 
   it "should correctly guess the status of several types" do
     @map.each do |scenario|
-      person = mock_person
-      person.attributes={
-        'type' => scenario[0],
-        'cornelleduacadcollege' => scenario[1],
-        'cornelleduwrkngtitle1' => scenario[2],
-        'cornelleduwrkngtitle2' => scenario[3]
-      }
+      person = mock_person( {
+        :cornelledutype => [scenario[0]],
+        :cornelleduacadcollege => [scenario[1]],
+        :cornelleduwrkngtitle1 => [scenario[2]],
+        :cornelleduwrkngtitle2 => [scenario[3]]
+      } )
       person.status.should eql scenario[4]
       person
     end
@@ -61,13 +59,13 @@ describe "CornellLdap" do
 
   it "should call address_attributes to return local address" do
     person = mock_person
-    CornellLdap::Record.should_receive(:address_attributes).once.with(person.cornelledulocaladdress)
+    CornellLdap::Record.should_receive(:address_attributes).once.with(person.attributes[:local_address])
     person.local_address
   end
 
   it "should call address_attributes to return home address" do
     person = mock_person
-    CornellLdap::Record.should_receive(:address_attributes).once.with(person.homePostalAddress)
+    CornellLdap::Record.should_receive(:address_attributes).once.with(person.attributes[:home_address])
     person.home_address
   end
 
@@ -76,19 +74,17 @@ describe "CornellLdap" do
     person.campus_address[:street].should eql '-100 Day Hall'
   end
 
-  def mock_person
-    person = CornellLdap::Record.new
-    person.attributes={
-      'type' => 'staff',
-      'cornelleduacadcollege' => 'AS',
-      'cornelleducampusaddress' => '-100 Day Hall     ',
-      'cornelledulocaladdress' => '1 Main St., Apt. 1, Ithaca, NY, 14850',
-      'homePostalAddress' => '1 Broadway, New York, NY, 00000',
-      'givenName' => 'John',
-      'cornelledumiddlename' => 'A',
-      'sn' => 'Doe'
-    }
-    person
+  def mock_person(values = {})
+    CornellLdap::Record.new( {
+      :cornelledutype => ['staff'],
+      :cornelleduacadcollege => ['AS'],
+      :cornelleducampusaddress => ['-100 Day Hall     '],
+      :cornelledulocaladdress => ['1 Main St., Apt. 1, Ithaca, NY, 14850'],
+      :homepostaladdress => ['1 Broadway, New York, NY, 00000'],
+      :givenname => ['John'],
+      :cornelledumiddlename => ['A'],
+      :sn => ['Doe']
+    }.merge(values) )
   end
 end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cornell_ldap
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Ari Epstein
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 -05:00
+date: 2010-07-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activeldap
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: net-ldap
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
-    version: 
+        segments: 
+        - 0
+        - 1
+        - 1
+        version: 0.1.1
+  type: :runtime
+  version_requirements: *id002
 description: Using ActiveLdap, this library provides an easy interface for communicating with the Cornell University LDAP directory.  Use of this directory is restricted to purposes authorized by the university.
 email: aepstein607@gmail.com
 executables: []
@@ -66,21 +79,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Toolkit for accessing information about people through the Cornell University LDAP directory.
 test_files: 
-- spec/cornell_ldap_spec.rb
 - spec/spec_helper.rb
+- spec/cornell_ldap_spec.rb