activeldap 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6843a03bb95047e714ba757d90fcc4072508a7cb
-  data.tar.gz: e281bb775badcb61da95465dec7c316c51d4bcdf
+SHA256:
+  metadata.gz: 8ff0abb4ff702e766243e5ff416b5b526b4ae0f2e0269e4058f00956b27b7de8
+  data.tar.gz: 87e13372b42e5b6c8b58012597f5631ebd92d50b213382f5d6f32a90479b4f60
 SHA512:
-  metadata.gz: 5ef2d625d33324a495fec527ba79b6b1483c21b885404220b5849af56345c1b08a8852d9c56a4df66b8cd230d21f3c6549190060c4978dc897da74fca2a12867
-  data.tar.gz: ae643d6b8552d95ed4fe089ba0104bb2347b1f0ed80bfeb2a4901a56e381801008836e640f701c356ecbed5f1a033f84754b78e47ca82611f4be56bc80845221
+  metadata.gz: a5b69fb0534269a9fdc2b0eda2882d35a4c74cfde74b3d82af50880e83c49a350f770d18538e6b9fca119aa4ca4c59c9482ca9c447620cdbdfe5327f113a268d
+  data.tar.gz: 10c8ebcb314692ed2e2abafe1a9edd39572c617f8ffe540fcc6ca760aff3c8b7ebd6dbf3f1f2af7d0c76097a340fb2c393516629e229e212af82842d5386d3f5

data/doc/text/news.textile

@@ -1,5 +1,21 @@
 h1. News
 
+h2(#release-5-2-0). 5.2.0: 2018-05-09
+
+h3. Improvements
+
+* Added @:dc_base_class@ and @:ou_base_class@ options to
+  @ActiveLdap::Populate.ensure_base@.
+  [GitHub#153][Patch by hide_24]
+
+* Added Active Model 5.2.0 support.
+
+* Improved connection error handling for net-ldap.
+
+h3. Thanks
+
+* hide_24
+
 h2(#release-5-1-1). 5.1.1: 2018-01-17
 
 h3. Improvements

data/lib/active_ldap/adapter/net_ldap.rb

@@ -33,8 +33,11 @@ module ActiveLdap
             info = {:uri => uri, :with_start_tls => with_start_tls}
             [log("connect", info) {Net::LDAP::Connection.new(config)},
              uri, with_start_tls]
-          rescue Net::LDAP::LdapError
-            raise ConnectionError, $!.message
+          rescue Net::LDAP::ConnectionError => error
+            raise ConnectionError, error.message
+          rescue Net::LDAP::Error => error
+            message = "#{error.class}: #{error.message}"
+            raise ConnectionError, message, caller(0) + error.backtrace
           end
         end
       end
@@ -50,7 +53,7 @@ module ActiveLdap
       def bind(options={})
         begin
           super
-        rescue Net::LDAP::LdapError
+        rescue Net::LDAP::Error
           raise AuthenticationError, $!.message
         end
       end
@@ -148,8 +151,13 @@ module ActiveLdap
         result = log(name, info) do
           begin
             @connection.send(method, *args, &block)
-          rescue Errno::EPIPE, Errno::ECONNRESET
-            raise ConnectionError, "#{$!.class}: #{$!.message}"
+          rescue SystemCallError => error
+            message = "#{error.class}: #{error.message}"
+            raise ConnectionError, message, caller(0) + error.backtrace
+          rescue Net::LDAP::ResponseMissingOrInvalidError => error
+            message = "#{error.class}: #{error.message}"
+            message << ": connection may be timed out"
+            raise ConnectionError, message, caller(0) + error.backtrace
           end
         end
         message = nil

data/lib/active_ldap/attribute_methods.rb

@@ -13,8 +13,7 @@ module ActiveLdap
       end.flatten
     end
 
-    protected
-
+    private
     # overiding ActiveModel::AttributeMethods
     def attribute_method?(method_name)
       have_attribute?(method_name, ['objectClass'])

data/lib/active_ldap/attribute_methods/before_type_cast.rb

@@ -7,7 +7,7 @@ module ActiveLdap
         attribute_method_suffix '_before_type_cast'
       end
 
-    protected
+      private
       def attribute_before_type_cast(attr)
         get_attribute_before_type_cast(attr)[1]
       end

data/lib/active_ldap/attribute_methods/dirty.rb

@@ -9,8 +9,7 @@ module ActiveLdap
       def save(*) #:nodoc:
         succeeded = super
         if succeeded
-          @previously_changed = changes
-          @changed_attributes.clear
+          changes_applied
         end
         succeeded
       end
@@ -18,20 +17,18 @@ module ActiveLdap
       # Attempts to <tt>save!</tt> the record and clears changed attributes if successful.
       def save!(*) #:nodoc:
         super.tap do
-          @previously_changed = changes
-          @changed_attributes.clear
+          changes_applied
         end
       end
 
       # <tt>reload</tt> the record and clears changed attributes.
       def reload(*) #:nodoc:
         super.tap do
-          @previously_changed.clear
-          @changed_attributes.clear
+          clear_changes_information
         end
       end
 
-    protected
+      private
       def set_attribute(name, value)
         if name and name != "objectClass"
           attribute_will_change!(name) unless value == get_attribute(name)

data/lib/active_ldap/attribute_methods/query.rb

@@ -8,7 +8,7 @@ module ActiveLdap
         attribute_method_suffix '?'
       end
 
-    protected
+      private
       def get_attribute_as_query(name, force_array=false)
         name, value = get_attribute_before_type_cast(name, force_array)
         if force_array

data/lib/active_ldap/attribute_methods/read.rb

@@ -3,11 +3,15 @@ module ActiveLdap
     module Read
       extend ActiveSupport::Concern
 
-    protected
+      private
       def attribute(attr, *args)
         return get_attribute(attr, args.first)
       end
 
+      def _read_attribute(name)
+        get_attribute(name)
+      end
+
       # get_attribute
       #
       # Return the value of the attribute called by method_missing?

data/lib/active_ldap/attribute_methods/write.rb

@@ -7,7 +7,7 @@ module ActiveLdap
         attribute_method_suffix '='
       end
 
-    protected
+      private
       def attribute=(attr, *args)
         return set_attribute(attr, args.first)
       end

data/lib/active_ldap/base.rb

@@ -946,9 +946,7 @@ module ActiveLdap
     def clear_object_class_based_cache
       @entry_attribute = nil
       @real_names = {}
-      @changed_attributes.reject! do |key, _|
-        not attribute_method?(key)
-      end
+      clear_changes_information
     end
 
     def clear_removed_attributes_data(removed_attributes)
@@ -1117,7 +1115,7 @@ module ActiveLdap
         end
         set_attribute(key, value)
       end
-      @changed_attributes.clear
+      clear_changes_information
     end
     private :initialize_attributes
 
@@ -1167,8 +1165,6 @@ module ActiveLdap
       @dn_split_value = nil
       @connection ||= nil
       @_hashing = false
-      @previously_changed = []
-      @changed_attributes = {}
       clear_connection_based_cache
     end
 

data/lib/active_ldap/populate.rb

@@ -1,9 +1,11 @@
 module ActiveLdap
   module Populate
     module_function
-    def ensure_base(base_class=nil)
+    def ensure_base(base_class=nil, options={})
       base_class ||= Base
       return unless base_class.search(:scope => :base).empty?
+      dc_base_class = options[:dc_base_class] || base_class
+      ou_base_class = options[:ou_base_class] || base_class
 
       base_dn = DN.parse(base_class.base)
       suffixes = []
@@ -15,11 +17,11 @@ module ActiveLdap
         begin
           case name.downcase
           when "dc"
-            ensure_dc(value, prefix, base_class)
+            ensure_dc(value, prefix, dc_base_class)
           when "ou"
             ensure_ou(value,
                       :base => prefix,
-                      :base_class => base_class)
+                      :base_class => ou_base_class)
           end
         rescue ActiveLdap::OperationNotPermitted
         end

data/lib/active_ldap/railties/controller_runtime.rb

@@ -6,8 +6,7 @@ module ActiveLdap
     module ControllerRuntime #:nodoc:
       extend ActiveSupport::Concern
 
-    protected
-
+      private
       attr_internal :ldap_runtime
 
       def process_action(action, *args)

data/lib/active_ldap/version.rb

@@ -1,3 +1,3 @@
 module ActiveLdap
-  VERSION = "5.1.1"
+  VERSION = "5.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeldap
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - Will Drewry
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -359,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby-activeldap
-rubygems_version: 2.5.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ActiveLdap is a object-oriented API to LDAP