pubid 2.0.0.pre.alpha.57 → 2.0.0.pre.alpha.59

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] ||
@@ -1151,6 +1157,13 @@ module Pubid
           return Identifiers::Standard.new(**printed_attrs.compact)
         end
 
+        # The designation route ("IEEE P24748-4/D=FDIS") has no
+        # publishers group and no parsed publisher slot; IEEE is the
+        # sole publisher of the D= designator face, and the elections
+        # below read the builder-local slots.
+        attributes[:publisher] ||= "IEEE"
+        attributes[:copublisher] ||= []
+
         # The re-parse of the pubid#203 designator render ("IEEE
         # P15026.2/D=FDIS-201008") captures the stage and the verbatim
         # date token (":2020", "-201008") with no publisher slot; the
@@ -1182,9 +1195,12 @@ module Pubid
           if parsed[:iso_stage_iteration]
             stage_abbr += extract_value(parsed[:iso_stage_iteration])
           end
+          # The designation route ("IEEE P24748-4/D=FDIS") carries no
+          # publishers group, so the builder-local copublisher is nil on
+          # it — the empty test must admit nil as none.
           bare_ieee_project = parsed[:project_marker] &&
                               attributes[:publisher] == "IEEE" &&
-                              attributes[:copublisher] == []
+                              (attributes[:copublisher] || []).empty?
           if bare_ieee_project && parsed[:draft_stage_year].nil?
             # pubid#203: a bare-IEEE project row carrying an ISO stage is
             # an IEEE draft of joint ISO/IEC work ("IEEE FDIS P15026.2,
@@ -1262,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..]
@@ -1517,9 +1540,13 @@ module Pubid
           if pub_data[:copublishers]
             copubs = pub_data[:copublishers]
             copubs = [copubs] unless copubs.is_a?(Array)
+            # A capture may carry its own separators ("/IEC/ISO" — a
+            # joint token glued to the leading slash); the copublisher
+            # collection renders join("/"), so entries hold bare orgs.
             attributes[:copublisher] = copubs.filter_map do |cp|
               extract_value(cp[:copublisher])
-            end
+            end.flat_map { |c| c.to_s.sub(%r{\A/}, "").split("/") }
+                   .reject(&:empty?)
           end
         elsif parsed[:publisher]
           attributes[:publisher] = extract_value(parsed[:publisher])
@@ -2008,7 +2035,14 @@ module Pubid
             end
           end
         else
-          version = extract_value(draft_data)
+          # A degraded wire leaf carries the whole draft clause verbatim
+          # ("/D2.1.1" — the three-segment designator the engine cannot
+          # structure): Draft.parse is the inverse of Draft#to_s, so it
+          # strips the prefix instead of double-appending it.
+          draft = Components::Draft.parse(extract_value(draft_data).to_s)
+          attributes[:draft_obj] = draft
+          attributes[:draft] = draft.to_s
+          return
         end
 
         # A stage-token draft's month rides the D= designator zero-padded

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

@@ -169,7 +169,12 @@ day: nil, iso_stage: nil, iso_iteration: nil)
         end
 
         def to_s
-          result = "/D#{version}"
+          # A version that already opens with a designator word ("ED4",
+          # the IEC edition-draft ordinal; an ISO/IEC stage token such
+          # 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 += "=#{iso_stage}" if iso_stage
           result += ".#{iso_iteration}" if iso_stage && iso_iteration
           result += if revision.to_s.start_with?(".")

data/lib/pubid/ieee/identifiers/base.rb

@@ -120,13 +120,13 @@ module Pubid
         # Handle draft as component object
         if args[:draft_obj]
           self.draft_obj = args[:draft_obj]
-          self.draft = args[:draft_obj].to_s
+          self.draft = args[:draft_obj].to_s.sub(%r{\A/}, "")
         elsif args[:draft].is_a?(String)
           self.draft_obj = Components::Draft.parse(args[:draft])
-          self.draft = draft_obj.to_s
+          self.draft = draft_obj.to_s.sub(%r{\A/}, "")
         elsif args[:draft]
           self.draft_obj = args[:draft]
-          self.draft = args[:draft].to_s
+          self.draft = args[:draft].to_s.sub(%r{\A/}, "")
         end
 
         # Set other attributes.
@@ -150,9 +150,11 @@ module Pubid
             public_send(setter, value)
           end
         end
+
       end
 
-      # Override accessors to return component objects.
+            # Override accessors to return component objects.
+
       def code
         code_obj
       end
@@ -231,7 +233,23 @@ module Pubid
       # no expansion (Draft.parse accepts the slashless form).
       def self.from_hash(data, options = {})
         data = Compaction.expand(Compaction.deep_dup(data)) if data.is_a?(::Hash)
-        super
+        identifier = super
+        # == compares the raw ivars: a rebuild whose lazy readers have not
+        # run carries @code_obj/@draft_obj nil while a parse has them set,
+        # so the objects compare unequal although their serialized hashes
+        # agree (pubid#596). Materialize the runtime components eagerly.
+        identifier.materialize_runtime_components
+        identifier
+      end
+
+      # Rebuild the runtime components from the wire strings. Safe on every
+      # construction path: the readers' ||= no-ops when already set, and the
+      # CodeNumber rebuild covers the split-column rows that carry no code
+      # string.
+      def materialize_runtime_components
+        code_obj
+        draft_obj
+        self
       end
 
       # Register the identifier classes the automatic `Identifiers::*` scan

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.57
+  version: 2.0.0.pre.alpha.59
 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