dm-ldap-adapter 0.4.0.alpha2 → 0.4.0.alpha3

data/Rakefile

@@ -9,7 +9,7 @@ require 'spec/rake/spectask'
 require 'pathname'
 
 Hoe.spec('dm-ldap-adapter') do |p|
-  p.version = "0.4.0.alpha2"
+  p.version = "0.4.0.alpha3"
   p.description = "ldap adapter for datamapper which uses either net-ldap or ruby-ldap"
   p.developer('mkristian', 'm.kristian@web.de')
   p.url = "http://dm-ldap-adapter.rubyforge.org"

data/lib/adapters/ldap_adapter.rb

@@ -132,19 +132,25 @@ module DataMapper
             end
             ldap_conditions << [:or_operator, or_conditions, nil]
           else
-          comparator = c.slug
-          case comparator
-          when :raw
-          when :not
-              # TODO proper recursion !!!
-            ldap_conditions << [comparator, c.operands.first.subject.field, c.operands.first.send(:dumped_value)]
-          when :in
-            ldap_conditions << [:eql, c.subject.field, c.send(:dumped_value)]
-          else
-            ldap_conditions << [comparator, c.subject.field, c.send(:dumped_value)]
+            comparator = c.slug
+            case comparator
+            when :raw
+            when :not
+                # TODO proper recursion !!!
+                ldap_conditions << [comparator, c.operands.first.subject.field, c.operands.first.send(:dumped_value)]
+            when :in
+              ldap_conditions << [:eql, c.subject.field, c.send(:dumped_value)]
+            else
+              if c.subject.is_a? Ldap::LdapArray
+                # assume a single value here !!!
+                val = c.send(:dumped_value)
+                ldap_conditions << [comparator, c.subject.field, val[1, val.size - 2]]
+              else
+                ldap_conditions << [comparator, c.subject.field, c.send(:dumped_value)]
+              end
+            end
           end
         end
-        end
         ldap_conditions
       end
 
@@ -238,7 +244,7 @@ module DataMapper
         attributes.each do |property, value|
           field = property.field.to_sym #TODO sym needed or string ???
           if property.class == ::Ldap::LdapArray
-value = property.load(value)
+            value = property.load(value)
             if resource.original_attributes[property].nil?
               value.each do |v|
                 actions << [:add, field, v]
@@ -260,7 +266,7 @@ value = property.load(value)
           else
             if resource.model.multivalue_field == property.field.to_sym
               if value.nil?
-                actions << [:delete, field, resource.original_attributes[property].to_s]
+                actions << [:delete, field, resource.attribute_get(property.name).to_s]
               else
                 actions << [:add, field, value.to_s]
               end
@@ -288,8 +294,6 @@ value = property.load(value)
             multivalue_prop = resource.send(:properties).detect do |prop|
               prop.field.to_sym == resource.model.multivalue_field
             end
-            # set the original value so update does the right thing
-            resource.send("#{multivalue_prop.name}=".to_sym, nil)
             update_resource(resource,
                             { multivalue_prop => nil })
           else

data/lib/adapters/noop_transaction.rb

@@ -1,16 +1,35 @@
 require "dm-core"
 
+module Ldap
+  class NoopTransaction
+    
+    def close ; end
+    def begin ; end
+    def prepare ; end
+    def commit ; end
+    def rollback ; end
+    def rollback_prepared ; end
+    
+  end
+end
+
 module DataMapper
   module Adapters
-    class NoopTransaction
-
-      def close ; end
-      def begin ; end
-      def prepare ; end
-      def commit ; end
-      def rollback ; end
-      def rollback_prepared ; end
+    class LdapAdapter
+      def transaction_primitive
+        ::Ldap::NoopTransaction.new
+      end
+      def push_transaction(transaction)
+        @transaction = transaction
+      end
 
+      def pop_transaction
+        @transaction
+      end
+      
+      def current_transaction
+        @transaction
+      end
     end
   end
 end

data/lib/ldap/array.rb

@@ -21,7 +21,6 @@ module Ldap
       result
     end
 
-    
     def <<(element)
       push(element)
     end

data/lib/ldap_resource.rb

@@ -40,15 +40,7 @@ module DataMapper
 
               value = record[property]
 
-              # TODO: typecasting should happen inside the Adapter
-              # and all values should come back as expected objects
-              if property.respond_to?(:load_with_resource)
-                # hack to allow mutable types which are able to reset 
-                # the attribute to make them dirty
-                value = property.load_with_resource(value, resource)
-              else
-                value = property.load(value)
-              end
+              value = property.load(value)
 
               property.set!(resource, value)
             end

data/spec/assiociations_ldap_adapter_spec.rb

@@ -137,20 +137,8 @@ describe DataMapper::Adapters::LdapAdapter do
       GroupUser.all.size.should == size + 3
     end
     DataMapper.repository(:ldap) do
-      puts
-      puts "--------------"
-      p User.get(@user1.id).groups
-      puts "--------------"
-      p User.get(@user2.id).groups
-      puts
       @user1 = User.get!(@user1.id)
       @user1.groups.delete(@group1)
-      puts
-      puts "--------------"
-      p User.get(@user1.id).groups
-      puts "--------------"
-      p User.get(@user2.id).groups
-      puts
       User.get(@user1.id).groups.should == [@group2]
       User.get(@user2.id).groups.should == [@group1]
       @user2 = User.get!(@user2.id)

data/spec/ldap_adapter_spec.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH << File.dirname(__FILE__)
 require 'spec_helper'
+require 'ldap/transactions'
 
 describe DataMapper::Adapters::LdapAdapter do
 

data/spec/multi_value_attributes_spec.rb

@@ -141,5 +141,13 @@ describe DataMapper.repository(:ldap).adapter.class do
         @contact.mail.should == ['foo', 'bar']
       end
     end
+
+    it 'should be able to search properties with LdapArray' do
+      DataMapper.repository(:ldap) do
+        @contact.mail = ["email1"]
+        @contact.save
+        TestContact.all(:mail => "email1").first.should == @contact
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-ldap-adapter
 version: !ruby/object:Gem::Version 
-  hash: 436503056
+  hash: 436503057
   prerelease: true
   segments: 
   - 0
   - 4
   - 0
-  - alpha2
-  version: 0.4.0.alpha2
+  - alpha3
+  version: 0.4.0.alpha3
 platform: ruby
 authors: 
 - mkristian
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +05:30
+date: 2010-10-20 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency