perfect_toml 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bdd721add5b9cda6201f1168e544ef143fe49057caadca19f84ce2415ef6511
-  data.tar.gz: 96cd13ab0484dbf0e2491441149e9df9d8312f16b64676ebc132610f387c7d28
+  metadata.gz: a29524e28ddec2096db536394364d7c17049e4e27ad06ddbd0fc26af198092ae
+  data.tar.gz: 2efab92700117fdedbc7d77f88246fc4037569f1dfb245bf176dac56bf368b05
 SHA512:
-  metadata.gz: c3b46cd8667c04e06e41c9b8fc9f9c902a7ffc8f79ed07d40ba187d845702062a78eed671ed3062b8cdb5ea67cd3e011af5caf60ed18c46f275364783dbf350f
-  data.tar.gz: dd618bfdd46be20cf703c79422e5f11f989ccc0dd8558ccd40e51ef26c037f3a0612acf22b8d7878417c74731c04d58f2268917b716e8911358f076004a9b03e
+  metadata.gz: 4ef80224ba391be10d0ba7b096e9d42e113699a08c0c0f2b9cf5bd12a562ca0f8fb8203d5f2ca54e4987805abf245e25fedb8917aa86279f6b52962cdda19a3c
+  data.tar.gz: 33182e8c0e71d39934dc63883486d1c5312fb0f9922ec3fada66dec7f5b796d53cdad2f1517b9c62c4ffe8ba2eab8b131a8a9b2584394d8b2922a1de639a02e3

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # PerfectTOML Changelog
 
+## 0.9.1 / 2026-02-26
+
+* Add preliminary support for TOML 1.1.0 (`PerfectTOML.parse(str, version: "1.1")`)
+* Improve the performance of datetime parsing
+* Encode empty arrays correctly
+* Prevent frozen-string-literal warnings
+* Drop Ruby 2.7 and 3.0 support
+
 ## 0.9.0 / 2022-07-17
 
 * First release.

data/Gemfile

@@ -7,3 +7,7 @@ gem "rake", "~> 13.0"
 gem "test-unit", "~> 3.0"
 
 gem "simplecov", "~> 0.21.2"
+
+gem "json", ">= 2.7.2"
+
+gem "rdoc", "~> 6.13"

data/README.md

@@ -4,7 +4,7 @@ Yet another [TOML](https://github.com/toml-lang/toml) parser and generator.
 
 Features:
 
-* Fully compliant with [TOML v1.0.0](https://toml.io/en/v1.0.0). It passes [BurntSushi/toml-test](https://github.com/BurntSushi/toml-test).
+* Fully compliant with [TOML v1.0.0](https://toml.io/en/v1.0.0). It passes [toml-lang/toml-test](https://github.com/toml-lang/toml-test).
 * Faster than existing TOML parsers for Ruby. See [Benchmark](#benchmark).
 * Single-file, plain old Ruby script without any dependencies: [perfect_toml.rb](https://github.com/mame/perfect_toml/blob/master/lib/perfect_toml.rb).
 
@@ -59,7 +59,7 @@ PerfectTOML provides dedicated classes, respectively,
 ```ruby
 require "perfect_toml"
 
-p PerfectTOML.parse("local-date = 1970-01-01)
+p PerfectTOML.parse("local-date = 1970-01-01")
 #=> { "local-date" => #<PerfectTOML::LocalDate 1970-01-01> }
 ```
 
@@ -74,7 +74,7 @@ require "toml-rb"
 require "tomlrb"
 
 # https://raw.githubusercontent.com/toml-lang/toml/v0.5.0/examples/example-v0.4.0.toml
-toml = File.read("example-v0.4.0.toml")
+data = File.read("example-v0.4.0.toml")
 
 Benchmark.ips do |x|
   x.report("emancu/toml-rb")     { TomlRB.parse(data) }

data/Rakefile

@@ -8,32 +8,58 @@ Rake::TestTask.new(:core_test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-TOML_TEST = "./toml-test-v1.2.0-linux-amd64"
+TOML_TEST = "./toml-test-v2.1.0-linux-amd64"
 
 file TOML_TEST do
   require "open-uri"
   require "zlib"
-  URI.open("https://github.com/BurntSushi/toml-test/releases/download/v1.2.0/toml-test-v1.2.0-linux-amd64.gz", "rb") do |f|
+  URI.open("https://github.com/toml-lang/toml-test/releases/download/v2.1.0/toml-test-v2.1.0-linux-amd64.gz", "rb") do |f|
     File.binwrite(TOML_TEST, Zlib::GzipReader.new(f).read)
     File.chmod(0o755, TOML_TEST)
   end
 end
 
-task :toml_decoder_test => TOML_TEST do
-  sh "./toml-test-v1.2.0-linux-amd64", "./tool/decoder.rb"
+task :toml_decoder_1_0_test => TOML_TEST do
+  ENV["TOML_DECODER_VERSION"] = "1.0"
+  sh TOML_TEST, "test", "-toml", "1.0", "-decoder", "./tool/decoder.rb"
 end
 
-task :toml_encoder_test => TOML_TEST do
+task :toml_decoder_1_1_test => TOML_TEST do
+  ENV["TOML_DECODER_VERSION"] = "1.1"
+  sh TOML_TEST, "test", "-toml", "1.1", "-decoder", "./tool/decoder.rb"
+end
+
+task :toml_encoder_1_0_test => TOML_TEST do
+  ENV["TOML_DECODER_VERSION"] = "1.0"
+  ["0000", "1000", "0010", "0001", "0011"].each do |mode|
+    ENV["TOML_ENCODER_USE_DOT"] = mode[0]
+    ENV["TOML_ENCODER_SORT_KEYS"] = mode[1]
+    ENV["TOML_ENCODER_USE_LITERAL_STRING"] = mode[2]
+    ENV["TOML_ENCODER_USE_MULTILINE_STRING"] = mode[3]
+    ENV.delete("BURNTSUSHI_TOML_110") # https://github.com/toml-lang/toml-test/issues/173
+    sh TOML_TEST, "test", "-toml", "1.0", "-decoder", "./tool/decoder.rb", "--encoder", "./tool/encoder.rb"
+  end
+end
+
+task :toml_encoder_1_1_test => TOML_TEST do
+  ENV["TOML_DECODER_VERSION"] = "1.1"
   ["0000", "1000", "0010", "0001", "0011"].each do |mode|
     ENV["TOML_ENCODER_USE_DOT"] = mode[0]
     ENV["TOML_ENCODER_SORT_KEYS"] = mode[1]
     ENV["TOML_ENCODER_USE_LITERAL_STRING"] = mode[2]
     ENV["TOML_ENCODER_USE_MULTILINE_STRING"] = mode[3]
-    sh "./toml-test-v1.2.0-linux-amd64", "./tool/encoder.rb", "--encoder", "-skip", "valid/string/multiline-quotes"
+    ENV["BURNTSUSHI_TOML_110"] = "1" # https://github.com/toml-lang/toml-test/issues/173
+    sh TOML_TEST, "test", "-toml", "1.1", "-decoder", "./tool/decoder.rb", "--encoder", "./tool/encoder.rb"
   end
 end
 
-task :test => [:core_test, :toml_decoder_test, :toml_encoder_test]
+task :test => [
+  :core_test,
+  :toml_decoder_1_0_test,
+  :toml_decoder_1_1_test,
+  :toml_encoder_1_0_test,
+  :toml_encoder_1_1_test,
+]
 
 task default: :test
 

data/lib/perfect_toml.rb

@@ -1,17 +1,17 @@
 # MIT License
-# 
+#
 # Copyright (c) 2022 Yusuke Endoh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,7 +23,7 @@
 require "strscan"
 
 module PerfectTOML
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 
   class LocalDateTimeBase
     def to_inline_toml
@@ -62,16 +62,18 @@ module PerfectTOML
   #
   # See https://toml.io/en/v1.0.0#local-date-time
   class LocalDateTime < LocalDateTimeBase
-    def initialize(year, month, day, hour, min, sec)
-      @year = year.to_i
-      @month = month.to_i
-      @day = day.to_i
-      @hour = hour.to_i
-      @min = min.to_i
-      @sec = Numeric === sec ? sec : sec.include?(".") ? Rational(sec) : sec.to_i
+    def initialize(*args)
+      @date = args[0].is_a?(LocalDate) ? args.shift : LocalDate.new(args.shift, args.shift, args.shift)
+      @time = args[0].is_a?(LocalTime) ? args.shift : LocalTime.new(args.shift, args.shift, args.shift)
+      raise ArgumentError, "wrong number of arguments" unless args.empty?
     end
 
-    attr_reader :year, :month, :day, :hour, :min, :sec
+    def year = @date.year
+    def month = @date.month
+    def day = @date.day
+    def hour = @time.hour
+    def min = @time.min
+    def sec = @time.sec
 
     # Converts to a Time object with the local timezone.
     #
@@ -83,7 +85,7 @@ module PerfectTOML
     #   ldt.to_time("UTC")    #=> 1970-01-01 02:03:04 UTC
     #   ldt.to_time("+00:00") #=> 1970-01-01 02:03:04 +0000
     def to_time(zone = nil)
-      @time = Time.new(@year, @month, @day, @hour, @min, @sec, zone)
+      Time.new(@date.year, @date.month, @date.day, @time.hour, @time.min, @time.sec, zone)
     end
 
     # Returns a string representation in RFC 3339 format
@@ -91,9 +93,7 @@ module PerfectTOML
     #   ldt = PerfectTOML::LocalDateTime.new(1970, 1, 1, 2, 3, 4)
     #   ldt.to_s #=> 1970-01-01T02:03:04
     def to_s
-      s = "%04d-%02d-%02dT%02d:%02d:%02d" % [@year, @month, @day, @hour, @min, @sec]
-      s << ("%11.9f" % (@sec - @sec.floor))[1..] unless Integer === @sec
-      s
+      "#{ @date }T#{ @time }"
     end
   end
 
@@ -101,10 +101,15 @@ module PerfectTOML
   #
   # See https://toml.io/en/v1.0.0#local-date
   class LocalDate < LocalDateTimeBase
+    DAYS_IN_MONTH = [31, nil, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+
     def initialize(year, month, day)
       @year = year.to_i
       @month = month.to_i
+      raise ArgumentError, "month must be in 1..12" unless 1 <= @month && @month <= 12
       @day = day.to_i
+      max_day = DAYS_IN_MONTH[@month - 1] || (@year % 4 == 0 && (@year % 100 != 0 || @year % 400 == 0) ? 29 : 28)
+      raise ArgumentError, "day must be in 1..#{ max_day }" unless 1 <= @day && @day <= max_day
     end
 
     attr_reader :year, :month, :day
@@ -132,15 +137,17 @@ module PerfectTOML
     end
   end
 
-
   # Represents TOML's Local Time
   #
   # See https://toml.io/en/v1.0.0#local-time
   class LocalTime < LocalDateTimeBase
     def initialize(hour, min, sec)
       @hour = hour.to_i
+      raise ArgumentError, "hour must be in 0..23" unless 0 <= @hour && @hour <= 23
       @min = min.to_i
+      raise ArgumentError, "min must be in 0..59" unless 0 <= @min && @min <= 59
       @sec = Numeric === sec ? sec : sec.include?(".") ? Rational(sec) : sec.to_i
+      raise ArgumentError, "sec must be in 0..60" unless 0 <= @sec && @sec <= 60
     end
 
     attr_reader :hour, :min, :sec
@@ -172,7 +179,7 @@ module PerfectTOML
 
   # call-seq:
   #
-  #   parse(toml_src, symbolize_names: boolean) -> Object
+  #   parse(toml_src, version: String, symbolize_names: boolean) -> Object
   #
   # Decodes a TOML string.
   #
@@ -184,6 +191,10 @@ module PerfectTOML
   #   END
   #   PerfectTOML.parse(src)  #=> { "foo" => { "bar" => "baz" } }
   #
+  # The keyword `version` specifies the TOML version to parse.
+  # Supported versions are "1.0.0" and "1.1.0" (which isn't released yet and may change).
+  # Defaults to "1.0.0", but the default will change in future releases.
+  #
   # All keys in the Hash are String by default.
   # If a keyword `symbolize_names` is specficied as truthy,
   # all keys in the Hash will be Symbols.
@@ -195,8 +206,14 @@ module PerfectTOML
   #     bar = "baz"
   #   END
   #   PerfectTOML.parse(src, symbolize_names: true)  #=> { :key => { :bar => "baz" } }
-  def self.parse(toml_src, **opts)
-    Parser.new(toml_src, **opts).parse
+  def self.parse(toml_src, version: "1.0.0", symbolize_names: false)
+    case version
+    when "1.0", "1.0.0" then version = :TOML_1_0_0
+    when "1.1", "1.1.0" then version = :TOML_1_1_0
+    else
+      raise ArgumentError, "unsupported TOML version: #{ version.inspect }"
+    end
+    Parser.new(toml_src, version, symbolize_names).parse
   end
 
   # call-seq:
@@ -278,7 +295,7 @@ module PerfectTOML
   #   # output:
   #   #   a.b.c.d = 42
   def self.generate(hash, **opts)
-    out = ""
+    out = +""
     Generator.new(hash, out, **opts).generate
     out
   end
@@ -304,10 +321,22 @@ module PerfectTOML
   class ParseError < StandardError; end
 
   class Parser # :nodoc:
-    def initialize(src, symbolize_names: false)
+    def initialize(src, version, symbolize_names)
       @s = StringScanner.new(src)
       @symbolize_names = symbolize_names
       @root_node = @topic_node = Node.new(1, nil)
+
+      @re_escape_char = version == :TOML_1_0_0 ?
+        /([btnmfr"\\])|u([0-9A-Fa-f]{4})|U([0-9A-Fa-f]{8})/ :
+        /([btnmfre"\\])|x([0-9A-Fa-f]{2})|u([0-9A-Fa-f]{4})|U([0-9A-Fa-f]{8})/
+      @re_multiline_basic_string = version == :TOML_1_0_0 ?
+        /[^\x00-\x08\x0b\x0c\x0e-\x1f\x7f"\\]*/ :
+        /([^\x00-\x08\x0b-\x1f\x7f"\\]|\r\n)*/
+      @re_multiline_literal_string = version == :TOML_1_0_0 ?
+        /[^\x00-\x08\x0b\x0c\x0e-\x1f\x7f']*/ :
+        /([^\x00-\x08\x0b-\x1f\x7f']|\r\n)*/
+      @omitted_seconds = version != :TOML_1_0_0 ? "0" : nil
+      @allow_newline_in_inline_table = version != :TOML_1_0_0
     end
 
     def parse
@@ -377,13 +406,13 @@ module PerfectTOML
     # parsing for strings
 
     ESCAPE_CHARS = {
-      ?b => ?\b, ?t => ?\t, ?n => ?\n, ?f => ?\f, ?r => ?\r, ?" => ?", ?\\ => ?\\
+      ?b => ?\b, ?t => ?\t, ?n => ?\n, ?f => ?\f, ?r => ?\r, ?e => ?\e, ?" => ?", ?\\ => ?\\
     }
 
     def parse_escape_char
       if @s.skip(/\\/)
-        if @s.skip(/([btnmfr"\\])|u([0-9A-Fa-f]{4})|U([0-9A-Fa-f]{8})/)
-          @s[1] ? ESCAPE_CHARS[@s[1]] : (@s[2] || @s[3]).hex.chr("UTF-8")
+        if @s.skip(@re_escape_char)
+          @s[1] ? ESCAPE_CHARS[@s[1]] : (@s[2] || @s[3] || @s[4]).hex.chr("UTF-8")
         else
           unterminated_string_error if @s.eos?
           error "invalid escape character in string: #{ @s.peek(1).dump }"
@@ -395,7 +424,7 @@ module PerfectTOML
     end
 
     def parse_basic_string
-      str = ""
+      str = +""
       while true
         str << @s.scan(/[^\x00-\x08\x0a-\x1f\x7f"\\]*/)
         return str if @s.skip(/"/)
@@ -407,9 +436,9 @@ module PerfectTOML
       # skip a newline
       @s.skip(/\n|\r\n/)
 
-      str = ""
+      str = +""
       while true
-        str << @s.scan(/[^\x00-\x08\x0b\x0c\x0e-\x1f\x7f"\\]*/)
+        str << @s.scan(@re_multiline_basic_string)
         delimiter = @s.skip(/"{1,5}/)
         if delimiter
           str << "\"" * (delimiter % 3)
@@ -432,9 +461,9 @@ module PerfectTOML
       # skip a newline
       @s.skip(/\n|\r\n/)
 
-      str = ""
+      str = +""
       while true
-        str << @s.scan(/[^\x00-\x08\x0b\x0c\x0e-\x1f\x7f']*/)
+        str << @s.scan(@re_multiline_literal_string)
         if delimiter = @s.skip(/'{1,5}/)
           str << "'" * (delimiter % 3)
           return str if delimiter >= 3
@@ -448,33 +477,23 @@ module PerfectTOML
     # parsing for date/time
 
     def parse_datetime(preread_len)
-      str = @s[0]
-      pos = @s.pos - preread_len
-      year, month, day = @s[1], @s[2], @s[3]
-      if @s.skip(/[T ](\d{2}):(\d{2}):(\d{2}(?:\.\d+)?)/i)
-        str << @s[0]
-        hour, min, sec = @s[1], @s[2], @s[3]
-        raise ArgumentError unless (0..23).cover?(hour.to_i)
-        zone = @s.scan(/(Z)|[-+]\d{2}:\d{2}/i)
-        time = Time.new(year, month, day, hour, min, sec.to_r, @s[1] ? "UTC" : zone)
-        if zone
-          time
-        else
-          LocalDateTime.new(year, month, day, hour, min, sec)
-        end
+      date = LocalDate.new(@s[1], @s[2], @s[3])
+      if @s[4]
+        time = LocalTime.new(@s[4], @s[5], @s[6] || @omitted_seconds || error("seconds field is required"))
+        datetime = LocalDateTime.new(date, time)
+        zone = @s[7]
+        datetime = datetime.to_time(zone == "z" ? "Z" : zone) if zone
+        datetime
       else
-        Time.new(year, month, day, 0, 0, 0, "Z") # parse check
-        LocalDate.new(year, month, day)
+        date
       end
     rescue ArgumentError
-      @s.pos = pos
-      error "failed to parse date or datetime \"#{ str }\""
+      @s.pos -= preread_len
+      error "failed to parse date or datetime \"#{ @s[0] }\""
     end
 
     def parse_time(preread_len)
-      hour, min, sec = @s[1], @s[2], @s[3]
-      Time.new(1970, 1, 1, hour, min, sec.to_r, "Z") # parse check
-      LocalTime.new(hour, min, sec)
+      LocalTime.new(@s[1], @s[2], @s[3] || @omitted_seconds || error("seconds field is required"))
     rescue ArgumentError
       @s.pos -= preread_len
       error "failed to parse time \"#{ @s[0] }\""
@@ -496,8 +515,16 @@ module PerfectTOML
       ary
     end
 
+    def skip_inline_table_spaces
+      if @allow_newline_in_inline_table
+        skip_spaces
+      else
+        @s.skip(/[\t ]*/)
+      end
+    end
+
     def parse_inline_table
-      @s.skip(/[\t ]*/)
+      skip_inline_table_spaces
       if @s.skip(/\}/)
         {}
       else
@@ -505,13 +532,14 @@ module PerfectTOML
         while true
           @keys_start_pos = @s.pos
           keys = parse_keys
-          @s.skip(/[\t ]*/)
-          unexpected_error unless @s.skip(/=[\t ]*/)
+          skip_inline_table_spaces
+          unexpected_error unless @s.skip(/=/)
+          skip_inline_table_spaces
           define_value(tmp_node, keys)
-          @s.skip(/[\t ]*/)
-          next if @s.skip(/,[\t ]*/)
-          break if @s.skip(/\}/)
-          unexpected_error
+          skip_inline_table_spaces
+          skip_inline_table_spaces if comma_seen = @s.skip(/,/)
+          break if (@allow_newline_in_inline_table || !comma_seen) && @s.skip(/\}/)
+          unexpected_error unless comma_seen
         end
         tmp_node.table
       end
@@ -547,9 +575,9 @@ module PerfectTOML
         @s.skip(/""/) ? parse_multiline_basic_string : parse_basic_string
       when @s.skip(/'/)
         @s.skip(/''/) ? parse_multiline_literal_string : parse_literal_string
-      when len = @s.skip(/(-?\d{4})-(\d{2})-(\d{2})/)
+      when len = @s.skip(/(-?\d{4})-(\d{2})-(\d{2})(?:[tT ](\d{2}):(\d{2})(?::(\d{2}(?:\.\d+)?))?([zZ]|[-+]\d{2}:\d{2})?)?/)
         parse_datetime(len)
-      when len = @s.skip(/(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?)/)
+      when len = @s.skip(/(\d{2}):(\d{2})(?::(\d{2}(?:\.\d+)?))?/)
         parse_time(len)
       when val = @s.scan(/0x\h(?:_?\h)*|0o[0-7](?:_?[0-7])*|0b[01](?:_?[01])*/)
         Integer(val)
@@ -846,7 +874,7 @@ module PerfectTOML
             break unless v
             v
           end
-          if ary
+          if ary && !ary.empty?
             children << [:array, k, ary]
           else
             values << [k, val]

data/perfect_toml.gemspec

@@ -15,7 +15,7 @@ It is fully compliant with TOML v1.0.0, and faster than existing TOML parsers fo
 END
   spec.homepage = "https://github.com/mame/perfect_toml"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/mame/perfect_toml"

data/sig/perfect_toml.rbs

@@ -4,9 +4,9 @@ module PerfectTOML
   def self.parse: (String toml_src, symbolize_names: bool) -> untyped
   def self.load_file: (String filename, symbolize_names: bool) -> untyped
                     | (IO io, symbolize_names: bool) -> untyped
-  def self.generate: (
-  def self.save_file: (String filename, untyped data, sort_keys: boolean, use_literal_string: boolean, use_multiline_string: boolean, use_dot: boolean) -> String) -> void
-                    | (IO io, untyped data, sort_keys: boolean, use_literal_string: boolean, use_multiline_string: boolean, use_dot: boolean) -> String) -> void
+  def self.generate: (untyped data, sort_keys: boolean, use_literal_string: boolean, use_multiline_string: boolean, use_dot: boolean) -> String
+  def self.save_file: (String filename, untyped data, sort_keys: boolean, use_literal_string: boolean, use_multiline_string: boolean, use_dot: boolean) -> void
+                    | (IO io, untyped data, sort_keys: boolean, use_literal_string: boolean, use_multiline_string: boolean, use_dot: boolean) -> void
 
   class LocalDateTime
     def initialize: (untyped year, untyped month, untyped day, untyped hour, untyped min, untyped sec) -> void

data/tool/decoder.rb

@@ -1,12 +1,15 @@
 #!/usr/bin/env ruby
 
+# usage: TOML_DECODER_VERSION=1.0 /path/to/toml-test-v2.1.0-linux-amd64 test -toml 1.0 -decoder tool/decoder.rb
+# usage: TOML_DECODER_VERSION=1.1 /path/to/toml-test-v2.1.0-linux-amd64 test -toml 1.1 -decoder tool/decoder.rb
+
 require_relative "../lib/perfect_toml"
 require "json"
 
-def convert(toml)
+def toml_to_json(toml)
   case toml
-  when Hash then toml.to_h {|k, v| [k, convert(v)] }
-  when Array then toml.map {|v| convert(v) }
+  when Hash then toml.to_h {|k, v| [k, toml_to_json(v)] }
+  when Array then toml.map {|v| toml_to_json(v) }
   when String then { "type" => "string", "value" => toml }
   when Integer then { "type" => "integer", "value" => toml.to_s }
   when Float
@@ -32,4 +35,7 @@ def convert(toml)
   end
 end
 
-puts JSON.generate(convert(PerfectTOML.parse($stdin.read)))
+puts JSON.generate(toml_to_json(PerfectTOML.parse(
+  $stdin.read.force_encoding("UTF-8"),
+  version: ENV.fetch("TOML_DECODER_VERSION", "1.0.0")
+)))

data/tool/encoder.rb

@@ -1,17 +1,20 @@
 #!/usr/bin/env ruby
 
+# usage: TOML_DECODER_VERSION=1.0 /path/to/toml-test-v2.1.0-linux-amd64 test -toml 1.0 -decoder tool/decoder.rb -encoder tool/encoder.rb
+# usage: TOML_DECODER_VERSION=1.1 /path/to/toml-test-v2.1.0-linux-amd64 test -toml 1.1 -decoder tool/decoder.rb -encoder tool/encoder.rb
+
 require_relative "../lib/perfect_toml"
 require "json"
 require "time"
 
-def convert(json)
-  return json.map {|v| convert(v) } if Array === json
+def json_to_toml(json)
+  return json.map {|v| json_to_toml(v) } if Array === json
   if json.key?("type")
     type, val = json["type"], json["value"]
     case type
     when "integer" then val.to_i
     when "float"
-      case val
+      case val.downcase
       when "inf", "+inf" then Float::INFINITY
       when "-inf" then -Float::INFINITY
       when "nan" then -Float::NAN
@@ -31,17 +34,17 @@ def convert(json)
       raise if val !~ /\A(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?)\z/
       PerfectTOML::LocalTime.new($1, $2, $3)
     else
-      raise "unknown type: %p" % type
+      json.to_h {|k, v| [k, json_to_toml(v)] }
     end
   else
-    json.to_h {|k, v| [k, convert(v)] }
+    json.to_h {|k, v| [k, json_to_toml(v)] }
   end
 end
 
-opts = {
+puts PerfectTOML.generate(
+  json_to_toml(JSON.parse($stdin.read.force_encoding("UTF-8"))),
   use_dot: ENV["TOML_ENCODER_USE_DOT"] == "1",
   sort_keys: ENV["TOML_ENCODER_SORT_KEYS"] == "1",
   use_literal_string: ENV["TOML_ENCODER_USE_LITERAL_STRING"] == "1",
   use_multiline_string: ENV["TOML_ENCODER_USE_MULTILINE_STRING"] == "1",
-}
-puts PerfectTOML.generate(convert(JSON.parse($stdin.read)), **opts)
+)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: perfect_toml
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Yusuke Endoh
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: |
   PerfectTOML is yet another TOML parser.
@@ -37,7 +36,6 @@ metadata:
   homepage_uri: https://github.com/mame/perfect_toml
   source_code_uri: https://github.com/mame/perfect_toml
   changelog_uri: https://github.com/mame/perfect_toml/blob/main/CHANGELOG.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -45,15 +43,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 4.1.0.dev
 specification_version: 4
 summary: A fast TOML parser gem fully compliant with TOML v1.0.0
 test_files: []