pubid-iec 1.15.20 → 1.15.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ccffba7aaa5a3e66b66a19ab5740b27eb6ff99934e3b16ad98a6892058b8996
-  data.tar.gz: b8bc82a61191c48aa37001af8311ff1c374654086ced0f1b64322c982f370e70
+  metadata.gz: f6c4c33c3e0c5a6ac9eea2d75c8e305a022a87804281baa31e9ffc4e91f29888
+  data.tar.gz: f9d685bc29bf07032d97a97ff70daf1c324df1f0f10d5a42ca7bfa52a50f9308
 SHA512:
-  metadata.gz: 5a651b8cd80493b51ef75fd6c3d94a30c0cee96164a2f2569c55ea645744f7ddc591bd974b40c94c489e06f4081db25f2bbe66205dd79892eb3ba332a751ac10
-  data.tar.gz: 0734ee8afb0cb0ca7271c4ebbf7e4c80db97af1d57f1c332ba33075209365a36386d1ce2e16236388cae8abb5de08b8de11023a4953fe3ff2c5a47581561011a
+  metadata.gz: b15519521d3a6c26e0a89a6b1bb3b9995a4daec97a58d435ba626457ae7d014f3d098911f6fe2bc81ba5fcaed06199f6523065cfb292c23e2edf9caeec2b9315
+  data.tar.gz: ca1363b31d730ca72a0ad42cfdf9728c1622bef91b5489504f994e788b58a56573b20eab4436cd20ed45f02248d9eebc22cc1fa551dd23fce38dc892dae72b83

data/lib/pubid/iec/identifier/base.rb

@@ -129,7 +129,11 @@ module Pubid::Iec
 
       def normalize_urn_params!(params)
         params[:publisher] = params[:publisher].to_s.upcase
-        params[:copublisher] = params[:copublisher].to_s.upcase if params[:copublisher]
+        # copublisher may be an array (e.g. ISO/IEC/IEEE -> [iec, ieee]);
+        # upcase each element rather than the array's inspect string.
+        if params[:copublisher]
+          params[:copublisher] = Array(params[:copublisher]).map { |c| c.to_s.upcase }
+        end
         params[:type] = params[:type].to_s.upcase if params[:type]
         params[:number] = params[:number].to_s.upcase
 
@@ -142,8 +146,9 @@ module Pubid::Iec
           end
         end
 
-        # Remove amendments/corrigendums parsed as bare strings from URN
-        # (full supplement round-trip support to be added later)
+        # Canonical URN supplements parse into amendment/corrigendum objects
+        # (see ParserUrn#urn_supplements). This guard only drops any stray
+        # bare-string capture, which the canonical grammar no longer produces.
         params.delete(:amendments) if params[:amendments].is_a?(String)
         params.delete(:corrigendums) if params[:corrigendums].is_a?(String)
       end

data/lib/pubid/iec/parser_urn.rb

@@ -64,20 +64,28 @@ module Pubid
               (dash >> array_to_str(VAP_CODES).as(:vap)).repeat
           end
 
-          rule(:urn_edition) do
-            (str("ed-") >> digits.as(:edition)).maybe
+          # Canonical deliverable slot: a deliverable code (csv/rlv/ser/…) or,
+          # when absent, the edition (ed-N). The two never co-occur.
+          rule(:urn_slot3) do
+            (urn_vap | (str("ed-") >> digits.as(:edition))).maybe
+          end
+
+          # Canonical adjunct: relation-marker ("::" normal, ":plus:"
+          # consolidated) + kind + ":" number + optional ":" date.
+          rule(:relation_marker) do
+            str(":plus:") | str("::")
           end
 
           rule(:urn_amendment) do
-            colon >> str("amd").as(:amendments) >>
-              (colon >> (year_digits | digits).as(:number)).maybe >>
-              (colon >> str("v") >> digits.as(:iteration)).maybe
+            (relation_marker >> str("amd") >> colon >>
+              digits.as(:number) >>
+              (colon >> year_digits.as(:year)).maybe).as(:amendments)
           end
 
           rule(:urn_corrigendum) do
-            colon >> str("cor").as(:corrigendums) >>
-              (colon >> (year_digits | digits).as(:number)).maybe >>
-              (colon >> str("v") >> digits.as(:iteration)).maybe
+            (relation_marker >> str("cor") >> colon >>
+              digits.as(:number) >>
+              (colon >> year_digits.as(:year)).maybe).as(:corrigendums)
           end
 
           rule(:urn_supplements) do
@@ -92,14 +100,17 @@ module Pubid
             (array_to_str(LANGUAGES) >> (dash >> array_to_str(LANGUAGES)).repeat).as(:language)
           end
 
+          # Positional structure: pub[:type]:number[-part][,conj]
+          #   :date:stage:deliverable:language{adjuncts}[fragment]
           rule(:urn_identifier) do
             str("urn:iec:std:") >> urn_publisher_copublisher >> urn_type >>
               urn_number >> urn_part >> urn_conjuction_part >>
               (colon >> urn_year >>
-                (colon >> (urn_stage | urn_vap).maybe >>
-                  (colon >> urn_edition >>
-                    urn_supplements >> urn_fragment >>
-                    (colon >> urn_language.maybe).maybe
+                (colon >> urn_stage.maybe >>
+                  (colon >> urn_slot3 >>
+                    (colon >> urn_language.maybe >>
+                      urn_supplements >> urn_fragment
+                    ).maybe
                   ).maybe
                 ).maybe
               ).maybe

data/lib/pubid/iec/renderer/trf_urn.rb

@@ -2,10 +2,14 @@ module Pubid::Iec::Renderer
   class TrfUrn < Urn
 
     def render_identifier(params)
+      # Trailing ":" is the (always-empty) language slot; TRF URNs carry no
+      # language. Previously this colon came from the base #render appending
+      # ":#{lang}", which no longer runs (language is now a positional slot in
+      # the base render_identifier, which TrfUrn overrides).
       "urn:iec:std:%{publisher}%{copublisher}:trf%{trf_publisher}:%{number}"\
       "%{part}%{conjuction_part}%{year}%{vap}"\
       "%{version}%{part_version}"\
-      "%{trf_version}" % params
+      "%{trf_version}:" % params
     end
 
     def render_trf_version(trf_version, _opts, _params)

data/lib/pubid/iec/renderer/urn.rb

@@ -52,22 +52,45 @@ module Pubid::Iec::Renderer
                WPUB: 95.99
     }.freeze
 
+    # Renders the ABNF-canonical IEC URN (ground truth in relaton-data-iec):
+    #
+    #   urn:iec:std:{pub}[-{copub}][:{type}]:{number}[-{part}][,{conj}]
+    #       :{date}:{stage}:{deliverable}:{language}{adjuncts}[{fragment}]
+    #
+    # The four positional slots after the number/part are always colon-
+    # separated even when empty. Amendments/corrigenda follow the language
+    # slot with a "::" (or ":plus:" for a consolidated amendment) relation-
+    # marker; see #render_amendments / #render_corrigendums.
     def render_identifier(params)
       result = "urn:iec:std:#{params[:publisher]}#{params[:copublisher]}" \
                "#{params[:type]}:#{params[:number]}" \
                "#{params[:part]}#{params[:conjuction_part]}"
 
-      # Positional fields — always colon-separated even when empty
+      # Positional slots — always colon-separated even when empty.
       result += ":#{strip_leading_colon(params[:year])}"
 
-      stage_value = [params[:stage], params[:vap], params[:urn_stage],
+      # Stage slot (deliverable/vap is no longer folded in here; it has its
+      # own canonical deliverable slot below).
+      stage_value = [params[:stage], params[:urn_stage],
                      params[:corrigendum_stage], params[:iteration],
                      params[:version], params[:part_version]].map(&:to_s).join
       result += ":#{strip_leading_colon(stage_value)}"
 
-      result += ":#{strip_leading_colon(params[:edition])}"
+      # Deliverable slot: "ser" (all parts), a deliverable code (csv/rlv/…),
+      # or the edition (ed-N) when neither is present.
+      deliverable = deliverable_slot(params)
+      result += ":#{deliverable}"
+
+      # Language slot. A bare (undated, stage/language/adjunct-less) all-parts
+      # series omits the trailing empty language slot, matching the canonical
+      # relaton-data-iec form: urn:iec:std:iec:80000:::ser (not ...:ser:). A
+      # dated series (...:2026::ser:) or a deliverable (...::rlv:) keeps it.
+      unless bare_series?(deliverable, stage_value, params)
+        result += ":#{strip_leading_colon(params[:language].to_s)}"
+      end
 
-      # Non-positional suffixes
+      # Adjuncts (amendments/corrigenda) with the relation-marker, then any
+      # fragment.
       result += params[:amendments].to_s
       result += params[:corrigendums].to_s
       result += params[:fragment].to_s
@@ -76,15 +99,9 @@ module Pubid::Iec::Renderer
     end
 
     def render(with_date: true, with_language_code: :iso, annotated: false, **args)
-      base = render_base_identifier(**args.merge(
+      render_base_identifier(**args.merge(
         with_date: with_date, with_language_code: with_language_code, annotated: annotated,
       ))
-      lang = strip_leading_colon(@prerendered_params[:language].to_s)
-      if @prerendered_params.key?(:all_parts)
-        "#{base}ser"
-      else
-        "#{base}:#{lang}"
-      end
     end
 
     def render_part(part, _opts, _params)
@@ -127,12 +144,26 @@ module Pubid::Iec::Renderer
       ":#{type.downcase}"
     end
 
-    def render_amendments(amendments, _opts, _params)
-      amendments&.map(&:urn)&.join || ""
+    # Amendments render as "{marker}amd:{number}[:{date}]". The marker is
+    # ":plus:" when the base is a consolidation (CSV/CMV) — the amendment is
+    # merged into the consolidated document — otherwise "::".
+    def render_amendments(amendments, _opts, params)
+      marker = consolidated_deliverable?(params) ? ":plus:" : "::"
+      Array(amendments).map do |amendment|
+        s = "#{marker}amd:#{amendment.number}"
+        s += ":#{amendment.year}" if amendment.year
+        s
+      end.join
     end
 
+    # Corrigenda always use the "::" relation-marker (they are separate
+    # corrections, never merged into a consolidation).
     def render_corrigendums(corrigendums, _opts, _params)
-      corrigendums&.map(&:urn)&.join || ""
+      Array(corrigendums).map do |corrigendum|
+        s = "::cor:#{corrigendum.number}"
+        s += ":#{corrigendum.year}" if corrigendum.year
+        s
+      end.join
     end
 
     def render_language(language, _opts, _params)
@@ -145,6 +176,48 @@ module Pubid::Iec::Renderer
 
     private
 
+    # The canonical deliverable slot: "ser" for an all-parts series, else the
+    # rendered deliverable code (csv/rlv/cmv/exv/…), else the edition (ed-N).
+    # Deliverable and edition never co-occur in practice, so one slot serves
+    # both.
+    def deliverable_slot(params)
+      if present?(params[:all_parts])
+        "ser"
+      elsif present?(params[:vap])
+        strip_leading_colon(params[:vap])
+      elsif present?(params[:edition])
+        strip_leading_colon(params[:edition])
+      else
+        ""
+      end
+    end
+
+    # True for a bare all-parts series — deliverable "ser" with no date, stage,
+    # language or adjuncts — whose canonical URN drops the trailing language
+    # slot (urn:iec:std:iec:80000:::ser). Keyed on the rendered deliverable so
+    # it holds whether the series is carried as +all_parts+ or a +ser+ vap.
+    def bare_series?(deliverable, stage_value, params)
+      return false unless deliverable == "ser"
+      if present?(stage_value) || present?(params[:year]) ||
+          present?(params[:language])
+        return false
+      end
+
+      [params[:amendments], params[:corrigendums], params[:fragment]]
+        .all? { |adjunct| adjunct.to_s.empty? }
+    end
+
+    # True when the base document is a consolidation that merges its
+    # amendments (CSV/CMV deliverable).
+    def consolidated_deliverable?(params)
+      Array(params[:vap]).map { |v| v.to_s.downcase }
+        .any? { |v| %w[csv cmv].include?(v) }
+    end
+
+    def present?(value)
+      !value.nil? && !value.to_s.empty?
+    end
+
     def strip_leading_colon(value)
       s = value.to_s
       s.start_with?(":") ? s[1..] : s

data/lib/pubid/iec/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iec
-    VERSION = "1.15.20".freeze
+    VERSION = "1.15.21".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iec
 version: !ruby/object:Gem::Version
-  version: 1.15.20
+  version: 1.15.21
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-06-26 00:00:00.000000000 Z
+date: 2026-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.20
+        version: 1.15.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.20
+        version: 1.15.21
 description: Library to generate, parse and manipulate IEC PubID.
 email:
 - open.source@ribose.com