ruby-activeldap 0.4.3 → 0.4.4

data/lib/activeldap/base.rb

@@ -249,7 +249,10 @@ module ActiveLDAP
     # This method deletes the LDAP connection object.
     # This does NOT reset any overridden values from a Base.connect call.
     def Base.close
+      @@conn.unbind unless @@conn.nil?
       @@conn = nil
+      # Make sure it is cleaned up
+      ObjectSpace.garbage_collect
     end
 
     # Return the LDAP connection object currently in use
@@ -466,7 +469,6 @@ module ActiveLDAP
     # If multiple values exist for dnattr, the first one put here will be authoritative
     # TODO: Add support for relative distinguished names
     def initialize(val='')
-      @@logger.debug("stub: initialize(#{val.inspect}) called")
       if val.class != String
         raise TypeError, "Object key must be a String"
       end
@@ -511,13 +513,20 @@ module ActiveLDAP
             # Save DN
             @dn = m.dn
             # Load up data into tmp
-	    @@logger.debug("loading entry: #{@dn}")
+            @@logger.debug("loading entry: #{@dn}")
             m.attrs.each do |attr|
               # Load with subtypes just like @data
-	      @@logger.debug("calling make_subtypes for m.vals(attr).dup")
+              @@logger.debug("calling make_subtypes for m.vals(attr).dup")
               safe_attr, value = make_subtypes(attr, m.vals(attr).dup)
-	      @@logger.debug("finished make_subtypes for #{attr}")
-              @ldap_data[safe_attr] = value
+              @@logger.debug("finished make_subtypes for #{attr}")
+              # Add subtype to any existing values
+              if @ldap_data.has_key? safe_attr
+	        value.each do |v|
+                  @ldap_data[safe_attr].push(v)
+		end
+              else
+                @ldap_data[safe_attr] = value
+              end
             end
           end
           @exists = true
@@ -754,7 +763,7 @@ module ActiveLDAP
           value = data[name+suffix]
 
           # Detect subtypes and account for them
-          binary = LDAP::LDAP_MOD_BVALUES if suffix.match(/;binary(;|$)/)
+          binary = LDAP::LDAP_MOD_BVALUES if Base.schema.binary? name
 
           replaceable.push(name+suffix)
           if pair[1] != value
@@ -786,9 +795,11 @@ module ActiveLDAP
 
           if not replaceable.member? name+suffix
             # Detect subtypes and account for them
-            binary = LDAP::LDAP_MOD_BVALUES if suffix.match(/;binary(;|$)/)
+            binary = LDAP::LDAP_MOD_BVALUES if Base.schema.binary? name
             @@logger.debug("adding attribute to existing entry:  #{name+suffix}: #{value.inspect}")
-            entry.push(LDAP.mod(LDAP::LDAP_MOD_ADD|binary, name + suffix, value)) unless value.empty?
+            # REPLACE will function like ADD, but doesn't hit EQUALITY problems
+            # TODO: Added equality(attr) to Schema2
+            entry.push(LDAP.mod(LDAP::LDAP_MOD_REPLACE|binary, name + suffix, value)) unless value.empty?
           end
         end
         @@logger.debug("#write: traversing data complete")
@@ -810,7 +821,7 @@ module ActiveLDAP
         data.each do |pair|
           if pair[1].size > 0  and pair[0] != 'objectClass' and pair[0] != @attr_methods[dnattr()]
             # Detect subtypes and account for them
-	    if pair[0].match(/;binary(;|$)/)
+            if Base.schema.binary? pair[0].split(/;/)[0]
               binary = LDAP::LDAP_MOD_BVALUES 
             else
               binary = 0
@@ -825,7 +836,7 @@ module ActiveLDAP
           @@logger.debug("#write: add successful")
           @exists = true
         rescue LDAP::ResultError => detail
-          raise WriteError, "Could not add LDAP entry: #{detail}"
+          raise WriteError, "Could not add LDAP entry[#{Base.conn.err2string(Base.conn.err)}]: #{detail}"
         end
       end
       @@logger.debug("#write: resetting @ldap_data to a dup of @data")
@@ -872,7 +883,7 @@ module ActiveLDAP
        if attr.nil?
          raise RuntimeError, 'attr argument must not be nil.'
        end
-       binary = Base.schema.binary? attr
+       binary = Base.schema.binary_required? attr
        single = Base.schema.single_value? attr
        case value.class.to_s
          when 'Array'
@@ -880,7 +891,10 @@ module ActiveLDAP
              raise TypeError, "This attribute can only have a single value"
            end
            value.map! do |entry|
-             entry = entry.to_s unless entry.class == Hash
+	     if entry.class != Hash
+	       @@logger.debug("coercing value for #{attr} into a string because nested values exceeds a useful depth: #{entry.inspect} -> #{entry.to_s}")
+	       entry = entry.to_s
+	     end
              entry = attribute_input_handler(attr, entry)[0]
            end
          when 'Hash'

data/lib/activeldap.rb

@@ -2,7 +2,6 @@
 # = Ruby/ActiveLDAP 
 #
 # "Ruby/ActiveLDAP" Copyright (C) 2004 Will Drewry mailto:will@alum.bu.edu
-# Documentation Version 0.3
 #
 # == Introduction
 # 
@@ -214,6 +213,11 @@
 # that field out to default to ['top'] only.  Then you can let each application
 # choose what objectClasses their objects should have by calling the method e.g.
 # Group#objectClass=(value).
+#
+# Note that is can be very important to define the default :classes value. Due to
+# implementation choices with most LDAP servers, once an object is created, its
+# structural objectclasses may not be removed (or replaced).  Setting a sane default
+# may help avoid programmer error later.
 # 
 # :classes isn't the only optional argument.  If :dnattr is left off, it defaults
 # to 'cn'.  If :prefix is left off, it will default to 'ou=CLASSNAME'. In this
@@ -679,21 +683,29 @@
 # Anytime a LDAP subtype is required, you must encapsulate the data in a Hash.
 #
 # But wait a minute, I just read in a binary certificate without wrapping it up.
-# So any binary attribute will automagically get wrapped in {'binary' => value}
-# if you don't do it. This keeps your #writes from breaking, and my code from
-# crying.  For correctness, I could have easily done the following:
+# So any binary attribute _that requires ;binary subtyping_ will automagically 
+# get wrapped in {'binary' => value} if you don't do it. This keeps your #writes 
+# from breaking, and my code from crying.  For correctness, I could have easily 
+# done the following:
 #
 #   irb>  user.userCertificate = {'binary' => File.read('example.der')}
 #
-# Really, it's up to you. The only subtypes defined in LDAPv3 are lang-* and
-# binary.  These can be nested through:
+# You should note that some binary data does not use the binary subtype all the time.
+# One example is jpegPhoto. You can use it as jpegPhoto;binary or just as jpegPhoto.
+# Since the schema dictates that it is a binary value, Ruby/ActiveLDAP will write
+# it as binary, but the subtype will not be automatically appended as above. The
+# use of the subtype on attributes like jpegPhoto is ultimately decided by the 
+# LDAP site policy and not by any programmatic means.
+#
+# The only subtypes defined in LDAPv3 are lang-* and binary.  These can be nested
+# though:
 #
 #  irb> user.cn = [{'lang-JP-jp' => {'binary' => 'somejp'}}]
 # 
 # As I understand it, OpenLDAP does not support nested subtypes, but some
 # documentation I've read suggests that Netscape's LDAP server does. I only
-# have access to OpenLDAP. If anyone tests thisout, please let me know how it 
-# goes!.
+# have access to OpenLDAP. If anyone tests this out, please let me know how it 
+# goes!
 #
 #
 # And that pretty much wraps up this section.
@@ -880,7 +892,7 @@ require 'activeldap/configuration'
 require 'activeldap/schema2'
 
 module ActiveLDAP
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end
 
 ActiveLDAP::Base.class_eval do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: ruby-activeldap
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
-date: 2004-10-08
+  version: 0.4.4
+date: 2004-10-10
 summary: Ruby/ActiveLDAP is a object-oriented API to LDAP
 require_paths: 
   - lib