dm-ldap-adapter 0.4.0.alpha4 → 0.4.0

data/Manifest.txt

@@ -6,7 +6,6 @@ Manifest.txt
 README-example.markdown
 README.txt
 Rakefile
-env.sh
 example/identity_map.rb
 example/posix.rb
 ldap-commands.txt

data/Rakefile

@@ -9,7 +9,7 @@ require 'spec/rake/spectask'
 require 'pathname'
 
 Hoe.spec('dm-ldap-adapter') do |p|
-  p.version = "0.4.0.alpha4"
+  p.version = "0.4.0"
   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"

data/lib/adapters/ldap_adapter.rb

@@ -1,5 +1,5 @@
 require "dm-core"
-require 'slf4r'
+require 'slf4r/logger'
 # require 'adapters/noop_transaction'
 
 module Ldap
@@ -361,7 +361,7 @@ module DataMapper
               if f.class == Ldap::LdapArray
                 prop if prop
               elsif prop
-                f.primitive == Integer ? prop.first.to_i : prop.first
+                f.primitive == Integer ? prop.first.to_i : prop.join
               end
             end
           end

data/lib/ldap/array.rb

@@ -16,9 +16,10 @@ module Ldap
     alias :push! :push
 
     def []=(k, v)
-      result = super
-      @resource.send("#{@property.name}=".to_sym, self)
-      result
+      ar = [self].flatten
+      ar[k] = v
+      @resource.send("#{@property.name}=".to_sym, ar)
+      super
     end
 
     def <<(element)
@@ -26,17 +27,19 @@ module Ldap
     end
 
     def push(element)
-      result = super
-      @resource.send("#{@property.name}=".to_sym, self)
-      result
+      ar = [self].flatten
+      ar.push(element)
+      @resource.send("#{@property.name}=".to_sym, ar)
+      super
     end
 
    alias :delete! :delete
 
     def delete(element)
-      result = super
-      @resource.send(:"#{@property.name}=", self)
-      result
+      ar = [self].flatten
+      ar.delete(element)
+      @resource.send(:"#{@property.name}=", ar)
+      super
     end
   end
 
@@ -80,7 +83,7 @@ module Ldap
             v.setup(self, properties[:#{name}])
           else
             vv = Ldap::Array.new(self, properties[:#{name}])
-            vv.replace(v | [])
+            vv.replace(v || [])
             v = vv
           end
           attribute_set(:#{name}, v)

data/spec/ldap_adapter_spec.rb

@@ -34,6 +34,14 @@ describe DataMapper::Adapters::LdapAdapter do
     end
   end
 
+  it 'should be able to use multiline attributes' do
+    DataMapper.repository(:ldap) do
+      @user1.name = "many\nlines\nin\none\property"
+      @user1.save
+      User.get(@user1.id).name.should == "many\nlines\nin\none\property"
+    end
+  end
+
   it 'should raise an error when trying to create an entity with already used key' do
     DataMapper.repository(:ldap) do
       #p User.first(:login => "black")
@@ -229,5 +237,3 @@ describe DataMapper::Adapters::LdapAdapter do
     end
   end
 end
-
-\

data/spec/spec_helper.rb

@@ -23,7 +23,7 @@ DataMapper.setup(:ldap, {
                    :base => "dc=example,dc=com",
                    :facade => (ENV['FACADE'] || :net_ldap).to_sym,
                    :bind_name => "cn=admin,dc=example,dc=com",
-                   :password => "secret"
+                   :password => "behappy"
 })
 
 module DataMapper

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-ldap-adapter
 version: !ruby/object:Gem::Version 
-  hash: 436503278
-  prerelease: true
+  hash: 15
+  prerelease: false
   segments: 
   - 0
   - 4
   - 0
-  - alpha4
-  version: 0.4.0.alpha4
+  version: 0.4.0
 platform: ruby
 authors: 
 - mkristian
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 +05:30
+date: 2011-01-17 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,7 +101,6 @@ files:
 - README-example.markdown
 - README.txt
 - Rakefile
-- env.sh
 - example/identity_map.rb
 - example/posix.rb
 - ldap-commands.txt
@@ -147,14 +145,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: dm-ldap-adapter

data/env.sh

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