klenod-build 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dbc1f6baef3ea6249edc7d68f1d8725234384d45c3f00dcf1b4ebba50eb8cbe
-  data.tar.gz: ee110cebfd420f402a67c922b2dcb1fa8cb9f8dffe768e4d5ced389ae6110f49
+  metadata.gz: 13ffde9084826c2af713cef2b267b547b57ec88b1f23dd7e32bb5da3681d929e
+  data.tar.gz: 46585426c377c8368573a901f7062fc7f862e8fed2dbf4b0b96b1032fd0e36dd
 SHA512:
-  metadata.gz: cae3766524cc6f31a74420abed1f8eaec845204f2465dfc1b48b9ff0f6ad7695dbc648a7394e58940338d1f8ce052beee3cb6cef7fc7c97ec18510f6badd85f6
-  data.tar.gz: 6a4230dcc4503ff87c4974f9cbd8065cc8348f66ca54f47a6f44e8419367b0901a0562e1dc0bd8bc633cf7d86fae621b4171b63e07b716f887d93b71e3d44e5a
+  metadata.gz: e4abd68c6f308b9fbadd8e099a034e741220a22d72f93207880d97400a7f2987a27dbcb3fd9aaaae2a833dfd4586cc7c23703ba6a5fe0f0691226ad378f4febf
+  data.tar.gz: f8c131821ecdbe4ed750418c0262be97602116f64f6b8a05cce9b099c3072a7bc73e5323c00ac9348cc1a68ce2256a1ad9a80611dea5805ee7f559aa650ee918

data/lib/klenod/build/plugins/data_plugin.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "date"
 require "json"
 require "toml-rb"
 require "yaml"
@@ -63,9 +64,42 @@ module Klenod
 
           def module_source(data)
             <<~RUBY
-              Default = #{data.inspect}
+              Default = #{ruby_literal(data)}
             RUBY
           end
+
+          # `inspect` is not Ruby source for every parsed value: dates, times,
+          # and non-finite floats need constructor calls instead.
+          def ruby_literal(value)
+            case value
+            when Hash
+              entries = value.map { |key, entry| "#{ruby_literal(key)} => #{ruby_literal(entry)}" }
+              "{#{entries.join(", ")}}"
+            when Array
+              "[#{value.map { ruby_literal(it) }.join(", ")}]"
+            when Float
+              float_literal(value)
+            when Time
+              zone = value.utc? ? "UTC" : value.utc_offset
+              "::Time.at(#{value.to_i}, #{value.nsec}, :nsec, in: #{zone.inspect})"
+            when Date
+              "::Date.new(#{value.year}, #{value.month}, #{value.day})"
+            when nil, true, false, String, Symbol, Integer
+              value.inspect
+            else
+              raise TypeError, "Cannot write #{value.class} as data module source"
+            end
+          end
+
+          def float_literal(value)
+            if value.nan?
+              "::Float::NAN"
+            elsif value.infinite?
+              value.positive? ? "::Float::INFINITY" : "-::Float::INFINITY"
+            else
+              value.inspect
+            end
+          end
         end
       end
 
@@ -155,8 +189,8 @@ module Klenod
         end
 
         class ParseError < Klenod::Build::SourceError
-          # "Failed to parse input on line 2 at offset 9\ninvalid =\n\n         ^"
-          LOCATION = /\AFailed to parse input on line (?<line>\d+) at offset (?<column>\d+)/
+          # "Unexpected \"\\n\" at line 2, column 10: expected a value"
+          LOCATION = / at line (?<line>\d+), column (?<column>\d+)/
 
           def kind
             "TOML parse error"
@@ -165,16 +199,16 @@ module Klenod
           private
 
           def location(error)
+            # Invalid values such as "Invalid date: 1979-13-01" carry no location.
             found = LOCATION.match(error.message)
             return nil unless found
 
-            # toml-rb embeds its own caret diagram in the message; we render our
-            # own from the line and column instead.
+            # One-based. The location is rendered as the title and the caret, so
+            # drop the copy the parser puts in its message.
             Location.new(
               line: found[:line].to_i,
-              # citrus reports a zero-based offset into the line.
-              column: found[:column].to_i + 1,
-              detail: "Could not parse TOML"
+              column: found[:column].to_i,
+              detail: error.message.sub(LOCATION, "")
             )
           end
         end
@@ -186,7 +220,26 @@ module Klenod
           private
 
           def parse(code)
-            TomlRB.parse(code)
+            plain_values(TomlRB.parse(code))
+          end
+
+          # toml-rb returns its own Time subclasses for local values. Exports
+          # and bundles should not depend on toml-rb, so a local date becomes a
+          # Date, as in YAML, and a local datetime or time becomes a UTC Time
+          # with the same clock time. A local time falls on 1970-01-01.
+          def plain_values(value)
+            case value
+            when Hash
+              value.transform_values { plain_values(it) }
+            when Array
+              value.map { plain_values(it) }
+            when TomlRB::LocalDate
+              Date.new(value.year, value.month, value.day)
+            when TomlRB::LocalDateTime, TomlRB::LocalTime
+              Time.at(value, in: "UTC")
+            else
+              value
+            end
           end
         end
       end

data/lib/klenod/build/version.rb

@@ -2,6 +2,6 @@
 
 module Klenod
   module Build
-    VERSION = "0.0.29"
+    VERSION = "0.0.30"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-build
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Andrés Alin
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.29
+        version: 0.0.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.29
+        version: 0.0.30
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
@@ -217,14 +217,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: tsort
   requirement: !ruby/object:Gem::Requirement