pubid 2.0.0.pre.alpha.45 → 2.0.0.pre.alpha.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6899d53fcf1708eacd4c4955c1005369f54fcbfd8dbbbaf73ab417c71fdfa1b
-  data.tar.gz: 2c194ebf70e57cc7e840f7eec013eb0e4073261ba150a9f6bb94d0234a032d74
+  metadata.gz: cdd72b807af6dfe0a054a41ea6936289d3a7baa1d9f52dd6ca526a2092fe74ed
+  data.tar.gz: 766936316a70dde70df50e5090555a8004663ed33cc21e2058e8a34ac9b56917
 SHA512:
-  metadata.gz: '047988bdc5488d32b23196662207015cc4fe728fe8dcdc43dde35f6041593a9e32e1b7eab22f35491a583193eb5fd74464e7e065c39a5e497178ec8c36fdc173'
-  data.tar.gz: b752b405f2664ea6246886f8f0d888a56ca6da898b5a05b03b6355b02d46d787760630ae19792f1eeacd13c018c5e1eb02e3a6c585f938118f56d4c5f2147484
+  metadata.gz: 001d0cec827dee1c30411aed304e52e14eda70989fa180575f9dff377e34022dd3d37caf2b6bf4f20415102c38e4aeb1b52531351c741544f80a587e413cfbc2
+  data.tar.gz: 100d3d5314550b4fbb535440e7002e070e205b28f5faf3f4cd66dae6cd054790d41c202ab239c3f961d2ac0db253eefcc9fc5737aa69cc666cb340fdd8a5c213

data/lib/pubid/cen_cenelec.rb

@@ -195,7 +195,21 @@ module Pubid
     # @return [Pubid::Components::TypedStage, nil] the matching typed stage
     def self.locate_stage(abbr)
       abbr_str = abbr.to_s.upcase
-      all_typed_stages.find { |s| s.abbr.any? { |a| a.to_s.upcase == abbr_str } }
+      all_typed_stages.find { |s| s.abbr.any? { |a| a.to_s.upcase == abbr_str } } ||
+        # A harmonized stage code ("43.20") names the stage the same way an
+        # abbreviation does; consumers query by it (pubid#251), so an
+        # unmatched abbreviation falls through to the code tables.
+        locate_stage_by_harmonized_code(abbr)
+    end
+
+    # Lookup: harmonized stage code -> typed stage ("43.20" -> the FV EN
+    # entry). The codes are the CEN/CENELEC lifecycle ladder; every code a
+    # consumer can query must resolve (pubid#251).
+    # @param code [String, Symbol] the harmonized stage code to find
+    # @return [Pubid::Components::TypedStage, nil] the matching typed stage
+    def self.locate_stage_by_harmonized_code(code)
+      code_str = code.to_s
+      all_typed_stages.find { |s| s.harmonized_stages.to_a.include?(code_str) }
     end
 
     # Lookup: typed-stage code -> typed stage ("pren" -> the prEN entry).

data/lib/pubid/iso/urn_parser.rb

@@ -142,16 +142,31 @@ module Pubid
         elsif TYPED_STAGE_REVERSE_MAP.key?(parts.first&.upcase) ||
             (parts.first&.match?(/^[A-Za-z]+\.\d+$/) &&
              TYPED_STAGE_REVERSE_MAP.key?(parts.first.upcase.split(".").first))
-          stage_abbr = parts.shift.upcase
-          # Check for iteration (WD.2 format)
-          if stage_abbr.include?(".")
-            abbr_part, iteration_part = stage_abbr.split(".")
-            stage_code = TYPED_STAGE_REVERSE_MAP[abbr_part]
-            stage_from_abbr = stage_code
-            stage_iteration = iteration_part.to_i
-          else
-            stage_code = TYPED_STAGE_REVERSE_MAP[stage_abbr]
-            stage_from_abbr = stage_code
+          stage_abbr = parts.first.upcase
+          # The family comes from the abbreviation without its iteration
+          # ("FDAM.3" is still the amd family).
+          family = Pubid::Iso.locate_stage(stage_abbr.split(".").first)&.type_code&.to_s
+          # A supplement-family stage directly before its own supplement
+          # type token ("...:FDAM:amd:1:v1") names the SUPPLEMENT's stage:
+          # consuming it as the base's stage builds the base as a base-less
+          # supplement, which cannot render.
+          supplement_follows =
+            %w[amd cor suppl add].include?(family) &&
+            parts.drop(1).any? do |token|
+              family == SUPPLEMENT_TYPE_MAP[token.to_s.downcase]&.to_s
+            end
+          unless supplement_follows
+            parts.shift
+            # Check for iteration (WD.2 format)
+            if stage_abbr.include?(".")
+              abbr_part, iteration_part = stage_abbr.split(".")
+              stage_code = TYPED_STAGE_REVERSE_MAP[abbr_part]
+              stage_from_abbr = stage_code
+              stage_iteration = iteration_part.to_i
+            else
+              stage_code = TYPED_STAGE_REVERSE_MAP[stage_abbr]
+              stage_from_abbr = stage_code
+            end
           end
         end
 
@@ -397,6 +412,16 @@ module Pubid
         # Build supplements recursively (forward order: first supplement wraps base,
         # second wraps first, etc. -- matching URN left-to-right semantics)
         supplements.each do |supp|
+          # A bare language token with no supplement identity names the BASE
+          # document: wrapping it would build a supplement with no type,
+          # number or base attribute, and a plain standard drops its base —
+          # the whole document was lost, rendering "ISO (FR)".
+          if supp[:type].nil? && supp[:stage].nil? && supp[:number].nil? &&
+              supp[:year].nil? && supp[:languages]
+            base_hash[:languages] = supp[:languages].join("/")
+            next
+          end
+
           supp_hash = {}
 
           if supp[:stage]

data/lib/pubid/iso.rb

@@ -223,7 +223,13 @@ module Pubid
     # @return [Pubid::Components::TypedStage, nil]
     def self.locate_stage_by_harmonized_code(harmonized_code)
       harmonized_str = harmonized_code.to_s
-      all_typed_stages.find { |s| s.harmonized_stages&.include?(harmonized_str) }
+      candidates = all_typed_stages.select { |s| s.harmonized_stages&.include?(harmonized_str) }
+      # all_typed_stages walks the loaded identifier constants, so its order
+      # is load-order dependent and a bare "first match" flipped between
+      # processes (an IWA at 10.99 rendered "AWI Add"/"AWI Suppl"/"AWI"
+      # depending on the run). The IS family is the default document type;
+      # prefer it, then keep the registry order.
+      candidates.find { |s| s.type_code.to_s == "is" } || candidates.first
     end
 
     # Default typed stage used when no type_with_stage is present

data/lib/pubid/nist/CLAUDE.md

@@ -72,3 +72,11 @@ Read this before you change `lib/pubid/nist/` or `spec/pubid/nist/`. The root
   (`"800-38.A.supp.add."` splits with a trailing `""` in JS but not in
   Ruby; keeping it appends a stray `.`). Locked by
   `spec/pubid/nist/urn_parser_spec.rb`.
+
+- **FIPS MR keeps the parsed publisher.** `FederalInformationProcessingStandards`
+  sets `default_publisher` to `""`, and its `to_mr_style` once started from
+  `series_code` alone, so `NIST.FIPS.197-upd1.ipd` rendered `FIPS.197-upd1.ipd`
+  — not the DOI suffix NIST publishes. It now mirrors its own
+  `to_short_style`: the publisher prefixes only when the input carried one
+  (`NIST.`/`NBS.`), and a bare `FIPS 140-3` still renders `FIPS.140-3`.
+  Locked by `spec/pubid/nist/identifiers/fips_spec.rb`.

data/lib/pubid/nist/identifiers/federal_information_processing_standards.rb

@@ -37,11 +37,12 @@ module Pubid
           ""
         end
 
-        # Override to_mr_style to not add "NIST" prefix for FIPS
+        # Override to_mr_style so FIPS adds no default "NIST" prefix
         def to_mr_style
-          # "FIPS.46e1977" (machine-readable with dots, no publisher prefix)
+          # "NIST.FIPS.197" keeps a parsed publisher (the DOI suffix NIST
+          # publishes); "FIPS.46e1977" has none and invents none.
           # Note: edition is appended directly to number without dot for FIPS
-          result = series_code
+          result = [publisher, series_code].compact.join(".")
           result += ".#{number}" if number
 
           # FIPS uses dash notation for parts; render here and skip the generic

data/lib/pubid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pubid
-  VERSION = "2.0.0.pre.alpha.45"
+  VERSION = "2.0.0.pre.alpha.47"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.45
+  version: 2.0.0.pre.alpha.47
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-20 00:00:00.000000000 Z
+date: 2026-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model