dm-ldap-adapter 0.4.4 → 0.4.5

data/History.txt

@@ -1,3 +1,24 @@
+version 
+=============
+
+version 0.4.5
+=============
+
+* fixed bug which did count the update result incorrectly
+
+* allow to search empty trees and handle DN only queries more useful
+
+version 0.4.4
+=============
+
+* some less depracted messages
+
+* skipped support for jruby-1.5.6 since rubygems bundled with jruby-complete-.1.5.6.jar does not work with latest gems anymore
+
+* support for datamapper verions 1.2.0
+
+* allow to pass on ldap-adapter(facade) specific parameters with :adapter_options 
+
 version 0.4.3
 =============
 

data/lib/adapters/ldap_adapter.rb

@@ -187,8 +187,8 @@ module DataMapper
         end.size # just return the number of create resources
       end
 
-      def update(attributes, collection)
-        size = collection.each do |resource|
+      def update(attributes, resources)
+        resources.select do |resource|
 #puts "update"
 #p resource
           update_resource(resource, attributes)
@@ -298,8 +298,8 @@ module DataMapper
       end
 
       # @see AbstractAdapter#delete
-      def delete(collection)
-        collection.each do |resource|
+      def delete(resource)
+        resource.each do |resource|
           if resource.model.multivalue_field
             multivalue_prop = resource.send(:properties).detect do |prop|
               prop.field.to_sym == resource.model.multivalue_field
@@ -355,7 +355,7 @@ module DataMapper
                   value
                 else
                   prop = props[f.field.to_sym].first
-                  f.primitive == Integer ? prop.to_i : prop.join
+                  f.primitive == Integer ? prop.to_i : prop.join rescue prop
                 end
               end
               props_result << values

data/lib/ldap/net_ldap_facade.rb

@@ -16,6 +16,7 @@ module Ldap
 
     # @param config Hash for the ldap connection
     def initialize(config)
+      @ldap_config = config
       if config.is_a? Hash
         @ldap = Net::LDAP.new( config )
       else
@@ -24,10 +25,9 @@ module Ldap
     end
 
     def retrieve_next_id(treebase, key_field)
-      base = "#{treebase},#{@ldap.base}"
       id_sym = key_field.downcase.to_sym
       max = 0
-      @ldap.search( :base => base,
+      @ldap.search( :base => base(treebase),
                     :attributes => [key_field],
                     :return_result => false ) do |entry|
         n = entry[id_sym].first.to_i
@@ -42,7 +42,6 @@ module Ldap
     # @param props Hash of the ldap attributes of the new ldap object
     # @return nil in case of an error or the new id of the created object
     def create_object(dn_prefix, treebase, key_field, props, silence = false)
-      base = "#{treebase},#{@ldap.base}"
       if @ldap.add( :dn => dn(dn_prefix, treebase),
                     :attributes => props) || @ldap.get_operation_result.code.to_s == "0"
         props[key_field.to_sym]
@@ -66,9 +65,17 @@ module Ldap
     # @param Array of conditions for the search
     # @return Array of Hashes with a name/values pair for each attribute
     def read_objects(treebase, key_fields, conditions, field_names, order_field = nil)
-      result = []
+      searchbase = base(treebase)
       filter = Conditions2Filter.convert(conditions)
-      @ldap.search( :base => "#{treebase},#{@ldap.base}",
+
+      # If there is a :dn in the filter skip everything and look it up
+      if dn = conditions.detect { |c| c[1] == "dn" } then
+        searchbase = dn[2]
+        filter = nil
+      end
+
+      result = []
+      @ldap.search( :base => searchbase,
                     :attributes => field_names,
                     :filter => filter ) do |res|
         mapp = to_map(field_names, res)
@@ -77,7 +84,7 @@ module Ldap
         # TODO maybe make filter which removes this unless
         # TODO move this into the ldap_Adapter to make it more general, so that
         # all field with Integer gets converted, etc
-        result << mapp if key_fields.detect do |key_field|
+        result << mapp if key_fields.all? do |key_field|
           mapp.keys.detect {|k| k.to_s.downcase == key_field.downcase }
         end
       end
@@ -94,6 +101,7 @@ module Ldap
                        :operations => actions ) || @ldap.get_operation_result.code.to_s == "0"
         true
       else
+        puts caller.join("\n")
         logger.warn(ldap_error("update",
                                dn(dn_prefix, treebase) + "\n\t#{actions.inspect}"))
         nil
@@ -118,15 +126,12 @@ module Ldap
     # @param dn String for identifying the ldap object
     # @param password String to be used for authenticate to the dn
     def authenticate(dn, password)
-      Net::LDAP.new( { :host => @ldap.host,
-                       :port => @ldap.port,
-                       :auth => {
-                         :method => :simple,
-                         :username => dn,
-                         :password => password
-                       },
-                       :base => @ldap.base
-                     } ).bind
+      config = @ldap_config.merge(:auth => {
+                                    :method => :simple,
+                                    :username => dn,
+                                    :password => password
+                                  })
+      Net::LDAP.new(config).bind
     end
 
     # helper to concat the dn from the various parts
@@ -134,7 +139,15 @@ module Ldap
     # @param treebase the treebase of the dn or any search
     # @return the complete dn String
     def dn(dn_prefix, treebase)
-      "#{dn_prefix},#{treebase},#{@ldap.base}"
+      [ dn_prefix, base(treebase) ].compact.join(",")
+    end
+
+    # helper to concat the base from the various parts
+    # @param treebase
+    # @param ldap_base the ldap_base defaulting to connection ldap_base
+    # @return the complete base String
+    def base(treebase = nil, ldap_base = @ldap.base)
+      [ treebase, ldap_base ].compact.join(",")
     end
 
     private

data/lib/ldap/ruby_ldap_facade.rb

@@ -8,6 +8,7 @@ module Ldap
     attr_reader :base, :host, :port
 
     def initialize(config)
+      @ldap_config = config
       super(config[:host], config[:port])
       @base = config[:base]
       @port = config[:port]
@@ -41,7 +42,7 @@ module Ldap
 
     def retrieve_next_id(treebase, key_field)
       max = 0
-      @ldap2.search("#{treebase},#{@ldap2.base}",
+      @ldap2.search(base(treebase),
                     LDAP::LDAP_SCOPE_SUBTREE,
                     "(objectclass=*)",
                      [key_field]) do |entry|
@@ -57,7 +58,6 @@ module Ldap
     # @param props Hash of the ldap attributes of the new ldap object
     # @return nil in case of an error or the new id of the created object
     def create_object(dn_prefix, treebase, key_field, props, silence = false)
-      base = "#{treebase},#{@ldap2.base}"
       mods = props.collect do |k,v|
         LDAP.mod(LDAP::LDAP_MOD_ADD, k.to_s, v.is_a?(::Array) ? v : [v.to_s] )
       end
@@ -90,9 +90,17 @@ module Ldap
         filter = "(objectclass=*)"
       end
 
+      searchbase = base(treebase)
+
+      # If there is a :dn in the filter skip everything and look it up
+      if dn = conditions.detect { |c| c[1] == "dn" } then
+        searchbase = dn[2]
+        filter = nil
+      end
+
       result = []
       begin
-      @ldap2.search("#{treebase},#{@ldap2.base}",
+      @ldap2.search(searchbase,
                     LDAP::LDAP_SCOPE_SUBTREE,
                     filter,
                     field_names, false, 0, 0, order_field) do |res|
@@ -176,7 +184,15 @@ module Ldap
     # @param treebase the treebase of the dn or any search
     # @return the complete dn String
     def dn(dn_prefix, treebase)
-      "#{dn_prefix},#{treebase},#{@ldap2.base}"
+      [ dn_prefix, base(treebase) ].compact.join(",")
+    end
+
+    # helper to concat the base from the various parts
+    # @param treebase
+    # @param ldap_base the ldap_base defaulting to connection ldap_base
+    # @return the complete base String
+    def base(treebase = nil, ldap_base = @ldap2.base)
+      [ treebase, ldap_base ].compact.join(",")
     end
 
     private

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-ldap-adapter
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - mkristian
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-03 00:00:00 Z
+date: 2011-12-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ldap