dm-ldap-adapter 0.3.5 → 0.4.0.alpha2

data/.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>dm-ldap-adapter</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

data/Manifest.txt

@@ -1,17 +1,20 @@
+.project
+.yardoc
 History.txt
 MIT-LICENSE
 Manifest.txt
 README-example.markdown
 README.txt
 Rakefile
+env.sh
 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/adapters/noop_transaction.rb
 lib/dummy_ldap_resource.rb
 lib/ldap/array.rb
+lib/ldap/conditions_2_filter.rb
 lib/ldap/digest.rb
 lib/ldap/net_ldap_facade.rb
 lib/ldap/ruby_ldap_facade.rb

data/README-example.markdown

@@ -15,4 +15,3 @@ first you need to adjust the configuration for ldap adapter in `example/posix.rb
      g.users
      u.authenticate("wrong-pwd")
      u.authenticate("pwd")
-

data/README.txt

@@ -4,7 +4,7 @@
 
 *Git*:       [http://github.com/mkristian/dm-ldap-adapter]
 
-*Author*:    Kristian Meier  
+*Author*:    Kristian Meier
 
 *Copyright*: 2008-2009
 
@@ -21,14 +21,14 @@ the ldap library which does the actual ldap protocol stuff is [http://rubyforge.
     DataMapper.setup(:ldap, {
                    :adapter  => 'ldap',
                    :facade => :ruby_ldap,
-		   .... })
+     .... })
 
 or
 
     DataMapper.setup(:ldap, {
                    :adapter  => 'ldap',
                    :facade => :net_ldap,
-		   .... })
+     .... })
 
 === setup DataMapper
 
@@ -40,7 +40,7 @@ or
                    :facade => :ruby_ldap,
                    :bind_name => "cn=admin,dc=example,dc=com",
                    :password => "behappy"
-		   })
+     })
 
 === examples
 
@@ -92,8 +92,8 @@ this uses the underlying bind of a ldap connection. so on any model where you ha
 
 === queries
 
-conditions in ldap depend on the attributes definition in the ldap schema. here is the list of what is working with that ldap adapter side and the usual AND between the conditions:  
-                                                               
+conditions in ldap depend on the attributes definition in the ldap schema. here is the list of what is working with that ldap adapter side and the usual AND between the conditions:
+
 * :eql
 * :not
 * :like
@@ -123,14 +123,14 @@ or-conditions can be done with :conditions option but only of the form "<propert
 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:
 
     class User
-      . . .     
+      . . .
       def self.default_repository_name
         :ldap
       end
     end
 
     class Config
-      . . .   
+      . . .
       def self.default_repository_name
         :db
       end
@@ -139,13 +139,13 @@ most probably you have to work with ldap as one repository and a database as a s
 if you want to benefit from the advantages of the identidy maps you need to wrap your actions for *merb* see http://www.datamapper.org/doku.php?id=docs:identity_map or for *rails* put an `around_filter` inside application.rb
 
      around_filter :repositories
-     
+
      def repositories
        DataMapper.repository(:ldap) do
          DataMapper.repository(:db) do
            yield
-         end 
-       end 
+         end
+       end
      end
 
 and to let the ldap resources use the ldap respository it is best to bind it to that repository like this
@@ -156,7 +156,7 @@ and to let the ldap resources use the ldap respository it is best to bind it to
       :ldap
     end
   end
-   
+
 === transactions
 
 the adapter offers a noop transaction, i.e. you can wrap everything into a transaction but the ldap part has no functionality.
@@ -168,7 +168,7 @@ the adapter offers a noop transaction, i.e. you can wrap everything into a trans
 staying with posix example there the groups has a memberuid attribute BUT unlike with relational databases it can have multiple values. to achieve a relationship with these values the underlying adapter needs to know that this specific attribute needs to be handled differently. for this `multivalue_field` comes into play. the ldap adapter clones the model and places the each memberuid in its own clone.
 
     class GroupUser
-      include DataMapper::Resource    
+      include DataMapper::Resource
       property :memberuid, String, :key => true
       property :gidnumber, Integer, :key => true
       dn_prefix { |group_user| "cn=#{group_user.group.name}" }
@@ -176,9 +176,9 @@ staying with posix example there the groups has a memberuid attribute BUT unlike
       ldap_properties do |group_user|
         {:cn=>"#{group_user.group.name}",  :objectclass => "posixGroup"}
       end
-    
+
       multivalue_field :memberuid
-          
+
     end
 
 === ldap attributes with many values

data/Rakefile

@@ -9,10 +9,11 @@ require 'spec/rake/spectask'
 require 'pathname'
 
 Hoe.spec('dm-ldap-adapter') do |p|
+  p.version = "0.4.0.alpha2"
   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']]
+  p.extra_deps = [['ruby-net-ldap', '=0.0.4'],['slf4r', '>=0'], ['dm-core', '~>1.0.0']]
   p.remote_rdoc_dir = '' # Release to root
 end
 
@@ -30,8 +31,8 @@ Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_files = Pathname.glob('./spec/**/*_spec.rb')
 end
 
-require 'yard'
+#require 'yard'
 
-YARD::Rake::YardocTask.new
+#YARD::Rake::YardocTask.new
 
 # vim: syntax=Ruby

data/env.sh

@@ -0,0 +1,2 @@
+export GEM_PATH=$PWD/../localgems
+export PATH=$PATH:$GEM_PATH/bin

data/example/identity_map.rb

@@ -3,11 +3,11 @@ require 'example/posix.rb'
 USER_REPO = :default
 
 class User
-  
+
   def self.ddefault_repository_name
     USER_REPO
   end
-  
+
   def self.repository_name
     USER_REPO
   end
@@ -19,11 +19,11 @@ class User
 end
 
 class GroupUser
-  
+
   def self.ddefault_repository_name
     USER_REPO
   end
-  
+
   def self.repository_name
     USER_REPO
   end
@@ -31,11 +31,11 @@ class GroupUser
 end
 
 class Group
-  
+
   def self.ddefault_repository_name
     USER_REPO
   end
-  
+
   def self.repository_name
     USER_REPO
   end
@@ -60,13 +60,13 @@ DataMapper.repository(USER_REPO) do |repository|
       root.groups << admin
 
       p DataMapper.repository(USER_REPO).identity_map(User)
-      
+
       p DataMapper.repository(USER_REPO).identity_map(Group)
-      
+
       p root.authenticate('none')
-      
+
       p root.groups
-      
+
       (1..10).each {Item.create}
 
       p DataMapper.repository(DATA_REPO).identity_map(Item)

data/example/posix.rb

@@ -31,7 +31,7 @@ unless dummy
                      :port => '389',
                      :base => ENV['LDAP_BASE'] || "dc=example,dc=com",
                      :bind_name => "cn=admin," + (ENV['LDAP_BASE'] || "dc=example,dc=com"),
-                     :password => ENV['LDAP_PWD'] || "behappy"   
+                     :password => ENV['LDAP_PWD'] || "behappy"
                    })
 else
   require 'dummy_ldap_resource'
@@ -101,11 +101,11 @@ class Group
   include Slf4r::Logger
   property :id,       Serial, :field => "gidnumber"
   property :name,     String, :field => "cn"
-  
+
   dn_prefix { |group| "cn=#{group.name}" }
-  
+
   treebase "ou=groups"
-  
+
   ldap_properties {{ :objectclass => "posixGroup"}}
 
   def users
@@ -131,17 +131,17 @@ class Group
     users
   end
 end
- 
+
 class GroupUser
   include DataMapper::Resource
   include Slf4r::Logger
- 
+
   dn_prefix { |group_user| "cn=#{group_user.group.name}" }
-  
+
   treebase "ou=groups"
-  
+
   multivalue_field :memberuid
-  
+
   ldap_properties do |group_user|
     {:cn=>"#{group_user.group.name}",  :objectclass => "posixGroup"}
   end

data/ldap-commands.txt

@@ -12,3 +12,6 @@ ldapsearch -x -w behappy -c -D "cn=admin,dc=example,dc=com" -b 'ou=groups,dc=exa
 
 # printout delete commands for all people
 ldapsearch -x -w behappy -c -D "cn=admin,dc=example,dc=com" -b 'ou=people,dc=example,dc=com' "uid=*" | grep ^uid: | sed -e "s/^.....//" -e 's/$/,ou=people,dc=example,dc=com"/' -e 's/^/-x -w behappy -c -D "cn=admin,dc=example,dc=com" "uid=/' | xargs -L 1 echo ldapdelete
+
+# all groups
+ldapsearch -x -w behappy -c -D "cn=admin,dc=example,dc=com" -b 'ou=groups,dc=example,dc=com' "cn=*" | grep ^cn: | sed -e "s/^....//" -e 's/$/,ou=groups,dc=example,dc=com"/' -e 's/^/-x -w behappy -c -D "cn=admin,dc=example,dc=com" "cn=/' | xargs -L 1 echo ldapdelete