activeldap 4.0.0 → 4.0.1

data/doc/text/news.textile

@@ -1,5 +1,31 @@
 h1. News
 
+h2(#4-0-1). 4.0.1: 2013-08-29
+
+h3. Improvements
+
+* Added ActiveLdap::EntryAttribute#exist?.
+* [GitHub:#66] Improved Active Directory support.
+  Binary data can be validated correctly. [Reported by Nowhere Man]
+* [GitHub:#6][GitHub:#69] Improved setup description in tutorial.
+  [Reported by Radosław Antoniuk] [Patch by Francisco Miguel Biete]
+* [GitHub:#56] Supported moving sub-tree. It requires Ruby/LDAP 0.9.13 or later,
+  JRuby or net-ldap 0.5.0 or later. (net-ldap 0.5.0 isn't released yet.)
+  [Reported by Jean-François Rioux]
+
+h3. Fixes
+
+* [GitHub:#65] Removed removed attributes values by removing
+  objectClasses. [Reported by mbab]
+
+h3. Thanks
+
+* mbab
+* Nowhere Man
+* Radosław Antoniuk
+* Francisco Miguel Biete
+* Jean-François Rioux
+
 h2(#4-0-0). 4.0.0: 2013-07-13
 
 h3. Improvements

data/doc/text/rails.textile

@@ -7,7 +7,7 @@ h2. Install
 To install, simply add the following code to your Gemfile:
 
 <pre>
-gem 'activeldap'
+gem 'activeldap', :require => 'active_ldap/railtie'
 </pre>
 
 You should also depend on an LDAP adapter such as Net::LDAP
@@ -20,13 +20,6 @@ gem 'ruby-ldap'
 Bundler will install the gems automatically when you run
 'bundle install'.
 
-You also need to include the ActiveLdap railtie in
-config/application.rb, after the other railties:
-
-<pre>
-require "active_ldap/railtie"
-</pre>
-
 h2. Configuration
 
 You can use a LDAP configuration per environment. They are in

data/lib/active_ldap/acts/tree.rb

@@ -56,9 +56,9 @@ module ActiveLdap
 
       def parent=(entry)
         if entry.is_a?(String) or entry.is_a?(DN)
-          base = entry
+          base = entry.to_s
         elsif entry.respond_to?(:dn)
-          base = entry.dn
+          base = entry.dn.to_s
           if entry.respond_to?(:clear_association_cache)
             entry.clear_association_cache
           end
@@ -66,12 +66,20 @@ module ActiveLdap
           message = _("parent must be an entry or parent DN: %s") % entry.inspect
           raise ArgumentError, message
         end
+
         unless new_entry?
-          self.class.delete_entry(dn, :connection => connection)
-          @new_entry = true
+          begin
+            self.class.modify_rdn_entry(dn, "#{dn_attribute}=#{id}",
+                                        true, base,
+                                        :connection => connection)
+          rescue NotImplemented
+            self.class.delete_entry(dn, :connection => connection)
+            @new_entry = true
+          end
         end
+
         self.dn = "#{dn_attribute}=#{id},#{base}"
-        save
+        save if new_entry?
       end
     end
   end

data/lib/active_ldap/adapter/base.rb

@@ -638,8 +638,8 @@ module ActiveLdap
            try_reconnect = options[:try_reconnect]
         else
            try_reconnect = true
-        end 
-        
+        end
+
         search(:base => "",
                :scope => :base,
                :attributes => attrs,

data/lib/active_ldap/adapter/ldap.rb

@@ -152,7 +152,8 @@ 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
+          rename_available_p = @connection.respond_to?(:rename)
+          if _new_superior and not rename_available_p
             raise NotImplemented.new(_("modify RDN with new superior"))
           end
           info = {
@@ -162,7 +163,12 @@ module ActiveLdap
             :new_superior => _new_superior,
             :delete_old_rdn => _delete_old_rdn
           }
-          execute(:modrdn, info, _dn, _new_rdn, _delete_old_rdn)
+          if rename_available_p
+            execute(:rename, info,
+                    _dn, _new_rdn, _new_superior, _delete_old_rdn, [], [])
+          else
+            execute(:modrdn, info, _dn, _new_rdn, _delete_old_rdn)
+          end
         end
       end
 

data/lib/active_ldap/adapter/net_ldap.rb

@@ -119,9 +119,6 @@ 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,
@@ -132,7 +129,8 @@ module ActiveLdap
           execute(:rename, info,
                   :olddn => _dn,
                   :newrdn => _new_rdn,
-                  :delete_attributes => _delete_old_rdn)
+                  :delete_attributes => _delete_old_rdn,
+                  :new_superior => _new_superior)
         end
       end
 
@@ -147,9 +145,13 @@ module ActiveLdap
           end
         end
         message = nil
-        if result.is_a?(Hash)
+        case result
+        when Hash
           message = result[:errorMessage]
           result = result[:resultCode]
+        when Net::LDAP::PDU
+          message = result.error_message
+          result = result.result_code
         end
         unless result.zero?
           klass = LdapError::ERRORS[result]

data/lib/active_ldap/associations.rb

@@ -94,7 +94,7 @@ module ActiveLdap
 
       # has_many
       #
-      # This defines a method for an extension class expand an 
+      # This defines a method for an extension class expand an
       # existing multi-element attribute into ActiveLdap objects.
       # This discards any calls which result in entries that
       # don't exist in LDAP!

data/lib/active_ldap/base.rb

@@ -931,6 +931,17 @@ module ActiveLdap
       end
     end
 
+    def clear_removed_attributes_data(removed_attributes)
+      return if removed_attributes.empty?
+      removed_entry_attribute = EntryAttribute.new(nil, [])
+      removed_attributes.each do |attribute|
+        removed_entry_attribute.register(attribute)
+      end
+      @data.reject! do |key, _|
+        removed_entry_attribute.exist?(key)
+      end
+    end
+
     def schema
       @schema ||= super
     end

data/lib/active_ldap/entry_attribute.rb

@@ -13,7 +13,7 @@ module ActiveLdap
       @must = []
       @may = []
       @object_classes = []
-      register(schema.attribute('objectClass'))
+      register(schema.attribute('objectClass')) if schema
       object_classes.each do |objc|
         # get all attributes for the class
         object_class = schema.object_class(objc)
@@ -56,6 +56,10 @@ module ActiveLdap
       end
     end
 
+    def exist?(name)
+      not normalize(name).nil?
+    end
+
     def all_names
       @names.keys + @aliases.keys
     end

data/lib/active_ldap/object_class.rb

@@ -28,8 +28,12 @@ module ActiveLdap
       new_classes = target_classes.flatten.compact.uniq
       assert_object_classes(new_classes)
       if new_classes.sort != classes.sort
+        original_attributes = must + may
         set_attribute('objectClass', new_classes)
         clear_object_class_based_cache
+        new_attributes = must + may
+        removed_attributes = original_attributes - new_attributes
+        clear_removed_attributes_data(removed_attributes)
       end
     end
     alias_method(:classes=, :replace_class)

data/lib/active_ldap/schema.rb

@@ -325,7 +325,12 @@ module ActiveLdap
         super(id, schema, "ldapSyntaxes")
         @id = id
         @name = nil if @name == @id
-        @validator = Syntaxes[@id]
+        @built_in_syntax = Syntaxes[@id]
+      end
+
+      def binary?
+        return true if @built_in_syntax and @built_in_syntax.binary?
+        binary_transfer_required? or !human_readable?
       end
 
       def binary_transfer_required?
@@ -341,24 +346,24 @@ module ActiveLdap
       end
 
       def validate(value)
-        if @validator
-          @validator.validate(value)
+        if @built_in_syntax
+          @built_in_syntax.validate(value)
         else
           nil
         end
       end
 
       def type_cast(value)
-        if @validator
-          @validator.type_cast(value)
+        if @built_in_syntax
+          @built_in_syntax.type_cast(value)
         else
           value
         end
       end
 
       def normalize_value(value)
-        if @validator
-          @validator.normalize_value(value)
+        if @built_in_syntax
+          @built_in_syntax.normalize_value(value)
         else
           value
         end
@@ -413,8 +418,8 @@ module ActiveLdap
 
       # binary?
       #
-      # Returns true if the given attribute's syntax
-      # is X-NOT-HUMAN-READABLE or X-BINARY-TRANSFER-REQUIRED
+      # Returns true if the given attribute's syntax is binary syntax,
+      # X-NOT-HUMAN-READABLE or X-BINARY-TRANSFER-REQUIRED
       def binary?
         @binary
       end
@@ -503,7 +508,7 @@ module ActiveLdap
         @syntax = @schema.ldap_syntax(@syntax) if @syntax
         if @syntax
           @binary_required = @syntax.binary_transfer_required?
-          @binary = (@binary_required or !@syntax.human_readable?)
+          @binary = @syntax.binary?
           @derived_syntax = @syntax
         else
           @binary_required = false

data/lib/active_ldap/schema/syntaxes.rb

@@ -20,6 +20,10 @@ module ActiveLdap
         PRINTABLE_CHARACTER = /[#{printable_character_source}]/ #
         UNPRINTABLE_CHARACTER = /[^#{printable_character_source}]/ #
 
+        def binary?
+          false
+        end
+
         def type_cast(value)
           value
         end
@@ -366,6 +370,19 @@ module ActiveLdap
         end
       end
 
+      class OctetString < Base
+        SYNTAXES["1.3.6.1.4.1.1466.115.121.1.40"] = self
+
+        def binary?
+          true
+        end
+
+        private
+        def validate_normalized_value(value, original_value)
+          nil
+        end
+      end
+
       class PostalAddress < Base
         SYNTAXES["1.3.6.1.4.1.1466.115.121.1.41"] = self
 

data/lib/active_ldap/version.rb

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

data/test/test_entry_attribute.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+require "al-test-utils"
+
+class TestEntryAttribute < Test::Unit::TestCase
+  include AlTestUtils
+
+  class TestExist < self
+    priority :must
+    def test_existence
+      schema = ActiveLdap::Base.connection.schema
+      object_classes = ["posixAccount"]
+      entry_attribute = ActiveLdap::EntryAttribute.new(schema, object_classes)
+      assert_true(entry_attribute.exist?("cn"))
+    end
+
+    def test_non_existence
+      schema = nil
+      object_classes = []
+      entry_attribute = ActiveLdap::EntryAttribute.new(schema, object_classes)
+      assert_false(entry_attribute.exist?("nonExistence"))
+    end
+  end
+end

data/test/test_object_class.rb

@@ -71,4 +71,23 @@ class TestObjectClass < Test::Unit::TestCase
       assert_raises(TypeError) {group.add_class(:posixAccount)}
     end
   end
+
+  class TestRemoveClass < self
+    def test_clear_existing_attributes
+      make_temporary_user(:simple => true) do |user, password|
+        user.add_class("inetOrgPerson")
+        user.given_name = "new given name"
+
+        original_attributes = user.attributes
+        user.remove_class("inetOrgPerson")
+        new_attributes = user.attributes
+        original_attributes.delete("objectClass")
+        removed_attributes = original_attributes.reject do |key, value|
+          value == new_attributes[key]
+        end
+        assert_equal({"givenName" => "new given name"},
+                     removed_attributes)
+      end
+    end
+  end
 end

data/test/test_validation.rb

@@ -6,6 +6,16 @@ class TestValidation < Test::Unit::TestCase
   include ActiveLdap::Helper
 
   priority :must
+  def test_octet_string
+    make_temporary_user(:simple => true) do |user,|
+      utf8_encoded_binary_value = "\xff".force_encoding("UTF-8")
+      user.user_password = utf8_encoded_binary_value
+      assert_true(user.save)
+      assert_equal([], user.errors.full_messages)
+    end
+  end
+
+  priority :normal
   def test_rename_duplicated
     make_temporary_user(:simple => true) do |user1,|
       make_temporary_user(:simple => true) do |user2,|
@@ -20,7 +30,6 @@ class TestValidation < Test::Unit::TestCase
     end
   end
 
-  priority :normal
   def test_not_show_binary_value
     make_temporary_user do |user,|
       user.user_certificate = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeldap
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -172,6 +172,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: packnga
+  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: ! "    '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
@@ -303,6 +319,7 @@ files:
 - test/test_dirty.rb
 - test/test_dn.rb
 - test/test_entry.rb
+- test/test_entry_attribute.rb
 - test/test_find.rb
 - test/test_groupadd.rb
 - test/test_groupdel.rb
@@ -343,7 +360,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4416735177306675209
+      hash: -4556557570349939659
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -352,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4416735177306675209
+      hash: -4556557570349939659
 requirements: []
 rubyforge_project: ruby-activeldap
 rubygems_version: 1.8.23
@@ -381,6 +398,7 @@ test_files:
 - test/test_dirty.rb
 - test/test_dn.rb
 - test/test_entry.rb
+- test/test_entry_attribute.rb
 - test/test_find.rb
 - test/test_groupadd.rb
 - test/test_groupdel.rb