isodoc-i18n 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7698b9379cd9b2bfea54973ec2cdaef465b92963e2e6e38715d20ef50edf58c1
-  data.tar.gz: c6370d69fcc7c5a5301b98582538853f29c6bd9455082b1b2e2e0b882e3ec0f3
+  metadata.gz: 5323ffdd11fbc3590df89e847850d94952dd14dbedc9a3890f816452c74e5bad
+  data.tar.gz: 8de0b46ebe7acfd0e5d63835462f01c672ac6f1a915926b98395ad47b5801a81
 SHA512:
-  metadata.gz: 7815dca37d2d415d53afe5a41260f650d8ff8f5b61a5d1fe200d0ad8de4fb008813f9e0737ceca81abf30c9dad15bd341c2e4db478787ff55d34a9901ef15b9b
-  data.tar.gz: 58f22f0df18829864fac021c3cb7e66c7d520c82eb92c385ecde375005341f27bb9f6546f8e4f4963f57826b05328bcb1cc4ba7fec11928a153002261d5b08a7
+  metadata.gz: 9a0c53b89c58f7d898955ed3ad725c5d38d10452787436b52e25a8dca493e6bc33aff19087ce0470098cdffaf52c71df7fdbb5c1eaea488eb96ff576987e470e
+  data.tar.gz: 27536a6ebf32c1dafca0da5db856c3215bad6a3a81b1314205a83337290c04bdbca13f75f3d27232085817913152af59072c88a4dfd1fc7a4cd503858d1078c2

data/lib/isodoc/extended_date.rb

@@ -6,10 +6,15 @@ module IsoDoc
   #
   # Adds three POSIX-flavoured surfaces:
   #
-  #   %E[YyC](?:\{ARGS\})?  - era year (calendar-aware)
-  #   %O[mdYy](?:\{ARGS\})? - alternative numbering for date components
-  #   %_                    - legacy alias for a literal space (kept for
-  #                           backwards compatibility with IsoDoc::I18n#date)
+  #   %E[YyC]              - era year (calendar-aware)
+  #   %O[mdYy]             - alternative numbering for date components
+  #   %_                   - legacy alias for a literal space (kept for
+  #                          backwards compatibility with IsoDoc::I18n#date)
+  #
+  # Optional square-bracket-delimited ARGS may follow the conversion letter
+  # for %E* and %O* tokens (e.g. +%EY[numeric]+, +%Om[roman]+).
+  # Square brackets rather than braces, so format strings remain safe to
+  # inline inside Liquid +{{...}}+ templates.
   #
   # The localised name directives (%B, %b, %h, %A, %a, %P, %p) are also
   # routed through the formatter so they pick up CLDR locale data without
@@ -25,8 +30,8 @@ module IsoDoc
     TOKEN_RX = /
       %_                                  |
       %\^?[BbhPpAa]                       |
-      %E[YyC](?:\{[^}]*\})?               |
-      %O[mdYy](?:\{[^}]*\})?
+      %E[YyC](?:\[[^\]]*\])?              |
+      %O[mdYy](?:\[[^\]]*\])?
     /x.freeze
 
     DAY_KEYS = %i[sun mon tue wed thu fri sat].freeze
@@ -39,6 +44,30 @@ module IsoDoc
       new(**opts).format(value, fmt)
     end
 
+    # Convenience wrapper for ISO 8601 date strings of variable arity
+    # (year-only, year-month, or full date). Picks one of three format
+    # strings keyed by the arity of the input. Each format string may be
+    # nil, in which case the input is returned unchanged for that arity.
+    # Used by metanorma-flavour metadata helpers to delegate their
+    # arity-branching logic instead of duplicating it per gem.
+    def self.format_iso_date(isodate, year: nil, year_month: nil, full: nil,
+                             **opts)
+      normalized, fmt = iso_normalize(isodate, [year, year_month, full])
+      return isodate if fmt.nil?
+
+      format(normalized, fmt, **opts)
+    rescue StandardError
+      isodate
+    end
+
+    def self.iso_normalize(isodate, fmts)
+      return [isodate, nil] if isodate.nil? || isodate.to_s.empty?
+
+      parts = isodate.to_s.split("-")
+      fmt = fmts[parts.size - 1] or return [isodate, nil]
+      [[parts[0], parts[1] || "01", parts[2] || "01"].join("-"), fmt]
+    end
+
     attr_reader :lang, :script
 
     def initialize(lang:, script: nil, calendar: nil, calendar_en: nil)
@@ -90,10 +119,10 @@ module IsoDoc
       when /\A%(\^?)([BbhPpAa])\z/
         render_localised_name(time, Regexp.last_match(1) == "^",
                               Regexp.last_match(2))
-      when /\A%E([YyC])(?:\{([^}]*)\})?\z/
+      when /\A%E([YyC])(?:\[([^\]]*)\])?\z/
         render_era(time, Regexp.last_match(1),
                    parse_args(Regexp.last_match(2)))
-      when /\A%O([mdYy])(?:\{([^}]*)\})?\z/
+      when /\A%O([mdYy])(?:\[([^\]]*)\])?\z/
         render_alt_num(time, Regexp.last_match(1),
                        parse_args(Regexp.last_match(2)))
       end

data/lib/isodoc/i18n/version.rb

@@ -1,5 +1,5 @@
 module IsoDoc
   class I18n
-    VERSION = "1.5.0".freeze
+    VERSION = "1.5.2".freeze
   end
 end

data/lib/isodoc/liquid/liquid.rb

@@ -33,6 +33,22 @@ module IsoDoc
         grammar = h.merge(parse_hash(infl, symbol: false))
         @@i18n.inflect_ordinal(num.to_i, grammar, "SpelloutRules")
       end
+
+      # value | date_i18n: fmt[, lang[, calendar]]
+      # e.g. "2024-09-30" | date_i18n: "%EY[numeric]年%-m月%-d日", "ja"
+      # lang defaults to the i18n instance's lang; calendar to language default.
+      def date_i18n(value, fmt, lang = nil, calendar = nil)
+        return value if value.nil? || value.to_s.empty?
+
+        IsoDoc::ExtendedDateFormatter.format(
+          value, fmt,
+          lang: lang || @@i18n.lang,
+          script: lang ? nil : @@i18n.script,
+          calendar: calendar
+        )
+      rescue StandardError
+        value
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc-i18n
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-11 00:00:00.000000000 Z
+date: 2026-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64