activeldap 5.2.2 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d6b5227689af0fea86d9e29d3fc76165038dafb71ff7962780647b83f5d973c
-  data.tar.gz: 3a645873ff56846dab7e85adc7cc1a99b4e904b72f2e28fb61297e4a5e70add2
+  metadata.gz: c13c85afc7e4d89ae99b34594d827b7970112e8a27cf011f484d2e8ec8708a6a
+  data.tar.gz: b6918bc5db92871b7e395911f08ca6f443a9dd4b6dd2a800716e07084f70b26e
 SHA512:
-  metadata.gz: 2eeacfd5b6f4d6e109299b1a59efd19a154845b11d192611575e95ce7c9585c68b366bf2844cb800474377b0efe83e4a5c9fac6a4b7c366c9222537300d88eb9
-  data.tar.gz: 7aaf91753784bd19d10ef86e8b720785c96b0ba8e5b7c072cb0e6f88a31d4f458525dc23d610d7ab679d1389e5db87d1cfc9f189f2cf48d7cb2ebdb1faab3974
+  metadata.gz: 5a3724db64fcd07d42fa7bf11bbddd646d72f2ece01de634abac1c7cf038ab36a209359768bd252d19b64b3fe99a370c53d96947ec87f8ef159a985228f421f1
+  data.tar.gz: caa6c1a7f32a8899f36dd9ce5e8996fe46838b78a1ba00dcd661d4480b15ac7763d0bead0c896c81f4afda80839c8dbe48dfc554a5c3a12920e479b26f68a4fc

data/doc/text/news.textile

@@ -1,5 +1,23 @@
 h1. News
 
+h2(#release-5-2-3). 5.2.3: 2019-02-15
+
+h3. Improvements
+
+* Changed to use add and delete for modify if it's needed.
+  [GitHub#156][Patch by David Klotz]
+
+* Added support for timezone with munites offset such as @0530@.
+  [GitHub#160][GitHub#161][Patch by Neng Xu]
+
+* Added support for Ruby 2.6.
+
+h3. Thanks
+
+* David Klotz
+
+* Neng Xu
+
 h2(#release-5-2-2). 5.2.2: 2018-07-12
 
 h3. Improvements

data/lib/active_ldap/base.rb

@@ -1372,7 +1372,14 @@ module ActiveLdap
         if k == _dn_attribute
           new_dn_value = value[0]
         else
-          attributes.push([:replace, k, value])
+          if (v.size == 1 and value.size == 1) or force_replace?(k)
+            attributes.push([:replace, k, value])
+          else
+            removed_values = v - value
+            added_values = value - v
+            attributes.push([:delete, k, removed_values]) unless removed_values.empty?
+            attributes.push([:add, k, added_values]) unless added_values.empty?
+          end
         end
       end
 
@@ -1386,12 +1393,22 @@ module ActiveLdap
         # Detect subtypes and account for them
         # REPLACE will function like ADD, but doesn't hit EQUALITY problems
         # TODO: Added equality(attr) to Schema
-        attributes.push([:replace, k, value])
+        if force_replace?(k)
+          attributes.push([:replace, k, value])
+        else
+          attributes.push([:add, k, value])
+        end
       end
 
       [new_dn_value, attributes]
     end
 
+    def force_replace?(k)
+      attribute = schema.attribute(k)
+      attribute.single_value? or
+        attribute.binary? # TODO: this should probably explicitly check for fields with no equality matching rule instead
+    end
+
     def collect_all_attributes(data)
       dn_attr = dn_attribute
       dn_value = data[dn_attr]

data/lib/active_ldap/schema/syntaxes.rb

@@ -192,11 +192,11 @@ module ActiveLdap
             fraction = fraction.to_f if fraction
             time_zone = match_data[-1]
             arguments = [
-              year, month, day, hour, minute, second, fraction, time_zone,
+              value, year, month, day, hour, minute, second, fraction, time_zone,
               Time.now,
             ]
-            if Time.method(:make_time).arity == 10
-              arguments.unshift(value)
+            if Time.method(:make_time).arity == 11
+              arguments[2, 0] = nil
             end
             begin
               Time.send(:make_time, *arguments)
@@ -222,7 +222,11 @@ module ActiveLdap
             if value.gmt?
               normalized_value + "Z"
             else
-              normalized_value + ("%+03d%02d" % value.gmtoff.divmod(3600))
+              # for timezones with non-zero minutes, such as IST which is +0530,
+              # divmod(3600) will give wrong value of 1800
+
+              offset = value.gmtoff / 60 # in minutes
+              normalized_value + ("%+03d%02d" % offset.divmod(60))
             end
           else
             value

data/lib/active_ldap/version.rb

@@ -1,3 +1,3 @@
 module ActiveLdap
-  VERSION = "5.2.2"
+  VERSION = "5.2.3"
 end

data/test/test_base.rb

@@ -252,6 +252,94 @@ class TestBase < Test::Unit::TestCase
     end
   end
 
+  def test_set_single_valued_attribute_uses_replace
+    make_temporary_user(:simple => true) do |user,|
+      assert_not_nil(user.homeDirectory)
+      assert_not_equal("/home/foo", user.homeDirectory)
+
+      user.homeDirectory = "/home/foo"
+      assert_equal({
+                     :modified => true,
+                     :entries => [
+                       [
+                         :replace,
+                         "homeDirectory",
+                         {"homeDirectory" => ["/home/foo"]},
+                       ]
+                     ]
+                   },
+                   detect_modify(user) {user.save})
+      assert_equal("/home/foo", user.homeDirectory)
+    end
+  end
+
+  def test_set_attribute_uses_add_for_completely_new_value
+    make_temporary_user(:simple => true) do |user,|
+      assert_nil(user.description)
+
+      user.description = "x"
+      assert_equal({
+                     :modified => true,
+                     :entries => [
+                       [:add, "description", {"description" => ["x"]}],
+                     ],
+                   },
+                   detect_modify(user) {user.save})
+      assert_equal("x", user.description)
+    end
+  end
+
+  def test_set_attribute_uses_add_for_added_value
+    make_temporary_user(:simple => true) do |user,|
+      user.description = ["a", "b"]
+      assert(user.save)
+
+      user.description = ["a", "b", "c"]
+      assert_equal({
+                     :modified => true,
+                     :entries => [
+                       [:add, "description", {"description" => ["c"]}],
+                     ],
+                   },
+                   capture = detect_modify(user) {user.save})
+      assert_equal(["a", "b", "c"], user.description)
+    end
+  end
+
+  def test_set_attribute_uses_delete_for_deleted_value
+    make_temporary_user(:simple => true) do |user,|
+      user.description = ["a", "b", "c"]
+      assert(user.save)
+
+      user.description = ["a", "c"]
+      assert_equal({
+                     :modified => true,
+                     :entries => [
+                       [:delete, "description", {"description" => ["b"]}],
+                     ],
+                   },
+                   detect_modify(user) {user.save})
+      assert_equal(["a", "c"], user.description)
+    end
+  end
+
+  def test_set_attribute_uses_delete_for_unset_value
+    make_temporary_user(:simple => true) do |user,|
+      user.description = "x"
+      assert(user.save)
+
+      user.description = nil
+      assert_equal({
+                     :modified => true,
+                     :entries => [
+                       [:delete, "description", {"description" => ["x"]}],
+                     ],
+                   },
+                   detect_modify(user) {user.save})
+      assert_nil(user.description)
+    end
+  end
+
   def test_set_attributes_with_a_blank_value_in_values
     make_temporary_user(:simple => true) do |user,|
       user.attributes = {"description" => ["a", "b", ""]}
@@ -354,14 +442,25 @@ class TestBase < Test::Unit::TestCase
 
   def test_save_with_changes
     make_temporary_user do |user, password|
+      cn = user.cn
       user.cn += "!!!"
-      assert_true(detect_modify(user) {user.save})
+      assert_equal({
+                     :modified => true,
+                     :entries => [
+                       [:replace, "cn", {"cn" => ["#{cn}!!!"]}],
+                     ],
+                   },
+                   detect_modify(user) {user.save})
     end
   end
 
   def test_save_without_changes
     make_temporary_user do |user, password|
-      assert_false(detect_modify(user) {user.save})
+      assert_equal({
+                     :modified => false,
+                     :entries => [],
+                   },
+                   detect_modify(user) {user.save})
     end
   end
 
@@ -1188,23 +1287,30 @@ EOX
 
   private
   def detect_modify(object)
-    modify_called = false
+    modify_called = nil
+    entries = nil
     singleton_class = class << object; self; end
     singleton_class.send(:define_method, :modify_entry) do |*args|
       dn, attributes, options = args
       options ||= {}
       modify_detector = Object.new
       modify_detector.instance_variable_set("@called", false)
+      modify_detector.instance_variable_set("@entries", [])
       def modify_detector.modify(dn, entries, options)
         @called = true
+        @entries = entries
       end
       options[:connection] = modify_detector
       result = super(dn, attributes, options)
       modify_called = modify_detector.instance_variable_get("@called")
+      entries = modify_detector.instance_variable_get("@entries")
       result
     end
     yield
-    modify_called
+    {
+      :modified => modify_called,
+      :entries => entries,
+    }
   end
 
   def assert_to_ldif(entry)

data/test/test_syntax.rb

@@ -117,6 +117,11 @@ class TestSyntax < Test::Unit::TestCase
                          "19941216103212.345+0900")
       end
 
+      def test_timezone_difference_with_minutes
+        assert_type_cast(Time.parse("2019-02-13 15:54:23 +0530"),
+                         "20190213155423+0530")
+      end
+
       def test_year_month_day_hour_minute
         assert_type_cast(Time.parse("2008/01/07 03:46:00"),
                          "200801070346")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeldap
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.3
 platform: ruby
 authors:
 - Will Drewry
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -360,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby-activeldap
-rubygems_version: 3.0.0.beta1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ActiveLdap is a object-oriented API to LDAP