dm-ldap-adapter 0.4.5 → 0.4.6

data/lib/adapters/ldap_adapter.rb

@@ -209,16 +209,22 @@ module DataMapper
           value = prop.get!(resource)
           if prop.class == ::Ldap::LdapArray
             props[prop.field.to_sym] = value unless value.nil? or value.size == 0
+          elsif ::DataMapper::Property::Boolean === prop
+            props[prop.field.to_sym] = value ? 'TRUE' : 'FALSE' unless value.nil?
           else
-            props[prop.field.to_sym] = value.to_s unless value.nil?
+            props[prop.field.to_sym] = prop.dump(value).to_s unless value.nil?
           end
           key = prop if prop.serial?
         end
         resource_dup = resource.dup
-        id = ldap.retrieve_next_id(resource.model.treebase,
-                                   key_properties(resource).field)
-        resource_dup.send("#{key_properties(resource).name}=".to_sym, id)
-        props[key_properties(resource).field.to_sym] = "#{id}"
+
+        if props[key_properties(resource).field.to_sym].nil? then
+          id = ldap.retrieve_next_id(resource.model.treebase,
+                                     key_properties(resource).field)
+          resource_dup.send("#{key_properties(resource).name}=".to_sym, id)
+          props[key_properties(resource).field.to_sym] = "#{id}"
+        end
+
         key_value = begin
                       ldap.create_object(resource.model.dn_prefix(resource_dup),
                                          resource.model.treebase,

data/lib/ldap/net_ldap_facade.rb

@@ -65,13 +65,14 @@ 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)
-      searchbase = base(treebase)
-      filter = Conditions2Filter.convert(conditions)
 
       # 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
+      else
+        searchbase = base(treebase)
+        filter = Conditions2Filter.convert(conditions)
       end
 
       result = []

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-ldap-adapter
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - mkristian
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 Z
+date: 2013-04-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ldap
@@ -26,12 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 15
         segments: 
         - 0
         - 2
-        - 2
-        version: 0.2.2
+        version: "0.2"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -118,34 +117,17 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
         - 2
         - 6
-        - 0
-        version: 2.6.0
+        version: "2.6"
   type: :development
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 0
-        - 15
-        version: 1.0.15
-  type: :development
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: ruby-ldap
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -157,7 +139,7 @@ dependencies:
         - 11
         version: 0.9.11
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 description: ldap adapter for datamapper which uses either net-ldap or ruby-ldap
 email: 
 - m.kristian@web.de
@@ -234,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: ""