dm-ldap-adapter 0.3.0 → 0.3.1

data/Manifest.txt

@@ -11,14 +11,17 @@ lib/adapters/ldap_adapter.rb
 lib/adapters/memory_adapter.rb
 lib/adapters/simple_adapter.rb
 lib/dummy_ldap_resource.rb
+lib/ldap/array.rb
 lib/ldap/digest.rb
 lib/ldap/ldap_facade.rb
-lib/ldap/ldap_facade_mock.rb
 lib/ldap/version.rb
 lib/ldap_resource.rb
 spec/assiociations_ldap_adapter_spec.rb
 spec/authentication_ldap_adapter_spec.rb
 spec/ldap_adapter_spec.rb
+spec/multi_repository_spec.rb
+spec/multi_value_attributes_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+test.db
 test.ldif

data/lib/adapters/ldap_adapter.rb

@@ -126,7 +126,12 @@ module DataMapper
           end
           key = prop if prop.serial?
         end
-        key_value = ldap.create_object(resource.model.dn_prefix(resource), 
+        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}"
+        key_value = ldap.create_object(resource.model.dn_prefix(resource_dup),
                                        resource.model.treebase, 
                                        key_properties(resource).field, 
                                        props, resource.model.multivalue_field)
@@ -135,10 +140,12 @@ module DataMapper
           key.set!(resource, key_value.to_i) 
           resource
         elsif resource.model.multivalue_field
-          multivalue_prop = resource.send(:properties)[resource.model.multivalue_field]
+          multivalue_prop = resource.send(:properties).detect do |prop|
+            prop.field.to_sym == resource.model.multivalue_field
+          end
           update_resource(resource, 
                           { multivalue_prop => 
-                            resource.send(resource.model.multivalue_field)})
+                            resource.send(multivalue_prop.name.to_sym)})
         else
           nil
         end
@@ -171,7 +178,7 @@ module DataMapper
               array_actions
             end
           else
-            if resource.model.multivalue_field == property.name
+            if resource.model.multivalue_field == property.field.to_sym
               if value.nil?
                 actions << [:delete, field, resource.original_values[property.name].to_s]
               else
@@ -199,10 +206,13 @@ module DataMapper
       # @see SimpleAdapter#delete_resource
       def delete_resource(resource)
         if resource.model.multivalue_field
+          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("#{resource.model.multivalue_field}=".to_sym, nil)
+          resource.send("#{multivalue_prop.name}=".to_sym, nil)
           update_resource(resource, 
-                          { resource.send(:properties)[resource.model.multivalue_field] => nil })
+                          { multivalue_prop => nil })
         else
           ldap.delete_object(resource.model.dn_prefix(resource),
                              resource.model.treebase)
@@ -280,7 +290,9 @@ module DataMapper
           result.collect do |props|
             query.fields.collect do |f|
               prop = props[f.field.to_sym]
-              if prop
+              if f.type == DataMapper::Types::LdapArray
+                prop if prop
+              elsif prop
                 f.primitive == Integer ? prop.first.to_i : prop.first
               end
             end

data/lib/ldap/array.rb

@@ -0,0 +1,9 @@
+module DataMapper
+  module Types
+    class LdapArray < DataMapper::Type
+      primitive Array
+      default Proc.new { Array.new }
+    end
+  end
+  Property::TYPES << Types::LdapArray unless Property::TYPES.member? Types::LdapArray 
+end

data/lib/ldap/ldap_facade.rb

@@ -21,12 +21,7 @@ module Ldap
       end
     end
 
-    # @param dn_prefix String the prefix of the dn
-    # @param treebase the treebase of the dn or any search
-    # @param key_field field which carries the integer unique id of the entity
-    # @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)
+    def retrieve_next_id(treebase, key_field)
       base = "#{treebase},#{@ldap.base}"
       id_sym = key_field.downcase.to_sym
       max = 0
@@ -36,11 +31,19 @@ module Ldap
         n = entry[id_sym].first.to_i
         max = n if max < n
       end
-      id = max + 1
-      props[id_sym] = "#{id}"
+      max + 1
+    end
+
+    # @param dn_prefix String the prefix of the dn
+    # @param treebase the treebase of the dn or any search
+    # @param key_field field which carries the integer unique id of the entity
+    # @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) and @ldap.get_operation_result.code.to_s == "0"
-        id
+        props[key_field.downcase.to_sym]
       else
         unless silence
           msg = ldap_error("create", 

data/lib/ldap/version.rb

@@ -1,3 +1,3 @@
 module Ldap
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/ldap_adapter_spec.rb

@@ -27,6 +27,20 @@ require 'spec_helper'
       end
     end
 
+    it 'should create an uid' do
+      class User
+        # put the assert here
+        dn_prefix { |user| user.id.should_not == nil; "uid=#{user.login}"}
+      end
+
+      DataMapper.repository(adapter) do
+        id = @user1.id
+        @user1.destroy
+        @user1 = User.create(:login => "black", :name => 'Black', :age => 0)
+        @user1.id.should_not == id
+      end
+    end
+
     it 'should successfully save an object' do
       DataMapper.repository(adapter) do
         @user1.new_record?.should be_false
@@ -34,7 +48,7 @@ require 'spec_helper'
       end
     end
 
-    it 'should log when trying to create an entity with already used key' do
+    it 'should raise an error when trying to create an entity with already used key' do
       DataMapper.repository(adapter) do
        #p User.first(:login => "black")
        lambda { User.create(:login => "black", :name => 'Black', :age => 0) }.should raise_error

data/spec/multi_repository_spec.rb

@@ -0,0 +1,43 @@
+$LOAD_PATH << File.dirname(__FILE__)
+require 'spec_helper'
+
+class Order
+  include DataMapper::Resource
+
+  property :id, Serial
+
+  repository(:ldap) do
+    belongs_to :user
+  end
+end
+
+DataMapper.auto_migrate!(:default)
+
+describe DataMapper.repository(:ldap).adapter do
+
+  describe 'belongs_to association' do
+
+    before do
+      DataMapper.repository(:ldap) do
+        @user = User.new(:login => "beige", :name => 'Beige')
+        @user.password = "asd123"
+        @user.save
+      end
+
+      @order = Order.create
+    end
+
+    after do
+      DataMapper.repository(:ldap) do
+        @user.destroy
+      end
+      @order.destroy
+    end
+
+    it 'should create and load the association' do
+      @order.user = @user
+      @order.save
+      Order.get!(@order.id).user.should == @user
+    end
+  end
+end

data/spec/multi_value_attributes_spec.rb

@@ -0,0 +1,100 @@
+$LOAD_PATH << File.dirname(__FILE__)
+require 'spec_helper'
+
+class Contact
+  include DataMapper::Resource
+
+  property :id,        Serial, :field => "uidnumber"
+  property :login,     String, :field => "uid", :unique_index => true
+  property :hashed_password,  String, :field => "userpassword", :access => :private
+  property :name,      String, :field => "cn"
+  property :mail,      LdapArray
+
+  dn_prefix { |contact| "uid=#{contact.login}"}
+
+  treebase "ou=people"
+
+  ldap_properties do |contact|
+    properties = { :objectclass => ["inetOrgPerson", "posixAccount", "shadowAccount"], :loginshell => "/bin/bash", :gidnumber => "10000" }
+    properties[:sn] = "#{contact.name.sub(/.*\ /, "")}"
+    properties[:givenname] = "#{contact.name.sub(/\ .*/, "")}"
+    properties[:homedirectory] = "/home/#{contact.login}"
+    properties
+  end
+
+  def password=(password)
+    attribute_set(:hashed_password, Ldap::Digest.ssha(password, "--#{Time.now}--#{login}--")) if password
+  end
+end
+
+describe DataMapper.repository(:ldap).adapter.class do
+
+  describe 'LdapArray' do
+
+    before :each do
+      DataMapper.repository(:ldap) do
+        @contact = Contact.first(:login => "beige") || Contact.new(:login => "beige", :name => 'Beige')
+        @contact.password = "asd123"
+        @contact.save
+      end
+    end
+
+    after :each do
+      DataMapper.repository(:ldap) do
+        @contact.destroy
+      end
+    end
+
+    it 'should add many values to a LdapArray' do
+       DataMapper.repository(:ldap) do
+        @contact.mail.should == []
+
+        @contact.mail << "email1"
+        @contact.save
+        @contact = Contact.get!(@contact.id)
+        @contact.mail.should == ["email1"]
+
+        @contact.mail << "email2"
+        @contact.save
+        @contact = Contact.get!(@contact.id)
+        @contact.mail.should == ["email1", "email2"]
+
+        @contact.mail.delete("email1")
+        @contact.save
+        @contact = Contact.get!(@contact.id)
+        @contact.mail.should == ["email2"]
+
+        @contact.mail.delete("email2")
+        @contact.save
+        @contact = Contact.get!(@contact.id)
+        @contact.mail.should == []
+      end
+    end
+
+    it 'should get an LdapArray on retrieving collection' do
+       DataMapper.repository(:ldap) do
+        @contact.mail.should == []
+
+        @contact.mail << "email1"
+        @contact.save
+        @contact = Contact.all.detect {|c| c.id = @contact.id}
+        @contact.mail.should == ["email1"]
+
+        @contact.mail << "email2"
+        @contact.save
+        @contact = Contact.all.detect {|c| c.id = @contact.id}
+        @contact.mail.should == ["email1", "email2"]
+
+        @contact.mail.delete("email1")
+        @contact.save
+        @contact = Contact.all.detect {|c| c.id = @contact.id}
+        @contact.mail.should == ["email2"]
+
+        @contact.mail.delete("email2")
+        @contact.save
+        @contact = Contact.all.detect {|c| c.id = @contact.id}
+        @contact.mail.should == []
+      end
+    end
+  end
+end

data/spec/spec.opts

@@ -1 +1,2 @@
 --colour
+--loadby random

data/spec/spec_helper.rb

@@ -37,20 +37,20 @@ class User
   has n, :group_users
 
   def groups
-    groups = GroupUser.all(:memberuid => id).collect{ |gu| gu.group }
+    groups = GroupUser.all(:user_id => id).collect{ |gu| gu.group }
     def groups.user=(user)
       @user = user
     end
     groups.user = self
     def groups.<<(group)
       unless member? group
-        GroupUser.create(:memberuid => @user.id, :gidnumber => group.id)
+        GroupUser.create(:user_id => @user.id, :group_id => group.id)
         super
       end
       self
     end
     def groups.delete(group)
-      gu = GroupUser.first(:memberuid => @user.id, :gidnumber => group.id)
+      gu = GroupUser.first(:user_id => @user.id, :group_id => group.id)
       if gu
         gu.destroy
         super
@@ -58,7 +58,7 @@ class User
     end
     groups
   end
-
+ 
   dn_prefix { |user| "uid=#{user.login}"}
 
   treebase "ou=people"
@@ -85,7 +85,7 @@ class Role
   
   treebase "ou=groups"
   
-  ldap_properties {:objectclass => "posixGroup"}
+  ldap_properties {{:objectclass => "posixGroup"}}
 
   belongs_to :user
 end
@@ -99,7 +99,7 @@ class Group
   
   treebase "ou=groups"
   
-  ldap_properties {:objectclass => "posixGroup"}
+  ldap_properties {{:objectclass => "posixGroup"}}
 end
 
 class GroupUser

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-ldap-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - mkristian
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-15 00:00:00 +05:30
+date: 2009-06-21 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,16 +78,19 @@ files:
 - lib/adapters/memory_adapter.rb
 - lib/adapters/simple_adapter.rb
 - lib/dummy_ldap_resource.rb
+- lib/ldap/array.rb
 - lib/ldap/digest.rb
 - lib/ldap/ldap_facade.rb
-- lib/ldap/ldap_facade_mock.rb
 - lib/ldap/version.rb
 - lib/ldap_resource.rb
 - spec/assiociations_ldap_adapter_spec.rb
 - spec/authentication_ldap_adapter_spec.rb
 - spec/ldap_adapter_spec.rb
+- spec/multi_repository_spec.rb
+- spec/multi_value_attributes_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- test.db
 - test.ldif
 has_rdoc: true
 homepage: http://dm-ldap-adapter.rubyforge.org

data/lib/ldap/ldap_facade_mock.rb

@@ -1,56 +0,0 @@
-module Ldap
-  class LdapFacade
-
-    def self.open(config)
-      puts "open"
-      p config
-      puts
-      yield "dummy"
-    end
-
-    def initialize(uri)
-      puts "new #{self.hash}"
-      p uri
-      puts
-    end
-
-    def create_object(treebase, dn_prefix, key_field, props, silence = false)
-      options = { :dn_prefix => dn_prefix, 
-        :treebase => treebase, 
-        :key_field => key_field, 
-        :properties => props }
-      puts "create #{self.hash}"
-      p options
-      puts
-      @@count ||= 0
-      @@count += 1
-    end
-
-    def read_objects(treebase, key_field, conditions, many = false)
-      options = { :treebase => treebase, 
-        :key_field => key_field,
-        :conditions => conditions, :many => many }
-      puts "read #{self.hash}"
-      p options
-      puts
-      [] if many
-    end
-
-    def update_object(treebase, dn_prefix, actions)
-      options = { :dn_prefix => dn_prefix, 
-        :treebase => treebase, 
-        :actions => actions }
-      puts "update #{self.hash}"
-      p options
-      puts
-    end
-
-    def delete_object(treebase, dn_prefix)
-      options = { :dn_prefix => dn_prefix, 
-        :treebase => treebase }
-      puts "delete #{self.hash}"
-      p options
-      puts
-    end
-  end
-end