dm-ldap-adapter 0.4.5-java → 0.4.6-java

data/README-bundler.md

@@ -0,0 +1,34 @@
+# no Gemfile.lock on git #
+
+there are two references for different DM versions
+
+* ~> 1.1.0
+
+* ~> 1.0.0
+
+with a simple symbolic link you can switch between these two profiles.
+
+`$ ln -s Gemfile.lock.1.1.0 Gemfile.lock`
+
+for that reason Gemfile.lock in not on github, so the script run-all.sh
+
+# run specs #
+
+`$ bundle exec spec spec`
+
+or for some jruby versions (which needs jruby and ruby-maven gem)
+
+`$ rmvn test`
+`$ rmvn test --Djruby.versions=1.5.6,1.6.2 -Djruby.18and19
+
+# build gem
+
+for the ruby platform
+
+`$ gem build dm-ldap-adapter.gemspec`
+
+or for java platform (needs jruby and ruby-maven gem)
+
+`$ rmvn package`
+
+gem will be inside target/dm-ldap-adapter directory.

data/README-example.md

@@ -0,0 +1,17 @@
+posix accounts/groups example
+=============================
+
+first you need to adjust the configuration for ldap adapter in `example/posix.rb` and then start irb
+
+    $ LDAP_PWD='secret' irb
+
+     require 'example/posix.rb'
+     u = User.create(:login=>'test', :name => "name", :password => "pwd")
+     User.all
+     g = Group.create(:name => "test")
+     Group.all
+     u.groups << g
+     u.groups
+     g.users
+     u.authenticate("wrong-pwd")
+     u.authenticate("pwd")

data/example/posix.rb

@@ -0,0 +1,166 @@
+require 'pathname'
+require 'rubygems'
+require 'slf4r/logger'
+require 'slf4r/ruby_logger'
+require 'dm-core'
+
+$LOAD_PATH << Pathname(__FILE__).dirname.parent.expand_path + 'lib'
+
+# Logging.init :debug, :info, :warn, :error
+
+# appender = Logging::Appender.stdout
+# appender.layout = Logging::Layouts::Pattern.new(:pattern => "%d [%-l] (%c) %m\n")
+# logger = Logging::Logger.new(:root)
+# logger.add_appenders(appender)
+# logger.level = :debug
+# logger.info "initialized logger . . ."
+
+dummy = false # uncomment this to use ldap, dummy = false uses the database
+unless dummy
+  require 'ldap_resource'
+
+  require 'adapters/ldap_adapter'
+
+  DataMapper.setup(:default, {
+                     :adapter  => 'ldap',
+                     :host => 'localhost',
+                     :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"
+                   })
+else
+  require 'dummy_ldap_resource'
+  DataMapper.setup(:default, 'sqlite3::memory:')
+  adapter = DataMapper.repository.adapter
+  def adapter.ldap_connection
+    con = Object.new
+    def con.open
+      yield
+    end
+    con
+  end
+end
+
+class User
+  include DataMapper::Resource
+
+  property :id,        Serial, :field => "uidNumber"
+  property :login,     String, :field => "uid"
+  property :hashed_password,  String, :field => "userPassword"
+  property :name,      String, :field => "cn"
+
+  has n, :group_users, :child_key => [:memberuid]
+
+  def groups
+    groups = GroupUser.all(:memberuid => login).collect{ |gu| gu.group }
+    def groups.user=(user)
+      @user = user
+    end
+    groups.user = self
+    def groups.<<(group)
+      unless member? group
+        GroupUser.create(:memberuid => @user.login, :gidnumber => group.id)
+        super
+      end
+      self
+    end
+    def groups.delete(group)
+      gu = GroupUser.first(:memberuid => @user.login, :gidnumber => 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)
+    attribute_set(:hashed_password, Ldap::Digest.sha(password)) if password
+  end
+end
+
+class Group
+  include DataMapper::Resource
+  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
+    users = GroupUser.all(:gidnumber => id).collect{ |gu| gu.user }
+    def users.group=(group)
+      @group = group
+    end
+    users.group = self
+    def users.<<(user)
+      unless member? user
+        GroupUser.create(:memberuid => user.login, :gidnumber => @group.id)
+        super
+      end
+      self
+    end
+    def users.delete(user)
+      gu = GroupUser.first(:memberuid => user.login, :gidnumber => @group.id)
+      if gu
+        gu.destroy
+        super
+      end
+    end
+    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
+  property :memberuid, String, :key => true#, :field => "memberUid"
+  property :gidnumber, Integer, :key => true#, :field => "gidNumber"
+
+  def group
+    Group.get!(gidnumber)
+  end
+
+  def group=(group)
+    gidnumber = group.id
+  end
+
+  def user
+    User.first(:login => memberuid)
+  end
+
+  def user=(user)
+    memberuid = user.login
+  end
+end
+
+if dummy
+  DataMapper.auto_migrate!
+end

data/lib/adapters/ldap_adapter.rb

@@ -209,16 +209,22 @@ module DataMapper
           value = prop.get!(resource)
           if prop.class == ::Ldap::LdapArray
             props[prop.field.to_sym] = value unless value.nil? or value.size == 0
+          elsif ::DataMapper::Property::Boolean === prop
+            props[prop.field.to_sym] = value ? 'TRUE' : 'FALSE' unless value.nil?
           else
-            props[prop.field.to_sym] = value.to_s unless value.nil?
+            props[prop.field.to_sym] = prop.dump(value).to_s unless value.nil?
           end
           key = prop if prop.serial?
         end
         resource_dup = resource.dup
-        id = ldap.retrieve_next_id(resource.model.treebase,
-                                   key_properties(resource).field)
-        resource_dup.send("#{key_properties(resource).name}=".to_sym, id)
-        props[key_properties(resource).field.to_sym] = "#{id}"
+
+        if props[key_properties(resource).field.to_sym].nil? then
+          id = ldap.retrieve_next_id(resource.model.treebase,
+                                     key_properties(resource).field)
+          resource_dup.send("#{key_properties(resource).name}=".to_sym, id)
+          props[key_properties(resource).field.to_sym] = "#{id}"
+        end
+
         key_value = begin
                       ldap.create_object(resource.model.dn_prefix(resource_dup),
                                          resource.model.treebase,

data/lib/ldap/net_ldap_facade.rb

@@ -65,13 +65,14 @@ module Ldap
     # @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, order_field = nil)
-      searchbase = base(treebase)
-      filter = Conditions2Filter.convert(conditions)
 
       # If there is a :dn in the filter skip everything and look it up
       if dn = conditions.detect { |c| c[1] == "dn" } then
         searchbase = dn[2]
         filter = nil
+      else
+        searchbase = base(treebase)
+        filter = Conditions2Filter.convert(conditions)
       end
 
       result = []

metadata

@@ -1,307 +1,215 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dm-ldap-adapter
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.4.5
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 0.4.6
 platform: java
-authors: 
-  - mkristian
-  - xertres
-autorequire: 
+authors:
+- mkristian
+- xertres
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2011-12-14 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: net-ldap
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.2.2
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: slf4r
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.4.2
-    type: :runtime
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: dm-core
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.2.0
-    type: :runtime
-    version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: addressable
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.2.6
-    type: :runtime
-    version_requirements: *id004
-  - !ruby/object:Gem::Dependency 
-    name: dm-transactions
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.2.0
-    type: :runtime
-    version_requirements: *id005
-  - !ruby/object:Gem::Dependency 
-    name: dm-sqlite-adapter
-    prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.2.0
-    type: :development
-    version_requirements: *id006
-  - !ruby/object:Gem::Dependency 
-    name: dm-do-adapter
-    prerelease: false
-    requirement: &id007 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.2.0
-    type: :runtime
-    version_requirements: *id007
-  - !ruby/object:Gem::Dependency 
-    name: data_objects
-    prerelease: false
-    requirement: &id008 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.10.7
-    type: :runtime
-    version_requirements: *id008
-  - !ruby/object:Gem::Dependency 
-    name: do_sqlite3
-    prerelease: false
-    requirement: &id009 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.10.7
-    type: :runtime
-    version_requirements: *id009
-  - !ruby/object:Gem::Dependency 
-    name: do_jdbc
-    prerelease: false
-    requirement: &id010 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.10.7
-    type: :runtime
-    version_requirements: *id010
-  - !ruby/object:Gem::Dependency 
-    name: jdbc-sqlite3
-    prerelease: false
-    requirement: &id011 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 3.6.14.2.056
-    type: :runtime
-    version_requirements: *id011
-  - !ruby/object:Gem::Dependency 
-    name: dm-migrations
-    prerelease: false
-    requirement: &id012 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.2.0
-    type: :development
-    version_requirements: *id012
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id013 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.6.0
-    type: :development
-    version_requirements: *id013
-  - !ruby/object:Gem::Dependency 
-    name: rspec-core
-    prerelease: false
-    requirement: &id014 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.6.2
-    type: :runtime
-    version_requirements: *id014
-  - !ruby/object:Gem::Dependency 
-    name: rspec-expectations
-    prerelease: false
-    requirement: &id015 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.6.0
-    type: :runtime
-    version_requirements: *id015
-  - !ruby/object:Gem::Dependency 
-    name: diff-lcs
-    prerelease: false
-    requirement: &id016 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.1.3
-    type: :runtime
-    version_requirements: *id016
-  - !ruby/object:Gem::Dependency 
-    name: rspec-mocks
-    prerelease: false
-    requirement: &id017 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.6.0
-    type: :runtime
-    version_requirements: *id017
-  - !ruby/object:Gem::Dependency 
-    name: bundler
-    prerelease: false
-    requirement: &id018 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.0.0
-    type: :development
-    version_requirements: *id018
-  - !ruby/object:Gem::Dependency 
-    name: jruby-openssl
-    prerelease: false
-    requirement: &id019 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.0.0
-    type: :runtime
-    version_requirements: *id019
+date: 2013-04-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: net-ldap
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: slf4r
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: dm-core
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: dm-transactions
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: dm-sqlite-adapter
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: dm-migrations
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: jruby-openssl
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+    none: false
+  prerelease: false
+  type: :runtime
 description: ldap adapter for datamapper which uses either net-ldap or ruby-ldap
-email: 
-  - m.kristian@web.de
-  - ""
+email:
+- m.kristian@web.de
+- ''
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-  - History.txt
-  - README.md
-  - ldap-commands.txt
-files: 
-  - MIT-LICENSE
-  - History.txt
-  - README.md
-  - ldap-commands.txt
-  - lib/dm-ldap-adapter.rb
-  - lib/ldap_resource.rb
-  - lib/dummy_ldap_resource.rb
-  - lib/adapters/ldap_adapter.rb
-  - lib/adapters/noop_transaction.rb
-  - lib/ldap/version.rb
-  - lib/ldap/unboundid_ldap_facade.rb
-  - lib/ldap/transactions.rb
-  - lib/ldap/ruby_ldap_facade.rb
-  - lib/ldap/digest.rb
-  - lib/ldap/net_ldap_facade.rb
-  - lib/ldap/conditions_2_filter.rb
-  - lib/ldap/array.rb
-  - spec/multi_value_attributes_spec.rb
-  - spec/sorting_spec.rb
-  - spec/multi_repository_spec.rb
-  - spec/spec.opts
-  - 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/performance_spec.rb.omit
-  - spec/support/group_user.rb
-  - spec/support/resource_state.rb-
-  - spec/support/user.rb
-  - spec/support/test_contact.rb
-  - spec/support/role.rb
-  - spec/support/contact.rb.omit
-  - spec/support/group.rb
+extra_rdoc_files:
+- History.txt
+- README.md
+- ldap-commands.txt
+files:
+- History.txt
+- MIT-LICENSE
+- ldap-commands.txt
+- README.md
+- README-example.md
+- README-bundler.md
+- lib/dm-ldap-adapter.rb
+- lib/ldap_resource.rb
+- lib/dummy_ldap_resource.rb
+- lib/adapters/ldap_adapter.rb
+- lib/adapters/noop_transaction.rb
+- lib/ldap/version.rb
+- lib/ldap/unboundid_ldap_facade.rb
+- lib/ldap/transactions.rb
+- lib/ldap/ruby_ldap_facade.rb
+- lib/ldap/digest.rb
+- lib/ldap/net_ldap_facade.rb
+- lib/ldap/conditions_2_filter.rb
+- lib/ldap/array.rb
+- spec/multi_value_attributes_spec.rb
+- spec/sorting_spec.rb
+- spec/multi_repository_spec.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
 homepage: http://github.com/mkristian/dm-ldap-adapter
-licenses: 
-  - MIT-LICENSE
-post_install_message: 
-rdoc_options: 
-  - --main
-  - README.txt
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+licenses: []
+post_install_message:
+rdoc_options:
+- "--main"
+- README.txt
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.9
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
-summary: ""
-test_files: 
-  - spec/multi_value_attributes_spec.rb
-  - spec/sorting_spec.rb
-  - spec/multi_repository_spec.rb
-  - spec/ldap_adapter_spec.rb
-  - spec/authentication_ldap_adapter_spec.rb
-  - spec/assiociations_ldap_adapter_spec.rb
-  - spec/ldap_array_spec.rb
+summary: ''
+test_files: []

data/spec/performance_spec.rb.omit

@@ -1,65 +0,0 @@
-require 'spec_helper'
-
-require 'dm-core/version'
-p DataMapper::VERSION
-describe DataMapper.repository(:ldap).adapter do
-
-  describe 'sorting of big list' do
-    
-    before do
-      DataMapper.repository(:ldap) do
-        #User.all.destroy!
-        first = 1501
-        len = 1500
-        (first..len).each do |i|
-          p i
-          Contact.create(:id => "login#{i}", :sn => "name#{Kernel.rand}")
-        end
-      end
-    end
-    
-    it 'should load all and sort in timely manner' do
-      expected = nil
-      all = nil
-
-      DataMapper.repository(:ldap) do
-        #puts User.all.collect {|u| u.name }.join("\n")
-        #p User.all.size
-        fields = Contact.properties.defaults.dup.<<(Contact.properties[:mobile])
-        start = Time.new
-        all  = Contact.all(:fields => fields)
-        intermediate = Time.new
-        all.each { |a| a.mobile }
-        finished = Time.new
-
-p intermediate - start
-p finished - intermediate
-p finished - start
-
-      end
-puts
-      DataMapper.repository(:ldap) do
-        #puts User.all.collect {|u| u.name }.join("\n")
-        #p User.all.size
-        fields = Contact.properties.defaults.dup.<<(Contact.properties[:mobile])
-        start = Time.new
-        all  = Contact.all(:order => [:sn], :fields => fields)
-        intermediate = Time.new
-        all.each { |a| a.inspect }
-        finished = Time.new
-        expected = all.dup.sort do |u1, u2|
-          u1.sn.upcase <=> u2.sn.upcase
-        end
-
-p intermediate - start
-p finished - intermediate
-p finished - start
-
- #       all.should == expected
-      end
-#p all#.collect {|u| u.name }.join("\n")
-
-    end
-  end
-
-end

data/spec/spec.opts

@@ -1,2 +0,0 @@
---colour
---loadby random

data/spec/support/contact.rb.omit

@@ -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

data/spec/support/resource_state.rb-

@@ -1,16 +0,0 @@
-#This needs some documentation.
-
-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