ucb_ldap 1.3.1 → 1.3.2

data/Manifest

@@ -20,6 +20,5 @@ lib/ucb_ldap_schema.rb
 lib/ucb_ldap_schema_attribute.rb
 lib/ucb_ldap_service.rb
 lib/ucb_ldap_student_term.rb
-lib/ucb_simple_ldap_entry.rb
 schema/schema.yml
 version.yml

data/Rakefile

@@ -3,14 +3,14 @@ require 'rake'
 require 'echoe'
 require 'hanna/rdoctask'
 
-Echoe.new('ucb_ldap', '1.3.1') do |p|
+Echoe.new('ucb_ldap', '1.3.2') do |p|
   p.description    = "Convenience classes for interacing with UCB's LDAP directory"
   p.url            = "http://ucbrb.rubyforge.org/ucb_ldap"
   p.author         = "Steven Hansen, Steve Downey, Lucas Rockwell"
   p.email          = "runner@berkeley.edu"
   p.ignore_pattern = ["svn_user.yml", "tasks/ucb_ldap.rake", "spec/**/**", "test/**/**"]
   p.project = "ucbrb"
-  p.runtime_dependencies = "ruby-net-ldap >=0.0.4"
+  p.runtime_dependencies = ["ruby-net-ldap >= 0.0.4"]
   p.rdoc_options = "-o doc --inline-source -T hanna lib/*.rb"
   p.rdoc_pattern = ["README", "lib/**/**"]
 end

data/lib/ucb_ldap.rb

@@ -21,7 +21,6 @@ require 'ucb_ldap_service'
 
 
 module UCB #:nodoc:
-
   # =UCB::LDAP
   #
   # <b>If you are doing searches that don't require a privileged bind
@@ -35,12 +34,10 @@ module UCB #:nodoc:
   # and other methods of UCB::LDAP::Entry and its sub-classes.
   # 
   module LDAP
-  
-    
+
     HOST_PRODUCTION = 'ldap.berkeley.edu'
     HOST_TEST       = 'ldap-test.berkeley.edu'
 
-    
     # class methods
     class << self
       
@@ -54,12 +51,12 @@ module UCB #:nodoc:
       end
 
       # Removes current bind (username, password).
-      def clear_authentication()
+      def clear_authentication
         authenticate(nil, nil)
       end
       
       # Returns LDAP host used for lookups.  Default is HOST_PRODUCTION.
-      def host()
+      def host
         @host || HOST_PRODUCTION
       end
   
@@ -85,15 +82,15 @@ module UCB #:nodoc:
       #
       # Note: callers should not cache the results of this call unless they
       # are prepared to handle timed-out connections (which this method does).  
-      def net_ldap()
-        @net_ldap ||= new_net_ldap()
+      def net_ldap
+        connection_open? ? @net_ldap : new_net_ldap
       end
 
-      def password() #:nodoc:
+      def password #:nodoc:
         @password
       end
       
-      def username() #:nodoc:
+      def username #:nodoc:
         @username
       end
       
@@ -140,30 +137,63 @@ module UCB #:nodoc:
     private unless $TESTING
       
       # The value of the :auth parameter for Net::LDAP.new().
-      def authentication_information()
+      def authentication_information
         password.nil? ? 
           {:method => :anonymous} : 
           {:method => :simple, :username => username, :password => password}
       end
       
-      # Returns new Net::LDAP instance.
-      # Note: Calling Net::LDAP.new does not result in a connection to the LDAP
-      # server. Rather, it stores the connection and binding parameters in the object.
-      # Later calls to: [search, add_attribute, rename_attribute, delete_attribute]
-      # will each result result in a new connection to the LDAP server.
+      # Returns +true+ if we have a Net::LDAP instance with an open
+      # connection.
+      def connection_open?
+        @net_ldap.nil? ? false : ldap_ping
+      rescue
+        false
+      end
+      
+      # Returns +true+ if connection simple search works.
+      def ldap_ping
+        search_attrs = {
+          :base => "",
+          :scope => Net::LDAP::SearchScope_BaseObject,
+          :attributes => [1.1]
+        }
+        result = false
+        @net_ldap.search(search_attrs){result = true}
+        result
+      end
+      
+      # Returns new Net::LDAP instance.  Also
+      # reaches into the Net::LDAP to set the @open_connection instance
+      # variable.
+      #
+      # Warning: this seems to be contrary to the Net::LDAP author's
+      # intent and may break with future versions of Net::LDAP.
       def new_net_ldap()
         @net_ldap = Net::LDAP.new(
           :host => host,
           :auth => authentication_information,
           :port => 636, 
           :encryption => {:method =>:simple_tls}
-        )
-        raise(BindFailedException, @net_ldap.get_operation_result.to_s) unless @net_ldap.bind
+          )
+        @net_ldap.instance_variable_set(:@open_connection, new_net_ldap_connection)
+        @net_ldap.bind || raise(BindFailedException)
         @net_ldap
       end
       
+      # Return a new Net::LDAP::Connection
+      def new_net_ldap_connection
+        Net::LDAP::Connection.new(
+          :host => host,
+          :port => 636,
+          :encryption => {:method => :simple_tls}
+        )
+      rescue Net::LDAP::LdapError
+        raise UCB::LDAP::ConnectionFailedException
+      end
+  
       # Used for testing
-      def clear_instance_variables()
+      def clear_instance_variables
         @host = nil
         @net_ldap = nil
         @username = nil

data/lib/ucb_ldap_entry.rb

@@ -1,4 +1,3 @@
-
 module UCB
   module LDAP
     # = UCB::LDAP::Entry
@@ -32,7 +31,7 @@ module UCB
     #
     # Entry subclasses may have convenience
     # methods that return scalars even though the schema defines
-    # the unerlying attribute as multi-valued becuase in practice they are single-valued.
+    # the unerlying attribute as multi-valued becuase in practice the are single-valued.
     # 
     # === Attribute Types
     # 
@@ -82,31 +81,14 @@ module UCB
       # 
       # You should not need to create any UCB::LDAP::Entry instances;
       # they are created by calls to UCB::LDAP.search and friends.
-      def initialize(dn = nil) #:nodoc:
-        @new_record = true
-        @attributes = {}
-        @tainted_attributes = {}
-      end
-      
-      def new_record?
-        @new_record
-      end
-      
-      # Hydrates (populates) the object with values from the ldap resultset.      
-      def self.hydrate(net_ldap_entry)
-        new_ldap_entry = self.new
-        new_ldap_entry.instance_variable_set(:@new_record, false)
+      def initialize(net_ldap_entry) #:nodoc:
         # Don't store Net::LDAP entry in object since it uses the block
         # initialization method of Hash which can't be marshalled ... this 
         # means it can't be stored in a Rails session.
+        @attributes = {}
         net_ldap_entry.each do |attr, value|
-          new_ldap_entry.attributes[canonical(attr)] = value.map{|v| v.dup}
+          @attributes[canonical(attr)] = value.map{|v| v.dup}
         end
-        new_ldap_entry
-      end
-    
-      def tainted_attributes
-        @tainted_attributes
       end
     
       # <tt>Hash</tt> of attributes returned from underlying NET::LDAP::Entry
@@ -120,7 +102,7 @@ module UCB
         @attributes
       end
     
-      # returns the value of the <em>distinguished name</em> attribute.
+      # Returns the value of the <em>Distinguished Name</em> attribute.
       def dn
         attributes[canonical(:dn)]
       end
@@ -129,13 +111,13 @@ module UCB
         self.class.canonical(string_or_symbol)
       end
     
-      # update an existing entry.  returns entry if successful else false.
+      # Update an existing entry.  Returns entry if successful else false.
       #
       #   attrs = {:attr1 => "new_v1", :attr2 => "new_v2"}
       #   entry.update_attributes(attrs)
       #
       def update_attributes(attrs)
-        attrs.each {|k, v| self.send("#{k}=", v)}        
+        attrs.each{|k, v| self.send("#{k}=", v)}        
         if modify()
           @attributes = self.class.find_by_dn(dn).attributes.dup
           return true
@@ -143,19 +125,19 @@ module UCB
         false
       end
       
-      # same as #update_attributes(), but raises directorynotupdated on failure. 
+      # Same as #update_attributes(), but raises DirectoryNotUpdated on failure. 
       def update_attributes!(attrs)
-        update_attributes(attrs) || raise(directorynotupdatedexception)
+        update_attributes(attrs) || raise(DirectoryNotUpdatedException)
       end
       
-      # delete entry.  returns +true+ on sucess, +false+ on failure.
+      # Delete entry.  Returns +true+ on sucess, +false+ on failure.
       def delete
         net_ldap.delete(:dn => dn)
       end
       
-      # same as #delete() except raises directorynotupdated on failure.
+      # Same as #delete() except raises DirectoryNotUpdated on failure.
       def delete!
-        delete || raise(directorynotupdatedexception)
+        delete || raise(DirectoryNotUpdatedException)
       end
       
       def net_ldap
@@ -163,11 +145,11 @@ module UCB
       end
       
       
-      private unless $testing
+      private unless $TESTING
 
-      # used to get/set attribute values.
+      # Used to get/set attribute values.
       #
-      # if we can't make an attribute name out of method, let
+      # If we can't make an attribute name out of method, let
       # regular method_missing() handle it.
       def method_missing(method, *args) #:nodoc:
         setter_method?(method) ? value_setter(method, *args) : value_getter(method)
@@ -175,29 +157,33 @@ module UCB
         return super
       end
       
-      # returns +true+ if _method_ is a "setter", i.e., ends in "=".
+      # Returns +true+ if _method_ is a "setter", i.e., ends in "=".
       def setter_method?(method)
         method.to_s[-1, 1] == "="
       end
 
-      # called by method_missing() to get an attribute value. 
+      # Called by method_missing() to get an attribute value. 
       def value_getter(method)
         schema_attribute = self.class.schema_attribute(method)
         raw_value = attributes[canonical(schema_attribute.name)]
         schema_attribute.get_value(raw_value)
       end
     
-      # called by method_missing() to set an attribute value.    
+      # Called by method_missing() to set an attribute value.    
       def value_setter(method, *args)
         schema_attribute = self.class.schema_attribute(method.to_s.chop)
         attr_key = canonical(schema_attribute.name)
-        tainted_attributes[attr_key] = schema_attribute.ldap_value(args[0])
+        assigned_attributes[attr_key] = schema_attribute.ldap_value(args[0])
+      end
+    
+      def assigned_attributes
+        @assigned_attributes ||= {}
       end
     
       def modify_operations
         ops = []
-        tainted_attributes.keys.sort_by{|k| k.to_s}.each do |key|
-          value = tainted_attributes[key]
+        assigned_attributes.keys.sort_by{|k| k.to_s}.each do |key|
+          value = assigned_attributes[key]
           op = value.nil? ? :delete : :replace
           ops << [op, key, value]
         end
@@ -205,20 +191,20 @@ module UCB
       end
     
       def modify()
-        if ucb::ldap.net_ldap.modify(:dn => dn, :operations => modify_operations)
-          @tainted_attributes = nil
+        if UCB::LDAP.net_ldap.modify(:dn => dn, :operations => modify_operations)
+          @assigned_attributes = nil
           return true
         end
         false
       end
 
-      # class methods
+      # Class methods
       class << self
         
         public
         
-        # creates and returns new entry.  returns +false+ if unsuccessful.
-        # sets :objectclass key of <em>args[:attributes]</em> to 
+        # Creates and returns new entry.  Returns +false+ if unsuccessful.
+        # Sets :objectclass key of <em>args[:attributes]</em> to 
         # object_classes read from schema.
         #
         #   dn = "uid=999999,ou=people,dc=example,dc=com"
@@ -227,24 +213,18 @@ module UCB
         #     :mail => "gsmith@example.com"
         #   }
         #   
-        #   entrysubclass.create(:dn => dn, :attributes => attr)  #=> #<ucb::ldap::entrysubclass ..>
+        #   EntrySubClass.create(:dn => dn, :attributes => attr)  #=> #<UCB::LDAP::EntrySubClass ..>
         #
-        # caller is responsible for setting :dn and :attributes correctly,
+        # Caller is responsible for setting :dn and :attributes correctly,
         # as well as any other validation.
         #
         def create(args)
           args[:attributes][:objectclass] = object_classes
           net_ldap.add(args) or return false
-
-          # why is the object being refetched from ldap here?
           find_by_dn(args[:dn])
         end
-        
-        def required_attributes
-          schema_attributes_hash.delete_if {|key, value| value["required"] == false }.keys
-        end
-        
-        # returns entry whose distinguised name is _dn_.
+
+        # Returns entry whose distinguised name is _dn_.
         def find_by_dn(dn)
           search(
             :base => dn,
@@ -341,7 +321,7 @@ module UCB
           
           results = []
           net_ldap.search(args) do |entry|
-            results << hydrate(entry)
+            results << new(entry)
           end
           results
         end
@@ -363,7 +343,7 @@ module UCB
         def entity_name
           @entity_name
         end
-                                
+ 
         # Want an array of Schema::Attributes as well as a hash
         # of all possible variations on a name pointing to correct array element.
         def set_schema_attributes

data/ucb_ldap.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ucb_ldap}
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Hansen, Steve Downey, Lucas Rockwell"]
-  s.date = %q{2008-12-14}
+  s.date = %q{2009-02-09}
   s.description = %q{Convenience classes for interacing with UCB's LDAP directory}
   s.email = %q{runner@berkeley.edu}
-  s.extra_rdoc_files = ["README", "lib/person/adv_con_person.rb", "lib/person/affiliation_methods.rb", "lib/person/generic_attributes.rb", "lib/ucb_ldap.rb", "lib/ucb_ldap_address.rb", "lib/ucb_ldap_affiliation.rb", "lib/ucb_ldap_entry.rb", "lib/ucb_ldap_exceptions.rb", "lib/ucb_ldap_namespace.rb", "lib/ucb_ldap_org.rb", "lib/ucb_ldap_person.rb", "lib/ucb_ldap_person_job_appointment.rb", "lib/ucb_ldap_schema.rb", "lib/ucb_ldap_schema_attribute.rb", "lib/ucb_ldap_service.rb", "lib/ucb_ldap_student_term.rb", "lib/ucb_simple_ldap_entry.rb"]
-  s.files = ["CHANGELOG", "Manifest", "README", "Rakefile", "TODO", "init.rb", "lib/person/adv_con_person.rb", "lib/person/affiliation_methods.rb", "lib/person/generic_attributes.rb", "lib/ucb_ldap.rb", "lib/ucb_ldap_address.rb", "lib/ucb_ldap_affiliation.rb", "lib/ucb_ldap_entry.rb", "lib/ucb_ldap_exceptions.rb", "lib/ucb_ldap_namespace.rb", "lib/ucb_ldap_org.rb", "lib/ucb_ldap_person.rb", "lib/ucb_ldap_person_job_appointment.rb", "lib/ucb_ldap_schema.rb", "lib/ucb_ldap_schema_attribute.rb", "lib/ucb_ldap_service.rb", "lib/ucb_ldap_student_term.rb", "lib/ucb_simple_ldap_entry.rb", "schema/schema.yml", "version.yml", "ucb_ldap.gemspec"]
+  s.extra_rdoc_files = ["README", "lib/person/adv_con_person.rb", "lib/person/affiliation_methods.rb", "lib/person/generic_attributes.rb", "lib/ucb_ldap.rb", "lib/ucb_ldap_address.rb", "lib/ucb_ldap_affiliation.rb", "lib/ucb_ldap_entry.rb", "lib/ucb_ldap_exceptions.rb", "lib/ucb_ldap_namespace.rb", "lib/ucb_ldap_org.rb", "lib/ucb_ldap_person.rb", "lib/ucb_ldap_person_job_appointment.rb", "lib/ucb_ldap_schema.rb", "lib/ucb_ldap_schema_attribute.rb", "lib/ucb_ldap_service.rb", "lib/ucb_ldap_student_term.rb"]
+  s.files = ["CHANGELOG", "Manifest", "README", "Rakefile", "TODO", "init.rb", "lib/person/adv_con_person.rb", "lib/person/affiliation_methods.rb", "lib/person/generic_attributes.rb", "lib/ucb_ldap.rb", "lib/ucb_ldap_address.rb", "lib/ucb_ldap_affiliation.rb", "lib/ucb_ldap_entry.rb", "lib/ucb_ldap_exceptions.rb", "lib/ucb_ldap_namespace.rb", "lib/ucb_ldap_org.rb", "lib/ucb_ldap_person.rb", "lib/ucb_ldap_person_job_appointment.rb", "lib/ucb_ldap_schema.rb", "lib/ucb_ldap_schema_attribute.rb", "lib/ucb_ldap_service.rb", "lib/ucb_ldap_student_term.rb", "schema/schema.yml", "version.yml", "ucb_ldap.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://ucbrb.rubyforge.org/ucb_ldap}
   s.rdoc_options = ["-o doc --inline-source -T hanna lib/*.rb"]
@@ -24,14 +24,14 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruby-net-ldap>, [">= 0.0.4"])
+      s.add_runtime_dependency(%q<ruby-net-ldap>, [">= 0", "= 0.0.4"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
-      s.add_dependency(%q<ruby-net-ldap>, [">= 0.0.4"])
+      s.add_dependency(%q<ruby-net-ldap>, [">= 0", "= 0.0.4"])
       s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<ruby-net-ldap>, [">= 0.0.4"])
+    s.add_dependency(%q<ruby-net-ldap>, [">= 0", "= 0.0.4"])
     s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/version.yml

@@ -1 +1 @@
-version: 'rel-1.3.1'
+version: 'rel-1.3.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ucb_ldap
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - Steven Hansen, Steve Downey, Lucas Rockwell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-14 00:00:00 -08:00
+date: 2009-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,6 +19,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    - - "="
       - !ruby/object:Gem::Version 
         version: 0.0.4
     version: 
@@ -56,7 +59,6 @@ extra_rdoc_files:
 - lib/ucb_ldap_schema_attribute.rb
 - lib/ucb_ldap_service.rb
 - lib/ucb_ldap_student_term.rb
-- lib/ucb_simple_ldap_entry.rb
 files: 
 - CHANGELOG
 - Manifest
@@ -80,7 +82,6 @@ files:
 - lib/ucb_ldap_schema_attribute.rb
 - lib/ucb_ldap_service.rb
 - lib/ucb_ldap_student_term.rb
-- lib/ucb_simple_ldap_entry.rb
 - schema/schema.yml
 - version.yml
 - ucb_ldap.gemspec

data/lib/ucb_simple_ldap_entry.rb

@@ -1,201 +0,0 @@
-
-module UCB
-  module LDAP
-    class SimpleEntry
-
-      # Returns new instance of UCB::LDAP::Entry.  The argument
-      # net_ldap_entry is an instance of Net::LDAP::Entry.
-      # 
-      # You should not need to create any UCB::LDAP::Entry instances;
-      # they are created by calls to UCB::LDAP.search and friends.
-      def initialize(dn) #:nodoc:
-        
-#
-#auth = {:username=>"cn=greedybuddha", :method=>:simple, :password=>"wig0gin"}
-#ldap = Net::LDAP.new(:host => '0.0.0.0', :port => 1389, :auth => auth)
-#dn = "cn=Steven Hansen,ou=people,dc=berkeley,dc=edu"
-#
-#attr = {
-#  :objectclass => [
-#    "inetorgperson",
-#  ], 
-#  :cn => "Steven Hansen",
-#  :uid => '61065',
-#  :sn => "Hansen",
-#}
-#        
-        
-        
-
-        # Don't store Net::LDAP entry in object since it uses the block
-        # initialization method of Hash which can't be marshalled ... this 
-        # means it can't be stored in a Rails session.
-        @attributes = {}
-        net_ldap_entry.each do |attr, value|
-          @attributes[canonical(attr)] = value.map{|v| v.dup}
-        end
-      end
-    
-      # <tt>Hash</tt> of attributes returned from underlying NET::LDAP::Entry
-      # instance.  Hash keys are #canonical attribute names, hash values are attribute
-      # values <em>as returned from LDAP</em>, i.e. arrays.
-      # 
-      # You should most likely be referencing attributes as if they were
-      # instance methods rather than directly through this method.  See top of
-      # this document.
-      def attributes
-        @attributes
-      end
-    
-      # Returns the value of the <em>Distinguished Name</em> attribute.
-      def dn
-        attributes[canonical(:dn)]
-      end
-    
-      def canonical(string_or_symbol) #:nodoc:
-        self.class.canonical(string_or_symbol)
-      end
-    
-      def net_ldap
-        self.class.net_ldap
-      end
-      
-      private unless $TESTING
-
-      # Used to get/set attribute values.
-      #
-      # If we can't make an attribute name out of method, let
-      # regular method_missing() handle it.
-      def method_missing(method, *args) #:nodoc:
-        setter_method?(method) ? value_setter(method, *args) : value_getter(method)
-      rescue BadAttributeNameException
-        return super
-      end
-      
-      # Returns +true+ if _method_ is a "setter", i.e., ends in "=".
-      def setter_method?(method)
-        method.to_s[-1, 1] == "="
-      end
-
-      # Called by method_missing() to get an attribute value. 
-      def value_getter(method)
-        schema_attribute = self.class.schema_attribute(method)
-        raw_value = attributes[canonical(schema_attribute.name)]
-        schema_attribute.get_value(raw_value)
-      end
-    
-      # Called by method_missing() to set an attribute value.    
-      def value_setter(method, *args)
-        schema_attribute = self.class.schema_attribute(method.to_s.chop)
-        attr_key = canonical(schema_attribute.name)
-        assigned_attributes[attr_key] = schema_attribute.ldap_value(args[0])
-      end
-    
-      def assigned_attributes
-        @assigned_attributes ||= {}
-      end
-    
-      # Class methods
-      class << self
-        
-        public
-        
-        # Creates and returns new entry.  Returns +false+ if unsuccessful.
-        # Sets :objectclass key of <em>args[:attributes]</em> to 
-        # object_classes read from schema.
-        #
-        #   dn = "uid=999999,ou=people,dc=example,dc=com"
-        #   attr = {
-        #     :uid => "999999",
-        #     :mail => "gsmith@example.com"
-        #   }
-        #   
-        #   EntrySubClass.create(:dn => dn, :attributes => attr)  #=> #<UCB::LDAP::EntrySubClass ..>
-        #
-        # Caller is responsible for setting :dn and :attributes correctly,
-        # as well as any other validation.
-        #
-        def create(args)
-          args[:attributes][:objectclass] = object_classes
-          net_ldap.add(args) or return false
-          
-          # Why is the object being refetched from LDAP here?
-          find_by_dn(args[:dn])
-        end
-
-        # Same as #create(), but raises DirectoryNotUpdated on failure.
-        def create!(args)
-          create(args) || raise(DirectoryNotUpdatedException)          
-        end
-        
-        # Returns +Array+ of object classes making up this type of LDAP entity.
-        def object_classes
-          @object_classes ||= UCB::LDAP::Schema.schema_hash[entity_name]["objectClasses"]
-        end
-        
-        def unique_object_class
-          @unique_object_class ||= UCB::LDAP::Schema.schema_hash[entity_name]["uniqueObjectClass"]
-        end
-        
-        # Returns an +Array+ of Schema::Attribute for the entity.
-        def schema_attributes_array
-          @schema_attributes_array || set_schema_attributes
-          @schema_attributes_array
-        end
-        
-        # Returns as +Hash+ whose keys are the canonical attribute names
-        # and whose values are the corresponding Schema::Attributes.
-        def schema_attributes_hash
-          @schema_attributes_hash || set_schema_attributes
-          @schema_attributes_hash
-        end
-        
-        def schema_attribute(attribute_name)
-          schema_attributes_hash[canonical(attribute_name)] ||
-            raise(BadAttributeNameException, "'#{attribute_name}' is not a recognized attribute name")
-        end
-        
-  
-        # Returns the canonical representation of a symbol or string so
-        # we can look up attributes in a number of ways.
-        def canonical(string_or_symbol)
-          string_or_symbol.to_s.downcase.to_sym
-        end
-   
-        # Returns underlying Net::LDAP instance.
-        def net_ldap #:nodoc:
-          UCB::LDAP.net_ldap
-        end
-
-        private unless $TESTING
-
-                                
-        # Want an array of Schema::Attributes as well as a hash
-        # of all possible variations on a name pointing to correct array element.
-        def set_schema_attributes
-          @schema_attributes_array = []
-          @schema_attributes_hash = {}
-          UCB::LDAP::Schema.schema_hash[entity_name]["attributes"].each do |k, v|
-            sa = UCB::LDAP::Schema::Attribute.new(v.merge("name" => k))
-            @schema_attributes_array << sa
-            [sa.name, sa.aliases].flatten.each do |name|
-              @schema_attributes_hash[canonical(name)] = sa
-            end
-          end
-        rescue
-          raise "Error loading schema attributes for entity_name '#{entity_name}'"
-        end
-        
-        # Can be overridden in #search by passing in a <tt>:base</tt> parm.
-        def tree_base
-          @tree_base
-        end
-        
-        def tree_base=(tree_base)
-          @tree_base = tree_base
-        end
-        
-      end  # end of class methods
-    end
-  end 
-end