toml-rb 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7deb039c3dea36679fb813cc6414671f8691f97d8a4d3d180a5a8cab2a5636e8
-  data.tar.gz: 6d495d33fe92641632e962d560a508c35f1d0f03c5d445e13151b5b4e046a9ce
+  metadata.gz: 80597ee120e2f6517bfca775d9215d4ac3c9c9880bac87c1ec432edb78f32566
+  data.tar.gz: fd278770b1c245508fc7ceb15336fba968e98b258bc06badcca0875107406292
 SHA512:
-  metadata.gz: 853879c8fbd703519d800f6e48b8b81cbc92791adb63584a5be9a75b9f17ea635df63aa86df7c05465684c4d15d2b72528740c307a06abda5f786913391ff16a
-  data.tar.gz: 766d75b5c583d47a17d17c0fca05d6f520ae198c7953ad78cf2eda937397bb67c77e5c820ca1ea0924825020da3af2d7d26249d89f1a9d6062a03ff647a811dc
+  metadata.gz: d31002d86304f9c675da476e41f9c196077c7ded480f9f2224fb9d43416de1964238410828d55ce894f0ed68a0559097f2d96324be0f527771507f2589da4777
+  data.tar.gz: 91a114c7a2c397be72edfb826025ae1cde65d0732359c38a3719ca6e61f2cd6eb237842d7ddf60e3034db9791c800c916e8bf1885aaa48e56ff147aaccc68d20

data/lib/toml-rb/errors.rb

@@ -11,7 +11,7 @@ module TomlRB
 
     def initialize(key)
       @key = key
-      super "Key #{key.inspect} is defined more than once"
+      super("Key #{key.inspect} is defined more than once")
     end
   end
 end

data/lib/toml-rb/keyvalue.rb

@@ -16,24 +16,30 @@ module TomlRB
       keys = symbolize_keys ? @dotted_keys.map(&:to_sym) : @dotted_keys
       update = keys.reverse.inject(visit_value(@value)) { |k1, k2| {k2 => k1} }
 
+      parent_inline_table = fully_defined_keys.find { |k| dotted_keys_str.start_with?("#{k}.") }
+      fail ValueOverwriteError.new(@dotted_keys.first) if parent_inline_table
+
       if @value.is_a?(InlineTable)
+        child_keys_exist = fully_defined_keys.find { |k| k.start_with?("#{dotted_keys_str}.") }
+        fail ValueOverwriteError.new(@dotted_keys.first) if child_keys_exist
+
+        existing_hash = hash.dig(*keys)
+        fail ValueOverwriteError.new(@dotted_keys.first) if existing_hash.is_a?(Hash) && !existing_hash.empty?
+
         fully_defined_keys << dotted_keys_str
-        hash.merge!(update) { |key, _, _| fail ValueOverwriteError.new(key) }
-      elsif fully_defined_keys.find { |k| update.dig(*k) }
-        hash.merge!(update) { |key, _, _| fail ValueOverwriteError.new(key) }
-      else
-        dotted_key_merge(hash, update)
       end
+
+      dotted_key_merge(hash, update)
     end
 
     def dotted_key_merge(hash, update)
-      hash.merge!(update) { |key, old, new|
+      hash.merge!(update) do |key, old, new|
         if old.is_a?(Hash) && new.is_a?(Hash)
           dotted_key_merge(old, new)
         else
           fail ValueOverwriteError.new(key)
         end
-      }
+      end
     end
 
     def accept_visitor(parser)

data/lib/toml-rb/parser.rb

@@ -14,6 +14,14 @@ module TomlRB
         parsed.matches.map(&:value).compact.each { |m| m.accept_visitor(self) }
       rescue Citrus::ParseError => e
         raise TomlRB::ParseError.new(e.message)
+      rescue Encoding::CompatibilityError => e
+        raise TomlRB::ParseError.new("Encoding error: #{e.message}")
+      rescue ArgumentError => e
+        if e.message.include?("invalid byte sequence") || e.message.include?("encoding")
+          raise TomlRB::ParseError.new("Encoding error: #{e.message}")
+        else
+          raise
+        end
       end
     end
 

data/lib/toml-rb/table.rb

@@ -8,9 +8,16 @@ module TomlRB
       ensure_key_not_defined(visited_keys)
       current = hash
       keys = symbolize_keys ? @dotted_keys.map(&:to_sym) : @dotted_keys
-      keys.each do |key|
+      keys.each_with_index do |key, index|
         current[key] = {} unless current.key?(key)
         element = current[key]
+
+        # If this is the final key and it's already an array (from [[key]]), that's invalid
+        is_final_key = (index == keys.length - 1)
+        if is_final_key && element.is_a?(Array)
+          fail ValueOverwriteError.new(key)
+        end
+
         current = element.is_a?(Array) ? element.last : element
         # check that key has not been defined before as a scalar value
         fail ValueOverwriteError.new(key) unless current.is_a?(Hash)

data/lib/toml-rb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TomlRB
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toml-rb
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Emiliano Mancuso
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 2025-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus