toml-rb 2.1.1 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea53f790d0b22319d57007c11b9d585bce92d0cbd1f97a7340fec49d03804271
-  data.tar.gz: 1e2e02260452b5dbd94eeeb9268116e64fed6d7f974b99f853d2cdd28cbd8fa7
+  metadata.gz: 6d198202b34da88436ce3d0e3cb8841bc1a6ff433a0d9397303c0870c6fed1d5
+  data.tar.gz: 916c15730aebc6974a1e7fd04e7c793a3b1321312657f370cae8c9c0a63e6f54
 SHA512:
-  metadata.gz: aaad1b4cd6379c6b1a66ce385b442d3fa1c068b985ba374d6c526bbd441b0c1fd4014c12eec523b2ca745b00d43e943c470fef3fcd79c132cc76882f4c2f87c2
-  data.tar.gz: e979b29743c71fe8ebb48afcbe1bc70129ed8a5f8df911bf812663af9983f4fee31388b2b4d030df0b8413b26832815d313c080b9c3e3d9e362414d47f9904bd
+  metadata.gz: acf22dc79ffa1f4b4650e1979eaf7b3d3a04bc894c68e752008e87dbdf695d5ab4ad2c4e835b8d7a5b0aab151c802cd6cfc403ecd361a2cad125c32cf2cb42b3
+  data.tar.gz: 1bdedac516138288dcb97ce4cf59153d03d5fdc8f48a93eca7afbd3ab2931f9ca1dd73eb104decca1e1a6bc7dbc3771d575cfe6a81429e3590e3f41d4048c959

data/README.md

@@ -1,4 +1,4 @@
-![TOML Logo](https://github.com/toml-lang/toml/blob/master/logos/toml-100.png)
+![TOML Logo](https://github.com/toml-lang/toml/blob/main/logos/toml-100.png)
 
 
 toml-rb
@@ -11,7 +11,7 @@ toml-rb
 
 A [TOML](https://github.com/toml-lang/toml) parser using [Citrus](http://mjackson.github.io/citrus) library.
 
-TOML specs supported: `0.5.0`
+TOML specs supported: `1.0.0`
 
 Installation
 ------------
@@ -68,6 +68,22 @@ TomlRB.dump(hash)
 # => "title = \"wow!\"\n[awesome]\nothers = false\nyou = true\n"
 ```
 
+Conformance
+-----------
+
+`toml-rb` is exercised against the official
+[toml-test](https://github.com/toml-lang/toml-test) conformance suite for both
+TOML 1.0.0 and TOML 1.1.0. The harness lives in:
+
+- `tool/toml-test-decoder` — toml-test decoder shim.
+- `.github/workflows/conformance.yml` — CI workflow (per-version matrix).
+- `.github/toml-test-skip-1.0.txt` and `.github/toml-test-skip-1.1.txt` —
+  skip-lists of currently-failing tests.
+
+The skip-lists are a living gap report: every entry is a known limitation in
+the current parser. The goal for v5.0.0 is **empty skip-lists** — full
+conformance against both spec versions.
+
 Contributing
 ------------
 

data/lib/toml-rb/dumper.rb

@@ -4,6 +4,18 @@ require "date"
 
 module TomlRB
   class Dumper
+    # TOML basic strings only allow these short escapes; every other control
+    # character must be written as \uXXXX (TOML 1.0.0 spec).
+    BASIC_ESCAPES = {
+      "\\" => "\\\\",
+      "\"" => "\\\"",
+      "\b" => "\\b",
+      "\t" => "\\t",
+      "\n" => "\\n",
+      "\f" => "\\f",
+      "\r" => "\\r"
+    }.freeze
+
     attr_reader :toml_str
 
     def initialize(hash)
@@ -93,21 +105,43 @@ module TomlRB
         obj.strftime("%Y-%m-%dT%H:%M:%SZ")
       elsif obj.is_a?(Date)
         obj.strftime("%Y-%m-%d")
-      elsif obj.is_a? Regexp
+      elsif obj.is_a?(Regexp)
         obj.inspect.inspect
-      elsif obj.is_a? String
-        obj.inspect.gsub(/\\(#[$@{])/, '\1')
+      elsif obj.is_a?(String)
+        escape_string(obj)
+      elsif obj.is_a?(Array)
+        "[" + obj.map(&method(:to_toml)).join(", ") + "]"
+      elsif obj.is_a?(Float) && (obj.nan? || obj.infinite?)
+        # Ruby renders these as Infinity/-Infinity/NaN, which are invalid TOML.
+        if obj.nan?
+          "nan"
+        elsif obj.negative?
+          "-inf"
+        else
+          "inf"
+        end
       else
         obj.inspect
       end
     end
 
     def bare_key?(key)
-      !!key.to_s.match(/^[a-zA-Z0-9_-]*$/)
+      !!key.to_s.match(/\A[a-zA-Z0-9_-]+\z/)
     end
 
+    # Quote and escape a key as a TOML basic string.
     def quote_key(key)
-      '"' + key.gsub('"', '\\"') + '"'
+      escape_string(key.to_s)
+    end
+
+    # Serialize a Ruby string as a TOML basic string. Ruby's String#inspect
+    # emits \a \v \e for 0x07/0x0B/0x1B, which TOML (and this parser) reject.
+    def escape_string(str)
+      escaped = str.gsub(/[\x00-\x1f\x7f"\\]/) do |char|
+        BASIC_ESCAPES[char] || format('\\u%04X', char.ord)
+      end
+
+      "\"#{escaped}\""
     end
   end
 end

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
 
-  rule inline_table
-    (space? '{' (keyvalue? (',' keyvalue)*)? space? '}' ) <TomlRB::InlineTableParser>
-  end
+  ### Values
 
-  rule inline_table_array
-    (inline_table (space "," array_comments inline_table)*) {
-      captures[:inline_table].map(&:value).map(&:value)
-    }
+  rule inline_table
+    (space? '{' array_comments (keyvalue (array_comments ',' array_comments keyvalue)* (array_comments ',')?)? array_comments '}' ) <TomlRB::InlineTableParser>
   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

@@ -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 = "2.1.1"
+  VERSION = "4.2.1"
 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,14 @@
 --- !ruby/object:Gem::Specification
 name: toml-rb
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 4.2.1
 platform: ruby
 authors:
 - Emiliano Mancuso
 - Lucas Tolchinsky
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2026-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -31,6 +30,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +101,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
@@ -103,7 +115,6 @@ homepage: https://github.com/emancu/toml-rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -111,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.2.9
-signing_key: 
+rubygems_version: 3.6.2
 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 (space "," array_comments float)*) {
-      captures[:float].map(&:value)
-    }
-  end
-
-  rule string_array
-    (string (space "," array_comments string)*) {
-      captures[:string].map(&:value)
-    }
-  end
-
-  rule integer_array
-    (integer (space "," array_comments integer)*) {
-      captures[:integer].map(&:value)
-    }
-  end
-
-  rule datetime_array
-    (datetime (space "," array_comments datetime)*) {
-      captures[:datetime].map(&:value)
-    }
-  end
-
-  rule bool_array
-    (bool (space "," array_comments bool)*) {
-      captures[:bool].map(&:value)
-    }
-  end
-end