dm-ldap-adapter 0.3.3 → 0.3.4

data/README.txt

@@ -16,9 +16,31 @@ 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] 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:
+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]. just add a facade parameter when setting up DataMapper
 
-    require 'ldap/ruby_ldap_facade'
+    DataMapper.setup(:ldap, {
+                   :adapter  => 'ldap',
+                   :facade => :ruby_ldap,
+		   .... })
+
+or
+
+    DataMapper.setup(:ldap, {
+                   :adapter  => 'ldap',
+                   :facade => :net_ldap,
+		   .... })
+
+=== setup DataMapper
+
+    DataMapper.setup(:ldap, {
+                   :adapter  => 'ldap',
+                   :host => 'localhost',
+                   :port => '389',
+                   :base => "dc=example,dc=com",
+                   :facade => :ruby_ldap,
+                   :bind_name => "cn=admin,dc=example,dc=com",
+                   :password => "behappy"
+		   })
 
 === examples
 
@@ -96,12 +118,6 @@ or-conditions can be done with :conditions option but only of the form "<propert
 
     Contact.all(:name.like => "A%", :conditions => ["phone like '+49%' or mobile like '+49%'"])
 
-=== using the ruby-ldap gem
-
-just require the right facade before require the adapter:
-
-    require 'ldap/ruby_ldap_facade'
-
 === multiple repositories
 
 most probably you have to work with ldap as one repository and a database as a second repository. for me it worked best to define the `default_repository` for each model in the model itself:
@@ -187,6 +203,7 @@ let's say your LDAP has multiple email values for a users then you can define yo
 
 * slf4r the logging facade
 * net-ldap pure ruby ldap library
+* ruby-ldap (optional) ruby with native ldap code
 * logging (optional) if logging via logging is desired
 * log4r (optional) if logging via log4r is desired
 

data/Rakefile

@@ -8,10 +8,10 @@ require 'spec'
 require 'spec/rake/spectask'
 require 'pathname'
 
-Hoe.new('dm-ldap-adapter', Ldap::VERSION) do |p|
+Hoe.spec('dm-ldap-adapter') do |p|
   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', ['dm-core', '<0.10.0']]
+  p.extra_deps = [['ruby-net-ldap', '=0.0.4'],['slf4r', '>=0'], ['dm-core', '<0.10.0']]
   p.remote_rdoc_dir = '' # Release to root
 end
 

data/lib/adapters/ldap_adapter.rb

@@ -1,6 +1,4 @@
 require 'adapters/simple_adapter'
-# load the ldap facade only if NOT loaded before
-require 'ldap/net_ldap_facade' unless Object.const_defined?('Ldap') and Ldap.const_defined?('LdapFacade')
 
 module Ldap
 
@@ -11,6 +9,22 @@ module Ldap
     include ::Slf4r::Logger
 
     def initialize(uri)
+      if uri[:facade].nil?
+        require 'ldap/net_ldap_facade'
+        @facade = ::Ldap::NetLdapFacade
+      else
+        case uri[:facade].to_sym
+        when :ruby_ldap
+          require 'ldap/ruby_ldap_facade'
+          @facade = ::Ldap::RubyLdapFacade
+        when :net_ldap
+          require 'ldap/net_ldap_facade'
+          @facade = ::Ldap::NetLdapFacade
+        else
+          "please add a :facade parameter to the adapter setup. possible values are :ruby_ldap or net_ldap"
+        end
+      end
+      logger.info("using #{@facade}")
       @ldaps = { }
       auth =  { 
         :method => :simple,
@@ -29,8 +43,8 @@ module Ldap
     # given block.
     def open
       begin
-        Ldap::LdapFacade.open(@config) do |ldap|
-          @ldaps[Thread.current] = Ldap::LdapFacade.new(ldap)
+        @facade.open(@config) do |ldap|
+          @ldaps[Thread.current] = @facade.new(ldap)
           yield
         end
       ensure
@@ -45,7 +59,7 @@ module Ldap
       if ldap
         ldap
       else
-        Ldap::LdapFacade.new(@config)
+        @facade.new(@config)
       end
     end
   end
@@ -273,11 +287,14 @@ module DataMapper
       # @see SimpleAdapter#read_resources
       def read_resources(query)
         order_by = query.order.first.property.field
+        order_by_sym = order_by.to_sym
         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, order_by)
+                                   field_names, order_by).sort! do |u1, u2|
+            u1[order_by_sym].first.upcase <=> u2[order_by_sym].first.upcase rescue -1
+          end
         if query.model.multivalue_field
           props_result = []
           result.each do |props|

data/lib/ldap/net_ldap_facade.rb

@@ -1,7 +1,7 @@
 require 'net/ldap'
 
 module Ldap
-  class LdapFacade
+  class NetLdapFacade
     
     # @param config Hash for the ldap connection
     def self.open(config)
@@ -75,11 +75,11 @@ module Ldap
                  when :eql
                    Net::LDAP::Filter.eq( cc[1].to_s, cc[2].to_s )
                  when :gte
-                   f = Net::LDAP::Filter.ge( cc[1].to_s, cc[2].to_s )
+                   Net::LDAP::Filter.ge( cc[1].to_s, cc[2].to_s )
                  when :lte
-                   f = Net::LDAP::Filter.le( cc[1].to_s, cc[2].to_s )
+                   Net::LDAP::Filter.le( cc[1].to_s, cc[2].to_s )
                  when :like
-                   f = Net::LDAP::Filter.eq( cc[1].to_s, cc[2].to_s.gsub(/%/, "*").gsub(/_/, "*").gsub(/\*\*/, "*") )
+                   Net::LDAP::Filter.eq( cc[1].to_s, cc[2].to_s.gsub(/%/, "*").gsub(/_/, "*").gsub(/\*\*/, "*") )
                  else
                    logger.error(cc[0].to_s + " needs coding")
                  end

data/lib/ldap/ruby_ldap_facade.rb

@@ -17,7 +17,7 @@ module Ldap
     
   end
 
-  class LdapFacade
+  class RubyLdapFacade
     
     # @param config Hash for the ldap connection
     def self.open(config)
@@ -95,11 +95,11 @@ module Ldap
                  when :eql
                    Net::LDAP::Filter.eq( cc[1].to_s, cc[2].to_s )
                  when :gte
-                   f = Net::LDAP::Filter.ge( cc[1].to_s, cc[2].to_s )
+                   Net::LDAP::Filter.ge( cc[1].to_s, cc[2].to_s )
                  when :lte
-                   f = Net::LDAP::Filter.le( cc[1].to_s, cc[2].to_s )
+                   Net::LDAP::Filter.le( cc[1].to_s, cc[2].to_s )
                  when :like
-                   f = Net::LDAP::Filter.eq( cc[1].to_s, cc[2].to_s.gsub(/%/, "*").gsub(/_/, "*").gsub(/\*\*/, "*") )
+                   Net::LDAP::Filter.eq( cc[1].to_s, cc[2].to_s.gsub(/%/, "*").gsub(/_/, "*").gsub(/\*\*/, "*") )
                  else
                    logger.error(cc[0].to_s + " needs coding")
                  end
@@ -154,7 +154,7 @@ module Ldap
         end
         filters << f if f
       end
-      
+
       filter = nil
       filters.each do |f|
         if filter.nil?

data/lib/ldap/version.rb

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

data/spec/ldap_adapter_spec.rb

@@ -130,6 +130,7 @@ require 'spec_helper'
           User.all(:conditions => ["name like 'Bl%'"]).should == [@user1, @user3]
           User.all(:conditions => ["name like 'B%'"]).should == [@user1, @user2, @user3]
           User.all(:conditions => ["name like 'X%X_X'"]).should == []
+User.all(:conditions => ["name like 'Bla%' or name like 'Br%'"]).should == [@user1, @user2]
         end
       end
     end

data/spec/multi_repository_spec.rb

@@ -11,7 +11,7 @@ class Order
   end
 end
 
-DataMapper.auto_migrate!(:default)
+Order.auto_migrate!(:default)
 
 describe DataMapper.repository(:ldap).adapter do
 

data/spec/sorting_spec.rb

@@ -1,47 +1,51 @@
 $LOAD_PATH << File.dirname(__FILE__)
 require 'spec_helper'
 
-if Object.const_defined?('LDAP')
-  describe DataMapper.repository(:ldap).adapter do
+describe DataMapper.repository(:ldap).adapter do
+  
+  describe 'belongs_to association' 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
+    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)
       end
-      
-      after do
-        DataMapper.repository(:ldap) do
-          @user1.destroy
-          @user2.destroy
-          @user3.destroy
-        end
+    end
+    
+    after do
+      DataMapper.repository(:ldap) do
+        @user1.destroy
+        @user2.destroy
+        @user3.destroy
       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
+    
+    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
+    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
+    it 'should sort case insensitive with order option' do
+      DataMapper.repository(:ldap) do
+        expected = User.all().sort do |u1, u2|
+          u1.name.upcase <=> u2.name.upcase
         end
+        User.all(:order => [:name]).should == expected
       end
     end
   end
-else
-  puts 'skip sorting spec for non "ruby-ldap" library'
 end

data/spec/spec_helper.rb

@@ -1,12 +1,15 @@
 require 'rubygems'
 
 require 'slf4r/ruby_logger'
-Slf4r::LoggerFacade4RubyLogger.level = ::Logger::DEBUG
+Slf4r::LoggerFacade4RubyLogger.level = :info
+
+gem 'dm-core', "<0.10.0"
+gem 'do_sqlite3', "<0.10.0"
+
 require 'do_sqlite3'
 require 'pathname'
 $LOAD_PATH << Pathname(__FILE__).dirname.parent.expand_path + 'lib'
 
-#require 'ldap/ruby_ldap_facade'
 require 'ldap_resource'
 require 'adapters/ldap_adapter'
 require 'adapters/memory_adapter'
@@ -17,6 +20,7 @@ DataMapper.setup(:ldap, {
                    :host => 'localhost',
                    :port => '389',
                    :base => "dc=example,dc=com",
+                   :facade => :net_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.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - mkristian
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-03 00:00:00 +05:30
+date: 2009-11-20 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        version: 2.3.3
     version: 
 description: ""
 email: 
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dm-ldap-adapter
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: ""