dm-ldap-adapter 0.4.3 → 0.4.4

data/lib/adapters/ldap_adapter.rb

@@ -28,17 +28,27 @@ module Ldap
       end
       logger.info("using #{@facade}")
       @ldaps = { }
-      auth =  {
-        :method => :simple,
-        :username => options[:bind_name],
-        :password => options[:password]
-      }
       @config = {
         :host => options[:host],
         :port => options[:port].to_i,
-        :auth => auth,
         :base => options[:base]
       }
+
+      if not options[:bind_name].nil? then
+        @config.update({
+          :auth => {
+            :method => :simple,
+            :username => options[:bind_name],
+            :password => options[:password]
+          }
+        })
+      end
+
+      if not options[:adapter_options].nil? then
+        options[:adapter_options].each do |k,v|
+          @config[k.to_sym] = v
+        end
+      end
     end
 
     # puts a LdapFacade into the current thread and executes the
@@ -178,7 +188,7 @@ module DataMapper
       end
 
       def update(attributes, collection)
-        collection.each do |resource|
+        size = collection.each do |resource|
 #puts "update"
 #p resource
           update_resource(resource, attributes)

data/lib/dm-ldap-adapter.rb

@@ -1 +1,2 @@
-require 'adapter/ldap-adapter'
+require 'slf4r'
+require 'adapters/ldap_adapter'

data/lib/ldap/net_ldap_facade.rb

@@ -1,4 +1,5 @@
 require 'net/ldap'
+require 'slf4r'
 require 'ldap/conditions_2_filter'
 
 module Ldap

data/lib/ldap_resource.rb

@@ -4,7 +4,15 @@ require 'ldap/array'
 
 module DataMapper
   module Model
-   
+
+    if DataMapper::VERSION =~ /^1.[0-1]/
+      Immutable = Resource::State::Immutable
+      Clean = Resource::State::Clean
+    else
+      Immutable = Resource::PersistenceState::Immutable
+      Clean = Resource::PersistenceState::Clean
+    end
+
       def load(records, query)
         repository      = query.repository
         repository_name = repository.name
@@ -67,13 +75,17 @@ module DataMapper
           resource.instance_variable_set(:@_repository, repository)
           
           if identity_map
-            resource.persisted_state = Resource::State::Clean.new(resource) unless resource.persisted_state?
-            
+            if DataMapper::VERSION =~ /^1.[0-1]/
+              resource.persisted_state = Clean.new(resource) unless resource.persisted_state?
+            else               
+              resource.persistence_state = Clean.new(resource) unless resource.persistence_state?
+            end
+
             # defer setting the IdentityMap so second level caches can
             # record the state of the resource after loaded
             identity_map[key_values] = resource
           else
-            resource.persisted_state = Resource::State::Immutable.new(resource)
+            resource.persisted_state = Immutable.new(resource)
           end
           
           resource

data/spec/assiociations_ldap_adapter_spec.rb

@@ -1,4 +1,3 @@
-$LOAD_PATH << File.dirname(__FILE__)
 require 'spec_helper'
 
 describe DataMapper::Adapters::LdapAdapter do

data/spec/authentication_ldap_adapter_spec.rb

@@ -1,4 +1,3 @@
-$LOAD_PATH << File.dirname(__FILE__)
 require 'spec_helper'
 
 describe DataMapper.repository(:ldap).adapter do

data/spec/ldap_adapter_spec.rb

@@ -1,4 +1,3 @@
-$LOAD_PATH << File.dirname(__FILE__)
 require 'spec_helper'
 require 'ldap/transactions'
 
@@ -50,6 +49,15 @@ describe DataMapper::Adapters::LdapAdapter do
     end
   end
 
+  it 'should return false if save fails' do
+    DataMapper.repository(:ldap) do
+      u = User.first(:login.not => "black")
+      u.age = 'some error'
+      u.save.should be_false
+      #p User.all
+    end
+  end
+
   it 'should be able to get all the objects' do
     DataMapper.repository(:ldap) do
       User.all(:login.like => "b%").should == [@user1, @user2, @user3]

data/spec/ldap_array_spec.rb

@@ -1,11 +1,6 @@
-$LOAD_PATH << Pathname(__FILE__).dirname.parent.expand_path + 'lib'
-
-require 'ldap/array'
-require 'dm-migrations'
-require 'dm-sqlite-adapter'
+require 'spec_helper'
 
 class A
-  
   include DataMapper::Resource
 
   property :id, Serial

data/spec/multi_repository_spec.rb

@@ -1,4 +1,3 @@
-$LOAD_PATH << File.dirname(__FILE__)
 require 'spec_helper'
 
 class Order

data/spec/multi_value_attributes_spec.rb

@@ -1,32 +1,5 @@
-$LOAD_PATH << File.dirname(__FILE__)
 require 'spec_helper'
 
-class TestContact
-  include DataMapper::Resource
-
-  property :id,        Serial, :field => "uidNumber"
-  property :login,     String, :field => "uid", :unique_index => true
-  property :hashed_password,  String, :field => "userPassword", :lazy => true
-  property :name,      String, :field => "cn"
-  property :mail,      ::Ldap::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

data/spec/sorting_spec.rb

@@ -1,4 +1,3 @@
-$LOAD_PATH << File.dirname(__FILE__)
 require 'spec_helper'
 
 describe DataMapper.repository(:ldap).adapter do
@@ -58,4 +57,4 @@ describe DataMapper.repository(:ldap).adapter do
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,19 +1,18 @@
-require 'rubygems'
-
-require 'slf4r/ruby_logger'
-Slf4r::LoggerFacade4RubyLogger.level = :warn
+#Require main environment
+require 'dm-ldap-adapter'
 
+#Require developer depdencies
 require 'dm-sqlite-adapter'
 require 'dm-migrations'
-require 'dm-transactions'
-require 'pathname'
-$LOAD_PATH << Pathname(__FILE__).dirname.parent.expand_path + 'lib'
 
 print "datamapper version:"
 puts DataMapper::VERSION
 
+#Logging needs to be cleaned up...
+require 'slf4r/ruby_logger'
+Slf4r::LoggerFacade4RubyLogger.level = :warn
+
 require 'ldap_resource'
-require 'adapters/ldap_adapter'
 
 DataMapper.setup(:default, 'sqlite3::memory:')
 DataMapper.setup(:ldap, {
@@ -28,136 +27,10 @@ DataMapper.setup(:ldap, {
 
 puts "using facade #{(ENV['FACADE'] || :net_ldap).to_sym}"
 
-module DataMapper
-  module Resource
-    class State
-
-      # a persisted/deleted resource
-      class Deleted < Persisted
-        def set(subject, value)
-          warn 'Deleted resource cannot be modified ' + subject.inspect + ' ' + value.to_s + " " + @resource.inspect
-          super
-        end
-      end
-    end
-  end
-end
-class User
-  include DataMapper::Resource
-  property :id,        Serial, :field => "uidnumber"
-  property :login,     String, :field => "uid", :unique_index => true
-  property :hashed_password,  String, :field => "userPassword", :writer => :private
-  property :name,      String, :field => "cn"
-  property :mail,      String
-  property :age,       Integer, :field => "postalCode"
-  property :alive,     Boolean, :field => "gecos"
-
-  has n, :roles
-
-  has n, :group_users
-
-  def groups
-    groups = GroupUser.all(:user_id => login).collect{ |gu| gu.group }
-
-    def groups.user=(user)
-      @user = user
-    end
-
-    groups.user = self
-
-    def groups.<<(group)
-      unless member? group
-        GroupUser.create(:user_id => @user.login, :group_id => group.id)
-        super
-      end
-      self
-    end
-
-    def groups.delete(group)
-      gu = GroupUser.first(:user_id => @user.login, :group_id => group.id)
-      if gu
-        gu.destroy
-        super
-      end
-    end
-
-    groups
-  end
-
-  dn_prefix { |user| "uid=#{user.login}"}
-
-  treebase "ou=people"
-
-  ldap_properties do |user|
-    properties = { :objectclass => ["inetOrgPerson", "posixAccount", "shadowAccount"], :loginshell => "/bin/bash", :gidnumber => "10000" }
-    properties[:sn] = "#{user.name.sub(/.*\ /, "")}"
-    properties[:givenname] = "#{user.name.sub(/\ .*/, "")}"
-    properties[:homedirectory] = "/home/#{user.login}"
-    properties
-  end
-
-  def password=(password)
-    salt = "--#{Time.now}--#{login}--"
-    attribute_set(:hashed_password, Ldap::Digest.ssha(password, salt)) if password
-  end
-end
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f}
 
-class Role
-  include DataMapper::Resource
-  property :id,       Serial, :field => "gidNumber"
-  property :name,     String, :field => "cn"
-
-  dn_prefix { |role| "cn=#{role.name}" }
-
-  treebase "ou=groups"
-
-  ldap_properties {{:objectclass => "posixGroup"}}
-
-  belongs_to :user
-end
-
-class Group
-  include DataMapper::Resource
-  property :id,       Serial, :field => "gidNumber"
-  property :name,     String, :field => "cn"
-
-  dn_prefix { |group| "cn=#{group.name}" }
-
-  treebase "ou=groups"
-
-  ldap_properties {{:objectclass => "posixGroup"}}
-end
-
-class GroupUser
-  include DataMapper::Resource
-
-  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
-
-  property :user_id, String, :key => true, :field => "memberUid"
-  property :group_id, Integer, :key => true, :field => "gidNumber"
-
-  def group
-    Group.get!(group_id)
-  end
-
-  def group=(group)
-    group_id = group.id
-  end
+DataMapper.auto_migrate!(:default)
 
-  def user
-    User.get!(user_id)
-  end
 
-  def user=(user)
-    user_id = user.id
-  end
-end
-DataMapper.auto_migrate!(:default)

data/spec/support/group.rb

@@ -0,0 +1,11 @@
+class Group
+  include DataMapper::Resource
+  property :id,       Serial, :field => "gidNumber"
+  property :name,     String, :field => "cn"
+
+  dn_prefix { |group| "cn=#{group.name}" }
+
+  treebase "ou=groups"
+
+  ldap_properties {{:objectclass => "posixGroup"}}
+end

data/spec/support/group_user.rb

@@ -0,0 +1,32 @@
+class GroupUser
+  include DataMapper::Resource
+
+  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
+
+  property :user_id, String, :key => true, :field => "memberUid"
+  property :group_id, Integer, :key => true, :field => "gidNumber"
+
+  def group
+    Group.get!(group_id)
+  end
+
+  def group=(group)
+    group_id = group.id
+  end
+
+  def user
+    User.get!(user_id)
+  end
+
+  def user=(user)
+    user_id = user.id
+  end
+end

data/spec/support/role.rb

@@ -0,0 +1,13 @@
+class Role
+  include DataMapper::Resource
+  property :id,       Serial, :field => "gidNumber"
+  property :name,     String, :field => "cn"
+
+  dn_prefix { |role| "cn=#{role.name}" }
+
+  treebase "ou=groups"
+
+  ldap_properties {{:objectclass => "posixGroup"}}
+
+  belongs_to :user
+end

data/spec/support/test_contact.rb

@@ -0,0 +1,25 @@
+class TestContact
+  include DataMapper::Resource
+
+  property :id,        Serial, :field => "uidNumber"
+  property :login,     String, :field => "uid", :unique_index => true
+  property :hashed_password,  String, :field => "userPassword", :lazy => true
+  property :name,      String, :field => "cn"
+  property :mail,      ::Ldap::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

data/spec/support/user.rb

@@ -0,0 +1,59 @@
+class User
+  include DataMapper::Resource
+  property :id,        Serial, :field => "uidnumber"
+  property :login,     String, :field => "uid", :unique_index => true
+  property :hashed_password,  String, :field => "userPassword", :writer => :private
+  property :name,      String, :field => "cn"
+  property :mail,      String
+  property :age,       Integer, :field => "postalCode"
+  property :alive,     Boolean, :field => "gecos"
+
+  has n, :roles
+
+  has n, :group_users
+
+  def groups
+    groups = GroupUser.all(:user_id => login).collect{ |gu| gu.group }
+
+    def groups.user=(user)
+      @user = user
+    end
+
+    groups.user = self
+
+    def groups.<<(group)
+      unless member? group
+        GroupUser.create(:user_id => @user.login, :group_id => group.id)
+        super
+      end
+      self
+    end
+
+    def groups.delete(group)
+      gu = GroupUser.first(:user_id => @user.login, :group_id => group.id)
+      if gu
+        gu.destroy
+        super
+      end
+    end
+
+    groups
+  end
+
+  dn_prefix { |user| "uid=#{user.login}"}
+
+  treebase "ou=people"
+
+  ldap_properties do |user|
+    properties = { :objectclass => ["inetOrgPerson", "posixAccount", "shadowAccount"], :loginshell => "/bin/bash", :gidnumber => "10000" }
+    properties[:sn] = "#{user.name.sub(/.*\ /, "")}"
+    properties[:givenname] = "#{user.name.sub(/\ .*/, "")}"
+    properties[:homedirectory] = "/home/#{user.login}"
+    properties
+  end
+
+  def password=(password)
+    salt = "--#{Time.now}--#{login}--"
+    attribute_set(:hashed_password, Ldap::Digest.ssha(password, salt)) if password
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-ldap-adapter
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - mkristian
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 +05:30
-default_executable: 
+date: 2011-12-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ldap
@@ -128,9 +127,25 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: ruby-ldap
+  name: bundler
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 0
+        - 15
+        version: 1.0.15
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: ruby-ldap
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -142,7 +157,7 @@ dependencies:
         - 11
         version: 0.9.11
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 description: ldap adapter for datamapper which uses either net-ldap or ruby-ldap
 email: 
 - m.kristian@web.de
@@ -178,14 +193,17 @@ files:
 - spec/multi_value_attributes_spec.rb
 - spec/sorting_spec.rb
 - spec/multi_repository_spec.rb
-- spec/contact.rb
 - spec/spec_helper.rb
 - spec/ldap_adapter_spec.rb
 - spec/authentication_ldap_adapter_spec.rb
 - spec/assiociations_ldap_adapter_spec.rb
 - spec/ldap_array_spec.rb
+- spec/support/group_user.rb
+- spec/support/user.rb
+- spec/support/test_contact.rb
+- spec/support/role.rb
+- spec/support/group.rb
 - example/posix.rb
-has_rdoc: true
 homepage: http://github.com/mkristian/dm-ldap-adapter
 licenses: []
 
@@ -216,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: ""

data/spec/contact.rb

@@ -1,58 +0,0 @@
-class Contact
-	include DataMapper::Resource
-
-	def self.auto_upgrade!(args = nil)
-		DataMapper.logger.warn("Skipping #{self.name}.auto_upgrade!")
-	end
-
-	def self.default_repository_name
-		:ldap
-	end
-
-	def self.repository_name
-		:ldap
-	end
-	
-	property :id,						Serial, :field => 'uid'
-	property :cn,						String, :required => true
-	property :salutation,					String, :lazy => [:view]
-	property :title,					String, :lazy => [:view]
-	property :givenname,					String
-	property :sn,						String, :required => true
-	property :o,						String
-	property :postaladdress,				String, :lazy => [:view]
-	property :postalcode,					String, :lazy => [:view]
-	property :l,						String
-	property :st,						String, :lazy => [:view]
-	property :c,						String, :lazy => [:view]
-	property :telephonenumber,				String
-	property :facsimiletelephonenumber,			String, :lazy => [:view]
-	property :pager,					String, :lazy => [:view]
-	property :jpegphoto,					LdapArray, :lazy => true
-	property :mobile,					String, :lazy => [:view]
-	property :anniversary,					String, :lazy => [:view]
-	property :mail,						LdapArray
-	property :labeleduri,					LdapArray, :lazy => [:view]
-	property :marker,					LdapArray, :lazy => [:view]
-	property :description,					LdapArray, :lazy => [:view]
-
-	dn_prefix do |u|
-		"uid=#{u.id}"
-	end
-
-	ldap_properties do |u|
-          properties = { :objectclass => ['inetOrgPerson']}#, "posixAccount", "shadowAccount"]}#'contactPerson'] }
-		properties
-	end
-
-	treebase 'ou=people'
-
-	before :save, :fix_object
-
-private
-
-	def fix_object
-		self.cn = "#{self.givenname} #{self.sn}".strip
-	end
-
-end