activeldap 1.2.0 → 1.2.1

data/CHANGES

@@ -1,5 +1,16 @@
 = CHANGES
 
+== 1.2.1: 2009-12-15
+
+* Supported ActiveRecord 2.3.5 and Rails 2.3.5.
+* Supported GetText 2.1.0 and Locale 2.0.5.
+* belongs_to(:many) support DN attribute.
+* [#31] ActiveLdap::Base#attributes returns data that reflects
+  schema definition. [Alexey.Chebotar]
+* blocks DN attribute change by mass assignment with :id => ....
+* [#35] fix has_many association is broken. [culturespy]
+* Supported nested attribute options. [Hideyuki Yasuda]
+
 == 1.2.0: 2009-09-22
 
 * Supported ActiveRecord 2.3.4 and Rails 2.3.4.

data/README

@@ -1,4 +1,4 @@
-= Ruby/ActiveLdap
+= ActiveLdap
 
 ruby library for object-oriented LDAP interction
 
@@ -13,7 +13,7 @@ Contributors::
 
 == DESCRIPTION
 
-'Ruby/ActiveLdap' is a ruby extension library which provides a clean objected
+'ActiveLdap' is a ruby extension library which provides a clean objected
 oriented interface to the Ruby/LDAP[0] library.  It was inspired by
 ActivRecord[3]. This is not nearly as clean or as flexible as ActiveRecord, but
 it is still trivial to define new objects and manipulate them with minimal
@@ -114,7 +114,9 @@ list, please point out.
 * Lennon Day-Reynolds: Bug reports.
 * Tilo: A bug report.
 * Matt Mencel: A bug report.
-* CultureSpy: A bug report.
+* CultureSpy:
+  * Bug reports.
+  * Bug fixes.
 * gwarf12: A bug report.
 * Baptiste Grenier: API improvement ideas.
 * Richard 3 Nicholas: API improvement ideas.
@@ -137,3 +139,4 @@ list, please point out.
 * George Montana Harkin: A suggestion.
 * Marc Dequènes: Bug reports.
 * brad@lucky-dip.net: A bug report.
+* Hideyuki Yasuda: Bug reports.

data/Rakefile

@@ -59,21 +59,21 @@ project = Hoe.spec('activeldap') do
   self.rubyforge_name = 'ruby-activeldap'
   self.author = ['Will Drewry', 'Kouhei Sutou']
   self.email = ['redpig@dataspill.org', 'kou@cozmixng.org']
-  self.summary = 'Ruby/ActiveLdap is a object-oriented API to LDAP'
+  self.summary = 'ActiveLdap is a object-oriented API to LDAP'
   self.url = 'http://rubyforge.org/projects/ruby-activeldap/'
   self.test_globs = ['test/test_*.rb']
   self.changes = self.paragraphs_of('CHANGES', 1..2).join("\n\n")
   self.extra_deps = [
                      # ['ruby-ldap', '= 0.9.9'],
-                     ['activerecord', '= 2.3.4'],
-                     ['locale', '= 2.0.4'],
-                     ['gettext', '= 2.0.4'],
-                     ['gettext_activerecord', '= 2.0.4'],
+                     ['activerecord', '= 2.3.5'],
+                     ['locale', '= 2.0.5'],
+                     ['gettext', '= 2.1.0'],
+                     ['gettext_activerecord', '= 2.1.0'],
                     ]
   self.remote_rdoc_dir = "doc"
   self.rsync_args += " --chmod=Dg+ws,Fg+w"
   self.description = String.new(<<-EOF)
-    'Ruby/ActiveLdap' is a ruby extension library which provides a clean
+    'ActiveLdap' is a ruby extension library which provides a clean
     objected oriented interface to the Ruby/LDAP library.  It was inspired
     by ActiveRecord. This is not nearly as clean or as flexible as
     ActiveRecord, but it is still trivial to define new objects and manipulate

data/examples/al-admin/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -27,8 +27,8 @@ Rails::Initializer.run do |config|
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   # config.gem "sqlite3-ruby", :lib => "sqlite3"
   # config.gem "aws-s3", :lib => "aws/s3"
-  config.gem "locale_rails", :version => "2.0.4"
-  config.gem "gettext_rails", :version => "2.0.4"
+  config.gem "locale_rails", :version => "2.0.5"
+  config.gem "gettext_rails", :version => "2.1.0"
 
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.

data/examples/groupadd

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/examples/groupdel

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/examples/groupls

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/examples/groupmod

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/examples/lpasswd

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/examples/ouadd

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/examples/useradd

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/examples/useradd-binary

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/examples/userdel

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/examples/userls

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/examples/usermod

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/examples/usermod-binary-add

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/examples/usermod-binary-add-time

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/examples/usermod-binary-del

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/examples/usermod-lang-add

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -W0
+#!/usr/bin/ruby
 
 base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH << File.join(base, "lib")

data/lib/active_ldap.rb

@@ -901,7 +901,7 @@ require_gem_if_need = Proc.new do |library_name, gem_name, *gem_args|
   end
 end
 
-require_gem_if_need.call("active_support", "activesupport", "= 2.3.4")
+require_gem_if_need.call("active_support", "activesupport", "= 2.3.5")
 
 if ActiveSupport.const_defined?(:Dependencies)
   dependencies = ActiveSupport::Dependencies
@@ -914,7 +914,7 @@ if dependencies.respond_to?(:load_paths)
 end
 
 module ActiveLdap
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end
 
 if RUBY_PLATFORM.match('linux')
@@ -923,11 +923,11 @@ else
   require 'active_ldap/timeout_stub'
 end
 
-require_gem_if_need.call("active_record", "activerecord", "= 2.3.4")
+require_gem_if_need.call("active_record", "activerecord", "= 2.3.5")
 begin
-  require_gem_if_need.call("locale", nil, "= 2.0.4")
-  require_gem_if_need.call("gettext", nil, "= 2.0.4")
-  require_gem_if_need.call("gettext_activerecord", nil, "= 2.0.4")
+  require_gem_if_need.call("locale", nil, "= 2.0.5")
+  require_gem_if_need.call("gettext", nil, "= 2.1.0")
+  require_gem_if_need.call("gettext_activerecord", nil, "= 2.1.0")
 rescue LoadError
 end
 require 'active_ldap/get_text'

data/lib/active_ldap/adapter/base.rb

@@ -67,7 +67,7 @@ module ActiveLdap
       def bind(options={})
         @bind_tried = true
 
-        bind_dn = options[:bind_dn] || @bind_dn
+        bind_dn = ensure_dn_string(options[:bind_dn] || @bind_dn)
         try_sasl = options.has_key?(:try_sasl) ? options[:try_sasl] : @try_sasl
         if options.has_key?(:allow_anonymous)
           allow_anonymous = options[:allow_anonymous]
@@ -164,6 +164,7 @@ module ActiveLdap
           values << value
         end
 
+        base = ensure_dn_string(base)
         begin
           operation(options) do
             yield(base, scope, filter, attrs, limit, callback)
@@ -185,6 +186,7 @@ module ActiveLdap
         begin
           operation(options) do
             targets.each do |target|
+              target = ensure_dn_string(target)
               begin
                 yield(target)
               rescue LdapError::UnwillingToPerform, LdapError::InsufficientAccess
@@ -198,6 +200,7 @@ module ActiveLdap
       end
 
       def add(dn, entries, options={})
+        dn = ensure_dn_string(dn)
         begin
           operation(options) do
             yield(dn, entries)
@@ -218,6 +221,7 @@ module ActiveLdap
       end
 
       def modify(dn, entries, options={})
+        dn = ensure_dn_string(dn)
         begin
           operation(options) do
             begin
@@ -234,6 +238,7 @@ module ActiveLdap
       end
 
       def modify_rdn(dn, new_rdn, delete_old_rdn, new_superior, options={})
+        dn = ensure_dn_string(dn)
         operation(options) do
           yield(dn, new_rdn, delete_old_rdn, new_superior)
         end
@@ -685,6 +690,14 @@ module ActiveLdap
           log_entry
         end
       end
+
+      def ensure_dn_string(dn)
+        if dn.is_a?(DN)
+          dn.to_s
+        else
+          dn
+        end
+      end
     end
   end
 end

data/lib/active_ldap/adapter/jndi.rb

@@ -76,8 +76,12 @@ module ActiveLdap
         super do |_dn, _new_rdn, _delete_old_rdn, _new_superior|
           info = {
             :name => "modify: RDN",
-            :dn => _dn, :new_rdn => _new_rdn, :delete_old_rdn => _delete_old_rdn,
+            :dn => _dn,
+            :new_rdn => _new_rdn,
+            :new_superior => _new_superior,
+            :delete_old_rdn => _delete_old_rdn
           }
+          _new_rdn = "#{_new_rdn},#{_new_superior}" if _new_superior
           execute(:modify_rdn, info, _dn, _new_rdn, _delete_old_rdn)
         end
       end

data/lib/active_ldap/adapter/net_ldap.rb

@@ -118,9 +118,15 @@ module ActiveLdap
 
       def modify_rdn(dn, new_rdn, delete_old_rdn, new_superior, options={})
         super do |_dn, _new_rdn, _delete_old_rdn, _new_superior|
+          if _new_superior
+            raise NotImplemented.new(_("modify RDN with new superior"))
+          end
           info = {
             :name => "modify: RDN",
-            :dn => _dn, :new_rdn => _new_rdn, :delete_old_rdn => _delete_old_rdn,
+            :dn => _dn,
+            :new_rdn => _new_rdn,
+            :new_superior => _new_superior,
+            :delete_old_rdn => _delete_old_rdn
           }
           execute(:rename, info,
                   :olddn => _dn,

data/lib/active_ldap/association/belongs_to_many.rb

@@ -5,6 +5,8 @@ module ActiveLdap
     class BelongsToMany < Collection
       private
       def insert_entry(entry)
+        _foreign_class = foreign_class
+        entry = _foreign_class.find(entry) unless entry.is_a?(_foreign_class)
         old_value = entry[@options[:many], true]
         primary_key_name = @options[:primary_key_name]
         if primary_key_name == "dn"
@@ -21,7 +23,9 @@ module ActiveLdap
       end
 
       def delete_entries(entries)
+          _foreign_class = foreign_class
         entries.each do |entry|
+          entry = _foreign_class.find(entry) unless entry.is_a?(_foreign_class)
           old_value = entry[@options[:many], true]
           primary_key_name = @options[:primary_key_name]
           if primary_key_name == "dn"

data/lib/active_ldap/association/has_many.rb

@@ -8,23 +8,23 @@ module ActiveLdap
 
       private
       def insert_entry(entry)
-        entry[@options[:foreign_key_name]] = @owner[primary_key]
+        entry[foreign_key] = @owner[primary_key]
         entry.save
       end
 
       def find_target
-        collect_targets(:primary_key_name)
+        collect_targets(primary_key)
       end
 
       def delete_entries(entries)
-        key = @options[:foreign_key_name]
+        _foreign_key = foreign_key
         components = @owner[primary_key, true].reject do |value|
           value.nil?
         end
         filter = [:and,
-                  [:and, {key => components}],
+                  [:and, {_foreign_key => components}],
                   [:or, {foreign_class.dn_attribute => entries.collect(&:id)}]]
-        foreign_class.update_all({key => []}, filter)
+        foreign_class.update_all({_foreign_key => []}, filter)
       end
     end
   end

data/lib/active_ldap/association/has_many_utils.rb

@@ -3,15 +3,14 @@ module ActiveLdap
     module HasManyUtils
       private
       def collect_targets(requested_target_key, need_requested_targets=false)
-        foreign_base_key = primary_key
-        return [] if foreign_base_key.nil?
-
-        requested_targets = @owner[@options[requested_target_key], true]
+        _foreign_key = foreign_key
+        return [] if _foreign_key.nil?
 
+        requested_targets = @owner[requested_target_key, true]
         requested_targets = requested_targets.reject(&:nil?)
         if requested_targets.empty?
           targets = []
-        elsif foreign_base_key == "dn"
+        elsif _foreign_key == "dn"
           requested_targets = requested_targets.collect do |target|
             if target.is_a?(DN)
               target
@@ -28,7 +27,7 @@ module ActiveLdap
           end
         else
           components = requested_targets.collect do |value|
-            [foreign_base_key, value]
+            [_foreign_key, value]
           end
           options = find_options(:filter => [:or, *components])
           targets = foreign_class.find(:all, options)

data/lib/active_ldap/association/has_many_wrap.rb

@@ -9,11 +9,11 @@ module ActiveLdap
       private
       def insert_entry(entry)
         old_value = @owner[@options[:wrap], true]
-        _primary_key = primary_key
-        if _primary_key == "dn"
+        _foreign_key = foreign_key
+        if _foreign_key == "dn"
           old_value = dn_values_to_string_values(old_value)
         end
-        current_value = entry[_primary_key, true]
+        current_value = entry[_foreign_key, true]
         current_value = dn_values_to_string_values(current_value)
         new_value = (old_value + current_value).uniq.sort
         if old_value != new_value
@@ -24,11 +24,11 @@ module ActiveLdap
 
       def delete_entries(entries)
         old_value = @owner[@options[:wrap], true]
-        _primary_key = primary_key
-        if _primary_key == "dn"
+        _foreign_key = foreign_key
+        if _foreign_key == "dn"
           old_value = dn_values_to_string_values(old_value)
         end
-        current_value = entries.collect {|entry| entry[_primary_key]}
+        current_value = entries.collect {|entry| entry[_foreign_key]}
         current_value = dn_values_to_string_values(current_value)
         new_value = old_value - current_value
         new_value = new_value.uniq.sort
@@ -39,13 +39,13 @@ module ActiveLdap
       end
 
       def find_target
-        targets, requested_targets = collect_targets(:wrap, true)
+        targets, requested_targets = collect_targets(@options[:wrap], true)
         return [] if targets.nil?
 
         found_targets = {}
-        foreign_base_key = primary_key
+        _foreign_key = foreign_key
         targets.each do |target|
-          found_targets[target[foreign_base_key]] ||= target
+          found_targets[target[_foreign_key]] ||= target
         end
 
         klass = foreign_class
@@ -53,6 +53,10 @@ module ActiveLdap
           found_targets[name] || klass.new(name)
         end
       end
+
+      def foreign_key
+        @options[:primary_key_name] || foreign_class.dn_attribute
+      end
     end
   end
 end