ruby-activeldap 0.5.3 → 0.5.4

data/lib/activeldap/base.rb

@@ -358,7 +358,7 @@ module ActiveLDAP
           dnval = m.dn.split(/,/)[0].split(/=/)[1]
 
           if objects
-            return eval("#{real_klass}.new(dnval)")
+            return eval("#{real_klass}.new(m)")
           else
             return dnval
           end
@@ -392,8 +392,8 @@ module ActiveLDAP
       end
 
       # Allow a single string argument
-      objects = false
       val = config
+      objects = false
       # Or a hash
       if config.respond_to?"has_key?"
         attr = config[:attribute] || dnattr()
@@ -410,7 +410,7 @@ module ActiveLDAP
           dnval = m.dn.split(/,/)[0].split(/=/)[1]
 
           if objects
-            matches.push(eval("#{real_klass}.new(dnval)"))
+            matches.push(eval("#{real_klass}.new(m)"))
           else
             matches.push(dnval)
           end
@@ -462,20 +462,20 @@ module ActiveLDAP
       []
     end
 
+
+
     ### All instance methods, etc
 
     # new
     #
-    # Creates a new instance of Base initializing all class and
-    # instance variables. initialize2() must be called to complete
-    # all initialization.
-    # defines local defaults. See examples
-    # If multiple values exist for dnattr, the first one put here will be authoritative
-    # TODO: Add support for relative distinguished names
+    # Creates a new instance of Base initializing all class and all
+    # initialization.  Defines local defaults. See examples If multiple values
+    # exist for dnattr, the first one put here will be authoritative 
+    # TODO: Add # support for relative distinguished names 
+    # 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='')
-      if val.class != String
-        raise TypeError, "Object key must be a String"
-      end
       # Try a default connection if none made explicitly
       unless Base.connection
         # Use @@config if it has been prepopulated and the conn is down.
@@ -485,6 +485,16 @@ module ActiveLDAP
           ActiveLDAP::Base.connect
         end
       end
+      if val.class == LDAP::Entry
+        # Call import, which is basically initialize
+        # without accessing LDAP.
+        @@logger.debug "initialize: val is a LDAP::Entry - running import."
+        import(val)
+        return
+      end
+      if val.class != String
+        raise TypeError, "Object key must be a String"
+      end
 
       @data = {} # where the r/w entry data is stored
       @data.default = []
@@ -551,7 +561,7 @@ module ActiveLDAP
           send(attr_sym, val)
         end
       end
-    end # initialize2
+    end # initialize
 
     # Hide new in Base
     private_class_method :new
@@ -845,6 +855,50 @@ module ActiveLDAP
 
      private
 
+      # import(LDAP::Entry)
+      #
+      # Overwrites an existing entry (usually called by new)
+      # with the data given in the data given in LDAP::Entry.
+      #
+      def import(entry=nil)
+        @@logger.debug("stub: import called")
+        if entry.class != LDAP::Entry
+          raise TypeError, "argument must be a LDAP::Entry"
+        end
+
+        @data = {} # where the r/w entry data is stored
+        @data.default = []
+        @ldap_data = {} # original ldap entry data
+        @ldap_data.default = []
+        @attr_methods = {} # list of valid method calls for attributes used for dereferencing
+
+        # Get some attributes
+        @dn = entry.dn
+        entry.attrs.each do |attr|
+          # Load with subtypes just like @data
+          @@logger.debug("calling make_subtypes for entry.vals(attr).dup")
+          safe_attr, value = make_subtypes(attr, entry.vals(attr).dup)
+          @@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
+        # Assume if we are importing it that it exists
+        @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
+      end # import
+
       # enforce_types
       #
       # enforce_types applies your changes without attempting to write to LDAP. This means that
@@ -860,8 +914,6 @@ module ActiveLDAP
         return true
       end
 
-
-
       # apply_objectclass
       #
       # objectClass= special case for updating appropriately

data/lib/activeldap.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -W0
 # = Ruby/ActiveLDAP 
 #
-# "Ruby/ActiveLDAP" Copyright (C) 2004 Will Drewry mailto:will@alum.bu.edu
+# "Ruby/ActiveLDAP" Copyright (C) 2004,2005 Will Drewry mailto:will@alum.bu.edu
 #
 # == Introduction
 # 
@@ -795,6 +795,15 @@
 # do all of your LDAP specific calls here and then continue about your normal
 # Ruby/ActiveLDAP business afterward.
 #
+#
+# ==== Reusing LDAP::Entry objects without reusing the LDAP connection
+#
+# You can call Klass.new(entry) where Klass is some subclass of Base and
+# enty is an LDAP::entry. This use of 'new' is is meant for use from
+# within find_all and find, but you can also use it in tandem with advanced
+# LDAP queries.
+#
+# See tests/benchmark for more insight.
 # 
 # ==== Juggling multiple LDAP connections
 # 
@@ -898,7 +907,7 @@ require 'activeldap/configuration'
 require 'activeldap/schema2'
 
 module ActiveLDAP
-  VERSION = "0.5.3"
+  VERSION = "0.5.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.5.3
-date: 2004-10-29
+  version: 0.5.4
+date: 2005-02-17
 summary: Ruby/ActiveLDAP is a object-oriented API to LDAP
 require_paths: 
   - lib