activeldap 1.2.2 → 1.2.3

data/lib/active_ldap/adapter/net_ldap.rb

@@ -62,8 +62,8 @@ module ActiveLdap
         end
       end
 
-      def search(options={}, &block)
-        super(options) do |base, scope, filter, attrs, limit, callback|
+      def search(options={})
+        super(options) do |base, scope, filter, attrs, limit|
           args = {
             :base => base,
             :scope => scope,
@@ -78,9 +78,10 @@ module ActiveLdap
           execute(:search, info, args) do |entry|
             attributes = {}
             entry.original_attribute_names.each do |name|
-              attributes[name] = entry[name]
+              value = entry[name]
+              attributes[name] = value if value
             end
-            callback.call([entry.dn, attributes], block)
+            yield([entry.dn, attributes])
           end
         end
       end

data/lib/active_ldap/base.rb

@@ -274,7 +274,7 @@ module ActiveLdap
   # by extension classes.
   class Base
     include GetTextSupport
-    public :gettext
+    public :_
 
     if Object.const_defined?(:Reloadable)
       if Reloadable.const_defined?(:Deprecated)

data/lib/active_ldap/get_text.rb

@@ -1,5 +1,5 @@
-if Object.const_defined?(:GetText)
-  ActiveLdap.const_set("GetText", GetText)
+if Object.const_defined?(:FastGettext)
+  ActiveLdap.const_set("GetText", FastGettext)
 end
 
 unless ActiveLdap.const_defined?(:GetText)

data/lib/active_ldap/get_text_fallback.rb

@@ -1,52 +1,59 @@
 module ActiveLdap
   module GetTextFallback
-    class << self
-      def included(base)
-        base.extend(self)
-      end
+    module_function
+    def add_text_domain(name, options)
     end
 
     module_function
-    def bindtextdomain(domain_name, *args)
+    def default_available_locales=(name)
     end
 
-    def gettext(msg_id)
-      msg_id
+    module_function
+    def default_text_domain=(name)
     end
 
-    def ngettext(arg1, arg2, arg3=nil)
-      if arg1.kind_of?(Array)
-        msg_id = arg1[0]
-        msg_id_plural = arg1[1]
-        n = arg2
-      else
-        msg_id = arg1
-        msg_id_plural = arg2
-        n = arg3
+    module Translation
+      class << self
+        def included(base)
+          base.extend(self)
+        end
       end
-      n == 1 ? msg_id : msg_id_plural
-    end
 
-    def N_(msg_id)
-      msg_id
-    end
+      def _(msg_id)
+        msg_id
+      end
 
-    def Nn_(msg_id, msg_id_plural)
-      [msg_id, msg_id_plural]
-    end
+      def n_(arg1, arg2, arg3=nil)
+        if arg1.kind_of?(Array)
+          msg_id = arg1[0]
+          msg_id_plural = arg1[1]
+          n = arg2
+        else
+          msg_id = arg1
+          msg_id_plural = arg2
+          n = arg3
+        end
+        n == 1 ? msg_id : msg_id_plural
+      end
 
-    def sgettext(msg_id, div='|')
-      index = msg_id.rindex(div)
-      if index
-        msg_id[(index + 1)..-1]
-      else
+      def N_(msg_id)
         msg_id
       end
+
+      def Nn_(msg_id, msg_id_plural)
+        [msg_id, msg_id_plural]
+      end
+
+      def s_(msg_id, div='|')
+        index = msg_id.rindex(div)
+        if index
+          msg_id[(index + 1)..-1]
+        else
+          msg_id
+        end
+      end
     end
 
-    alias_method(:_, :gettext)
-    alias_method(:n_, :ngettext)
-    alias_method(:s_, :sgettext)
   end
 
   GetText = GetTextFallback

data/lib/active_ldap/get_text_support.rb

@@ -9,8 +9,10 @@ module ActiveLdap
     class << self
       def included(base)
         base.class_eval do
-          include(GetText)
-          bindtextdomain("active-ldap")
+          include(GetText::Translation)
+          GetText.add_text_domain('active-ldap',:path=>'po', :type=>:po)
+          GetText.default_available_locales = ['en', 'jp']
+          GetText.default_text_domain = "active-ldap"
         end
       end
     end

data/lib/active_ldap/operations.rb

@@ -62,7 +62,8 @@ module ActiveLdap
         }
 
         options[:connection] ||= connection
-        values = options[:connection].search(search_options) do |dn, attrs|
+        values = []
+        options[:connection].search(search_options) do |dn, attrs|
           attributes = {}
           attrs.each do |key, _value|
             normalized_attr, normalized_value =
@@ -70,7 +71,7 @@ module ActiveLdap
             attributes[normalized_attr] ||= []
             attributes[normalized_attr].concat(normalized_value)
           end
-          [dn, attributes]
+          values << [dn, attributes]
         end
         values = values.collect {|_value| yield(_value)} if block_given?
         values

data/lib/active_ldap/validations.rb

@@ -88,17 +88,7 @@ module ActiveLdap
 
     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
+      format % parameters
     end
 
     def validate_duplicated_dn_creation
@@ -109,7 +99,7 @@ module ActiveLdap
         return
       end
       if _dn and exist?
-        format = _("%{fn} is duplicated: %s")
+        format = _("is duplicated: %s")
         message = format_validation_message(format, _dn)
         errors.add("distinguishedName", message)
       end
@@ -129,7 +119,7 @@ module ActiveLdap
         return
       end
       if _dn and exist?
-        format = _("%{fn} is duplicated: %s")
+        format = _("is duplicated: %s")
         message = format_validation_message(format, _dn)
         errors.add("distinguishedName", message)
       end
@@ -138,11 +128,11 @@ module ActiveLdap
     def validate_dn
       dn
     rescue DistinguishedNameInvalid
-      format = _("%{fn} is invalid: %s")
+      format = _("is invalid: %s")
       message = format_validation_message(format, $!.message)
       errors.add("distinguishedName", message)
     rescue DistinguishedNameNotSetError
-      format = _("%{fn} isn't set: %s")
+      format = _("isn't set: %s")
       message = format_validation_message(format, $!.message)
       errors.add("distinguishedName", message)
     end
@@ -167,8 +157,8 @@ module ActiveLdap
       names = unexpected_classes.collect do |object_class|
         self.class.human_object_class_name(object_class)
       end
-      format = n_("%{fn} has excluded value: %s",
-                  "%{fn} has excluded values: %s",
+      format = n_("has excluded value: %s",
+                  "has excluded values: %s",
                   names.size)
       message = format_validation_message(format, names.join(", "))
       errors.add("objectClass", message)
@@ -204,9 +194,9 @@ module ActiveLdap
           end
           args = [self.class.human_object_class_name(object_class)]
           if aliases.empty?
-            format = _("%{fn} is required attribute by objectClass '%s'")
+            format = _("is required attribute by objectClass '%s'")
           else
-            format = _("%{fn} is required attribute by objectClass " \
+            format = _("is required attribute by objectClass " \
                        "'%s': aliases: %s")
             args << aliases.join(', ')
           end
@@ -236,9 +226,9 @@ module ActiveLdap
                 self.class.human_syntax_description(attribute.syntax),
                 failed_reason]
       if option
-        format = _("%{fn}(%s) has invalid format: %s: required syntax: %s: %s")
+        format = _("(%s) has invalid format: %s: required syntax: %s: %s")
       else
-        format = _("%{fn} has invalid format: %s: required syntax: %s: %s")
+        format = _("has invalid format: %s: required syntax: %s: %s")
       end
       params.unshift(option) if option
       message = format_validation_message(format, params)

data/po/en/active-ldap.po

@@ -3710,29 +3710,29 @@ msgid "%s isn't sub DN of %s"
 msgstr ""
 
 #: lib/active_ldap/validations.rb:97
-msgid "%{fn} is duplicated: %s"
+msgid "is duplicated: %s"
 msgstr ""
 
 #: lib/active_ldap/validations.rb:108
-msgid "%{fn} is invalid: %s"
+msgid "is invalid: %s"
 msgstr ""
 
 #: lib/active_ldap/validations.rb:112
-msgid "%{fn} isn't set: %s"
+msgid "isn't set: %s"
 msgstr ""
 
 #: lib/active_ldap/validations.rb:134
-msgid "%{fn} has excluded value: %s"
-msgid_plural "%{fn} has excluded values: %s"
+msgid "has excluded value: %s"
+msgid_plural "has excluded values: %s"
 msgstr[0] ""
 msgstr[1] ""
 
 #: lib/active_ldap/validations.rb:169
-msgid "%{fn} is required attribute by objectClass '%s'"
+msgid "is required attribute by objectClass '%s'"
 msgstr ""
 
 #: lib/active_ldap/validations.rb:171
-msgid "%{fn} is required attribute by objectClass '%s': aliases: %s"
+msgid "is required attribute by objectClass '%s': aliases: %s"
 msgstr ""
 
 #: lib/active_ldap/validations.rb:195
@@ -3740,11 +3740,11 @@ msgid "<binary-value>"
 msgstr ""
 
 #: lib/active_ldap/validations.rb:203
-msgid "%{fn}(%s) has invalid format: %s: required syntax: %s: %s"
+msgid "(%s) has invalid format: %s: required syntax: %s: %s"
 msgstr ""
 
 #: lib/active_ldap/validations.rb:205
-msgid "%{fn} has invalid format: %s: required syntax: %s: %s"
+msgid "has invalid format: %s: required syntax: %s: %s"
 msgstr ""
 
 #: lib/active_ldap/command.rb:16

data/po/ja/active-ldap.po

@@ -3727,42 +3727,42 @@ msgid "%s isn't sub DN of %s"
 msgstr "%sは%sのサブDNではありません"
 
 #: lib/active_ldap/validations.rb:97
-msgid "%{fn} is duplicated: %s"
-msgstr "%{fn}が重複しています: %s"
+msgid "is duplicated: %s"
+msgstr "が重複しています: %s"
 
 #: lib/active_ldap/validations.rb:108
-msgid "%{fn} is invalid: %s"
-msgstr "%{fn}が不正です: %s"
+msgid "is invalid: %s"
+msgstr "が不正です: %s"
 
 #: lib/active_ldap/validations.rb:112
-msgid "%{fn} isn't set: %s"
-msgstr "%{fn}が設定されていません: %s"
+msgid "isn't set: %s"
+msgstr "が設定されていません: %s"
 
 #: lib/active_ldap/validations.rb:134
-msgid "%{fn} has excluded value: %s"
-msgid_plural "%{fn} has excluded values: %s"
-msgstr[0] "%{fn}に除外した値があります: %s"
-msgstr[1] "%{fn}に除外した値があります: %s"
+msgid "has excluded value: %s"
+msgid_plural "has excluded values: %s"
+msgstr[0] "に除外した値があります: %s"
+msgstr[1] "に除外した値があります: %s"
 
 #: lib/active_ldap/validations.rb:169
-msgid "%{fn} is required attribute by objectClass '%s'"
-msgstr "%{fn}はobjectClass'%s'の必須の属性です"
+msgid "is required attribute by objectClass '%s'"
+msgstr "はobjectClass'%s'の必須の属性です"
 
 #: lib/active_ldap/validations.rb:171
-msgid "%{fn} is required attribute by objectClass '%s': aliases: %s"
-msgstr "%{fn}はobjectClass'%s'の必須の属性です: 別名: %s"
+msgid "is required attribute by objectClass '%s': aliases: %s"
+msgstr "はobjectClass'%s'の必須の属性です: 別名: %s"
 
 #: lib/active_ldap/validations.rb:195
 msgid "<binary-value>"
 msgstr "<バイナリ値>"
 
 #: lib/active_ldap/validations.rb:203
-msgid "%{fn}(%s) has invalid format: %s: required syntax: %s: %s"
-msgstr "%{fn}(%s)は不正な書式です: %s: 要求されている構文: %s: %s"
+msgid "(%s) has invalid format: %s: required syntax: %s: %s"
+msgstr "(%s)は不正な書式です: %s: 要求されている構文: %s: %s"
 
 #: lib/active_ldap/validations.rb:205
-msgid "%{fn} has invalid format: %s: required syntax: %s: %s"
-msgstr "%{fn}は不正な書式です: %s: 要求されている構文: %s: %s"
+msgid "has invalid format: %s: required syntax: %s: %s"
+msgstr "は不正な書式です: %s: 要求されている構文: %s: %s"
 
 #: lib/active_ldap/command.rb:16
 msgid "Common options:"

data/test/run-test.rb

@@ -11,7 +11,13 @@ top_dir = File.expand_path(File.join(base_dir, ".."))
 $LOAD_PATH.unshift(File.join(top_dir, "lib"))
 $LOAD_PATH.unshift(File.join(top_dir, "test"))
 
-$LOAD_PATH.unshift(File.join(top_dir, "test-unit", "lib"))
+test_unit_lib_dir = File.join(top_dir, "test-unit", "lib")
+if File.exist?(test_unit_lib_dir)
+  $LOAD_PATH.unshift(test_unit_lib_dir)
+else
+  require 'rubygems'
+  gem "test-unit", "> 2"
+end
 require "test/unit"
 ARGV.unshift("--priority-mode")
 

data/test/test_adapter.rb

@@ -37,6 +37,7 @@ class TestAdapter < Test::Unit::TestCase
     assert_parse_filter("(uid=Alice\\2ABob)", {:uid => "Alice**Bob"})
     assert_parse_filter("(uid=Alice\\2A*\\5CBob)", {:uid => "Alice***\\Bob"})
     assert_parse_filter("(uid=Alice\\5C\\2A*Bob)", {:uid => "Alice\\***Bob"})
+    assert_parse_filter("(uid=Alice\\3ABob)", {:uid => "Alice:Bob"})
   end
 
   def test_empty_filter

data/test/test_base.rb

@@ -6,6 +6,14 @@ class TestBase < Test::Unit::TestCase
   include AlTestUtils
 
   priority :must
+  def test_search_colon_value
+    make_temporary_group(:cn => "temp:group") do |group|
+      assert_equal("temp:group", group.cn)
+      assert_not_nil(@group_class.find("temp:group"))
+    end
+  end
+
+  priority :normal
   def test_lower_case_object_class
     fixture_file = fixture("lower_case_object_class_schema.rb")
     schema_entries = eval(File.read(fixture_file))
@@ -30,7 +38,6 @@ class TestBase < Test::Unit::TestCase
     assert_equal("1.555.5551234", target.umpn)
   end
 
-  priority :normal
   def test_set_and_get_false
     user = @user_class.new
     user.sn = false

data/test/test_load.rb

@@ -77,7 +77,8 @@ class TestLoad < Test::Unit::TestCase
       ldif << record
       ActiveLdap::Base.load(ldif.to_s)
       user.reload
-      assert(original_descriptions + [new_description], user.description(true))
+      assert_equal(original_descriptions + [new_description],
+                   user.description(true))
     end
   end
 

data/test/test_user.rb

@@ -69,15 +69,14 @@ class TestUser < Test::Unit::TestCase
       errors = %w(person organizationalPerson
                   inetOrgPerson).collect do |object_class|
         if ActiveLdap.get_text_supported?
-          format = _("%{fn} is required attribute by objectClass '%s': " \
+          format = _("is required attribute by objectClass '%s': " \
                      "aliases: %s")
-          format = user.gettext(format)
-          format = format % {:fn => user.class.human_attribute_name("sn")}
+          format = user._(format)
           format % [user.class.human_object_class_name(object_class),
                     user.class.human_attribute_name("surname")]
         else
           format = "is required attribute by objectClass '%s': aliases: %s"
-          user.gettext(format) % [object_class, "surname"]
+          user._(format) % [object_class, "surname"]
         end
       end
       assert_equal(errors.sort, user.errors.on(:sn).sort)

data/test/test_validation.rb

@@ -12,8 +12,8 @@ class TestValidation < Test::Unit::TestCase
         user1.id = user2.id
         assert_false(user1.save)
 
-        format = _("%{fn} is duplicated: %s")
-        format = format.sub(/^%\{fn\}/, la_('distinguishedName'))
+        format = la_('distinguishedName')
+        format  << ' ' << _("is duplicated: %s")
         assert_equal([format % [user2.dn.to_s]],
                      user1.errors.full_messages)
       end
@@ -27,8 +27,8 @@ class TestValidation < Test::Unit::TestCase
       user.jpeg_photo = "XXX"
       assert_not_predicate(user, :save)
 
-      format = _("%{fn} has invalid format: %s: required syntax: %s: %s")
-      format = format.sub(/^%\{fn\}/, la_('jpegPhoto'))
+      format = la_('jpegPhoto')
+      format << ' '  << _("has invalid format: %s: required syntax: %s: %s")
       arguments = [_("<binary-value>"),
                    lsd_("1.3.6.1.4.1.1466.115.121.1.28"),
                    _("invalid JPEG format")]
@@ -73,8 +73,8 @@ class TestValidation < Test::Unit::TestCase
     reason = _("attribute value is missing")
     invalid_format = _("%s is invalid distinguished name (DN): %s")
     invalid_message = invalid_format % ["uid==,#{user.class.base}", reason]
-    format = _("%{fn} is invalid: %s")
-    format = format.sub(/^%\{fn\}/, la_('distinguishedName'))
+    format = la_('distinguishedName')
+    format << ' ' << _("is invalid: %s")
     message = format % invalid_message
     assert_equal([message],
                  user.errors.full_messages.find_all {|m| /DN/ =~ m})
@@ -87,8 +87,8 @@ class TestValidation < Test::Unit::TestCase
       reason = _("attribute value is missing")
       invalid_format = _("%s is invalid distinguished name (DN): %s")
       invalid_message = invalid_format % ["uid==,#{user.class.base}", reason]
-      format = _("%{fn} is invalid: %s")
-      format = format.sub(/^%\{fn\}/, la_('distinguishedName'))
+      format = la_('distinguishedName')
+      format << ' ' << _("is invalid: %s")
       message = format % invalid_message
       assert_equal([message], user.errors.full_messages)
     end
@@ -99,8 +99,8 @@ class TestValidation < Test::Unit::TestCase
       assert(user.valid?)
       user.uid_number = ""
       assert(!user.valid?)
-      format = _("%{fn} is required attribute by objectClass '%s'")
-      format = format.sub(/^%\{fn\}/, la_('uidNumber'))
+      format = la_('uidNumber')
+      format << ' ' << _("is required attribute by objectClass '%s'")
       blank_message = format % loc_("posixAccount")
       assert_equal([blank_message], user.errors.full_messages)
     end
@@ -111,10 +111,10 @@ class TestValidation < Test::Unit::TestCase
       assert(user.save)
       user.class.excluded_classes = ['person']
       assert(!user.save)
-      format = n_("%{fn} has excluded value: %s",
-                  "%{fn} has excluded values: %s",
-                  1)
-      format = format.sub(/^%\{fn\}/, la_("objectClass"))
+      format = la_("objectClass")
+      format << ' ' << n_("has excluded value: %s",
+                          "has excluded values: %s",
+                          1)
       message = format % loc_("person")
       assert_equal([message], user.errors.full_messages)
     end
@@ -183,8 +183,8 @@ class TestValidation < Test::Unit::TestCase
     assert(ou_class.new("YYY").save)
     ou = ou_class.new("YYY")
     assert(!ou.save)
-    format = _("%{fn} is duplicated: %s")
-    format = format.sub(/^%\{fn\}/, la_("distinguishedName"))
+    format = la_("distinguishedName")
+    format << ' ' << _("is duplicated: %s")
     message = format % ou.dn
     assert_equal([message], ou.errors.full_messages)
   end
@@ -225,16 +225,13 @@ class TestValidation < Test::Unit::TestCase
     assert_not_nil(syntax_description)
     params = [formatted_value, syntax_description, reason]
     params.unshift(option) if option
+    localized_name = la_(name)
+    format = localized_name << ' '
     if option
-      format = _("%{fn}(%s) has invalid format: %s: required syntax: %s: %s")
+      format << _("(%s) has invalid format: %s: required syntax: %s: %s")
     else
-      format = _("%{fn} has invalid format: %s: required syntax: %s: %s")
-    end
-    localized_name = la_(name)
-    if option and !ActiveLdap.get_text_supported?
-      localized_name += ' '
+      format << _("has invalid format: %s: required syntax: %s: %s")
     end
-    format = format.sub(/^%\{fn\}/, localized_name)
     message = format % params
     assert_equal([message], model.errors.full_messages)
   end