tag_options 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cee8f74f051ffc41909e62f0a613904ce5f342a6be1fd8d961b8f7663d66087
-  data.tar.gz: 5e8c5f2b69fe32e13330a99f4d112a412bc4e6b3a78a5233d66f11a3ad032e7c
+  metadata.gz: 416b4a714b85d92ffe1d81481749e7e75f3ebb6a5ef2f9c40330a544dd3cd774
+  data.tar.gz: ef14412ef73a773aaec41c5f2cd7f9a715e7f3368b5d1338d4d85dfaf6af0d4c
 SHA512:
-  metadata.gz: d6613c09fbf756a9a15e3a4001e478a0c225f643c1dd3f8b58be3e63fe8c3afb0dab00bed9d8984ca75ae58b37ae4fbb4e26d0410b7d36bb0cf59f52fecbd869
-  data.tar.gz: ed905332c293482cd3610c5374bb9a7b27328cd1c245bb55c6d69fc10b4c36e7c67f6a38ca3a32ef3a0f879344c9751b9a22ae18f91f1ed21d4bf5a6b7a8cac4
+  metadata.gz: 664555bb319ec2add3dc7887b80b3e8e4ce84e288707c2a73eb003e72474549505bd401cebab4adc3eae78ed624a60ff28f9f50af9b431bae2322a5038a5b821
+  data.tar.gz: 0c5693a2ab6f3ad7ed39a1f4b29a0b0683394cfd6b1895f8d9a33379aa72c63d241f0285055296c7cd228a8741d482f5fee030cc5dd8751e07ad128119fb213c

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [1.3.1] - 2023-03-06
+
+- Fixed a bug where keys with empty values were being populated when using
+`at()` against a non-existant key and the values passed to `combine!`, `set!`,
+  or `default` resolved to no values or where `remove!` removed all values.
+
 ## [1.3.0] - 2023-03-03
 
 - Added `at().remove!` option for removing values.

data/README.md

@@ -65,7 +65,7 @@ bundle install
 
 ## General Usage
 
-Initialize a `TagOptions::Hash` directly or by passing an existing `Hash`.
+Instantiate a `TagOptions::Hash` directly or by passing an existing `Hash`.
 
 ```ruby
 TagOptions::Hash.new
@@ -76,6 +76,24 @@ TagOptions::Hash.new(hash)
 => {:class=>"flex"}
 ```
 
+Similar to `Array()`, you can also instantiate a new `TagOptions::Hash` by
+passing a has to `TagOptions::Hash()`.
+
+```ruby
+hash = {class: "flex"}
+TagOptions::Hash(hash)
+=> {:class=>"flex"}
+```
+
+The values of the hash passed to `TagOptions::Hash.new` or `TagOptions::Hash()`
+are automatically converted to strings.
+
+```ruby
+hash = {disabled: true}
+TagOptions::Hash.new(hash)
+=> {:disabled=>"true"}
+```
+
 `TagOptions::Hash` inherits from `ActiveSupport::HashWithIndifferentAccess`,
 implementing a hash where keys `:foo` and `"foo"` are considered to be the same.
 It differs from `ActiveSupport::HashWithIndifferentAccess`, however, by storing

data/lib/tag_options/hash.rb

@@ -1,5 +1,6 @@
 require "active_support/callbacks"
 require "active_support/core_ext/hash/indifferent_access"
+require "active_support/core_ext/object/blank"
 require "tag_options/convert_key"
 require "tag_options/hash_at"
 require "tag_options/errors/not_hash_error"
@@ -14,8 +15,9 @@ module TagOptions
     def initialize(hash = {})
       run_callbacks :initialize do
         hash.each do |key, value|
-          self[convert_key(key)] = value.is_a?(::Hash) ? self.class.new(value) : value
+          self[convert_key(key)] = value.is_a?(::Hash) ? self.class.new(value) : value.to_s
         end
+        remove_blank!
       end
     end
 
@@ -24,21 +26,50 @@ module TagOptions
     end
 
     def dig(*keys)
-      keys = keys.map { |key| convert_key(key) }
-      keys.size.zero? ? self : super(*keys)
+      return self if keys.size.zero?
+
+      dug_keys = []
+      data = self
+      keys.each_with_index do |key, index|
+        key = convert_key(key)
+        return nil unless data.key?(key)
+
+        data = data[key]
+        dug_keys << key
+        last_key = index == keys.size - 1
+        unless last_key || data.is_a?(self.class)
+          raise TagOptions::Errors::NotHashError.new(dug_keys, type: data.class)
+        end
+      end
+      data
     end
 
     def populate!(*keys)
       populated_keys = []
       data = self
       keys.each do |key|
-        data[convert_key(key)] ||= self.class.new
-        data = data[convert_key(key)]
+        key = convert_key(key)
+        data[key] ||= self.class.new
+        data = data[key]
+        populated_keys << key
         unless data.is_a?(self.class)
           raise TagOptions::Errors::NotHashError.new(populated_keys, type: data.class)
         end
       end
       self
     end
+
+    def remove_blank!(hash = self, parent_hash: nil)
+      hash.each do |key, value|
+        if value.blank?
+          hash.delete(key)
+          remove_blank!(parent_hash, parent_hash: nil) if parent_hash
+        elsif value.is_a?(Hash)
+          remove_blank!(value, parent_hash: hash)
+          remove_blank!(parent_hash, parent_hash: nil) if parent_hash
+        end
+      end
+      hash
+    end
   end
 end

data/lib/tag_options/hash_at.rb

@@ -13,23 +13,19 @@ module TagOptions
     end
 
     def combine!(*values, **conditions)
-      @opt_hash.populate!(*@keys)
       current_value = @opt_hash.dig(*@keys, @value_key)
       set_value! @resolver.call(current_value, *values, **conditions)
     end
 
     def default!(*values, **conditions)
-      @opt_hash.populate!(*@keys)
       set_default! @resolver.call(*values, **conditions)
     end
 
     def set!(*values, **conditions)
-      @opt_hash.populate!(*@keys)
       set_value! @resolver.call(*values, **conditions)
     end
 
     def remove!(*values, **conditions)
-      @opt_hash.populate!(*@keys)
       regex_values, values = values.flatten.partition { |v| v.is_a?(Regexp) }
       remove_values!(*regex_values, *@resolver.values(*values, **conditions))
     end
@@ -37,7 +33,7 @@ module TagOptions
     private
 
     def remove_values!(*values_to_remove)
-      values = @resolver.values(@opt_hash.dig(*@keys)[@value_key])
+      values = @resolver.values(@opt_hash.dig(*@keys)&.[](@value_key))
       values_to_remove.each do |value|
         if value.is_a?(Regexp)
           values.reject! { |current_value| value.match?(current_value) }
@@ -45,17 +41,25 @@ module TagOptions
           values.reject! { |current_value| value == current_value }
         end
       end
+      @opt_hash.populate!(*@keys)
       @opt_hash.dig(*@keys)[@value_key] = @resolver.call(*values)
+      @opt_hash.remove_blank!
       @opt_hash
     end
 
     def set_default!(value)
+      return @opt_hash if value.blank?
+
+      @opt_hash.populate!(*@keys)
       root = @opt_hash.dig(*@keys)
       root[@value_key] = value unless root.key?(@value_key)
       @opt_hash
     end
 
     def set_value!(value)
+      return @opt_hash if value.blank?
+
+      @opt_hash.populate!(*@keys)
       @opt_hash.dig(*@keys)[@value_key] = value
       @opt_hash
     end

data/lib/tag_options/version.rb

@@ -1,3 +1,3 @@
 module TagOptions
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tag_options
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Alex Monroe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport