From codesite-noreply at google.com  Wed Jun 16 09:19:17 2010
From: codesite-noreply at google.com (codesite-noreply at google.com)
Date: Wed, 16 Jun 2010 13:19:17 +0000
Subject: [activeldap-commit] [ruby-activeldap] r1142 committed - * update
	ActiveRecord version: 2.3.5 -> 2.3.8.
Message-ID: <001636c5bd15a465c10489259195@google.com>

Revision: 1142
Author: koutou
Date: Wed Jun 16 06:18:51 2010
Log: * update ActiveRecord version: 2.3.5 -> 2.3.8.

http://code.google.com/p/ruby-activeldap/source/detail?r=1142

Modified:
  /trunk/Rakefile
  /trunk/lib/active_ldap.rb

=======================================
--- /trunk/Rakefile	Sun Mar 21 04:02:06 2010
+++ /trunk/Rakefile	Wed Jun 16 06:18:51 2010
@@ -66,7 +66,7 @@
    self.extra_deps = [
                       # ['ruby-ldap', '= 0.9.9'],
                       # ['net-ldap', '= 0.1.1'],
-                     ['activerecord', '= 2.3.5'],
+                     ['activerecord', '= 2.3.8'],
                       ['locale', '= 2.0.5'],
                       ['gettext', '= 2.1.0'],
                       ['gettext_activerecord', '= 2.1.0'],
=======================================
--- /trunk/lib/active_ldap.rb	Sun Apr 25 02:51:56 2010
+++ /trunk/lib/active_ldap.rb	Wed Jun 16 06:18:51 2010
@@ -2,7 +2,7 @@
  # = ActiveLdap
  #
  #   Copyright (C) 2004,2005 Will Drewry mailto:will at alum.bu.edu
-#   Copyright (C) 2006-2009 Kouhei Sutou <kou at clear-code.com>
+#   Copyright (C) 2006-2010 Kouhei Sutou <kou at clear-code.com>
  #
  # == Introduction
  #
@@ -902,7 +902,7 @@
    end
  end

-require_gem_if_need.call("active_support", "activesupport", "= 2.3.5")
+require_gem_if_need.call("active_support", "activesupport", "= 2.3.8")

  if ActiveSupport.const_defined?(:Dependencies)
    dependencies = ActiveSupport::Dependencies
@@ -924,7 +924,7 @@
    require 'active_ldap/timeout_stub'
  end

-require_gem_if_need.call("active_record", "activerecord", "= 2.3.5")
+require_gem_if_need.call("active_record", "activerecord", "= 2.3.8")
  begin
    require_gem_if_need.call("locale", nil, "= 2.0.5")
    require_gem_if_need.call("gettext", nil, "= 2.1.0")

From codesite-noreply at google.com  Mon Jun 21 03:35:27 2010
From: codesite-noreply at google.com (codesite-noreply at google.com)
Date: Mon, 21 Jun 2010 07:35:27 +0000
Subject: [activeldap-commit] [ruby-activeldap] r1143 committed - * work with
	Ruby-GetText-Package again.
Message-ID: <0016e64697d43a87b6048985596e@google.com>

Revision: 1143
Author: koutou
Date: Mon Jun 21 00:35:11 2010
Log: * work with Ruby-GetText-Package again.

http://code.google.com/p/ruby-activeldap/source/detail?r=1143

Modified:
  /trunk/lib/active_ldap/validations.rb

=======================================
--- /trunk/lib/active_ldap/validations.rb	Sun May 30 02:54:01 2010
+++ /trunk/lib/active_ldap/validations.rb	Mon Jun 21 00:35:11 2010
@@ -87,6 +87,20 @@
      end

      private
+    def format_validation_message(format, parameters)
+      if ActiveLdap.get_text_supported?
+        if /\A(%\{fn\})/ =~ format
+          place_holder = $1
+          format = $POSTMATCH
+        else
+          place_holder = ""
+        end
+        "#{place_holder}#{format % parameters}"
+      else
+        format.sub(/\A%\{fn\} /, '') % parameters
+      end
+    end
+
      def validate_duplicated_dn_creation
        _dn = nil
        begin
@@ -96,10 +110,8 @@
        end
        if _dn and exist?
          format = _("%{fn} is duplicated: %s")
-        unless ActiveLdap.get_text_supported?
-          format = format.sub(/^%\{fn\} /, '')
-        end
-        errors.add("distinguishedName", format % _dn)
+        message = format_validation_message(format, _dn)
+        errors.add("distinguishedName", message)
        end
      end

@@ -118,10 +130,8 @@
        end
        if _dn and exist?
          format = _("%{fn} is duplicated: %s")
-        unless ActiveLdap.get_text_supported?
-          format = format.sub(/^%\{fn\} /, '')
-        end
-        errors.add("distinguishedName", format % _dn)
+        message = format_validation_message(format, _dn)
+        errors.add("distinguishedName", message)
        end
      end

@@ -129,12 +139,12 @@
        dn
      rescue DistinguishedNameInvalid
        format = _("%{fn} is invalid: %s")
-      format = format.sub(/^%\{fn\} /, '') unless  
ActiveLdap.get_text_supported?
-      errors.add("distinguishedName", format % $!.message)
+      message = format_validation_message(format, $!.message)
+      errors.add("distinguishedName", message)
      rescue DistinguishedNameNotSetError
        format = _("%{fn} isn't set: %s")
-      format = format.sub(/^%\{fn\} /, '') unless  
ActiveLdap.get_text_supported?
-      errors.add("distinguishedName", format % $!.message)
+      message = format_validation_message(format, $!.message)
+      errors.add("distinguishedName", message)
      end

      def validate_excluded_classes
@@ -160,8 +170,8 @@
        format = n_("%{fn} has excluded value: %s",
                    "%{fn} has excluded values: %s",
                    names.size)
-      format = format.sub(/^%\{fn\} /, '') unless  
ActiveLdap.get_text_supported?
-      errors.add("objectClass", format % names.join(", "))
+      message = format_validation_message(format, names.join(", "))
+      errors.add("objectClass", message)
      end

      # validate_required_ldap_values
@@ -200,10 +210,8 @@
                         "'%s': aliases: %s")
              args << aliases.join(', ')
            end
-          unless ActiveLdap.get_text_supported?
-            format = format.sub(/^%\{fn\} /, '')
-          end
-          errors.add(real_name, format % args)
+          message = format_validation_message(format, args)
+          errors.add(real_name, message)
          end
        end
      end
@@ -233,10 +241,8 @@
          format = _("%{fn} has invalid format: %s: required syntax: %s: %s")
        end
        params.unshift(option) if option
-      unless ActiveLdap.get_text_supported?
-        format = format.sub(/^%\{fn\} ?/, '')
-      end
-      errors.add(name, format % params)
+      message = format_validation_message(format, params)
+      errors.add(name, message)
      end
    end
  end

From codesite-noreply at google.com  Mon Jun 28 08:44:52 2010
From: codesite-noreply at google.com (codesite-noreply at google.com)
Date: Mon, 28 Jun 2010 12:44:52 +0000
Subject: [activeldap-commit] [ruby-activeldap] r1144 committed - * work
	without Ruby-GetText-Package.
Message-ID: <001636c9251ba88bf9048a167c51@google.com>

Revision: 1144
Author: koutou
Date: Mon Jun 28 05:44:16 2010
Log: * work without Ruby-GetText-Package.

http://code.google.com/p/ruby-activeldap/source/detail?r=1144

Modified:
  /trunk/lib/active_ldap/validations.rb

=======================================
--- /trunk/lib/active_ldap/validations.rb	Mon Jun 21 00:35:11 2010
+++ /trunk/lib/active_ldap/validations.rb	Mon Jun 28 05:44:16 2010
@@ -97,7 +97,7 @@
          end
          "#{place_holder}#{format % parameters}"
        else
-        format.sub(/\A%\{fn\} /, '') % parameters
+        format.sub(/\A%\{fn\} ?/, '') % parameters
        end
      end


From codesite-noreply at google.com  Tue Jun 29 10:19:06 2010
From: codesite-noreply at google.com (codesite-noreply at google.com)
Date: Tue, 29 Jun 2010 14:19:06 +0000
Subject: [activeldap-commit] [ruby-activeldap] r1145 committed - * support
	DN attribute value for assosiation replacement....
Message-ID: <001636c924dd80c26c048a2beba6@google.com>

Revision: 1145
Author: koutou
Date: Tue Jun 29 07:18:43 2010
Log: * support DN attribute value for assosiation replacement.
   Suggested by J?rg Herzinger. Thanks!!!

http://code.google.com/p/ruby-activeldap/source/detail?r=1145

Modified:
  /trunk/lib/active_ldap/association/collection.rb
  /trunk/test/test_associations.rb

=======================================
--- /trunk/lib/active_ldap/association/collection.rb	Fri Jun 13 17:41:48  
2008
+++ /trunk/lib/active_ldap/association/collection.rb	Tue Jun 29 07:18:43  
2010
@@ -40,8 +40,20 @@

        def replace(others)
          load_target
-        deleted_entries = @target - others
-        added_entries = others - @target
+
+        entry = @target.first
+        if entry.nil?
+          deleted_entries = []
+          added_entries = others
+        else
+          base_class = entry.class
+          others = others.collect do |other|
+            other = base_class.find(other) unless other.is_a?(base_class)
+            other
+          end
+          deleted_entries = @target - others
+          added_entries = others - @target
+        end

          delete(deleted_entries)
          concat(added_entries)
=======================================
--- /trunk/test/test_associations.rb	Sat Nov  7 05:43:17 2009
+++ /trunk/test/test_associations.rb	Tue Jun 29 07:18:43 2010
@@ -4,6 +4,26 @@
    include AlTestUtils

    priority :must
+  def test_belongs_to_replace_with_string
+    make_temporary_user do |user,|
+      make_temporary_group do |group1|
+        make_temporary_group do |group2|
+          user.groups = [group1, group2]
+          user.save!
+
+          user.groups = [group2.cn]
+
+          group1.reload
+          group2.reload
+          assert_equal([group2], user.groups.to_a)
+          assert_equal([], group1.member_uid(true))
+          assert_equal([user.id], group2.member_uid(true))
+        end
+      end
+    end
+  end
+
+  priority :normal
    def test_has_many_of_self
      @user_class.has_many(:references,
                           :class_name => "User",
@@ -28,7 +48,6 @@
      end
    end

-  priority :normal
    def test_belongs_to_add_with_string
      make_temporary_user do |user,|
        make_temporary_group do |group1|