dm-ldap-adapter 0.3.2 → 0.3.3

data/History.txt

@@ -1,3 +1,10 @@
+version 0.3.3
+=============
+
+* fix bug with empty LdapArray for ruby-ldap-adapter
+
+* added order option to search with just using the first order attribute and ignoring the direction and other attributes
+
 version 0.3.2
 =============
 

data/Manifest.txt

@@ -18,14 +18,12 @@ lib/ldap/net_ldap_facade.rb
 lib/ldap/ruby_ldap_facade.rb
 lib/ldap/version.rb
 lib/ldap_resource.rb
-net-ldap.txt
-ruby-ldap.txt
 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/sorting_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
-test.db
 test.ldif

data/README.txt

@@ -16,7 +16,9 @@ the usecase for that implementation was using an ldap server for user authentica
 
 === low level ldap library
 
-the ldap library which does the actual ldap protocol stuff is [http://rubyforge.org/projects/net-ldap] and it is hidden behind a facade, so one could replace it with a different library or make it pluggable.
+the ldap library which does the actual ldap protocol stuff is [http://rubyforge.org/projects/net-ldap] which is the default. the other ldap library is [http://rubyforge.org/projects/ruby-ldap]. these libraries are behind a facade, if you want to use the ruby-ldap library you need to require the right facade before the ldap-adapter:
+
+    require 'ldap/ruby_ldap_facade'
 
 === examples
 
@@ -26,9 +28,9 @@ the 'example/identity_map.rb' shows the usage of identity maps, see also below.
 
 == FEATURES/PROBLEMS:
 
-* the net-ldap has some issues with not closing the connections when an exception/error got raised
+* the net-ldap has some issues with not closing the connections when an exception/error got raised, with limit the search result to 126 entries which gets fixed by making consecutives searches and collect the result.
 
-* error from the ldap server are only logged and do not raise any exceptions (to be changed in next release)
+* error from the ldap server are only logged and do not raise any exceptions (to be changed in next release) with one exception: when creating a new ldap entry a duplicated entry will raise DataMapper::PersistenceError
 
 == SYNOPSIS:
 
@@ -165,7 +167,7 @@ staying with posix example there the groups has a memberuid attribute BUT unlike
 
 === ldap attributes with many values
 
-let's say your LDAP has multiple email values for a users then you can define your resource class like that using the type LdapArray for such multivalue fields
+let's say your LDAP has multiple email values for a users then you can define your resource class like that using the type *LdapArray* for such multivalue fields
 
     class User
       include DataMapper::Resource

data/lib/adapters/ldap_adapter.rb

@@ -271,12 +271,13 @@ module DataMapper
       # @return [Array<DataMapper::Resource]
       #   the array of found resources
       # @see SimpleAdapter#read_resources
-      def read_resources(query)     
+      def read_resources(query)
+        order_by = query.order.first.property.field
         field_names = query.fields.collect {|f| f.field }
         result = ldap.read_objects(query.model.treebase, 
                                    query.model.key.collect { |k| k.field }, 
                                    to_ldap_conditions(query),
-                                   field_names)
+                                   field_names, order_by)
         if query.model.multivalue_field
           props_result = []
           result.each do |props|

data/lib/ldap/array.rb

@@ -3,6 +3,15 @@ module DataMapper
     class LdapArray < DataMapper::Type
       primitive Array
       default Proc.new { Array.new }
+
+      def self.dump(value, property)
+        value || []
+      end
+
+      def self.load(value, property)
+        value || []
+      end
+
     end
   end
   Property::TYPES << Types::LdapArray unless Property::TYPES.member? Types::LdapArray 

data/lib/ldap/net_ldap_facade.rb

@@ -63,7 +63,7 @@ module Ldap
     # @param key_fields Array of fields which carries the integer unique id(s) of the entity
     # @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)
+    def read_objects(treebase, key_fields, conditions, field_names, order_field = nil)
       filters = []
       conditions.each do |cond|
         c = cond[2]

data/lib/ldap/ruby_ldap_facade.rb

@@ -83,7 +83,7 @@ module Ldap
     # @param key_fields Array of fields which carries the integer unique id(s) of the entity
     # @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)
+    def read_objects(treebase, key_fields, conditions, field_names, order_field = '')
       filters = []
       conditions.each do |cond|
         c = cond[2]
@@ -169,7 +169,7 @@ module Ldap
       @ldap2.search("#{treebase},#{@ldap2.base}", 
                     LDAP::LDAP_SCOPE_SUBTREE, 
                     filter.to_s == "" ? "(objectclass=*)" : filter.to_s.gsub(/\(\(/, "(").gsub(/\)\)/, ")"), 
-                    field_names) do |res|
+                    field_names, false, 0, 0, order_field) do |res|
 
         map = to_map(res) 
         #puts map[key_field.to_sym]

data/lib/ldap/version.rb

@@ -1,3 +1,3 @@
 module Ldap
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/spec/assiociations_ldap_adapter_spec.rb

@@ -92,7 +92,7 @@ require 'spec_helper'
         @user1.groups << @group2
         @user1.save
         User.get(@user1.id)
-        @user1.groups.should == [@group1, @group2]
+        @user1.groups.sort{|g1, g2| g1.id <=> g2.id}.should == [@group1, @group2]
         @user1.groups.delete(@group1)
         @user1.save
         User.get(@user1.id).groups.should == [@group2]
@@ -109,13 +109,13 @@ require 'spec_helper'
         @user1.groups << @group1
         @user1.groups << @group2
         @user1.save
-        User.get(@user1.id).groups.should == [@group1, @group2]
+        User.get(@user1.id).groups.sort{|g1, g2| g1.id <=> g2.id}.should == [@group1, @group2]
         @user2.groups << @group1
         @user2.save
       end
       DataMapper.repository(adapter) do
         User.get(@user2.id).groups.should == [@group1]
-        User.get(@user1.id).groups.should == [@group1, @group2]
+        User.get(@user1.id).groups.sort{|g1, g2| g1.id <=> g2.id}.should == [@group1, @group2]
       end
     end
     
@@ -130,11 +130,11 @@ require 'spec_helper'
         @user1 = User.get!(@user1.id)
         @user1.groups << @group1
         @user1.groups << @group2
-        @user1.groups.should == [@group1, @group2]
+        @user1.groups.sort{|g1, g2| g1.id <=> g2.id}.should == [@group1, @group2]
         @user2.groups << @group1
       end
       DataMapper.repository(adapter) do
-        User.get(@user1.id).groups.should == [@group1, @group2]
+        User.get(@user1.id).groups.sort{|g1, g2| g1.id <=> g2.id}.should == [@group1, @group2]
         User.get(@user2.id).groups.should == [@group1]
       end
     end

data/spec/multi_value_attributes_spec.rb

@@ -33,7 +33,8 @@ describe DataMapper.repository(:ldap).adapter.class do
 
     before :each do
       DataMapper.repository(:ldap) do
-        @contact = Contact.first(:login => "beige") || Contact.new(:login => "beige", :name => 'Beige')
+        Contact.all(:login => "beige").destroy!
+        @contact =  Contact.new(:login => "beige", :name => 'Beige')
         @contact.password = "asd123"
         @contact.save
       end
@@ -72,7 +73,7 @@ describe DataMapper.repository(:ldap).adapter.class do
     end
 
     it 'should get an LdapArray on retrieving collection' do
-       DataMapper.repository(:ldap) do
+      DataMapper.repository(:ldap) do
         @contact.mail.should == []
 
         @contact.mail << "email1"
@@ -96,5 +97,16 @@ describe DataMapper.repository(:ldap).adapter.class do
         @contact.mail.should == []
       end
     end
+
+    it 'should allow to replace the LdapArray' do
+      DataMapper.repository(:ldap) do
+        @contact = Contact.get(@contact.id)
+        @contact.mail.should == []
+        @contact.mail = ['foo', 'bar']
+        @contact.save
+        @contact = Contact.get(@contact.id)
+        @contact.mail.should == ['foo', 'bar']
+      end
+    end
   end
 end

data/spec/sorting_spec.rb

@@ -0,0 +1,47 @@
+$LOAD_PATH << File.dirname(__FILE__)
+require 'spec_helper'
+
+if Object.const_defined?('LDAP')
+  describe DataMapper.repository(:ldap).adapter do
+    
+    describe 'belongs_to association' do
+      
+      before do
+        DataMapper.repository(:ldap) do
+          User.all.destroy!
+          @user1 = User.create(:login => "black", :name => 'Black', :age => 0) 
+          @user2 = User.create(:login => "brown", :name => 'Brown', :age => 25)
+          @user3 = User.create(:login => "blue", :name => 'Blue',  :age => nil)
+        end
+      end
+      
+      after do
+        DataMapper.repository(:ldap) do
+          @user1.destroy
+          @user2.destroy
+          @user3.destroy
+        end
+      end
+      
+      it 'should sort descending without order option' do
+        DataMapper.repository(:ldap) do
+          expected = User.all().sort do |u1, u2|
+            u1.id <=> u2.id
+          end
+          User.all.should == expected
+        end
+      end
+
+      it 'should sort descending with order option' do
+        DataMapper.repository(:ldap) do
+          expected = User.all().sort do |u1, u2|
+            u1.login <=> u2.login
+          end
+          User.all(:order => [:login]).should == expected
+        end
+      end
+    end
+  end
+else
+  puts 'skip sorting spec for non "ruby-ldap" library'
+end

data/spec/spec_helper.rb

@@ -6,8 +6,8 @@ require 'do_sqlite3'
 require 'pathname'
 $LOAD_PATH << Pathname(__FILE__).dirname.parent.expand_path + 'lib'
 
+#require 'ldap/ruby_ldap_facade'
 require 'ldap_resource'
-#require 'ldap_facade_mock' # uncomment this to use the mock facade
 require 'adapters/ldap_adapter'
 require 'adapters/memory_adapter'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-ldap-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - mkristian
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-21 00:00:00 +05:30
+date: 2009-07-03 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,8 +64,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 - ldap-commands.txt
-- net-ldap.txt
-- ruby-ldap.txt
 files: 
 - History.txt
 - MIT-LICENSE
@@ -87,16 +85,14 @@ files:
 - lib/ldap/ruby_ldap_facade.rb
 - lib/ldap/version.rb
 - lib/ldap_resource.rb
-- net-ldap.txt
-- ruby-ldap.txt
 - 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/sorting_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- test.db
 - test.ldif
 has_rdoc: true
 homepage: http://dm-ldap-adapter.rubyforge.org

data/net-ldap.txt

@@ -1,11 +0,0 @@
-6.225829
-6.410389
-6.462378
-6.227339
-6.324937
-6.55648
-6.331228
-6.729877
-6.416464
-6.99718
-0

data/ruby-ldap.txt

@@ -1,11 +0,0 @@
-4.534209
-4.659179
-4.688091
-4.721425
-4.495823
-4.260121
-4.656991
-4.024788
-4.444355
-4.283845
-0