toml-rb 4.0.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7deb039c3dea36679fb813cc6414671f8691f97d8a4d3d180a5a8cab2a5636e8
-  data.tar.gz: 6d495d33fe92641632e962d560a508c35f1d0f03c5d445e13151b5b4e046a9ce
+  metadata.gz: d11cbf4f3f759b946f7f1eec65450c67798690a7488146243e9e524c7f41b0f0
+  data.tar.gz: a034e9b52165a77cf56cb33e6fbaae8dc02c64bb9891d0d27b5071490dde7ea2
 SHA512:
-  metadata.gz: 853879c8fbd703519d800f6e48b8b81cbc92791adb63584a5be9a75b9f17ea635df63aa86df7c05465684c4d15d2b72528740c307a06abda5f786913391ff16a
-  data.tar.gz: 766d75b5c583d47a17d17c0fca05d6f520ae198c7953ad78cf2eda937397bb67c77e5c820ca1ea0924825020da3af2d7d26249d89f1a9d6062a03ff647a811dc
+  metadata.gz: 0ccb42dd5b8499964d2d0d4b33c2a99b6e5ea1620ca7e8b2c132ccc3e420564c3a897b3075768069c8a82245899cc36eb8e99c2c5f1f2c1723e92f7054f2fc5f
+  data.tar.gz: 7cecedebad2b68ee1be63707bce6a7ce8a551356b8a536a6d522d04c38474b0d90c389d2deacfe09a67d206997bc77f472d586f928e9372f7d0ba9b2c899d365

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/grammars/document.citrus

@@ -20,7 +20,7 @@ grammar TomlRB::Document
   ### Values
 
   rule inline_table
-    (space? '{' (keyvalue? (',' keyvalue)*)? space? '}' ) <TomlRB::InlineTableParser>
+    (space? '{' array_comments (keyvalue (array_comments ',' array_comments keyvalue)* (array_comments ',')?)? array_comments '}' ) <TomlRB::InlineTableParser>
   end
 
   rule array

data/lib/toml-rb/keyvalue.rb

@@ -10,30 +10,36 @@ module TomlRB
       @symbolize_keys = false
     end
 
-    def assign(hash, fully_defined_keys, symbolize_keys = false)
+    def assign(hash, fully_defined_paths, symbolize_keys = false)
       @symbolize_keys = symbolize_keys
-      dotted_keys_str = @dotted_keys.join(".")
       keys = symbolize_keys ? @dotted_keys.map(&:to_sym) : @dotted_keys
+      depth = @dotted_keys.size
       update = keys.reverse.inject(visit_value(@value)) { |k1, k2| {k2 => k1} }
 
+      parent_inline_table = fully_defined_paths.find { |k| k.size < depth && @dotted_keys.first(k.size) == k }
+      fail ValueOverwriteError.new(@dotted_keys.first) if parent_inline_table
+
       if @value.is_a?(InlineTable)
-        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)
+        child_keys_exist = fully_defined_paths.find { |k| k.size > depth && k.first(depth) == @dotted_keys }
+        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_paths << @dotted_keys
       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

@@ -5,7 +5,7 @@ module TomlRB
     def initialize(content, symbolize_keys: false)
       @hash = {}
       @visited_keys = []
-      @fully_defined_keys = []
+      @fully_defined_paths = []
       @current = @hash
       @symbolize_keys = symbolize_keys
 
@@ -14,13 +14,21 @@ 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
 
     # Read about the Visitor pattern
     # http://en.wikipedia.org/wiki/Visitor_pattern
     def visit_table_array(table_array)
-      @fully_defined_keys = []
+      @fully_defined_paths = []
       table_array_key = table_array.full_key
       @visited_keys.reject! { |k| k.start_with? table_array_key }
 
@@ -28,12 +36,12 @@ module TomlRB
     end
 
     def visit_table(table)
-      @fully_defined_keys = []
+      @fully_defined_paths = []
       @current = table.navigate_keys @hash, @visited_keys, @symbolize_keys
     end
 
     def visit_keyvalue(keyvalue)
-      keyvalue.assign @current, @fully_defined_keys, @symbolize_keys
+      keyvalue.assign @current, @fully_defined_paths, @symbolize_keys
     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.2.0"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toml-rb
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Emiliano Mancuso
 - Lucas Tolchinsky
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 2026-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -116,7 +115,6 @@ homepage: https://github.com/emancu/toml-rb
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,15 +122,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Toml parser in ruby, for ruby.
 test_files: []