toml-rb 3.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17bca528380dd019502a124e00667782d479b10f3b969d4953eb53738c8f94b4
-  data.tar.gz: db97b38da58ce0a0ff99f5f1c62b0c14aadf40529188336843964f8fe7bc808a
+  metadata.gz: 80597ee120e2f6517bfca775d9215d4ac3c9c9880bac87c1ec432edb78f32566
+  data.tar.gz: fd278770b1c245508fc7ceb15336fba968e98b258bc06badcca0875107406292
 SHA512:
-  metadata.gz: 7f27ceb8979c1775126f652c39766e84072007ba59d58bab852be8a38033f091c31239b7931515de1c9d504e11f253d27cf2086e47efc9339de62aaa17dee6cc
-  data.tar.gz: f659f25a3335391dbb3982e09f76266ac365349e87b8d58b3eb1d6f3b2b403da4bf976b735a2cb55bcddbdd061894989329b243f19818ab50f339d86c40b8b07
+  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/grammars/document.citrus

@@ -1,6 +1,5 @@
 grammar TomlRB::Document
   include TomlRB::Primitive
-  include TomlRB::Arrays
 
   rule document
     (comment | table_array | table | keyvalue | line_break)*
@@ -18,35 +17,41 @@ grammar TomlRB::Document
     (stripped_key '=' space? v:(toml_values) comment? space) <TomlRB::KeyvalueParser>
   end
 
+  ### Values
+
   rule inline_table
     (space? '{' (keyvalue? (',' keyvalue)*)? space? '}' ) <TomlRB::InlineTableParser>
   end
 
-  rule inline_table_array
-    (inline_table (space "," array_comments inline_table)*) {
-      captures[:inline_table].map(&:value).map(&:value)
-    }
-  end
-
   rule array
     ("[" array_comments (array_elements)? space ","? array_comments "]" indent?) <TomlRB::ArrayParser>
   end
 
-  rule array_elements
-    inline_table_array | float_array | string_array | array_array | integer_array | datetime_array | bool_array
-  end
-
   rule array_array
     (array (space "," array_comments array)*) {
       captures[:array].map(&:value)
     }
   end
 
-  rule toml_values
-    primitive | inline_table | array | inline_table_array
+  rule array_elements
+    (toml_values (indent? "," array_comments toml_values)*) {
+      captures[:toml_values].map(&:value).map do |v|
+        v.respond_to?(:value) ? v.value : v
+      end
+    }
   end
 
+  ### Helpers
+
   rule stripped_key
     (space? key space?) { captures[:key].first.value }
   end
+
+  rule array_comments
+    (indent? (comment indent?)*)
+  end
+
+  rule toml_values
+    primitive | inline_table | array
+  end
 end

data/lib/toml-rb/grammars/primitive.citrus

@@ -99,33 +99,33 @@ grammar TomlRB::Primitive
   end
 
   rule exponential_float
-    ((fractional_float | demical_integer) [eE] demical_integer) { to_str.to_f }
+    ((fractional_float | decimal_integer) [eE] decimal_integer) { to_str.to_f }
   end
 
   rule fractional_float
-    (demical_integer '.' [0-9_]+) { 
+    (decimal_integer '.' [0-9] ([0-9] | '_' [0-9])*) {
       to_str.to_f
     }
   end
 
   rule integer
-    hexadecimal_integer | octal_integer | binary_integer | demical_integer
+    hexadecimal_integer | octal_integer | binary_integer | decimal_integer
   end
 
   rule hexadecimal_integer
-    ('0x' [a-fA-F0-9_]+) { to_str.to_i(16) }
+    ('0x' [a-fA-F0-9] ([a-fA-F0-9] | '_' [a-fA-F0-9])*) { to_str.to_i(16) }
   end
 
   rule octal_integer
-    ('0o' [0-7_]+) { to_str.to_i(8) }
+    ('0o' [0-7] ([0-7] | '_' [0-7])*) { to_str.to_i(8) }
   end
 
   rule binary_integer
-    ('0b' [01_]+) { to_str.to_i(2) }
+    ('0b' [01] ([01] | '_' [01])*) { to_str.to_i(2) }
   end
 
-  rule demical_integer
-    (sign? [0-9_]+) { to_str.to_i }
+  rule decimal_integer
+    (sign? [0-9] ([0-9] | '_' [0-9])*) { to_str.to_i }
   end
 
   rule sign
@@ -161,7 +161,7 @@ grammar TomlRB::Primitive
   end
 
   rule quoted_key
-    basic_string | literal_string 
+    basic_string | literal_string
   end
 
   rule single_key

data/lib/toml-rb/inline_table.rb

@@ -20,7 +20,7 @@ module TomlRB
 
   module InlineTableParser
     def value
-      TomlRB::InlineTable.new captures[:keyvalue].map(&:value)
+      TomlRB::InlineTable.new(captures[:keyvalue].map(&:value))
     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 = "3.0.1"
+  VERSION = "4.1.0"
 end

data/lib/toml-rb.rb

@@ -14,7 +14,6 @@ require_relative "toml-rb/dumper"
 File.dirname(File.expand_path(__FILE__)).tap do |root|
   Citrus.load "#{root}/toml-rb/grammars/helper.citrus"
   Citrus.load "#{root}/toml-rb/grammars/primitive.citrus"
-  Citrus.load "#{root}/toml-rb/grammars/array.citrus"
   Citrus.load "#{root}/toml-rb/grammars/document.citrus"
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: toml-rb
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Emiliano Mancuso
 - Lucas Tolchinsky
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-31 00:00:00.000000000 Z
+date: 2025-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -102,7 +102,6 @@ files:
 - lib/toml-rb/datetime.rb
 - lib/toml-rb/dumper.rb
 - lib/toml-rb/errors.rb
-- lib/toml-rb/grammars/array.citrus
 - lib/toml-rb/grammars/document.citrus
 - lib/toml-rb/grammars/helper.citrus
 - lib/toml-rb/grammars/primitive.citrus
@@ -117,7 +116,7 @@ homepage: https://github.com/emancu/toml-rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,8 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Toml parser in ruby, for ruby.
 test_files: []

data/lib/toml-rb/grammars/array.citrus

@@ -1,37 +0,0 @@
-grammar TomlRB::Arrays
-  include TomlRB::Primitive
-
-  rule array_comments
-    (indent? (comment indent?)*)
-  end
-
-  rule float_array
-    (float (indent? "," array_comments float)*) {
-      captures[:float].map(&:value)
-    }
-  end
-
-  rule string_array
-    (string (indent? "," array_comments string)*) {
-      captures[:string].map(&:value)
-    }
-  end
-
-  rule integer_array
-    (integer (indent? "," array_comments integer)*) {
-      captures[:integer].map(&:value)
-    }
-  end
-
-  rule datetime_array
-    (datetime (indent? "," array_comments datetime)*) {
-      captures[:datetime].map(&:value)
-    }
-  end
-
-  rule bool_array
-    (bool (indent? "," array_comments bool)*) {
-      captures[:bool].map(&:value)
-    }
-  end
-end