ruby-activeldap 0.5.9 → 0.6.0

data/lib/activeldap/associations.rb

@@ -82,7 +82,11 @@ module ActiveLDAP
         def #{association_id}(objects = true)
           local_key = "#{local_key}"
           local_key = dnattr() if local_key.empty?
-          return #{klass}.find_all(:attribute => "#{key}", :value => send(local_key.to_sym), :objects => objects)
+          results = []
+          #{klass}.find_all(:attribute => "#{key}", :value => send(local_key.to_sym), :objects => objects).each do |o|
+            results << o
+          end
+          return results
         end
       end_eval
     end
@@ -110,18 +114,20 @@ module ActiveLDAP
             foreign_key = dnattr()
           end
           results = []
-          @data["#{key}"].each do |item|
-            fkey = ""
-            if foreign_key == "dn" and not item.empty?
-              fkey = item.split(',')[0].split('=')[0]
-              item = item.split(',')[0].split('=')[1]
-            end
-            # This will even yield entries that don't necessarily exist
-            if foreign_key != "dn"
-              fkey = foreign_key
-            end
-            #{klass}.find_all(:attribute =>  fkey, :value => item, :objects => objects).each do |match|
-              results << match
+          unless @data["#{key}"].nil?
+            @data["#{key}"].each do |item|
+              fkey = ""
+              if foreign_key == "dn" and not item.empty?
+                fkey = item.split(',')[0].split('=')[0]
+                item = item.split(',')[0].split('=')[1]
+              end
+              # This will even yield entries that don't necessarily exist
+              if foreign_key != "dn"
+                fkey = foreign_key
+              end
+              #{klass}.find_all(:attribute => fkey, :value => item, :objects => objects).each do |match|
+                results << match
+              end
             end
           end
           return results

data/lib/activeldap/base.rb

@@ -80,6 +80,13 @@ module ActiveLDAP
   class ObjectClassError < RuntimeError
   end
 
+  # AttributeAssignmentError
+  #
+  # An exception raised when there is an issue assigning a value to
+  # an attribute
+  class AttributeAssignmentError < RuntimeError
+  end
+
 
   # Base
   #
@@ -408,7 +415,8 @@ module ActiveLDAP
       tries = 0
       begin
         # Get some attributes
-        @@conn.search(base(), LDAP::LDAP_SCOPE_ONELEVEL, "(#{attr}=#{val})")  do |m|
+        @@conn.search(base(), LDAP::LDAP_SCOPE_ONELEVEL,
+          "(#{attr}=#{val})")  do |m|
           # Extract the dnattr value
           dnval = m.dn.split(/,/)[0].split(/=/)[1]
 
@@ -488,7 +496,8 @@ module ActiveLDAP
     # val can be a dn attribute value, a full DN, or a LDAP::Entry.  The use
     # with a LDAP::Entry is primarily meant for internal use by find and
     # find_all.
-    def initialize(val='')
+    def initialize(val)
+      @exists = false
       # Try a default connection if none made explicitly
       unless Base.connection
         # Use @@config if it has been prepopulated and the conn is down.
@@ -526,17 +535,19 @@ module ActiveLDAP
       end
 
       # Do a search - if it exists, pull all data and parse schema, if not, just set the hierarchical data
-      if val.empty?
-        @exists = false
-        # Setup what should eb authoritative
+      if val.class != String or val.empty?
+        raise TypeError, 'a dn attribute String must be supplied ' +
+          'on initialization'
+      else
+        # Create what should be the authoritative DN
         @dn = "#{dnattr()}=#{val},#{base()}"
-        send(:apply_objectclass, required_classes())
-      else # do a search then
+
         # Search for the existing entry
         tries = 0
         begin
           # Get some attributes
           Base.connection.search(base(), LDAP::LDAP_SCOPE_ONELEVEL, "(#{dnattr()}=#{val})")  do |m|
+            @exists = true
             # Save DN
             @dn = m.dn
             # Load up data into tmp
@@ -556,43 +567,41 @@ module ActiveLDAP
               end
             end
           end
-          @exists = true
-          # Populate schema data
-          send(:apply_objectclass, @ldap_data['objectClass'])
-
-          # Populate real data now that we have the schema with aliases
-          @ldap_data.each do |pair|
-            send(:attribute_method=, pair[0], pair[1].dup)
-          end
         rescue RuntimeError => detail
           #todo# check for 'no message' when retrying
           # the connection may have gone stale. let's reconnect and retry. 
-          if tries > @@config[:retries]
-            @exists = false
-            # Create what should be the authoritative DN
-            @dn = "#{dnattr()}=#{val},#{base()}"
-            send(:apply_objectclass, required_classes())
-
-            # Setup dn attribute (later rdn too!)
-            attr_sym = "#{dnattr()}=".to_sym
-            
-            send(attr_sym, val)
+          if tries <= @@config[:retries]
+            tries += 1
+            # reconnect and rebind.
+            do_connect()
+            retry
+          else
+            @@logger.error('new: unable to search for entry')
+            raise detail
           end
-          tries += 1
-          # reconnect and rebind.
-          do_connect()
-          retry
         rescue LDAP::ResultError
-          @exists = false
-          # Create what should be the authoritative DN
-          @dn = "#{dnattr()}=#{val},#{base()}"
-          send(:apply_objectclass, required_classes())
+        end
+      end
 
-          # Setup dn attribute (later rdn too!)
-          attr_sym = "#{dnattr()}=".to_sym
+      # Do the actual object setup work.
+      if @exists
+        # Populate schema data
+        send(:apply_objectclass, @ldap_data['objectClass'])
+
+        # Populate real data now that we have the schema with aliases
+        @ldap_data.each do |pair|
+          real_attr = @attr_methods[pair[0]]
+          
+          @data[real_attr] = pair[1].dup
           
-          send(attr_sym, val)
         end
+      else
+        send(:apply_objectclass, required_classes())
+
+        # Setup dn attribute (later rdn too!)
+        real_dnattr = @attr_methods[dnattr()]
+        @data[real_dnattr] = val
+        
       end
     end # initialize
 
@@ -961,7 +970,10 @@ module ActiveLDAP
 
         # Populate real data now that we have the schema with aliases
         @ldap_data.each do |pair|
-          send(:attribute_method=, pair[0], pair[1].dup)
+          real_attr = @attr_methods[pair[0]]
+          
+          @data[real_attr] = pair[1].dup
+          
         end
       end # import
 
@@ -1291,6 +1303,11 @@ module ActiveLDAP
        attr = @attr_methods[method]
        
 
+       # Check if it is the DN attribute
+       if dnattr() == attr
+         raise AttributeAssignmentError, 'cannot modify the DN attribute value'
+       end
+
        # Assign the value 
        @data[attr] = value
 

data/lib/activeldap/configuration.rb

@@ -8,7 +8,7 @@ module ActiveLDAP
  module Configuration
     @@host = "127.0.0.1"
     @@port = 389
-    @@bind_format = "uid=%s,ou=People,dc=localdomain"
+    @@bind_format = "cn=%s,dc=localdomain"
 
     # Make the return value the string that is your LDAP base
     def Base.base

data/lib/activeldap.rb

@@ -909,7 +909,7 @@ require 'activeldap/schema2'
 
 
 module ActiveLDAP
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end
 
 ActiveLDAP::Base.class_eval do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: ruby-activeldap
 version: !ruby/object:Gem::Version 
-  version: 0.5.9
-date: 2005-11-01
+  version: 0.6.0
+date: 2006-01-09
 summary: Ruby/ActiveLDAP is a object-oriented API to LDAP
 require_paths: 
   - lib