activeldap 3.2.3 → 4.0.0

data/Gemfile

@@ -9,4 +9,7 @@ group :test do
   platforms :mri_18, :mri_19 do
     gem "ruby-ldap"
   end
+  platforms :jruby do
+    gem "jruby-openssl"
+  end
 end

data/README.textile

@@ -3,13 +3,13 @@ h1. ActiveLdap
 A ruby library for object-oriented LDAP interface.
 
 * Copyright (C) 2004-2006 Will Drewry _<will@alum.bu.edu>_
-* Copyright (C) 2006-2011 Kouhei Sutou _<kou@clear-code.com>_
+* Copyright (C) 2006-2013 Kouhei Sutou _<kou@clear-code.com>_
 
 h2. Description
 
 'ActiveLdap' is a ruby library which provides a clean
 objected oriented interface to LDAP library.  It was
-inspired by ActivRecord. This is not nearly as clean or as
+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 them with minimal difficulty.
 
@@ -20,7 +20,7 @@ h2. Prerequisites
 
 - Ruby intepreter :=
 One of them:
-* "Ruby":http://www.ruby-lang.org (1.8.x or 1.9.x)
+* "Ruby":http://www.ruby-lang.org (1.9.3 or 2.0.x)
 * "JRuby":http://www.jruby.org/
 
 See the above links for installation.
@@ -45,7 +45,7 @@ h2. Notes
 
 h2. Rails
 
-See "Rails":file.rails.html page for Rails integration.
+See "Rails":doc/text/rails.textile page for Rails integration.
 
 h2. Licence
 

data/doc/text/news.textile

@@ -1,5 +1,55 @@
 h1. News
 
+h2(#4-0-0). 4.0.0: 2013-07-13
+
+h3. Improvements
+
+* [activeldap-discuss] Added {ActiveLdap::Entry} for convenient.
+  [Suggested by Craig White]
+* [GitHub:#45] Ensured that {ActiveLdap::Persistence#save!} returns
+  true on success. But you should use {ActiveLdap::Persistence#save}
+  to determine success or failure by return value.
+  [Reported by Suggested by Erik M Jacobs]
+* [GitHub:#52] Improved binary data handling on Ruby 1.9.3.
+  [Patch by Carl P. Corliss]
+* [GitHub:#53] Supported lower case hashed password.
+  [Patch by jpiotro3]
+* [GitHub:#51] Supported implicit railtie load by
+  @require "active_ldap"@.
+  [Patch by mperrando]
+* [GitHub:#62] Improved JNDI communication error handling.
+  [Patch by Ryosuke Yamazaki]
+* [GitHub:#61] Supported Rails 4. Dropped Rails 3 support.
+  [Patch by superscott]
+* [GitHub:#63] Handled Errno::ECONNRESET as connection in
+  net-ldap adapter [Patch by mpoornima]
+h3. Fixes
+
+* [GitHub:#44] Fixed a typo in document.
+  [Patch by Vaucher Philippe]
+* [GitHub:#50] Fixed a stack overflow during SASL bind to a
+  unresponsive LDAP server.
+  [Patch by pwillred]
+* [GitHub:#54] Fixed a link in document.
+  [Patch by marco]
+* [GitHub:#57] Fixed a wrong blank value detection for "false".
+  [Reported by Robin Doer]
+
+h3. Thanks
+
+* Craig White
+* Vaucher Philippe
+* Erik M Jacobs
+* pwillred
+* Carl P. Corliss
+* jpiotro3
+* marco
+* mperrando
+* Robin Doer
+* Ryosuke Yamazaki
+* superscott
+* mpoornima
+
 h2(#3-2-2). 3.2.2: 2012-09-01
 
 * Supported entry creation by direct ActiveLdap::Base use.

data/lib/active_ldap.rb

@@ -55,7 +55,7 @@ ActiveLdap::Base.class_eval do
   include ActiveLdap::Persistence
 
   include ActiveLdap::Associations
-  include ActiveModel::MassAssignmentSecurity
+  include ActiveModel::ForbiddenAttributesProtection
   include ActiveLdap::Attributes
   include ActiveLdap::AttributeMethods
   include ActiveLdap::AttributeMethods::BeforeTypeCast
@@ -83,3 +83,5 @@ ACTIVE_LDAP_CONNECTION_ADAPTERS.each do |adapter|
   require "active_ldap/adapter/#{adapter}"
 end
 
+require "active_ldap/entry"
+require "active_ldap/railtie" if defined?(Rails)

data/lib/active_ldap/adapter/base.rb

@@ -336,7 +336,7 @@ module ActiveLdap
       def sasl_bind(bind_dn, options={})
         # Get all SASL mechanisms
         mechanisms = operation(options) do
-          root_dse_values("supportedSASLMechanisms")
+          root_dse_values("supportedSASLMechanisms", options)
         end
 
         if options.has_key?(:sasl_quiet)
@@ -579,9 +579,10 @@ module ActiveLdap
           options[:reconnect_attempts] = 0 if force
           options[:reconnect_attempts] += 1 if retry_limit >= 0
           begin
+            options[:try_reconnect] = false
             connect(options)
             break
-          rescue AuthenticationError
+          rescue AuthenticationError, Timeout::Error
             raise
           rescue => detail
             @logger.error do
@@ -633,10 +634,17 @@ module ActiveLdap
 
       def root_dse(attrs, options={})
         found_attributes = nil
+        if options.has_key?(:try_reconnect)
+           try_reconnect = options[:try_reconnect]
+        else
+           try_reconnect = true
+        end 
+        
         search(:base => "",
                :scope => :base,
                :attributes => attrs,
-               :limit => 1) do |dn, attributes|
+               :limit => 1,
+               :try_reconnect => try_reconnect) do |dn, attributes|
           found_attributes = attributes
         end
         found_attributes

data/lib/active_ldap/adapter/jndi.rb

@@ -28,6 +28,10 @@ module ActiveLdap
         end
       end
 
+      def connecting?
+        super and @connection.bound?
+      end
+
       def unbind(options={})
         super do
           execute(:unbind)
@@ -89,6 +93,8 @@ module ActiveLdap
       def execute(method, info=nil, *args, &block)
         name = (info || {}).delete(:name) || method
         log(name, info) {@connection.send(method, *args, &block)}
+      rescue JndiConnection::CommunicationException => e
+        raise ActiveLdap::ConnectionError.new(e.getMessage())
       rescue JndiConnection::NamingException
         if /\[LDAP: error code (\d+) - ([^\]]+)\]/ =~ $!.to_s
           message = $2

data/lib/active_ldap/adapter/jndi_connection.rb

@@ -26,6 +26,7 @@ module ActiveLdap
       StartTlsRequest = ldap.StartTlsRequest
       Control = ldap.Control
 
+      CommunicationException = naming.CommunicationException
       NamingException = naming.NamingException
       NameNotFoundException = naming.NameNotFoundException
 

data/lib/active_ldap/adapter/ldap.rb

@@ -183,10 +183,6 @@ module ActiveLdap
         end
       end
 
-      def do_in_timeout(timeout, &block)
-        Timeout.timeout(timeout, &block)
-      end
-
       def ensure_method(method)
         normalized_method = method.to_s.downcase
         Method.constants.each do |name|

data/lib/active_ldap/adapter/net_ldap.rb

@@ -142,7 +142,7 @@ module ActiveLdap
         result = log(name, info) do
           begin
             @connection.send(method, *args, &block)
-          rescue Errno::EPIPE
+          rescue Errno::EPIPE, Errno::ECONNRESET
             raise ConnectionError, "#{$!.class}: #{$!.message}"
           end
         end

data/lib/active_ldap/attributes.rb

@@ -16,7 +16,9 @@ module ActiveLdap
         when Array
           value.all? {|val| blank_value?(val)}
         when String
-          /\A\s*\z/ =~ value
+          /\A\s*\z/ === value
+        when true, false
+          false
         when nil
           true
         else
@@ -138,37 +140,6 @@ module ActiveLdap
     end
 
     private
-    def sanitize_for_mass_assignment(attributes, role=nil)
-      role ||= :default
-      authorizer = mass_assignment_authorizer(role)
-      black_list_p =
-        authorizer.is_a?(ActiveModel::MassAssignmentSecurity::BlackList)
-
-      always_needless_attributes = {}
-      needless_attributes = {}
-
-      _dn_attribute = nil
-      begin
-        _dn_attribute = dn_attribute_with_fallback
-      rescue DistinguishedNameInvalid
-      end
-      [_dn_attribute, 'objectClass'].compact.each do |name|
-        always_needless_attributes[to_real_attribute_name(name)] = true
-      end
-      authorizer.each do |name|
-        needless_attributes[to_real_attribute_name(name)] = black_list_p
-      end
-
-      sanitized_attributes = attributes.collect do |key, value|
-        key = _dn_attribute if ["id", "dn"].include?(key.to_s)
-        [to_real_attribute_name(key) || key, value]
-      end
-      sanitized_attributes = sanitized_attributes.reject do |key, value|
-        always_needless_attributes[key] or needless_attributes[key]
-      end
-      sanitized_attributes
-    end
-
     def normalize_attribute_name(name)
       self.class.normalize_attribute_name(name)
     end

data/lib/active_ldap/base.rb

@@ -224,11 +224,11 @@ module ActiveLdap
   end
 
   class EntryInvalid < Error
-    attr_reader :entry
-    def initialize(entry)
-      @entry = entry
-      errors = @entry.errors.full_messages.join(", ")
-      super(errors)
+    attr_reader :entry
+    def initialize(entry)
+      @entry = entry
+      errors = @entry.errors.full_messages.join(", ")
+      super(errors)
     end
   end
 
@@ -679,15 +679,10 @@ module ActiveLdap
         self.classes = initial_classes
         self.dn = attributes
       when Hash
-        classes, attributes = extract_object_class(attributes)
+        attributes = attributes.clone
+        classes = extract_object_class!(attributes)
         self.classes = classes | initial_classes
-        normalized_attributes = {}
-        attributes.each do |key, value|
-          real_key = to_real_attribute_name(key) || key
-          normalized_attributes[real_key] = value
-        end
-        self.dn = normalized_attributes.delete(dn_attribute)
-        self.attributes = normalized_attributes
+        self.attributes = attributes
       else
         format = _("'%s' must be either nil, DN value as ActiveLdap::DN, " \
                    "String or Array or attributes as Hash")
@@ -831,15 +826,11 @@ module ActiveLdap
       assign_attributes(new_attributes)
     end
 
-    def assign_attributes(new_attributes, options={})
+    def assign_attributes(new_attributes)
       return if new_attributes.blank?
 
       _schema = _local_entry_attribute = nil
-      if options[:without_protection]
-        targets = new_attributes
-      else
-        targets = sanitize_for_mass_assignment(new_attributes, options[:role])
-      end
+      targets = sanitize_for_mass_assignment(new_attributes)
       targets.each do |key, value|
         setter = "#{key}="
         unless respond_to?(setter)
@@ -1032,18 +1023,31 @@ module ActiveLdap
       @local_entry_attribute ||= connection.entry_attribute([])
     end
 
-    def extract_object_class(attributes)
+    def extract_object_class!(attributes)
       classes = []
-      attrs = {}
-      attributes.each do |key, value|
-        key = key.to_s
-        if /\Aobject_?class\z/i =~ key
-          classes.concat(value.to_a)
+      attributes.keys.each do |key|
+        string_key = key.to_s
+        if /\Aobject_?class\z/i =~ string_key
+          classes.concat(attributes[key].to_a)
+          attributes.delete(key)
+        end
+      end
+      classes
+    end
+
+    def remove_dn_attribute!(attributes)
+      _dn_attribute = dn_attribute
+      attributes.keys.each do |key|
+        case key
+        when "id", :id, "dn", :dn
+          attributes.delete(key)
         else
-          attrs[key] = value
+          normalized_key = to_real_attribute_name(key) || key
+          if normalized_key == _dn_attribute
+            attributes.delete(key)
+          end
         end
       end
-      [classes, attributes]
     end
 
     def init_base
@@ -1061,9 +1065,11 @@ module ActiveLdap
       @new_entry = false
       @dn_is_base = false
       @ldap_data = attributes
-      classes, attributes = extract_object_class(attributes)
+      attributes = attributes.clone
+      classes = extract_object_class!(attributes)
       self.classes = classes
       self.dn = dn
+      remove_dn_attribute!(attributes)
       initialize_attributes(attributes)
       yield self if block_given?
     end
@@ -1181,8 +1187,9 @@ module ActiveLdap
 
     def split_dn_value(value)
       dn_value = relative_dn_value = nil
+      value = value.first if value.is_a?(Array) and value.size == 1
+      dn_value = value if value.is_a?(DN)
       begin
-        dn_value = value if value.is_a?(DN)
         dn_value ||= DN.parse(value)
       rescue DistinguishedNameInvalid
         begin

data/lib/active_ldap/callbacks.rb

@@ -36,8 +36,8 @@ module ActiveLdap
     module ClassMethods
       def instantiate_with_callbacks(record)
         object = instantiate_without_callbacks(record)
-        object.send(:_run_find_callbacks)
-        object.send(:_run_initialize_callbacks)
+        object.run_callbacks(:find)
+        object.run_callbacks(:initialize)
         object
       end
     end

data/lib/active_ldap/entry.rb

@@ -0,0 +1,8 @@
+module ActiveLdap
+  class Entry < ActiveLdap::Base
+    ldap_mapping :prefix => "",
+                 :classes => ["top"],
+                 :scope => :sub
+    self.dn_attribute = nil
+  end
+end

data/lib/active_ldap/persistence.rb

@@ -44,6 +44,7 @@ module ActiveLdap
       unless create_or_update
         raise EntryNotSaved, _("entry %s can't be saved") % dn
       end
+      true
     end
 
     def create_or_update
@@ -90,7 +91,7 @@ module ActiveLdap
       end
 
       @ldap_data.update(attributes)
-      classes, attributes = extract_object_class(attributes)
+      classes = extract_object_class!(attributes)
       self.classes = classes
       self.attributes = attributes
       @new_entry = false

data/lib/active_ldap/schema.rb

@@ -88,6 +88,7 @@ module ActiveLdap
     end
 
     def attribute(name)
+      name = name.to_s if name.is_a?(Symbol)
       cache([:attribute, name]) do
         Attribute.new(name, self)
       end
@@ -552,7 +553,7 @@ module ActiveLdap
         when Hash
           normalize_hash_value(value, have_binary_mark)
         else
-          if value.blank?
+          if value.nil?
             value = []
           else
             value = send_to_syntax(value, :normalize_value, value)

data/lib/active_ldap/schema/syntaxes.rb

@@ -187,15 +187,10 @@ module ActiveLdap
             fraction = match_data[-2]
             fraction = fraction.to_f if fraction
             time_zone = match_data[-1]
-            arguments = [
-              year, month, day, hour, minute, second, fraction, time_zone,
-              Time.now
-            ]
-            if Time.method(:make_time).arity == 10
-              arguments.unshift(value)
-            end
             begin
-              Time.send(:make_time, *arguments)
+              Time.send(:make_time,
+                        year, month, day, hour, minute, second, fraction,
+                        time_zone, Time.now)
             rescue ArgumentError
               raise if year >= 1700
               out_of_range_messages = ["argument out of range",

data/lib/active_ldap/user_password.rb

@@ -7,7 +7,7 @@ module ActiveLdap
   module UserPassword
     module_function
     def valid?(password, hashed_password)
-      unless /^\{([A-Z][A-Z\d]+)\}/ =~ hashed_password
+      unless /^\{([A-Za-z][A-Za-z\d]+)\}/ =~ hashed_password
         # Plain text password
         return hashed_password == password
       end

data/lib/active_ldap/validations.rb

@@ -147,7 +147,7 @@ module ActiveLdap
           next if required_attribute.read_only?
           next if _validation_skip_attributes.include?(real_name)
 
-          value = @data[real_name] || []
+          value = @data[real_name]
           next unless self.class.blank_value?(value)
 
           _schema ||= schema
@@ -171,6 +171,10 @@ module ActiveLdap
     def validate_ldap_values
       entry_attribute.schemata.each do |name, attribute|
         value = self[name]
+        # Is it really proper location for setting encoding?
+        if attribute.binary? and value.respond_to?(:force_encoding)
+          value.force_encoding("ASCII-8BIT")
+        end
         next if self.class.blank_value?(value)
         validate_ldap_value(attribute, name, value)
       end

data/lib/active_ldap/version.rb

@@ -1,3 +1,3 @@
 module ActiveLdap
-  VERSION = "3.2.3"
+  VERSION = "4.0.0"
 end

data/lib/rails/generators/active_ldap/model/model_generator.rb

@@ -33,10 +33,10 @@ module ActiveLdap
       
       def ldap_mapping(indent='  ')
         mapping = "ldap_mapping "
-        mapping_options = [key_value(:dn_attribute, options[:dn_attribute].dump)]
-        mapping_options << key_value(:prefix, prefix.dump)
+        mapping_options = ["dn_attribute: #{options[:dn_attribute].dump}"]
+        mapping_options << "prefix: #{prefix.dump}"
         if options[:classes]
-          mapping_options << key_value(:classes, options[:classes].inspect)
+          mapping_options << "classes: #{options[:classes].inspect}"
         end
         mapping_options = mapping_options.join(",\n#{indent}#{' ' * mapping.size}")
         "#{indent}#{mapping}#{mapping_options}"

data/test/command.rb

@@ -32,6 +32,7 @@ module Command
     if args.any? {|x| x.nil?}
       raise ArgumentError, "args has nil: #{args.inspect}"
     end
+    args = args.collect {|arg| arg.to_s}
     return java_run(cmd, *args, &block) if Object.respond_to?(:java)
     in_r, in_w = IO.pipe
     out_r, out_w = IO.pipe
@@ -48,7 +49,7 @@ module Command
         STDOUT.reopen(out_w)
         STDERR.reopen(out_w)
         out_w.close
-        exec(cmd, *args.collect {|arg| arg.to_s})
+        exec(cmd, *args)
         exit!(-1)
       end
       $VERBOSE = verbose

data/test/test_attributes.rb

@@ -17,22 +17,6 @@ class TestAttributes < Test::Unit::TestCase
     assert_nil(user.__send__(:to_real_attribute_name, "objectclass", false))
   end
 
-  def test_protect_object_class_from_mass_assignment
-    classes = @user_class.required_classes + ["inetOrgPerson"]
-    user = @user_class.new(:uid => "XXX", :object_class => classes)
-    assert_equal(["inetOrgPerson"],
-                 user.classes -  @user_class.required_classes)
-
-    user = @user_class.new(:uid => "XXX", :object_class => ['inetOrgPerson'])
-    assert_equal(["inetOrgPerson"],
-                 user.classes -  @user_class.required_classes)
-
-    user = @user_class.new("XXX")
-    assert_equal([], user.classes -  @user_class.required_classes)
-    user.attributes = {:object_class => classes}
-    assert_equal([], user.classes -  @user_class.required_classes)
-  end
-
   def test_normalize_attribute
     assert_normalize_attribute(["usercertificate", [{"binary" => []}]],
                                "userCertificate",
@@ -71,41 +55,6 @@ class TestAttributes < Test::Unit::TestCase
                                                  {"phonetic" => ["やまだ"]}]}])
   end
 
-  def test_attr_protected
-    user = @user_class.new(:uid => "XXX")
-    assert_equal("XXX", user.uid)
-    user.attributes = {:uid => "ZZZ"}
-    assert_equal("XXX", user.uid)
-
-    user = @user_class.new(:sn => "ZZZ")
-    assert_equal("ZZZ", user.sn)
-
-    user = @user_class.new(:uid => "XXX", :sn => "ZZZ")
-    assert_equal("XXX", user.uid)
-    assert_equal("ZZZ", user.sn)
-
-    @user_class.attr_protected :sn
-    user = @user_class.new(:sn => "ZZZ")
-    assert_nil(user.sn)
-
-    sub_user_class = Class.new(@user_class)
-    sub_user_class.ldap_mapping :dn_attribute => "uid"
-    user = sub_user_class.new(:uid => "XXX", :sn => "ZZZ")
-    assert_equal("XXX", user.uid)
-    assert_nil(user.sn)
-
-    sub_user_class.attr_protected :cn
-    user = sub_user_class.new(:uid => "XXX", :sn => "ZZZ", :cn => "Common Name")
-    assert_equal("XXX", user.uid)
-    assert_nil(user.sn)
-    assert_nil(user.cn)
-
-    user = @user_class.new(:uid => "XXX", :sn => "ZZZ", :cn => "Common Name")
-    assert_equal("XXX", user.uid)
-    assert_nil(user.sn)
-    assert_equal("Common Name", user.cn)
-  end
-
   private
   def assert_normalize_attribute(expected, name, value)
     assert_equal(expected, ActiveLdap::Base.normalize_attribute(name, value))
@@ -114,4 +63,121 @@ class TestAttributes < Test::Unit::TestCase
   def assert_unnormalize_attribute(expected, name, value)
     assert_equal(expected, ActiveLdap::Base.unnormalize_attribute(name, value))
   end
+
+  class TestBlankValue < self
+    private
+    def assert_blank_value(value)
+      assert_true(ActiveLdap::Base.blank_value?(value),
+                  "value: <#{value.inspect}>")
+    end
+
+    def assert_not_blank_value(value)
+      assert_false(ActiveLdap::Base.blank_value?(value),
+                   "value: <#{value.inspect}>")
+    end
+
+    class TestHash < self
+      def test_empty
+        assert_blank_value({})
+      end
+
+      def test_have_elements
+        assert_not_blank_value({"name" => "Taro", "age" => 29})
+      end
+
+      def test_have_blank_element
+        assert_not_blank_value({"name" => nil, "age" => 29})
+      end
+
+      def test_all_blank_elements
+        assert_blank_value({"name" => nil, "age" => nil})
+      end
+    end
+
+    class TestArray < self
+      def test_empty
+        assert_blank_value([])
+      end
+
+      def test_have_elements
+        assert_not_blank_value(["Taro", "Jiro"])
+      end
+
+      def test_have_blank_element
+        assert_not_blank_value(["Taro", nil])
+      end
+
+      def test_all_blank_elements
+        assert_blank_value([nil, nil])
+      end
+    end
+
+    class TestString < self
+      def test_empty
+        assert_blank_value("")
+      end
+
+      def test_only_spaces
+        assert_blank_value(" \t\n")
+      end
+
+      def test_have_non_spaces
+        assert_not_blank_value("Taro")
+      end
+    end
+
+    class TestBoolean < self
+      def test_true
+        assert_not_blank_value(true)
+      end
+
+      def test_false
+        assert_not_blank_value(true)
+      end
+    end
+  end
+
+  class TestMassAssignment < self
+    def test_forbid
+      attributes = {:cn => "Alice"}
+      def attributes.permitted?
+        false
+      end
+      assert_raise(ActiveModel::ForbiddenAttributesError) do
+        @user_class.new(attributes)
+      end
+    end
+
+    def test_permit
+      attributes = {:cn => "Alice"}
+      def attributes.permitted?
+        true
+      end
+      alice = @user_class.new(attributes)
+      assert_equal("Alice", alice.cn)
+    end
+
+    def test_forbid_object_class
+      classes = @user_class.required_classes + ["inetOrgPerson"]
+      user = @user_class.new(:uid => "XXX", :object_class => classes)
+      assert_equal(["inetOrgPerson"],
+                   user.classes -  @user_class.required_classes)
+
+      user = @user_class.new(:uid => "XXX", :object_class => ['inetOrgPerson'])
+      assert_equal(["inetOrgPerson"],
+                   user.classes -  @user_class.required_classes)
+
+      user = @user_class.new("XXX")
+      assert_equal([], user.classes -  @user_class.required_classes)
+      user.attributes = {:object_class => classes}
+      assert_equal([], user.classes -  @user_class.required_classes)
+    end
+
+    def test_rename
+      make_temporary_user(:simple => true) do |user,|
+        assert_true(user.update_attributes(:id => "user2"))
+        assert_equal("user2", user.id)
+      end
+    end
+  end
 end

data/test/test_base.rb

@@ -75,14 +75,6 @@ class TestBase < Test::Unit::TestCase
     end
   end
 
-  def test_not_rename_by_mass_update
-    make_temporary_user(:simple => true) do |user,|
-      original_id = user.id
-      assert_true(user.update_attributes(:id => "user2"))
-      assert_equal(original_id, user.id)
-    end
-  end
-
   def test_attributes
     make_temporary_group do |group|
       assert_equal({

data/test/test_entry.rb

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+require 'al-test-utils'
+
+class TestEntry < Test::Unit::TestCase
+  include AlTestUtils
+
+  def test_all
+    make_temporary_group do |group|
+      make_temporary_user do |user, password|
+        all_entries = [ActiveLdap::Base.base]
+        all_entries += [user.dn, user.base]
+        all_entries += [group.dn, group.base]
+        assert_equal(all_entries.sort,
+                     ActiveLdap::Entry.all.collect(&:dn).sort)
+      end
+    end
+  end
+end

data/test/test_user.rb

@@ -198,7 +198,8 @@ class TestUser < Test::Unit::TestCase
       assert_nothing_raised() { user.save! }
 
       user = @user_class.find(user.uid)
-      assert_equal(cn, user.cn,
+      assert_equal(cn.sort_by {|value| value.to_s},
+                   user.cn.sort_by {|value| value.to_s},
                    'Making sure a modify with mixed subtypes works')
     end
   end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: activeldap
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 4.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Will Drewry
@@ -9,154 +10,172 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-18 00:00:00.000000000 Z
+date: 2013-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: locale
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gettext
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gettext_i18n_rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      'ActiveLdap' is a ruby 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
-      them with minimal difficulty.
+description: ! "    'ActiveLdap' is a ruby library which provides a clean\n    objected
+  oriented interface to the Ruby/LDAP library.  It was inspired\n    by ActiveRecord.
+  This is not nearly as clean or as flexible as\n    ActiveRecord, but it is still
+  trivial to define new objects and manipulate\n    them with minimal difficulty.\n"
 email:
 - redpig@dataspill.org
 - kou@cozmixng.org
@@ -164,7 +183,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".yardopts"
+- .yardopts
 - COPYING
 - Gemfile
 - LICENSE
@@ -232,6 +251,7 @@ files:
 - lib/active_ldap/configuration.rb
 - lib/active_ldap/connection.rb
 - lib/active_ldap/distinguished_name.rb
+- lib/active_ldap/entry.rb
 - lib/active_ldap/entry_attribute.rb
 - lib/active_ldap/escape.rb
 - lib/active_ldap/get_text.rb
@@ -282,6 +302,7 @@ files:
 - test/test_connection_per_dn.rb
 - test/test_dirty.rb
 - test/test_dn.rb
+- test/test_entry.rb
 - test/test_find.rb
 - test/test_groupadd.rb
 - test/test_groupdel.rb
@@ -310,26 +331,33 @@ files:
 homepage: http://ruby-activeldap.rubyforge.org/
 licenses:
 - Ruby's or GPLv2 or later
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4416735177306675209
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4416735177306675209
 requirements: []
 rubyforge_project: ruby-activeldap
-rubygems_version: 2.5.1
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: ActiveLdap is a object-oriented API to LDAP
 test_files:
 - test/add-phonetic-attribute-options-to-slapd.ldif
@@ -352,6 +380,7 @@ test_files:
 - test/test_connection_per_dn.rb
 - test/test_dirty.rb
 - test/test_dn.rb
+- test/test_entry.rb
 - test/test_find.rb
 - test/test_groupadd.rb
 - test/test_groupdel.rb
@@ -377,3 +406,4 @@ test_files:
 - test/test_usermod-lang-add.rb
 - test/test_usermod.rb
 - test/test_validation.rb
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 0848564f21de4b95f1d09fde5f6ec186edcb4d08
-  data.tar.gz: 783377f08856388cdc329bf37f6f3784324e7f4f
-SHA512:
-  metadata.gz: b5ea19b28a4fa0851d7e41d3a75ba7a3eed1390f7e599c3df9ffc9db1af7ad7aba6f2b5d84f2c709306b646317c9b30ac7ecfd99c28fbea8a37c02e53bb77a25
-  data.tar.gz: 7875832eddc2347c17a0e3aa53c9f5328df8ce2f18d6a5f8473627772299bac8ea2a716f520fb3a665e8f026108b297c17cf9a857c70102aa99e9f68b3f54b24