toml-rb 3.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17bca528380dd019502a124e00667782d479b10f3b969d4953eb53738c8f94b4
-  data.tar.gz: db97b38da58ce0a0ff99f5f1c62b0c14aadf40529188336843964f8fe7bc808a
+  metadata.gz: 7deb039c3dea36679fb813cc6414671f8691f97d8a4d3d180a5a8cab2a5636e8
+  data.tar.gz: 6d495d33fe92641632e962d560a508c35f1d0f03c5d445e13151b5b4e046a9ce
 SHA512:
-  metadata.gz: 7f27ceb8979c1775126f652c39766e84072007ba59d58bab852be8a38033f091c31239b7931515de1c9d504e11f253d27cf2086e47efc9339de62aaa17dee6cc
-  data.tar.gz: f659f25a3335391dbb3982e09f76266ac365349e87b8d58b3eb1d6f3b2b403da4bf976b735a2cb55bcddbdd061894989329b243f19818ab50f339d86c40b8b07
+  metadata.gz: 853879c8fbd703519d800f6e48b8b81cbc92791adb63584a5be9a75b9f17ea635df63aa86df7c05465684c4d15d2b72528740c307a06abda5f786913391ff16a
+  data.tar.gz: 766d75b5c583d47a17d17c0fca05d6f520ae198c7953ad78cf2eda937397bb67c77e5c820ca1ea0924825020da3af2d7d26249d89f1a9d6062a03ff647a811dc

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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TomlRB
-  VERSION = "3.0.1"
+  VERSION = "4.0.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.0.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-03-12 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