pubid 2.0.0.pre.alpha.58 → 2.0.0.pre.alpha.60

data/lib/pubid/iec/CLAUDE.md

@@ -30,4 +30,4 @@ These notes were part of the root `CLAUDE.md`. Read them before you change `lib/
 
   **Two parent-slot gaps recorded by the cross-flavor `base` survey** (`lib/pubid/bsi/CLAUDE.md` has the measured version). `Identifiers::TestReportForm#cispr_identifier` is a polymorphic `Identifier` parent slot with no `#root` override, so `root` returns the form itself. And `Identifiers::ConsolidatedIdentifier#base_document` returns `identifiers&.first` **without** the recursive `&.base_document` that its BSI, CSA and CEN counterparts use — a one-level peel where the others peel fully, so a consolidated edition of a supplement does not reduce to the bare standard. Neither is chased here; both are pinned by nothing, which is why they are written down.
 
-  **Stage codes — the SSOT and what is settled.** The authoritative source for IEC stage abbreviations is committed in this repo: **`data/iec/stage-codes.md`** — the 52-row IEC/ISO stage-code correspondence table transcribed from IEC's official *IEC/ISO Harmonized APIs* documents (v0.0.8 2023-06, api-portal.iec.ch; v0.0.7 2021-05, iec-apiportal.apigee.io — the successors that replace the IEC Data Feeds), the legacy Data-Feeds field examples, and the IS-lifecycle ladder from `StageCodes_IS_v2.pdf` (2023-06). `www.iec.ch` itself is fully WAF-gated to non-browsers and the Wayback Machine holds no snapshots of its PDFs, so the extract — not the unreachable original — is the reference. **`Pubid::Iec.locate_stage` reads `TYPED_STAGES` only** (`lib/pubid/iec.rb`); `PROJECT_STAGES` (AFDIS, TCDV, PRVC…) are not queryable through it. Every one of metanorma-iec's 55 `STAGE_CODES` — the list quoted in pubid#237 — resolves, locked by `spec/pubid/iec/typed_stages_spec.rb` in the issue's own order; aliases are always **appended, never prepended**, so `abbr.first` (what renders) is unchanged. Notable rulings from that pass: **ADIS** is the legacy Data-Feeds spelling of AFDIS ("Approved for FDIS circulation", ISO_LEVEL 40.99) and is an alias on `cdv` (the typed stage claiming 40.99); **CDISH/CDPAS** are the 50.20 rows of the DISH/DPAS deliverables, not "committee draft ISH/PAS" (30.xx); bare **PUB**, and the codes **AWG/CANV**, are defined by no IEC source and are deliberately unregistered (pubid#572, closed — the extract's "absent from every source" section is the standing evidence). **Reconciliation items recorded in the extract, deliberately not applied:** DELPUB sits at 99.60 there while the `is` ladder does not claim 99.60; CAN carries two codes (30.98 IS/TR/TS, 50.98 PAS/ISH/COR); the rows CDISH-table-siblings DECDISH/MERGED/SPLIT/PCC/PRVN/DEL/RPUB/TPUB and the per-deliverable translation/preparation families are not registered as typed-stage abbreviations.
+  **Stage codes — the SSOT and what is settled.** The authoritative source for IEC stage abbreviations is committed in this repo: **`data/iec/stage-codes.md`** — the 52-row IEC/ISO stage-code correspondence table transcribed from IEC's official *IEC/ISO Harmonized APIs* documents (v0.0.8 2023-06, api-portal.iec.ch; v0.0.7 2021-05, iec-apiportal.apigee.io — the successors that replace the IEC Data Feeds), the legacy Data-Feeds field examples, and the IS-lifecycle ladder from `StageCodes_IS_v2.pdf` (2023-06). `www.iec.ch` itself is fully WAF-gated to non-browsers and the Wayback Machine holds no snapshots of its PDFs, so the extract — not the unreachable original — is the reference. **`Pubid::Iec.locate_stage` reads `TYPED_STAGES` only** (`lib/pubid/iec.rb`); `PROJECT_STAGES` (AFDIS, TCDV, PRVC…) are not queryable through it. Every one of metanorma-iec's 55 `STAGE_CODES` — the list quoted in pubid#237 — resolves, locked by `spec/pubid/iec/typed_stages_spec.rb` in the issue's own order; aliases are always **appended, never prepended**, so `abbr.first` (what renders) is unchanged. Notable rulings from that pass: **ADIS** is the legacy Data-Feeds spelling of AFDIS ("Approved for FDIS circulation", ISO_LEVEL 40.99) and is an alias on `cdv` (the typed stage claiming 40.99); **CDISH/CDPAS** are the 50.20 rows of the DISH/DPAS deliverables, not "committee draft ISH/PAS" (30.xx); **Reconciliation items recorded in the extract, deliberately not applied:** DELPUB sits at 99.60 there while the `is` ladder does not claim 99.60; CAN carries two codes (30.98 IS/TR/TS, 50.98 PAS/ISH/COR); the rows CDISH-table-siblings DECDISH/MERGED/SPLIT/PCC/PRVN/DEL/RPUB/TPUB and the per-deliverable translation/preparation families are not registered as typed-stage abbreviations.

data/lib/pubid/ieee/builder.rb

@@ -1079,11 +1079,17 @@ module Pubid
         # P + a /D designator (any draft capture) is a DRAFT, never a
         # printed Std (the owner's 2026-10-24 ruling): the P marker is
         # project status, so the joint/project-draft family owns the row
-        # whatever date trails the designator. The non-P rows keep the
-        # printed-strip doctrine (the normalization ledger).
-        p_with_draft = parsed[:project_marker] &&
+        # whatever date trails the designator. The ruling extends to the
+        # P-less joint rows (pubid#597): a numeric /D designator alone is
+        # project status too — the row is a draft AND takes the P, so the
+        # marker is set below when the source spelling lacked it.
+        p_with_draft = (parsed[:project_marker] || numeric_draft) &&
                        (parsed[:draft_version] || parsed[:draft_iso_stage] ||
                         parsed[:draft_month] || parsed[:draft_year])
+        if p_with_draft && !parsed[:project_marker]
+          attributes[:project_marker] = true
+          parsed[:project_marker] = "P"
+        end
         printed_joint = parsed[:iso_published] && parsed[:iso_stage].nil? &&
                         !p_with_draft &&
                         (parsed[:printed_dash_year] || parsed[:printed_month_year] ||
@@ -1272,8 +1278,15 @@ module Pubid
         # rather than the joint-development model.
         if attributes[:draft] && parsed[:iso_stage].nil? &&
            parsed[:iec_stage].nil? && parsed[:amd_number].nil?
-          draft_attrs = { code: attributes[:code],
-                          draft: attributes[:draft] }
+          # The ruling (pubid#597): a joint row with a numeric /D designator
+          # is a draft AND takes the P project marker, whatever the source
+          # spelling printed — the marker is set on the identifier (and the
+          # code prepended) even when the row reached it without one.
+          draft_code = attributes[:code].to_s
+          draft_code = "P" + draft_code unless draft_code.start_with?("P")
+          draft_attrs = { code: draft_code,
+                          draft: attributes[:draft],
+                          project_marker: true }
           if attributes[:publishers]
             draft_attrs[:publisher] = attributes[:publishers].first
             rest = attributes[:publishers][1..]
@@ -1974,11 +1987,16 @@ module Pubid
             end
           end
 
-          # The PARG capture carries its separator (".12", the #471
-          # convention); Draft#to_s prints the dot itself, so keep only
-          # the digits or "D2022.10.12" renders "D2022.10..12" (pubid#477).
-          if draft_data[:revision]
-            revision = extract_value(draft_data[:revision])&.delete_prefix(".")
+          # The dotted ordinal stays part of the designator (the #601
+          # convergence): the grammar splits it only on the joint
+          # designation route, so a split field would make the parse and
+          # from_hash paths build different Draft objects on
+          # wire-identical rows ("DP62271-111_D6.1"). #to_s renders
+          # version + revision identically, so the whole tail rides the
+          # version on every route.
+          if draft_data[:revision] && version
+            tail = extract_value(draft_data[:revision])&.delete_prefix(".")
+            version = "#{version}.#{tail}"
           end
 
           # The compound both-systems form (docs/IEEE-DRAFT-STAGES.md

data/lib/pubid/ieee/components/draft.rb

@@ -8,13 +8,13 @@ module Pubid
       # IEEE draft version
       # Handles formats like:
       #   /D5              - version only
-      #   /D3.4            - version with revision
+      #   /D3.4            - dotted designator (the tail rides the version)
       #   /D7, July 2019   - with date
       class Draft < Lutaml::Model::Serializable
         include ::Pubid::SubsetMatch
 
-        attribute :version, :string       # D5, D3, etc.
-        attribute :revision, :string      # .4, .2 in D3.4
+        attribute :version, :string       # D5, D3.4, etc.
+        attribute :revision, :string      # unused on construction paths (#601)
         attribute :year, :string
         attribute :month, :string
         attribute :day, :string
@@ -94,8 +94,10 @@ day: nil, iso_stage: nil, iso_iteration: nil)
         # The compound stage suffix (docs/IEEE-DRAFT-STAGES.md §1.3):
         # "=DIS.3" is canonical — D (draft) = DIS (the stage), iteration 3.
         # "=DDIS.3", "=DDIS3", "=DDIS-3" (the stage echoed with its own D)
-        # are accepted aliases. Captures [stage, iteration].
-        COMPOUND_SUFFIX = /=D?(PWI|NP|WD|CDV|FDIS|DIS|CD)(?:[.-]?(\d+))?\z/.freeze
+        # are accepted aliases. Captures [stage, iteration]. The
+        # iteration is SHORT — a long digit run is a glued date
+        # ("=CDV-201507", the designator face), not an ordinal.
+        COMPOUND_SUFFIX = /=D?(PWI|NP|WD|CDV|FDIS|DIS|CD)(?:[.-]?(\d{1,2}))?\z/.freeze
         private_constant :COMPOUND_SUFFIX
 
         # The D-echo aliases ("DDIS3" = D + DIS + iteration 3) normalize
@@ -103,7 +105,7 @@ day: nil, iso_stage: nil, iso_iteration: nil)
         # ("CD1", "FCD", "CDV1") restores verbatim -- the compound split
         # would degrade the glued iterations and drop the stages the
         # alias list never knew, so from_hash(row) != parse(row).
-        ECHO_SUFFIX = /\AD(=?(PWI|NP|WD|CDV|FDIS|DIS|CD|FCD))(?:[.-]?\d+)?\z/.freeze
+        ECHO_SUFFIX = /\AD(=?(PWI|NP|WD|CDV|FDIS|DIS|CD|FCD))(?:[.-]?\d{1,2})?\z/.freeze
         private_constant :ECHO_SUFFIX
 
         def self.parse(value)
@@ -131,9 +133,19 @@ day: nil, iso_stage: nil, iso_iteration: nil)
           draft
         end
 
+        # The stage tokens #to_s renders verbatim (no D prepend). The
+        # strip_prefix must refuse them symmetrically: a wire form like
+        # "DIS2-1504" opens with the stage's own D, and stripping it
+        # corrupts the version ("IS2-1504") while still rendering alike.
+        STAGE_VERBATIM = /\A(ED\d|FDIS|FCD|CDV|DIS|CD|WD|PWI|NP)/
+        private_constant :STAGE_VERBATIM
+
         # Remove the leading "/D" (or a bare leading "D"/"/") that #to_s emits,
-        # leaving the version and any trailing date.
+        # leaving the version and any trailing date. A stage-token version
+        # keeps its whole spelling: #to_s renders it with no designator
+        # prepend, so the leading D is the stage's own letter.
         def self.strip_prefix(str)
+          return str if str.match?(STAGE_VERBATIM)
           return str[2..] if str.start_with?("/D")
           return str[1..] if str.start_with?("/")
           return str[1..] if str.start_with?("D") && str.length > 1
@@ -174,7 +186,7 @@ day: nil, iso_stage: nil, iso_iteration: nil)
           # as "FDIS_March") renders verbatim — prepending D
           # concatenates a hallucinated token ("DED4", "DFDIS") that no
           # face spells. Every other version keeps the D designator.
-          result = version&.match?(/\A(ED\d|(FDIS|FCD|CDV|DIS|CD|WD|PWI|NP))/) ? "/#{version}" : "/D#{version}"
+          result = version&.match?(STAGE_VERBATIM) ? "/#{version}" : "/D#{version}"
           result += "=#{iso_stage}" if iso_stage
           result += ".#{iso_iteration}" if iso_stage && iso_iteration
           result += if revision.to_s.start_with?(".")

data/lib/pubid/ieee/renderer.rb

@@ -141,11 +141,16 @@ module Pubid
         # so the WHOLE type word is dropped — not just "Std" (pubid#318: the
         # half-strip left "Draft" in the render, the re-parse dropped it, and
         # to_s needed three rounds to converge while losing the type).
-        should_render_type = id.publisher&.match?(/^(IEEE|AIEE)/)
-
-        if should_render_type && !id.typed_stage&.project_status && id.type && !id.type.to_s.strip.empty? && id.type != "P" &&
+        # A project draft carries the word Draft whatever the lead
+        # publisher — the ISO-led joint drafts (pubid#597) print it too.
+        should_render_type = id.publisher&.match?(/^(IEEE|AIEE)/) ||
+                             id.is_a?(Identifiers::ProjectDraftIdentifier)
+
+        if should_render_type && !id.typed_stage&.project_status &&
+           ((id.type && !id.type.to_s.strip.empty? && id.type != "P") ||
+            id.is_a?(Identifiers::ProjectDraftIdentifier)) &&
             !id.draft_status.to_s.match?(/unapproved/i)
-          type_str = id.type.dup
+          type_str = id.type ? id.type.dup : "Draft"
           type_str = type_str.sub(/^P/, "") if type_str.start_with?("P")
           # A draft carries the word Draft alone in every face (the C2
           # ruling): Std/Standard never renders on a draft, whatever

data/lib/pubid/iso/identifiers/guide.rb

@@ -89,6 +89,8 @@ module Pubid
         end
 
         def to_s(**opts)
+          return super if opts[:format] && opts[:format] != :human
+
           context = build_rendering_context(nil, format: :human, **opts)
           Pubid::Renderers::GuideRenderer.new(self).render(context:,
                                                            **opts.slice(:with_edition))

data/lib/pubid/iso/supplement_identifier.rb

@@ -54,6 +54,8 @@ module Pubid
       end
 
       def to_s(**opts)
+        return super if opts[:format] && opts[:format] != :human
+
         context = build_rendering_context(nil, format: :human, **opts)
         Pubid::Renderers::SupplementRenderer.new(self).render(context:,
                                                               **opts.slice(:with_edition))

data/lib/pubid/version.rb

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

metadata

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