dm-ldap-adapter 0.4.0.alpha4 → 0.4.0

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/Manifest.txt CHANGED
@@ -6,7 +6,6 @@ Manifest.txt
6
6
  README-example.markdown
7
7
  README.txt
8
8
  Rakefile
9
- env.sh
10
9
  example/identity_map.rb
11
10
  example/posix.rb
12
11
  ldap-commands.txt
data/Rakefile CHANGED
@@ -9,7 +9,7 @@ require 'spec/rake/spectask'
9
9
  require 'pathname'
10
10
 
11
11
  Hoe.spec('dm-ldap-adapter') do |p|
12
- p.version = "0.4.0.alpha4"
12
+ p.version = "0.4.0"
13
13
  p.description = "ldap adapter for datamapper which uses either net-ldap or ruby-ldap"
14
14
  p.developer('mkristian', 'm.kristian@web.de')
15
15
  p.url = "http://dm-ldap-adapter.rubyforge.org"
@@ -1,5 +1,5 @@
1
1
  require "dm-core"
2
- require 'slf4r'
2
+ require 'slf4r/logger'
3
3
  # require 'adapters/noop_transaction'
4
4
 
5
5
  module Ldap
@@ -361,7 +361,7 @@ module DataMapper
361
361
  if f.class == Ldap::LdapArray
362
362
  prop if prop
363
363
  elsif prop
364
- f.primitive == Integer ? prop.first.to_i : prop.first
364
+ f.primitive == Integer ? prop.first.to_i : prop.join
365
365
  end
366
366
  end
367
367
  end
data/lib/ldap/array.rb CHANGED
@@ -16,9 +16,10 @@ module Ldap
16
16
  alias :push! :push
17
17
 
18
18
  def []=(k, v)
19
- result = super
20
- @resource.send("#{@property.name}=".to_sym, self)
21
- result
19
+ ar = [self].flatten
20
+ ar[k] = v
21
+ @resource.send("#{@property.name}=".to_sym, ar)
22
+ super
22
23
  end
23
24
 
24
25
  def <<(element)
@@ -26,17 +27,19 @@ module Ldap
26
27
  end
27
28
 
28
29
  def push(element)
29
- result = super
30
- @resource.send("#{@property.name}=".to_sym, self)
31
- result
30
+ ar = [self].flatten
31
+ ar.push(element)
32
+ @resource.send("#{@property.name}=".to_sym, ar)
33
+ super
32
34
  end
33
35
 
34
36
  alias :delete! :delete
35
37
 
36
38
  def delete(element)
37
- result = super
38
- @resource.send(:"#{@property.name}=", self)
39
- result
39
+ ar = [self].flatten
40
+ ar.delete(element)
41
+ @resource.send(:"#{@property.name}=", ar)
42
+ super
40
43
  end
41
44
  end
42
45
 
@@ -80,7 +83,7 @@ module Ldap
80
83
  v.setup(self, properties[:#{name}])
81
84
  else
82
85
  vv = Ldap::Array.new(self, properties[:#{name}])
83
- vv.replace(v | [])
86
+ vv.replace(v || [])
84
87
  v = vv
85
88
  end
86
89
  attribute_set(:#{name}, v)
@@ -34,6 +34,14 @@ describe DataMapper::Adapters::LdapAdapter do
34
34
  end
35
35
  end
36
36
 
37
+ it 'should be able to use multiline attributes' do
38
+ DataMapper.repository(:ldap) do
39
+ @user1.name = "many\nlines\nin\none\property"
40
+ @user1.save
41
+ User.get(@user1.id).name.should == "many\nlines\nin\none\property"
42
+ end
43
+ end
44
+
37
45
  it 'should raise an error when trying to create an entity with already used key' do
38
46
  DataMapper.repository(:ldap) do
39
47
  #p User.first(:login => "black")
@@ -229,5 +237,3 @@ describe DataMapper::Adapters::LdapAdapter do
229
237
  end
230
238
  end
231
239
  end
232
-
233
- \
data/spec/spec_helper.rb CHANGED
@@ -23,7 +23,7 @@ DataMapper.setup(:ldap, {
23
23
  :base => "dc=example,dc=com",
24
24
  :facade => (ENV['FACADE'] || :net_ldap).to_sym,
25
25
  :bind_name => "cn=admin,dc=example,dc=com",
26
- :password => "secret"
26
+ :password => "behappy"
27
27
  })
28
28
 
29
29
  module DataMapper
metadata CHANGED
@@ -1,14 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dm-ldap-adapter
3
3
  version: !ruby/object:Gem::Version
4
- hash: 436503278
5
- prerelease: true
4
+ hash: 15
5
+ prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 4
9
9
  - 0
10
- - alpha4
11
- version: 0.4.0.alpha4
10
+ version: 0.4.0
12
11
  platform: ruby
13
12
  authors:
14
13
  - mkristian
@@ -16,7 +15,7 @@ autorequire:
16
15
  bindir: bin
17
16
  cert_chain: []
18
17
 
19
- date: 2010-12-16 00:00:00 +05:30
18
+ date: 2011-01-17 00:00:00 +05:30
20
19
  default_executable:
21
20
  dependencies:
22
21
  - !ruby/object:Gem::Dependency
@@ -102,7 +101,6 @@ files:
102
101
  - README-example.markdown
103
102
  - README.txt
104
103
  - Rakefile
105
- - env.sh
106
104
  - example/identity_map.rb
107
105
  - example/posix.rb
108
106
  - ldap-commands.txt
@@ -147,14 +145,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
147
145
  required_rubygems_version: !ruby/object:Gem::Requirement
148
146
  none: false
149
147
  requirements:
150
- - - ">"
148
+ - - ">="
151
149
  - !ruby/object:Gem::Version
152
- hash: 25
150
+ hash: 3
153
151
  segments:
154
- - 1
155
- - 3
156
- - 1
157
- version: 1.3.1
152
+ - 0
153
+ version: "0"
158
154
  requirements: []
159
155
 
160
156
  rubyforge_project: dm-ldap-adapter
data/env.sh DELETED
@@ -1,2 +0,0 @@
1
- export GEM_PATH=$PWD/../localgems
2
- export PATH=$PATH:$GEM_PATH/bin