dm-ldap-adapter 0.3.4 → 0.3.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/History.txt CHANGED
@@ -1,3 +1,17 @@
1
+ version 0.3.5
2
+ =============
3
+
4
+ * sorting can handle nil values now
5
+
6
+ version 0.3.4
7
+ =============
8
+
9
+ * fixed bug with or condition
10
+
11
+ * sort now case insensitive
12
+
13
+ * added setup parameter to choose the facade the ldap adapter shall use
14
+
1
15
  version 0.3.3
2
16
  =============
3
17
 
data/Manifest.txt CHANGED
@@ -1,7 +1,6 @@
1
1
  History.txt
2
2
  MIT-LICENSE
3
3
  Manifest.txt
4
- Manifest.txt-
5
4
  README-example.markdown
6
5
  README.txt
7
6
  Rakefile
data/Rakefile CHANGED
@@ -9,6 +9,7 @@ require 'spec/rake/spectask'
9
9
  require 'pathname'
10
10
 
11
11
  Hoe.spec('dm-ldap-adapter') do |p|
12
+ p.description = "ldap adapter for datamapper which uses either net-ldap or ruby-ldap"
12
13
  p.developer('mkristian', 'm.kristian@web.de')
13
14
  p.url = "http://dm-ldap-adapter.rubyforge.org"
14
15
  p.extra_deps = [['ruby-net-ldap', '=0.0.4'],['slf4r', '>=0'], ['dm-core', '<0.10.0']]
@@ -293,8 +293,10 @@ module DataMapper
293
293
  query.model.key.collect { |k| k.field },
294
294
  to_ldap_conditions(query),
295
295
  field_names, order_by).sort! do |u1, u2|
296
- u1[order_by_sym].first.upcase <=> u2[order_by_sym].first.upcase rescue -1
297
- end
296
+ value1 = u1[order_by_sym].first.upcase rescue ""
297
+ value2 = u2[order_by_sym].first.upcase rescue ""
298
+ value1 <=> value2
299
+ end
298
300
  if query.model.multivalue_field
299
301
  props_result = []
300
302
  result.each do |props|
data/lib/ldap/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Ldap
2
- VERSION = '0.3.4'
2
+ VERSION = '0.3.5'.freeze
3
3
  end
data/spec/sorting_spec.rb CHANGED
@@ -8,9 +8,10 @@ describe DataMapper.repository(:ldap).adapter do
8
8
  before do
9
9
  DataMapper.repository(:ldap) do
10
10
  User.all.destroy!
11
- @user1 = User.create(:login => "black", :name => 'Black', :age => 0)
12
- @user2 = User.create(:login => "brown", :name => 'brown', :age => 25)
13
- @user3 = User.create(:login => "blue", :name => 'Yellow', :age => nil)
11
+ @user1 = User.create(:login => "black", :name => 'Black', :mail => "blackmail@exmple.com", :age => 100)
12
+ @user2 = User.create(:login => "brown", :name => 'brown', :mail => "brownmail@exmple.com", :age => 25)
13
+ @user3 = User.create(:login => "blue", :name => 'Yellow')
14
+ @user4 = User.create(:login => "baluh", :name => 'Hmm')
14
15
  end
15
16
  end
16
17
 
@@ -19,6 +20,7 @@ describe DataMapper.repository(:ldap).adapter do
19
20
  @user1.destroy
20
21
  @user2.destroy
21
22
  @user3.destroy
23
+ @user4.destroy
22
24
  end
23
25
  end
24
26
 
@@ -47,5 +49,12 @@ describe DataMapper.repository(:ldap).adapter do
47
49
  User.all(:order => [:name]).should == expected
48
50
  end
49
51
  end
52
+
53
+ it 'should sort with nil values' do
54
+ DataMapper.repository(:ldap) do
55
+ users = User.all(:order => [:mail]).select { |u| !u.mail.nil? }
56
+ users.should == [@user1, @user2]
57
+ end
58
+ end
50
59
  end
51
60
  end
data/spec/spec_helper.rb CHANGED
@@ -20,7 +20,7 @@ DataMapper.setup(:ldap, {
20
20
  :host => 'localhost',
21
21
  :port => '389',
22
22
  :base => "dc=example,dc=com",
23
- :facade => :net_ldap,
23
+ # :facade => :ruby_ldap,
24
24
  :bind_name => "cn=admin,dc=example,dc=com",
25
25
  :password => "behappy"
26
26
  })
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dm-ldap-adapter
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.4
4
+ version: 0.3.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - mkristian
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-11-20 00:00:00 +05:30
12
+ date: 2009-11-25 00:00:00 +05:30
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -52,7 +52,7 @@ dependencies:
52
52
  - !ruby/object:Gem::Version
53
53
  version: 2.3.3
54
54
  version:
55
- description: ""
55
+ description: ldap adapter for datamapper which uses either net-ldap or ruby-ldap
56
56
  email:
57
57
  - m.kristian@web.de
58
58
  executables: []
@@ -68,7 +68,6 @@ files:
68
68
  - History.txt
69
69
  - MIT-LICENSE
70
70
  - Manifest.txt
71
- - Manifest.txt-
72
71
  - README-example.markdown
73
72
  - README.txt
74
73
  - Rakefile
data/Manifest.txt- DELETED
@@ -1,27 +0,0 @@
1
- History.txt
2
- MIT-LICENSE
3
- Manifest.txt
4
- README-example.markdown
5
- README.txt
6
- Rakefile
7
- example/identity_map.rb
8
- example/posix.rb
9
- ldap-commands.txt
10
- lib/adapters/ldap_adapter.rb
11
- lib/adapters/memory_adapter.rb
12
- lib/adapters/simple_adapter.rb
13
- lib/dummy_ldap_resource.rb
14
- lib/ldap/array.rb
15
- lib/ldap/digest.rb
16
- lib/ldap/ldap_facade.rb
17
- lib/ldap/version.rb
18
- lib/ldap_resource.rb
19
- spec/assiociations_ldap_adapter_spec.rb
20
- spec/authentication_ldap_adapter_spec.rb
21
- spec/ldap_adapter_spec.rb
22
- spec/multi_repository_spec.rb
23
- spec/multi_value_attributes_spec.rb
24
- spec/spec.opts
25
- spec/spec_helper.rb
26
- test.db
27
- test.ldif