ruby-activeldap 0.4.2 → 0.4.3

data/lib/activeldap.rb

@@ -880,7 +880,7 @@ require 'activeldap/configuration'
 require 'activeldap/schema2'
 
 module ActiveLDAP
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end
 
 ActiveLDAP::Base.class_eval do

data/lib/activeldap/base.rb

@@ -689,54 +689,56 @@ module ActiveLDAP
       # Put all changes into one change entry to ensure
       # automatic rollback upon failure.
       entry = []
-      if @exists
-        # Cycle through all attrs to determine action
-        action = {}
 
-        replaceable = []
 
-        # Expand subtypes to real ldap_data entries
-        # We can't reuse @ldap_data because an exception would leave
-        # an object in an unknown state
-        @@logger.debug("#write: dup'ing @ldap_data")
-        ldap_data = @ldap_data.dup
-        @@logger.debug("#write: dup finished @ldap_data")
-        @@logger.debug("#write: expanding subtypes in @ldap_data")
-        ldap_data.keys.each do |key|
-          ldap_data[key].each do |value|
-            if value.class == Hash
-              suffix, real_value = extract_subtypes(value)
-              if ldap_data.has_key? key + suffix
-                ldap_data[key + suffix].push(real_value)
-              else
-                ldap_data[key + suffix] = real_value
-              end
-              ldap_data[key].delete(value)
+      # Expand subtypes to real ldap_data entries
+      # We can't reuse @ldap_data because an exception would leave
+      # an object in an unknown state
+      @@logger.debug("#write: dup'ing @ldap_data")
+      ldap_data = @ldap_data.dup
+      @@logger.debug("#write: dup finished @ldap_data")
+      @@logger.debug("#write: expanding subtypes in @ldap_data")
+      ldap_data.keys.each do |key|
+        ldap_data[key].each do |value|
+          if value.class == Hash
+            suffix, real_value = extract_subtypes(value)
+            if ldap_data.has_key? key + suffix
+              ldap_data[key + suffix].push(real_value)
+            else
+              ldap_data[key + suffix] = real_value
             end
+            ldap_data[key].delete(value)
           end
         end
-        @@logger.debug("#write: subtypes expanded for @ldap_data")
-
-        # Expand subtypes to real data entries, but leave @data alone
-        @@logger.debug("#write: dup'ing @data")
-        data = @data.dup
-        @@logger.debug("#write: finished dup'ing @data")
-        @@logger.debug("#write: expanding subtypes for @data")
-        data.keys.each do |key|
-          data[key].each do |value|
-            if value.class == Hash
-              suffix, real_value = extract_subtypes(value)
-              if data.has_key? key + suffix
-                data[key + suffix].push(real_value)
-              else
-                data[key + suffix] = real_value
-              end
-              data[key].delete(value)
+      end
+      @@logger.debug("#write: subtypes expanded for @ldap_data")
+
+      # Expand subtypes to real data entries, but leave @data alone
+      @@logger.debug("#write: dup'ing @data")
+      data = @data.dup
+      @@logger.debug("#write: finished dup'ing @data")
+      @@logger.debug("#write: expanding subtypes for @data")
+      data.keys.each do |key|
+        data[key].each do |value|
+          if value.class == Hash
+            suffix, real_value = extract_subtypes(value)
+            if data.has_key? key + suffix
+              data[key + suffix].push(real_value)
+            else
+              data[key + suffix] = real_value
             end
+            data[key].delete(value)
           end
         end
-        @@logger.debug("#write: subtypes expanded for @data")
+      end
+      @@logger.debug("#write: subtypes expanded for @data")
+
 
+      if @exists
+        # Cycle through all attrs to determine action
+        action = {}
+
+        replaceable = []
         # Now that all the subtypes will be treated as unique attributes
         # we can see what's changed and add anything that is brand-spankin'
         # new.
@@ -805,11 +807,15 @@ module ActiveLDAP
         @@logger.debug("#write: adding objectClass = #{data[@attr_methods['objectClass']].inspect}")
         entry.push(LDAP.mod(LDAP::LDAP_MOD_ADD, 'objectClass', 
           data[@attr_methods['objectClass']]))
-        @data.each do |pair|
+        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
-            binary = LDAP::LDAP_MOD_BVALUES if pair[0].match(/;binary(;|$)/)
-            @@logger.debug("adding attribute to new entry:  #{name+suffix}: #{value.inspect}")
+	    if pair[0].match(/;binary(;|$)/)
+              binary = LDAP::LDAP_MOD_BVALUES 
+            else
+              binary = 0
+            end
+            @@logger.debug("adding attribute to new entry:  #{pair[0].inspect}: #{pair[1].inspect}")
             entry.push(LDAP.mod(LDAP::LDAP_MOD_ADD|binary, pair[0], pair[1]))
           end
         end

metadata

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