pubid 2.0.0.pre.alpha.48 → 2.0.0.pre.alpha.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d96c2a0afa3e30407bdb23ab55cdef729e19f2f12d49d82f0ee9cb7594221b8d
-  data.tar.gz: 2e6dbc1455732f38e27821af391a2a48df7024b86459ff7bc9283fa0aa824d51
+  metadata.gz: 497049ade2827d12f1d6a7774b14c033e0915d21b657a78b5290056f84a3a9d2
+  data.tar.gz: 6f09327d056fa64a8e7656ba277a09258bc60335a4e92b28aeef1fa2833f9e2f
 SHA512:
-  metadata.gz: 9ad1bac459f9e54a1c56b20e3767a2ea5b757a7772fc5d18c7d93749a64015bbfd2d6d19a8fbd1ff11bbf8e0d22b5a706cefc024383f77ed90eb8462ba0caa16
-  data.tar.gz: 954df498a860062ad39b0523fb2d860d8e1c6506c2efc044134ec165a481d19151c828865aa4b2c960552e4b1f7f2a97fc77fddb7141050bf5baeab3886fcc03
+  metadata.gz: 136a58459836eaf728383f00e34214c3015e7abfcf7ffac60fec64900fe1c44d029af4f4309c41d7f404d30b4865f443136cb6cb5dc56152ca3ef720fdbc9c45
+  data.tar.gz: 638e743baf216904da4fbf08b764f33ed6bd0784f58b17865f5cafb501ebe2ca9f2b86acc35dc9651415055dcc376682b98bd8ce4e53a0db67bcbf3bec81dd8c

data/data/iec/stage-codes.md

@@ -136,16 +136,22 @@ stage RFDIS/50.00 — a snapshot of the project's plan, not a code rename.
 ## Relationship to the pubid stage registry
 
 - `ADIS` is registered as an alias on the IEC `cdv` typed stage, whose
-  harmonized list covers 40.99 (project stages are not queryable through
-  `Pubid::Iec.locate_stage`, which reads `TYPED_STAGES` only).
+  harmonized list covers 40.99.
 - `AWG` and `CANV` appear in neither this table nor the legacy examples —
-  IEC's own Data-Feeds successors do not know them. Any registration
-  awaits IEC's confirmation of their harmonized codes.
-- Reconciliation items against this table, deliberately not changed yet:
-  `DELPUB` sits at **99.60** here (the registry's `is` ladder starts at
-  60.00 and does not claim 99.60); `CAN` carries **two** harmonized codes
-  (30.98 for IS/TR/TS, 50.98 for PAS/ISH/COR); `DECDISH`, `MERGED`,
-  `SPLIT`, `PCC`, `PRVN`, `DEL`, `RPUB`, `TPUB` and the per-deliverable
-  translation/preparation rows are not registered as typed-stage
-  abbreviations. `CDISH` and `CDPAS` are registered as aliases on the
-  `dish`/`dpas` stages (the 50.20 rows of their deliverables).
+  IEC's own Data-Feeds successors do not know them, and neither does
+  #237's list; they are fictitious (pubid#572).
+- **Reconciliation (2026-10-22, applied):** `DELPUB`'s code 99.60 is
+  claimed by the `is` ladder; `SPLIT`/`MERGED` are claimed at
+  30.96/30.97 by the `cd` ladder; `PCC`, `RPUB`, `TPUB`, `DECPUB`,
+  `DEL` (10.98 and 20.98) and `PRVN` are registered as typed-stage
+  abbreviations; every per-deliverable row — the translation/preparation
+  families, `DECDISH`, `PRVDISH`/`PRVDPAS`/`PRVDTR`/`PRVDTS`, `CDTR`/
+  `CDTS`/`CDISH`/`CDPAS`, `ADTR`/`ADTS`, `DTRM`/`DTSM`, `NDTR`/`NDTS`,
+  `RDISH`, `TCDV`, `PRVC`, `AFDIS`, … — is queryable through
+  `Pubid::Iec.locate_stage` via the classes' PROJECT_STAGES;
+  `Pubid::Iec.locate_stage_by_harmonized_code` resolves the codes with
+  the IS-family preference (the pubid#570 deterministic rule). The
+  review/withdrawal ladder rows (90.xx/95.xx) stay claimed: the
+  harmonized system is joint ISO/IEC and #237's own list maps RR to
+  9092 — IEC's table simply does not name IEC stage codes for the
+  review sub-states. Locked by `spec/pubid/iec/stage_reconciliation_spec.rb`.

data/lib/pubid/iec/identifiers/international_standard.rb

@@ -21,7 +21,9 @@ module Pubid
             code: :np,
             stage_code: :np,
             type_code: :is,
-            abbr: ["NP"],
+            # DEL is 10.98 (IS/TR/TS "Deleted/abandoned") and PRVN 10.60
+            # ("Preparation of RVN") — data/iec/stage-codes.md
+            abbr: ["NP", "DEL", "PRVN"],
             name: "New Proposal",
             harmonized_stages: %w[10.00 10.60 10.92 10.98],
           ),
@@ -50,7 +52,8 @@ module Pubid
             code: :wd,
             stage_code: :wd,
             type_code: :is,
-            abbr: ["WD"],
+            # DEL is 20.98 for the ISH deliverable ("Deleted/abandoned")
+            abbr: ["WD", "DEL"],
             name: "Working Draft",
             harmonized_stages: %w[20.20 20.60 20.98 20.99],
           ),
@@ -60,9 +63,10 @@ module Pubid
             type_code: :is,
             abbr: %w[CD 2CD 3CD 4CD 5CD 6CD 7CD 8CD 9CD
                      ACD A2CD A3CD A4CD A5CD A6CD A7CD A8CD A9CD
-                     CDM],
+                     CDM PCC SPLIT MERGED],
             name: "Committee Draft",
-            harmonized_stages: %w[30.00 30.20 30.60 30.92 30.98 30.99],
+            harmonized_stages: %w[30.00 30.20 30.60 30.92 30.96 30.97 30.98
+                                  30.99],
           ),
           Pubid::Components::TypedStage.new(
             code: :cdv,
@@ -88,10 +92,10 @@ module Pubid
             stage_code: :published,
             type_code: :is,
             abbr: ["", "BPUB", "PPUB", "APUB", "WPUB", "DELPUB",
-                   "RR", "CAN"],
+                   "RR", "CAN", "RPUB", "TPUB", "DECPUB"],
             name: "International Standard",
             harmonized_stages: %w[60.00 60.60 90.20 90.60 90.92 90.93 90.99
-                                  95.20 95.60 95.92 95.99],
+                                  95.20 95.60 95.92 95.99 99.60],
           ),
         ].freeze
 

data/lib/pubid/iec.rb

@@ -51,13 +51,51 @@ module Pubid
       end
     end
 
+    # The per-deliverable PROJECT_STAGES (AFDIS, TCDV, PRVC, DECDISH, …)
+    # as TypedStage objects, so they are queryable like typed stages.
+    # Deliberately NOT merged into all_typed_stages: the URN parser's
+    # stage reverse-map matches on harmonized_stages.first and would
+    # start resolving project codes (stage-IS-40.99 etc.) that resolve
+    # to "" today — a parse-behavior change outside a lookup-only round.
+    def self.all_project_stages
+      @all_project_stages ||= identifier_types.flat_map do |klass|
+        next [] unless klass.const_defined?(:PROJECT_STAGES)
+
+        type_key = klass.type[:key]
+        klass.const_get(:PROJECT_STAGES).map do |key, stage|
+          Pubid::Components::TypedStage.new(
+            code: key.to_sym,
+            stage_code: key.to_sym,
+            type_code: type_key,
+            abbr: [stage[:abbr]].flatten,
+            name: stage[:name],
+            harmonized_stages: stage[:harmonized_stages],
+          )
+        end
+      end
+    end
+
     def self.locate_type(code)
       identifier_types.find { |t| t.type[:key].to_s == code.to_s }
     end
 
     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 } } ||
+        all_project_stages.find { |s| s.abbr.any? { |a| a.to_s.upcase == abbr_str } }
+    end
+
+    # Harmonized code -> typed stage ("99.60" -> is, "30.96" -> cd). The
+    # IS family wins a shared code — the same deterministic rule as the
+    # ISO lookup (pubid#570), because registry order is load-order
+    # dependent. Project stages are not candidates: their codes overlap
+    # the typed ladders by design (AFDIS 40.99 is also cdv's 40.99).
+    def self.locate_stage_by_harmonized_code(code)
+      code_str = code.to_s
+      candidates = all_typed_stages.select do |s|
+        s.harmonized_stages&.include?(code_str)
+      end
+      candidates.find { |s| s.type_code.to_s == "is" } || candidates.first
     end
   end
 end

data/lib/pubid/version.rb

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

metadata

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