dm-ldap-adapter 0.3.4 → 0.3.5

data/History.txt

@@ -1,3 +1,17 @@
+version 0.3.5
+=============
+
+* sorting can handle nil values now
+
+version 0.3.4
+=============
+
+* fixed bug with or condition
+
+* sort now case insensitive
+
+* added setup parameter to choose the facade the ldap adapter shall use
+
 version 0.3.3
 =============
 

data/Manifest.txt

@@ -1,7 +1,6 @@
 History.txt
 MIT-LICENSE
 Manifest.txt
-Manifest.txt-
 README-example.markdown
 README.txt
 Rakefile

data/Rakefile

@@ -9,6 +9,7 @@ require 'spec/rake/spectask'
 require 'pathname'
 
 Hoe.spec('dm-ldap-adapter') do |p|
+  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"
   p.extra_deps = [['ruby-net-ldap', '=0.0.4'],['slf4r', '>=0'], ['dm-core', '<0.10.0']]

data/lib/adapters/ldap_adapter.rb

@@ -293,8 +293,10 @@ module DataMapper
                                    query.model.key.collect { |k| k.field }, 
                                    to_ldap_conditions(query),
                                    field_names, order_by).sort! do |u1, u2|
-            u1[order_by_sym].first.upcase <=> u2[order_by_sym].first.upcase rescue -1
-          end
+          value1 = u1[order_by_sym].first.upcase rescue ""
+          value2 = u2[order_by_sym].first.upcase rescue ""
+          value1 <=> value2
+        end
         if query.model.multivalue_field
           props_result = []
           result.each do |props|

data/lib/ldap/version.rb

@@ -1,3 +1,3 @@
 module Ldap
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'.freeze
 end

data/spec/sorting_spec.rb

@@ -8,9 +8,10 @@ describe DataMapper.repository(:ldap).adapter 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 => 'Yellow',  :age => nil)
+        @user1 = User.create(:login => "black", :name => 'Black', :mail => "blackmail@exmple.com", :age => 100) 
+        @user2 = User.create(:login => "brown", :name => 'brown', :mail => "brownmail@exmple.com", :age => 25)
+        @user3 = User.create(:login => "blue", :name => 'Yellow')
+        @user4 = User.create(:login => "baluh", :name => 'Hmm')
       end
     end
     
@@ -19,6 +20,7 @@ describe DataMapper.repository(:ldap).adapter do
         @user1.destroy
         @user2.destroy
         @user3.destroy
+        @user4.destroy
       end
     end
     
@@ -47,5 +49,12 @@ describe DataMapper.repository(:ldap).adapter do
         User.all(:order => [:name]).should == expected
       end
     end
+
+    it 'should sort with nil values' do
+      DataMapper.repository(:ldap) do
+        users = User.all(:order => [:mail]).select { |u| !u.mail.nil? }
+        users.should == [@user1, @user2]
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ DataMapper.setup(:ldap, {
                    :host => 'localhost',
                    :port => '389',
                    :base => "dc=example,dc=com",
-                   :facade => :net_ldap,
+#                   :facade => :ruby_ldap,
                    :bind_name => "cn=admin,dc=example,dc=com",
                    :password => "behappy"   
 })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-ldap-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - mkristian
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 +05:30
+date: 2009-11-25 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.3.3
     version: 
-description: ""
+description: ldap adapter for datamapper which uses either net-ldap or ruby-ldap
 email: 
 - m.kristian@web.de
 executables: []
@@ -68,7 +68,6 @@ files:
 - History.txt
 - MIT-LICENSE
 - Manifest.txt
-- Manifest.txt-
 - README-example.markdown
 - README.txt
 - Rakefile

data/Manifest.txt-

@@ -1,27 +0,0 @@
-History.txt
-MIT-LICENSE
-Manifest.txt
-README-example.markdown
-README.txt
-Rakefile
-example/identity_map.rb
-example/posix.rb
-ldap-commands.txt
-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/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