activeldap 4.0.5 → 6.1.0

data/test/test_validation.rb

@@ -37,6 +37,15 @@ class TestValidation < Test::Unit::TestCase
   priority :must
 
   priority :normal
+  def test_validate_false
+    make_temporary_user(:simple => true) do |user,|
+      user.sn = nil
+      assert_raise(ActiveLdap::RequiredAttributeMissed) do
+        user.save(validate: false)
+      end
+    end
+  end
+
   def test_octet_string
     make_temporary_user(:simple => true) do |user,|
       utf8_encoded_binary_value = "\xff".force_encoding("UTF-8")
@@ -52,8 +61,8 @@ class TestValidation < Test::Unit::TestCase
         user1.id = user2.id
         assert_false(user1.save)
 
-        format = la_('distinguishedName').humanize
-        format  << ' ' << _("is duplicated: %s")
+        format = human_attribute_name("distinguishedName")
+        format << " " << _("is duplicated: %s")
         assert_equal([format % [user2.dn.to_s]],
                      user1.errors.full_messages)
       end
@@ -66,8 +75,8 @@ class TestValidation < Test::Unit::TestCase
       user.jpeg_photo = "XXX"
       assert_not_predicate(user, :save)
 
-      format = la_('jpegPhoto').humanize
-      format << ' '  << _("has invalid format: %s: required syntax: %s: %s")
+      format = human_attribute_name('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")]
@@ -112,8 +121,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 = la_('distinguishedName').humanize
-    format << ' ' << _("is invalid: %s")
+    format = human_attribute_name("distinguishedName")
+    format << " " << _("is invalid: %s")
     message = format % invalid_message
     assert_equal([message],
                  user.errors.full_messages.find_all {|m| /DN/ =~ m})
@@ -126,8 +135,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 = la_('distinguishedName').humanize
-      format << ' ' << _("is invalid: %s")
+      format = human_attribute_name("distinguishedName")
+      format << " " << _("is invalid: %s")
       message = format % invalid_message
       assert_equal([message], user.errors.full_messages)
     end
@@ -138,8 +147,8 @@ class TestValidation < Test::Unit::TestCase
       assert(user.valid?)
       user.uid_number = ""
       assert(!user.valid?)
-      format = la_('uidNumber').humanize
-      format << ' ' << _("is required attribute by objectClass '%s'")
+      format = human_attribute_name("uidNumber")
+      format << " " << _("is required attribute by objectClass '%s'")
       blank_message = format % loc_("posixAccount")
       assert_equal([blank_message], user.errors.full_messages)
     end
@@ -150,8 +159,8 @@ class TestValidation < Test::Unit::TestCase
       assert(user.save)
       user.class.excluded_classes = ['person']
       assert(!user.save)
-      format = la_("objectClass").humanize
-      format << ' ' << n_("has excluded value: %s",
+      format = human_attribute_name("objectClass")
+      format << " " << n_("has excluded value: %s",
                           "has excluded values: %s",
                           1)
       message = format % loc_("person")
@@ -222,8 +231,8 @@ class TestValidation < Test::Unit::TestCase
     assert(ou_class.new("YYY").save)
     ou = ou_class.new("YYY")
     assert(!ou.save)
-    format = la_("distinguishedName").humanize
-    format << ' ' << _("is duplicated: %s")
+    format = human_attribute_name("distinguishedName")
+    format << " " << _("is duplicated: %s")
     message = format % ou.dn
     assert_equal([message], ou.errors.full_messages)
   end
@@ -259,12 +268,16 @@ class TestValidation < Test::Unit::TestCase
   end
 
   private
+  def human_attribute_name(name)
+    la_(name).dup
+  end
+
   def assert_invalid_value(name, formatted_value, syntax, reason, model, option)
     syntax_description = lsd_(syntax)
     assert_not_nil(syntax_description)
     params = [formatted_value, syntax_description, reason]
     params.unshift(option) if option
-    localized_name = la_(name).humanize
+    localized_name = human_attribute_name(name)
     format = localized_name << ' '
     if option
       format << _("(%s) has invalid format: %s: required syntax: %s: %s")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeldap
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 6.1.0
 platform: ruby
 authors:
 - Will Drewry
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2020-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: locale
   requirement: !ruby/object:Gem::Requirement
@@ -68,13 +68,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit-notify
+  name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,7 +138,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: RedCloth
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -152,7 +152,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: packnga
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -182,16 +182,15 @@ files:
 - COPYING
 - Gemfile
 - LICENSE
-- README.textile
 - TODO
 - benchmark/README.md
 - benchmark/bench-backend.rb
 - benchmark/bench-instantiate.rb
 - benchmark/config.yaml.sample
-- doc/text/development.textile
-- doc/text/news.textile
-- doc/text/rails.textile
-- doc/text/tutorial.textile
+- doc/text/development.md
+- doc/text/news.md
+- doc/text/rails.md
+- doc/text/tutorial.md
 - examples/config.yaml.example
 - examples/example.der
 - examples/example.jpg
@@ -265,8 +264,6 @@ files:
 - lib/active_ldap/schema.rb
 - lib/active_ldap/schema/syntaxes.rb
 - lib/active_ldap/supported_control.rb
-- lib/active_ldap/timeout.rb
-- lib/active_ldap/timeout_stub.rb
 - lib/active_ldap/user_password.rb
 - lib/active_ldap/validations.rb
 - lib/active_ldap/version.rb
@@ -282,6 +279,8 @@ files:
 - test/al-test-utils.rb
 - test/command.rb
 - test/config.yaml.sample
+- test/enable-dynamic-groups.ldif
+- test/enable-start-tls.ldif
 - test/fixtures/lower_case_object_class_schema.rb
 - test/run-test.rb
 - test/test_acts_as_tree.rb
@@ -346,8 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ruby-activeldap
-rubygems_version: 2.4.5.1
+rubygems_version: 3.2.0.rc.2
 signing_key: 
 specification_version: 4
 summary: ActiveLdap is a object-oriented API to LDAP
@@ -356,6 +354,8 @@ test_files:
 - test/al-test-utils.rb
 - test/command.rb
 - test/config.yaml.sample
+- test/enable-dynamic-groups.ldif
+- test/enable-start-tls.ldif
 - test/fixtures/lower_case_object_class_schema.rb
 - test/run-test.rb
 - test/test_acts_as_tree.rb
@@ -400,4 +400,3 @@ test_files:
 - test/test_usermod-lang-add.rb
 - test/test_usermod.rb
 - test/test_validation.rb
-has_rdoc: 

data/README.textile

@@ -1,141 +0,0 @@
-h1. ActiveLdap
-
-A ruby library for object-oriented LDAP interface.
-
-* Copyright (C) 2004-2006 Will Drewry _<will@alum.bu.edu>_
-* 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 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.
-
-For example and usage - read the
-"document":http://activeldap.github.io/.
-
-h2. Prerequisites
-
-- Ruby intepreter :=
-One of them:
-* "Ruby":http://www.ruby-lang.org (1.9.3 or 2.0.x)
-* "JRuby":http://www.jruby.org/
-
-See the above links for installation.
-=:
-- LDAP client :=
-JRuby doesn't need to install new library because JRuby
-has builtin LDAP support. Ruby users need one of them:
-
-* "Ruby/LDAP":http://ruby-ldap.sourceforge.net/
-* "Net::LDAP":http://rubyldap.com/
-
-See the above links for installation.
-=:
-- ActiveModel :=
-A toolkit for building modeling frameworks like Active
-Record and Active Resource.
-=:
-
-h2. Notes
-
-* Only GSSAPI SASL support exists due to Ruby/LDAP limitations
-
-h2. Rails
-
-See "Rails":file.rails.html ("doc/text/rails.textile":doc/text/rails.textile
-in the repository and on GitHub) page for Rails integration.
-
-h2. Licence
-
-This program is free software; you can redistribute it and/or modify it.  It is
-dual licensed under Ruby's license and under the terms of the GNU General
-Public License as published by the Free Software Foundation; either version 2,
-or (at your option) any later version.
-
-Please see the file LICENSE for the terms of the licence.
-
-h2. Thanks
-
-This list may not be correct. If you notice mistakes of this
-list, please point out.
-
-* Dick Davies
-* Nathan Kinder
-* Patrick Cole
-* Google Inc.
-* Nobody: Bug reports and API improveent ideas.
-* James Hughes: Bug reports and advices and documentations.
-* Buzz Chopra: Documentations.
-* Christoph Lipp:
-** Bug reports.
-** Tell us character escape syntax.
-* Jeff Hall: Bug reports.
-* Ernie Miller: Bug reports and advices.
-* Daniel Pfile: Patches.
-* Jacob Wilkins: Bug reports.
-* Ace Suares:
-** Bug reports.
-** Nederlands translations.
-* Iain Pople: Bug reports and API improvement ideas.
-* Kevin McCarthy: Patches.
-* Perry Smith: Patches, bug reports and indications.
-* Marc Dequènes: API suggestions.
-* Jeremy Pruitt: Bug reports.
-* Bodaniel Jeanes:
-** A suggestion for behavior on simple bind with empty password.
-** Bug reports.
-* Naoto Morishima: Bug reports.
-* David Morton:
-** An API improvement idea.
-** Bug reports.
-* Lennon Day-Reynolds: Bug reports.
-* Tilo: A bug report.
-* Matt Mencel: Bug reports.
-* CultureSpy:
-** Bug reports.
-** Bug fixes.
-* gwarf12: A bug report.
-* Baptiste Grenier: API improvement ideas.
-* Richard 3 Nicholas: API improvement ideas.
-* Kazuhiro NISHIYAMA: A bug report.
-* Grzegorz Marszałek: A bug report.
-* しまさわらさん: A suggesetion.
-* Ted Lepich: A suggestion.
-* danger1986: A suggestion.
-* michael.j.konopka: Bug reports.
-* ingersoll: A suggestion.
-* Alexey.Chebotar: Bug reports.
-* ery.lee: A bug report.
-* id:dicdak: A bug report.
-* Raiko Mitsu: A bug report.
-* Kazuaki Takase: Documents in Japanese.
-* Tim Hermans: A bug report.
-* Joe Francis: A suggestion.
-* Tiago Fernandes: Bug reports.
-* achemze: A suggestion.
-* George Montana Harkin: A suggestion.
-* Marc Dequènes: Bug reports.
-* brad@lucky-dip.net: A bug report.
-* Hideyuki Yasuda: Bug reports.
-* zachwily: A bug report.
-* syrius.ml@no-log.org: A bug report.
-* Tim Hermans: A bug report.
-* Anthony M. Martinez: Helped SASL options support
-* ilusi0n.x: A bug report.
-* projekttabla: A suggestion.
-* christian.pennaforte: A bug report.
-* planetmcd: A bug report.
-* spoidar: Rails 3 support.
-* Kris Wehner: Rails 2.3.8 support.
-* Ryan Tandy:
-** A test bug fix.
-** Rails 3 support.
-* rbq: A bug report.
-* Narihiro Nakamura: Rails 3 support.
-* Hidetoshi Yoshimoto: Rails 3 support.
-* warden: A bug report.
-* bklier: A bug fix.
-* Craig White: Bug reports.

data/doc/text/development.textile

@@ -1,54 +0,0 @@
-h1. Development
-
-Here is information for developers.
-
-h2. Repository
-
-ActiveLdap uses ["git repository on
-GitHub":https://github.com/activeldap]. Here is a
-list to get each source code.
-
-- "activeldap":https://github.com/activeldap/activeldap :=
-<pre class="command">
-% git clone https://github.com/activeldap/activeldap.git
-</pre>
-=:
-- "al-admin":https://github.com/activeldap/al-admin :=
-<pre class="command">
-% git clone https://github.com/activeldap/al-admin.git
-</pre>
-=:
-
-h2. Issues
-
-ActiveLdap uses "Issues on
-GitHub":https://github.com/activeldap/activeldap/issues for
-issue tracking. Please submit a issue when you find an
-issue.
-
-h2. Rails 3 support
-
-Here is design about Rails 3 support.
-
-h3. must
-
-* We add active_ldap/test_help.rb to support ActiveLdap fixture.
-We don't write same codes into test_helper.rb like
-http://ruby-activeldap.rubyforge.org/activeldap-fabrication/en/#Install
-
-h3. may
-
-* We support Warden.
-* We support Devise
-* We support OmniAuth. (instead of Warden)
-
-h3. DONE
-
-* We don't support Rails 3.0.x.
-* We provide active_ldap/railtie to initialize ActiveLdap.
-* We remove ActiveRecord dependency.
-* We depend on ActiveModel instead of ActiveRecord.
-* We target to Rails 3.1.0. (Yes, it's not released yet
-  but it will be released before we support Rails 3.x.)
-* We update the documentation and ensure that the procedure
-  for including ActiveLdap in a Rails 3 project is correct.

data/lib/active_ldap/timeout.rb

@@ -1,75 +0,0 @@
-require 'timeout'
-
-module Timeout
-
-  # A forking timeout implementation that relies on
-  # signals to interrupt blocking I/O instead of passing
-  # that code to run in a separate process.
-  #
-  # A process is fork()ed, sleeps for _sec_,
-  # then sends a ALRM signal to the Process.ppid
-  # process. ALRM is used to avoid conflicts with sleep()
-  #
-  # This overwrites any signal
-  def Timeout.alarm(sec, exception=Timeout::Error, &block)
-    return block.call if sec == nil or sec.zero?
- 
-  
-    # Trap an alarm in case it comes before we're ready
-    orig_alrm = trap(:ALRM, 'IGNORE')
-
-    # Setup a fallback in case of a race condition of an
-    # alarm before we set the other trap
-    trap(:ALRM) do 
-      # Don't leave zombies
-      Process.wait2()
-      # Restore the original handler
-      trap('ALRM', orig_alrm)
-      # Now raise an exception!
-      raise exception, 'execution expired'
-    end
-
-    # Spawn the sleeper
-    pid = Process.fork {
-      begin
-        # Sleep x seconds then send SIGALRM 
-        sleep(sec)
-        # Send alarm!
-        Process.kill(:ALRM, Process.ppid)
-      end
-      exit! 0
-    }
-
-    # Setup the real handler
-    trap(:ALRM) do
-      # Make sure we clean up any zombies
-      Process.waitpid(pid)
-      # Restore the original handler
-      trap(:ALRM, orig_alrm)
-      # Now raise an exception!
-      raise exception, 'execution expired'
-    end
-
-    begin
-      # Run the code!
-      return block.call
-    ensure
-      # Restore old alarm handler since we're done
-      trap(:ALRM, orig_alrm)
-      # Make sure the process is dead
-      # This may be run twice (trap occurs during execution) so ignore ESRCH
-      Process.kill(:TERM, pid) rescue Errno::ESRCH
-      # Don't leave zombies
-      Process.waitpid(pid) rescue Errno::ECHILD
-    end
-  end
-end # Timeout
-
-if __FILE__ == $0
-  require 'time'
-  Timeout.alarm(2) do 
-    loop do 
-      p Time.now
-    end
-  end
-end

data/lib/active_ldap/timeout_stub.rb

@@ -1,17 +0,0 @@
-require 'timeout'
-
-module Timeout
-  # STUB
-  def Timeout.alarm(sec, exception=Timeout::Error, &block)
-    timeout(sec, exception, &block)
-  end
-end # Timeout
-
-if __FILE__ == $0
-  require 'time'
-  Timeout.alarm(2) do 
-    loop do 
-      p Time.now
-    end
-  end
-end