activeldap 4.0.6 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 549828cfce6c587f25851096b0adf279c77b8da2
-  data.tar.gz: c8b3dc33d6e602e801f6ea7a223fcfd02fc587a3
+  metadata.gz: 9c8e12943a7cec9dc82ccb3d0691ef449ac50218
+  data.tar.gz: 7a5902d6f963ff74d9bb54c8f7f52a0e063c1929
 SHA512:
-  metadata.gz: b75cccdfba4b4f3735f9a3f2b11d3e1d1595c823ecfd979c7fa351b4e034645634cec04650c6c127e888c895b96715f25613883770dbf115dc068700ec60e6fe
-  data.tar.gz: 4531111740536884deb9c5dd3d4be3adea9a944849bf4ebc61d96b5bc0468eeb05b144495787fa5e0f074e3430cc33f30eccb1b66dccec76bc3b3835bcbb11e7
+  metadata.gz: 7f0106de394d61a8ca1524676c88d00cfbf8cf8839fa6004509685e1c30b0f37ddf3efee78d8a53eb23e7c905daa3fc0322cf4f5c2d9cff65bb9c4b4b4a6c42f
+  data.tar.gz: 71532cb3525dc88eb99f9dfe19203f2fd294e7e6575b589fe61649bd0fbd13f8d7b78ced72f8d6803b549b1f20a591c3b886b17951b15a8b9a97e31c8e9d906e

data/doc/text/news.textile

@@ -1,5 +1,35 @@
 h1. News
 
+h2(#release-5-1-0). 5.1.0: 2017-05-01
+
+h3. Improvements
+
+* Supported Rails 5.1.0.
+
+* Supported sub class instantiate by objectClass.
+   [GitHub#134][Patch by Chris Garrigues]
+
+* Improved error messages.
+
+* Changed to the default LDAP client to net-ldap from ruby-ldap
+  because ruby-ldap doesn't support timeout.
+
+* Suppressed warnings.
+  [GitHub#146][Reported by jas01]
+
+h3. Fixes
+
+* Added missing dependency.
+  [GitHub#145][Reported by Tom Wardrop]
+
+h3. Thanks
+
+* Chris Garrigues
+
+* Tom Wardrop
+
+* jas01
+
 h2(#release-4-0-6). 4.0.6: 2016-04-07
 
 h3. Improvements

data/lib/active_ldap.rb

@@ -8,12 +8,6 @@ module ActiveLdap
   autoload :Command, "active_ldap/command"
 end
 
-if RUBY_PLATFORM.match('linux')
-  require 'active_ldap/timeout'
-else
-  require 'active_ldap/timeout_stub'
-end
-
 require 'active_ldap/get_text'
 
 require 'active_ldap/compatible'

data/lib/active_ldap/adapter/base.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 require 'active_ldap/schema'
 require 'active_ldap/entry_attribute'
 require 'active_ldap/ldap_error'
@@ -328,7 +330,7 @@ module ActiveLdap
         n_retries = 0
         retry_limit = options[:retry_limit] || @retry_limit
         begin
-          do_in_timeout(@timeout, &block)
+          Timeout.timeout(@timeout, &block)
         rescue Timeout::Error => e
           @logger.error {_('Requested action timed out.')}
           if @retry_on_timeout and (retry_limit < 0 or n_retries <= retry_limit)
@@ -344,10 +346,6 @@ module ActiveLdap
         end
       end
 
-      def do_in_timeout(timeout, &block)
-        Timeout.alarm(timeout, &block)
-      end
-
       def sasl_bind(bind_dn, options={})
         # Get all SASL mechanisms
         mechanisms = operation(options) do
@@ -601,9 +599,13 @@ module ActiveLdap
             raise
           rescue => detail
             @logger.error do
-              _("Reconnect to server failed: %s\n" \
+              _("Reconnect to server failed: %s: %s\n" \
                 "Reconnect to server failed backtrace:\n" \
-                "%s") % [detail.message, detail.backtrace.join("\n")]
+                "%s") % [
+                detail.class,
+                detail.message,
+                detail.backtrace.join("\n"),
+              ]
             end
             # Do not loop if forced
             raise ConnectionError, detail.message if force

data/lib/active_ldap/associations.rb

@@ -75,15 +75,15 @@ module ActiveLdap
           association_class = Association::BelongsTo
           opts[:foreign_key_name] ||= "#{association_id}_id"
 
-          before_save(<<-EOC)
-            if defined?(@#{association_id})
-              association = @#{association_id}
+          before_save do
+            if instance_variable_defined?(:"@#{association_id}")
+              association = instance_variable_get(:"@#{association_id}")
               if association and association.updated?
                 self[association.__send__(:primary_key)] =
-                  association[#{opts[:foreign_key_name].dump}]
+                  association[opts[:foreign_key_name]]
               end
             end
-          EOC
+          end
         end
 
         association_accessor(association_id) do |target|

data/lib/active_ldap/base.rb

@@ -32,6 +32,7 @@
 require 'English'
 require 'thread'
 require 'erb'
+require 'set'
 
 module ActiveLdap
   # OO-interface to LDAP assuming pam/nss_ldap-style organization with
@@ -330,6 +331,7 @@ module ActiveLdap
     class_local_attr_accessor true, :dn_attribute, :scope, :sort_by, :order
     class_local_attr_accessor true, :required_classes, :recommended_classes
     class_local_attr_accessor true, :excluded_classes
+    class_local_attr_accessor false, :sub_classes
 
     class << self
       # Hide new in Base
@@ -340,6 +342,7 @@ module ActiveLdap
         sub_class.module_eval do
           include GetTextSupport
         end
+        (self.sub_classes ||= []) << sub_class
       end
 
       # Set LDAP connection configuration up. It doesn't connect
@@ -548,6 +551,20 @@ module ActiveLdap
         defaults.first || name || to_s
       end
 
+      protected
+      def find_real_class(object_classes)
+        (sub_classes || []).each do |sub_class|
+          real_class = sub_class.find_real_class(object_classes)
+          return real_class if real_class
+        end
+
+        if object_classes.superset?(Set.new(classes))
+          self
+        else
+          nil
+        end
+      end
+
       private
       def inspect_attributes(attributes)
         inspected_attribute_names = {}
@@ -594,12 +611,19 @@ module ActiveLdap
       def instantiate(args)
         dn, attributes, options = args
         options ||= {}
-        if self.class == Class
-          klass = self.ancestors[0].to_s.split(':').last
-          real_klass = self.ancestors[0]
+
+        object_classes_raw =
+          attributes["objectClass"] ||
+          attributes["objectclass"] ||
+          []
+        if sub_classes.nil? or object_classes_raw.empty?
+          real_klass = self
         else
-          klass = self.class.to_s.split(':').last
-          real_klass = self.class
+          object_classes = Set.new
+          object_classes_raw.each do |object_class_raw|
+            object_classes << schema.object_class(object_class_raw)
+          end
+          real_klass = find_real_class(object_classes) || self
         end
 
         obj = real_klass.allocate

data/lib/active_ldap/callbacks.rb

@@ -14,13 +14,12 @@ module ActiveLdap
     included do
       extend ActiveModel::Callbacks
       include ActiveModel::Validations::Callbacks
-      
+      singleton_class.class_eval do
+        prepend CallbackedInstantiatable
+      end
+
       define_model_callbacks :initialize, :find, :touch, :only => :after
       define_model_callbacks :save, :create, :update, :destroy
-      
-      class << self
-        alias_method_chain :instantiate, :callbacks
-      end
     end
 
     module ClassMethods
@@ -33,9 +32,9 @@ module ActiveLdap
       end
     end
 
-    module ClassMethods
-      def instantiate_with_callbacks(record)
-        object = instantiate_without_callbacks(record)
+    module CallbackedInstantiatable
+      def instantiate(record)
+        object = super(record)
         object.run_callbacks(:find)
         object.run_callbacks(:initialize)
         object

data/lib/active_ldap/connection.rb

@@ -197,27 +197,9 @@ module ActiveLdap
         if Object.respond_to?(:java)
           "jndi"
         else
-          ruby_ldap_available = false
-          $LOAD_PATH.each do |path|
-            if File.exist?(File.join(path, "ldap", "ldif.rb"))
-              ruby_ldap_available = true
-              break
-            end
-          end
-          if !ruby_ldap_available and Object.const_defined?(:Gem)
-            ruby_ldap_available = gem_available?("ruby-ldap")
-          end
-          if ruby_ldap_available
-            "ldap"
-          else
-            "net-ldap"
-          end
+          "net-ldap"
         end
       end
-
-      def gem_available?(name)
-        not Gem::Specification.find_all_by_name(name).empty?
-      end
     end
 
     def setup_connection(config=nil)

data/lib/active_ldap/version.rb

@@ -1,3 +1,3 @@
 module ActiveLdap
-  VERSION = "4.0.6"
+  VERSION = "5.1.0"
 end

data/po/en/active-ldap.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ruby/ActiveLdap 1.1.1\n"
 "POT-Creation-Date: 2009-08-04 23:26+0900\n"
-"PO-Revision-Date: 2009-02-25 08:40+0900\n"
+"PO-Revision-Date: 2016-05-13 21:52+0900\n"
 "Last-Translator: Kouhei Sutou <kou@cozmixng.org>\n"
 "Language-Team: English\n"
 "MIME-Version: 1.0\n"
@@ -3524,7 +3524,7 @@ msgstr ""
 
 #: lib/active_ldap/adapter/base.rb:579
 msgid ""
-"Reconnect to server failed: %s\n"
+"Reconnect to server failed: %s: %s\n"
 "Reconnect to server failed backtrace:\n"
 "%s"
 msgstr ""

data/po/ja/active-ldap.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ruby/ActiveLdap 1.1.1\n"
 "POT-Creation-Date: 2009-08-04 23:26+0900\n"
-"PO-Revision-Date: 2009-08-04 23:28+0900\n"
+"PO-Revision-Date: 2016-05-13 21:53+0900\n"
 "Last-Translator: Kouhei Sutou <kou@cozmixng.org>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -3533,11 +3533,11 @@ msgstr "再接続を試みています"
 
 #: lib/active_ldap/adapter/base.rb:579
 msgid ""
-"Reconnect to server failed: %s\n"
+"Reconnect to server failed: %s: %s\n"
 "Reconnect to server failed backtrace:\n"
 "%s"
 msgstr ""
-"サーバへの再接続が失敗しました: %s\n"
+"サーバへの再接続が失敗しました: %s: %s\n"
 "サーバへの再接続失敗時のバックトレース:\n"
 "%s"
 

data/test/command.rb

@@ -36,24 +36,21 @@ module Command
     return java_run(cmd, *args, &block) if Object.respond_to?(:java)
     in_r, in_w = IO.pipe
     out_r, out_w = IO.pipe
-    pid = nil
-    Thread.exclusive do
-      verbose = $VERBOSE
-      # ruby(>=1.8)'s fork terminates other threads with warning messages
-      $VERBOSE = nil
-      pid = fork do
-        $VERBOSE = verbose
-        detach_io
-        STDIN.reopen(in_r)
-        in_r.close
-        STDOUT.reopen(out_w)
-        STDERR.reopen(out_w)
-        out_w.close
-        exec(cmd, *args)
-        exit!(-1)
-      end
+    verbose = $VERBOSE
+    # ruby(>=1.8)'s fork terminates other threads with warning messages
+    $VERBOSE = nil
+    pid = fork do
       $VERBOSE = verbose
+      detach_io
+      STDIN.reopen(in_r)
+      in_r.close
+      STDOUT.reopen(out_w)
+      STDERR.reopen(out_w)
+      out_w.close
+      exec(cmd, *args)
+      exit!(-1)
     end
+    $VERBOSE = verbose
     yield(out_r, in_w) if block_given?
     in_r.close unless in_r.closed?
     out_w.close unless out_w.closed?

data/test/test_base.rb

@@ -663,6 +663,43 @@ class TestBase < Test::Unit::TestCase
     end
   end
 
+  class TestInstantiate < self
+    class Person < ActiveLdap::Base
+      ldap_mapping dn_attribute: "cn",
+                   prefix: "ou=People",
+                   scope: :one,
+                   classes: ["top", "person"]
+    end
+
+    class OrganizationalPerson < Person
+      ldap_mapping dn_attribute: "cn",
+                   prefix: "",
+                   classes: ["top", "person", "organizationalPerson"]
+    end
+
+    class ResidentialPerson < Person
+      ldap_mapping dn_attribute: "cn",
+                   prefix: "",
+                   classes: ["top", "person", "residentialPerson"]
+    end
+
+    def test_sub_class
+      make_ou("People")
+      residential_person = ResidentialPerson.new(cn: "John Doe",
+                                                 sn: "Doe",
+                                                 street: "123 Main Street",
+                                                 l: "Anytown")
+      residential_person.save!
+      organizational_person = OrganizationalPerson.new(cn: "Jane Smith",
+                                                       sn: "Smith",
+                                                       title: "General Manager")
+      organizational_person.save!
+      people = Person.all
+      assert_equal([ResidentialPerson, OrganizationalPerson],
+                   people.collect(&:class))
+    end
+  end
+
   def test_reload_of_not_exists_entry
     make_temporary_user do |user,|
       assert_nothing_raised do

data/test/test_callback.rb

@@ -6,10 +6,10 @@ class TestCallback < Test::Unit::TestCase
   priority :must
   def test_new
     initialized_entries = []
-    @group_class.instance_variable_set("@initialized_entries",
-                                       initialized_entries)
     @group_class.module_eval do
-      after_initialize "self.class.instance_variable_get('@initialized_entries') << self"
+      after_initialize do
+        initialized_entries << self
+      end
     end
     assert_equal([], initialized_entries)
     new_group = @group_class.new(:cn => "new-cn")
@@ -22,12 +22,14 @@ class TestCallback < Test::Unit::TestCase
     make_temporary_group do |group|
       found_entries = []
       initialized_entries = []
-      @group_class.instance_variable_set("@found_entries", found_entries)
-      @group_class.instance_variable_set("@initialized_entries",
-                                         initialized_entries)
       @group_class.module_eval do
-        after_find "self.class.instance_variable_get('@found_entries') << self"
-        after_initialize "self.class.instance_variable_get('@initialized_entries') << self"
+        prepend ActiveLdap::Callbacks::CallbackedInstantiatable
+        after_find do
+          found_entries << self
+        end
+        after_initialize do
+          initialized_entries << self
+        end
       end
 
       assert_equal([], found_entries)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeldap
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 5.1.0
 platform: ruby
 authors:
 - Will Drewry
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -67,6 +67,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -265,8 +279,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
@@ -347,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby-activeldap
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: ActiveLdap is a object-oriented API to LDAP
@@ -400,4 +412,3 @@ test_files:
 - test/test_usermod-lang-add.rb
 - test/test_usermod.rb
 - test/test_validation.rb
-has_rdoc: 

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