activeldap 1.2.4 → 3.1.0

data/{rails_generators/model_active_ldap → lib/rails/generators/active_ldap/model}/USAGE

@@ -8,10 +8,11 @@ Description:
     test/fixtures/singular_name.yml. It will not create a migration.
 
 Examples:
-    ./script/generate model_active_ldap user
+    rails generate active_ldap:model user
     
         This will create a User model:
             Model:      app/models/user.rb
             Test:       test/unit/user_test.rb
             Fixtures:   test/fixtures/users.yml
 
+

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

@@ -0,0 +1,47 @@
+require 'rails/generators'
+require 'active_ldap'
+
+module ActiveLdap
+  module Generators
+    class ModelGenerator < Rails::Generators::NamedBase
+      include ActiveLdap::GetTextSupport
+      source_root File.expand_path('../templates', __FILE__)
+      
+      class_option :dn_attribute, :type => :string, :default => 'cn',
+        :desc => _("Use ATTRIBUTE as default DN attribute for " \
+                   "instances of this model")
+      class_option :prefix, :type => :string,
+        :desc => _("Use PREFIX as prefix for this model")
+      class_option :classes, :type => :array, :default => nil,
+        :desc => _("Use CLASSES as required objectClass for instances of this model")
+      
+      def create_model
+        template 'model_active_ldap.rb', File.join('app/models', class_path, "#{file_name}.rb")
+      end
+      
+      hook_for :test_framework, :as => :model
+      
+      private
+      
+      def prefix
+        options[:prefix] || default_prefix
+      end
+      
+      def default_prefix
+        "ou=#{name.demodulize.pluralize}"
+      end
+      
+      def ldap_mapping(indent='  ')
+        mapping = "ldap_mapping "
+        mapping_options = [":dn_attribute => #{options[:dn_attribute].dump}"]
+        mapping_options << ":prefix => #{prefix.dump}"
+        if options[:classes]
+          mapping_options << ":classes => #{options[:classes].inspect}"
+        end
+        mapping_options = mapping_options.join(",\n#{indent}#{' ' * mapping.size}")
+        "#{indent}#{mapping}#{mapping_options}"
+      end
+    end
+  end
+end
+

data/lib/rails/generators/active_ldap/scaffold/scaffold_generator.rb

@@ -0,0 +1,14 @@
+require 'rails/generators'
+
+module ActiveLdap
+  module Generators
+    class ScaffoldGenerator < Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+      
+      def create_ldap_yml
+        copy_file 'ldap.yml', 'config/ldap.yml'
+      end
+    end
+  end
+end
+

data/{rails_generators/scaffold_active_ldap → lib/rails/generators/active_ldap/scaffold}/templates/ldap.yml

@@ -16,3 +16,4 @@ production:
   base: dc=production,dc=local,dc=net
   bind_dn: cn=admin,dc=local,dc=net
   password: secret
+

data/test/test_base.rb

@@ -1127,6 +1127,15 @@ EOX
     end
   end
 
+  def test_to_key
+    uid = "bob"
+    new_user = @user_class.new
+    assert_equal(nil, new_user.to_key)
+
+    new_user.uid = uid
+    assert_equal([new_user.dn], new_user.to_key)
+  end
+
   private
   def detect_modify(object)
     modify_called = false

data/test/test_callback.rb

@@ -14,12 +14,8 @@ class TestCallback < Test::Unit::TestCase
       @group_class.instance_variable_set("@initialized_entries",
                                          initialized_entries)
       @group_class.module_eval do
-        define_method(:after_find) do
-          self.class.instance_variable_get("@found_entries") << self
-        end
-        define_method(:after_initialize) do
-          self.class.instance_variable_get("@initialized_entries") << self
-        end
+        after_find "self.class.instance_variable_get('@found_entries') << self"
+        after_initialize "self.class.instance_variable_get('@initialized_entries') << self"
       end
 
       assert_equal([], found_entries)

data/test/test_connection.rb

@@ -47,7 +47,7 @@ class TestConnection < Test::Unit::TestCase
         raise
       end
     end
-    assert_equal("Unknown key(s): bind_format", exception.message)
+    assert_equal("Unknown key: bind_format", exception.message)
   end
 
   def test_can_reconnect?
@@ -71,10 +71,10 @@ class TestConnection < Test::Unit::TestCase
 
   priority :low
   def test_retry_limit_0_with_nonexistent_host
+    omit("this test will take a long time...")
     config = current_configuration.merge("host" => "192.168.29.29",
                                          "retry_limit" => 0)
     ActiveLdap::Base.setup_connection(config)
-    notify("maybe take a long time")
     assert_raise(ActiveLdap::ConnectionError) do
       ActiveLdap::Base.find(:first)
     end

data/test/test_user.rb

@@ -65,7 +65,7 @@ class TestUser < Test::Unit::TestCase
       assert_equal(see_also, user.see_also)
 
       assert(!user.valid?)
-      assert(user.errors.invalid?(:sn))
+      assert(user.errors[:sn].any?)
       errors = %w(person organizationalPerson
                   inetOrgPerson).collect do |object_class|
         if ActiveLdap.get_text_supported?
@@ -79,7 +79,7 @@ class TestUser < Test::Unit::TestCase
           user._(format) % [object_class, "surname"]
         end
       end
-      assert_equal(errors.sort, user.errors.on(:sn).sort)
+      assert_equal(errors.sort, user.errors[:sn].sort)
       user.sn = ['User']
       assert(user.valid?)
       assert_equal(0, user.errors.size)

data/test/test_validation.rb

@@ -12,7 +12,7 @@ class TestValidation < Test::Unit::TestCase
         user1.id = user2.id
         assert_false(user1.save)
 
-        format = la_('distinguishedName')
+        format = la_('distinguishedName').humanize
         format  << ' ' << _("is duplicated: %s")
         assert_equal([format % [user2.dn.to_s]],
                      user1.errors.full_messages)
@@ -27,7 +27,7 @@ class TestValidation < Test::Unit::TestCase
       user.jpeg_photo = "XXX"
       assert_not_predicate(user, :save)
 
-      format = la_('jpegPhoto')
+      format = la_('jpegPhoto').humanize
       format << ' '  << _("has invalid format: %s: required syntax: %s: %s")
       arguments = [_("<binary-value>"),
                    lsd_("1.3.6.1.4.1.1466.115.121.1.28"),
@@ -73,7 +73,7 @@ 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 = la_('distinguishedName')
+    format = la_('distinguishedName').humanize
     format << ' ' << _("is invalid: %s")
     message = format % invalid_message
     assert_equal([message],
@@ -87,7 +87,7 @@ 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 = la_('distinguishedName')
+      format = la_('distinguishedName').humanize
       format << ' ' << _("is invalid: %s")
       message = format % invalid_message
       assert_equal([message], user.errors.full_messages)
@@ -99,7 +99,7 @@ class TestValidation < Test::Unit::TestCase
       assert(user.valid?)
       user.uid_number = ""
       assert(!user.valid?)
-      format = la_('uidNumber')
+      format = la_('uidNumber').humanize
       format << ' ' << _("is required attribute by objectClass '%s'")
       blank_message = format % loc_("posixAccount")
       assert_equal([blank_message], user.errors.full_messages)
@@ -111,7 +111,7 @@ class TestValidation < Test::Unit::TestCase
       assert(user.save)
       user.class.excluded_classes = ['person']
       assert(!user.save)
-      format = la_("objectClass")
+      format = la_("objectClass").humanize
       format << ' ' << n_("has excluded value: %s",
                           "has excluded values: %s",
                           1)
@@ -153,7 +153,7 @@ class TestValidation < Test::Unit::TestCase
       user.add_class("strongAuthenticationUser")
       user.user_certificate = nil
       assert(!user.save)
-      assert(user.errors.invalid?(:userCertificate))
+      assert(user.errors[:userCertificate].any?)
       assert_equal(1, user.errors.size)
     end
   end
@@ -183,7 +183,7 @@ class TestValidation < Test::Unit::TestCase
     assert(ou_class.new("YYY").save)
     ou = ou_class.new("YYY")
     assert(!ou.save)
-    format = la_("distinguishedName")
+    format = la_("distinguishedName").humanize
     format << ' ' << _("is duplicated: %s")
     message = format % ou.dn
     assert_equal([message], ou.errors.full_messages)
@@ -214,7 +214,7 @@ class TestValidation < Test::Unit::TestCase
 
       @group_class.validates_presence_of(:description)
       assert(!group.valid?)
-      assert(group.errors.invalid?(:description))
+      assert(group.errors[:description].any?)
       assert_equal(1, group.errors.size)
     end
   end
@@ -225,7 +225,7 @@ 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)
+    localized_name = la_(name).humanize
     format = localized_name << ' '
     if option
       format << _("(%s) has invalid format: %s: required syntax: %s: %s")
@@ -245,7 +245,7 @@ class TestValidation < Test::Unit::TestCase
 
       user.see_also = value
       assert(!user.save)
-      assert(user.errors.invalid?(:seeAlso))
+      assert(user.errors[:seeAlso].any?)
       assert_equal(1, user.errors.size)
 
       reason_params = [invalid_value, _("attribute value is missing")]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activeldap
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 3
   prerelease: 
   segments: 
+  - 3
   - 1
-  - 2
-  - 4
-  version: 1.2.4
+  - 0
+  version: 3.1.0
 platform: ruby
 authors: 
 - Will Drewry
@@ -16,104 +16,166 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 Z
+date: 2011-07-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 15424109
         segments: 
-        - 2
         - 3
-        - 11
-        version: 2.3.11
+        - 1
+        - 0
+        - rc
+        - 4
+        version: 3.1.0.rc4
+  name: activemodel
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: locale
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
-        - 2
         - 0
-        - 5
-        version: 2.0.5
+        version: "0"
+  name: locale
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: fast_gettext
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
         - 0
-        - 5
-        - 8
-        version: 0.5.8
+        version: "0"
+  name: gettext_i18n_rails
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: gettext_i18n_rails
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: ruby-ldap
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 3
         segments: 
         - 0
-        - 2
-        - 2
-        version: 0.2.2
-  type: :runtime
-  version_requirements: *id004
+        version: "0"
+  name: net-ldap
+  prerelease: false
+  type: :development
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: jeweler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 2
         - 0
-        - 4
-        version: 2.0.4
+        version: "0"
+  name: test-unit
+  prerelease: false
   type: :development
-  version_requirements: *id005
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: test-unit-notify
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 3
         segments: 
-        - 2
-        - 6
-        - 1
-        version: 2.6.1
+        - 0
+        version: "0"
+  name: yard
+  prerelease: false
   type: :development
-  version_requirements: *id006
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: RedCloth
+  prerelease: false
+  type: :development
+  requirement: *id011
 description: "    'ActiveLdap' is a ruby extension 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
@@ -123,19 +185,21 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
-- CHANGES
-- COPYING
 - LICENSE
+- README.textile
+- TODO
 files: 
-- CHANGES
 - COPYING
+- Gemfile
 - LICENSE
-- README
-- Rakefile
+- README.textile
 - TODO
 - benchmark/bench-al.rb
 - benchmark/config.yaml.sample
+- doc/text/development.textile
+- doc/text/news.textile
+- doc/text/rails.textile
+- doc/text/tutorial.textile
 - examples/config.yaml.example
 - examples/example.der
 - examples/example.jpg
@@ -194,9 +258,13 @@ files:
 - lib/active_ldap/human_readable.rb
 - lib/active_ldap/ldap_error.rb
 - lib/active_ldap/ldif.rb
+- lib/active_ldap/log_subscriber.rb
 - lib/active_ldap/object_class.rb
 - lib/active_ldap/operations.rb
+- lib/active_ldap/persistence.rb
 - lib/active_ldap/populate.rb
+- lib/active_ldap/railtie.rb
+- lib/active_ldap/railties/controller_runtime.rb
 - lib/active_ldap/schema.rb
 - lib/active_ldap/schema/syntaxes.rb
 - lib/active_ldap/timeout.rb
@@ -204,65 +272,56 @@ files:
 - lib/active_ldap/user_password.rb
 - lib/active_ldap/validations.rb
 - lib/active_ldap/xml.rb
+- lib/rails/generators/active_ldap/model/USAGE
+- lib/rails/generators/active_ldap/model/model_generator.rb
+- lib/rails/generators/active_ldap/model/templates/model_active_ldap.rb
+- lib/rails/generators/active_ldap/scaffold/scaffold_generator.rb
+- lib/rails/generators/active_ldap/scaffold/templates/ldap.yml
 - po/en/active-ldap.po
 - po/ja/active-ldap.po
-- rails/README
-- rails/init.rb
-- rails_generators/model_active_ldap/USAGE
-- rails_generators/model_active_ldap/model_active_ldap_generator.rb
-- rails_generators/model_active_ldap/templates/model_active_ldap.rb
-- rails_generators/model_active_ldap/templates/unit_test.rb
-- rails_generators/scaffold_active_ldap/scaffold_active_ldap_generator.rb
-- rails_generators/scaffold_active_ldap/templates/ldap.yml
-- test/al-test-utils.rb
-- test/command.rb
-- test/config.yaml.sample
-- test/fixtures/lower_case_object_class_schema.rb
-- test/run-test.rb
-- test/test_acts_as_tree.rb
-- test/test_adapter.rb
-- test/test_associations.rb
-- test/test_attributes.rb
-- test/test_base.rb
-- test/test_base_per_instance.rb
-- test/test_bind.rb
-- test/test_callback.rb
-- test/test_configuration.rb
-- test/test_connection.rb
-- test/test_connection_per_class.rb
-- test/test_connection_per_dn.rb
-- test/test_dn.rb
-- test/test_find.rb
+- test/test_lpasswd.rb
 - test/test_groupadd.rb
 - test/test_groupdel.rb
+- test/test_base_per_instance.rb
 - test/test_groupls.rb
-- test/test_groupmod.rb
-- test/test_ldif.rb
-- test/test_load.rb
-- test/test_lpasswd.rb
-- test/test_object_class.rb
-- test/test_reflection.rb
+- test/test_connection_per_dn.rb
+- test/test_connection.rb
+- test/test_usermod-lang-add.rb
+- test/test_associations.rb
 - test/test_schema.rb
+- test/test_dn.rb
+- test/test_attributes.rb
+- test/test_object_class.rb
+- test/test_acts_as_tree.rb
+- test/test_usermod-binary-add.rb
+- test/test_find.rb
+- test/test_bind.rb
+- test/test_useradd-binary.rb
+- test/test_callback.rb
+- test/test_useradd.rb
+- test/test_usermod.rb
 - test/test_syntax.rb
+- test/test_usermod-binary-add-time.rb
 - test/test_user.rb
 - test/test_user_password.rb
-- test/test_useradd-binary.rb
-- test/test_useradd.rb
-- test/test_userdel.rb
+- test/test_base.rb
+- test/test_adapter.rb
+- test/test_groupmod.rb
+- test/test_reflection.rb
+- test/test_load.rb
+- test/test_configuration.rb
 - test/test_userls.rb
-- test/test_usermod-binary-add-time.rb
-- test/test_usermod-binary-add.rb
-- test/test_usermod-binary-del.rb
-- test/test_usermod-lang-add.rb
-- test/test_usermod.rb
+- test/test_userdel.rb
 - test/test_validation.rb
-homepage: http://rubyforge.org/projects/ruby-activeldap/
-licenses: []
-
+- test/test_ldif.rb
+- test/test_connection_per_class.rb
+- test/test_usermod-binary-del.rb
+homepage: http://ruby-activeldap.rubyforge.org/
+licenses: 
+- Ruby's or GPLv2 or later
 post_install_message: 
-rdoc_options: 
-- --main
-- lib/active_ldap.rb
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement