pubid 2.0.0.alpha.10 → 2.0.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: facbee8180c6ede119bb1b64a7b093042c2796a2284fe8ad5f94f7e3a2ac2883
-  data.tar.gz: 4f6c85a812219cab5f8f0e8b1d476551f062ff1dfa4c3b2edf9495964ddfddbb
+  metadata.gz: e650437c35c0d8e6ba019b07ae835ca224bd620415bd9c9d27c20a36a1b82589
+  data.tar.gz: 3d8d15f420d6cff7dbba69007218d670cde06511fc00df7b7dcfd957493600cb
 SHA512:
-  metadata.gz: 26536df235c241698783ecd1cba744adaa486f9c71ed8fd6e15fa45aaad0d8fea8eb4a5d84e5fed7a934287aa70cfba6f2f14a1a207d53801a8d9227925f6a8e
-  data.tar.gz: 19bf310a9550e104bbe6c29dc563aa5e2ace16d7141aec2357e4976e8ac0d4e129fcbfcda9b47ab32961b2a03b44798506b44be97da432d4ed04ad68b31f0ef8
+  metadata.gz: f231838d92fd52c9d8fb298899a6f62018c29872d0d67104ea064ea70ea5cd4e115490876e2e83ba9601da87aeb9060d9f28e34535d0495ca680bc93ad6801ec
+  data.tar.gz: de691a34d6783e9df75f4304315d6791eb30e68b7788177f8e04285aa8f88372e38ce9754527eb8479db0926ef9276ddef7c6fae1ede170380541459c150a823

data/README.adoc

@@ -1,15 +1,54 @@
 = PubID: Interoperable identifiers for information resources
 
-image:https://img.shields.io/gem/v/pubid.svg["pubid Gem Version", link="https://rubygems.org/gems/pubid"]
+image:https://img.shields.io/gem/v/pubid-core.svg["pubid-core Gem Version", link="https://rubygems.org/gems/pubid-core"]
 image:https://github.com/metanorma/pubid/actions/workflows/rake.yml/badge.svg["Build Status", link="https://github.com/metanorma/pubid/actions/workflows/rake.yml"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/pubid.svg["Pull Requests", link="https://github.com/metanorma/pubid/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/pubid/latest.svg["Commits since latest",link="https://github.com/metanorma/pubid/releases"]
 
+== Badges
+
+[cols="3*", options="header"]
+|===
+| Core & Meta | Standards Organizations | Regional Standards
+
+| pubid image:https://img.shields.io/gem/v/pubid.svg["pubid", link="https://rubygems.org/gems/pubid"]
+| pubid-iso image:https://img.shields.io/gem/v/pubid-iso.svg["pubid-iso", link="https://rubygems.org/gems/pubid-iso"]
+| pubid-cen image:https://img.shields.io/gem/v/pubid-cen.svg["pubid-cen", link="https://rubygems.org/gems/pubid-cen"]
+
+| pubid-core image:https://img.shields.io/gem/v/pubid-core.svg["pubid-core", link="https://rubygems.org/gems/pubid-core"]
+| pubid-iec image:https://img.shields.io/gem/v/pubid-iec.svg["pubid-iec", link="https://rubygems.org/gems/pubid-iec"]
+| pubid-bsi image:https://img.shields.io/gem/v/pubid-bsi.svg["pubid-bsi", link="https://rubygems.org/gems/pubid-bsi"]
+
+|
+| pubid-ieee image:https://img.shields.io/gem/v/pubid-ieee.svg["pubid-ieee", link="https://rubygems.org/gems/pubid-ieee"]
+| pubid-jis image:https://img.shields.io/gem/v/pubid-jis.svg["pubid-jis", link="https://rubygems.org/gems/pubid-jis"]
+
+|
+| pubid-nist image:https://img.shields.io/gem/v/pubid-nist.svg["pubid-nist", link="https://rubygems.org/gems/pubid-nist"]
+|
+
+|
+| pubid-etsi image:https://img.shields.io/gem/v/pubid-etsi.svg["pubid-etsi", link="https://rubygems.org/gems/pubid-etsi"]
+|
+
+|
+| pubid-itu image:https://img.shields.io/gem/v/pubid-itu.svg["pubid-itu", link="https://rubygems.org/gems/pubid-itu"]
+|
+
+|
+| pubid-ccsds image:https://img.shields.io/gem/v/pubid-ccsds.svg["pubid-ccsds", link="https://rubygems.org/gems/pubid-ccsds"]
+|
+
+|
+| pubid-plateau image:https://img.shields.io/gem/v/pubid-plateau.svg["pubid-plateau", link="https://rubygems.org/gems/pubid-plateau"]
+|
+|===
+
 == Quick Start
 
 [source,ruby]
 ----
-gem install pubid
+gem install pubid-core
 
 require 'pubid/iso'
 
@@ -253,46 +292,6 @@ base.root.equal?(base) # => true
 * ✅ **Works with supplements** - Traverses supplement chains correctly
 
 
-== Flavor Prefix Routing
-
-Every flavor exposes a static `prefixes` method returning the *leading
-identifier prefix tokens* it recognizes — the tokens a printed identifier can
-start with such that the string belongs to that SDO. This is the routing key a
-consumer (such as relaton) uses to dispatch a reference string to the right
-backend, without parsing.
-
-[source,ruby]
-----
-require 'pubid'
-
-Pubid::Iso.prefixes
-# => ["ISO", "ISO/IEC", "IEC/ISO", "ISO/IEC/IEEE"]
-
-Pubid::Bsi.prefixes
-# => ["BS", "BSI", "DD", "PD", "PAS", "NA", "TS", "HB", ... , "BS EN ISO"]
-
-# Look up a single flavor by name
-Pubid.prefixes(:iec)
-# => ["IEC", "CISPR", "IECEE", "IECEx", "IECQ", "ISO/IEC", "IEC/ISO", "ISO/IEC/IEEE"]
-
-# Reverse index: prefix token => owning flavor(s)
-Pubid.prefix_flavors["ISO/IEC"]       # => [:iec, :iso]
-Pubid.prefix_flavors["ISO/IEC/IEEE"]  # => [:iec, :ieee, :iso]
-Pubid.prefix_flavors["DD"]            # => [:bsi]
-----
-
-**Semantics** (see `Pubid::PrefixesSupport` for the full contract):
-
-* **Static** — no identifier string is parsed; callable at startup.
-* **Uniform** — every registered flavor returns a plain `Array<String>`.
-* **Symmetric joints** — a co-published prefix is listed by every co-publisher
-  (`"ISO/IEC"` is in both `Pubid::Iso.prefixes` and `Pubid::Iec.prefixes`).
-* **Inclusion** — publisher prefixes (`ISO`, `NIST`, `BS`…) and leading
-  series/type tokens that can *begin* a reference (BSI `DD`/`PD`, NIST `FIPS`).
-* **Exclusion** — pure sub-series that never lead a reference and
-  dangerously-ambiguous single letters (e.g. BSI aerospace `A`/`B`/`C`).
-
-
 == Advanced Rendering Styles
 
 ISO and IEC identifiers support multiple abbreviation forms for supplements to maintain round-trip fidelity with different official formats.
@@ -639,13 +638,15 @@ lib/tasks/export.rake                # Rake tasks: export:website_data, export:a
 
 == Repository
 
-This repository provides the single `pubid` Ruby gem, which implements the PubID
+This repository is a monorepo for the PubID Ruby gems, which implement the PubID
 identifier data model and its various components.
 
-The `pubid` gem implements identifiers from multiple standards organizations,
-making it easier for developers to work with them in their applications. All 22+
-supported flavors (ISO, IEC, NIST, IEEE, …) live under `lib/pubid/{flavor}/` and
-ship together in the one gem.
+The PubID Ruby gems implement identifiers from multiple standards organizations,
+making it easier for developers to work with them in their applications.
+
+This repository contains all the `pubid-*` gems consolidated into a single
+monorepo for easier development and maintenance while preserving individual gem
+releases.
 
 == Structure
 
@@ -670,11 +671,11 @@ The repository is organized as follows:
 ├── spec/                   # Tests
 │   ├── pubid/              # Per-flavor tests
 │   ├── fixtures/           # Bulk test fixtures
-│   └── integration/        # Cross-flavor integration tests
+│   └── integration/        # Cross-gem tests
 ├── docs/                   # Documentation
 ├── .github/workflows/      # CI/CD workflows
 ├── Gemfile                 # Root Gemfile for development
-├── Rakefile               # Test, lint, build, and release tasks
+├── Rakefile               # Monorepo management tasks
 ├── .rubocop.yml           # Shared RuboCop configuration
 └── LICENSE.txt            # Shared license
 ----
@@ -1728,13 +1729,9 @@ The V2 implementation strictly follows these design principles:
 
 Object-Oriented Design:: Single Responsibility, Open/Closed, Liskov Substitution, Interface Segregation, Dependency Inversion
 MECE Organization:: Mutually Exclusive (no overlap), Collectively Exhaustive (full coverage), clear boundaries
-Separation of Concerns:: Parser handles syntax only, Builder handles transformation only, Renderer handles formatting only
-Self-Describing Types:: Each identifier class IS the type definition — no central registry required for type metadata
-Renderer Pattern:: Dedicated per-flavor Renderer classes handle human-readable output; identifier `to_s` delegates to `render(format: :human)` via `FormatRegistry`
-Single Source of Truth:: Series matching, type metadata, and rendering logic live in exactly one place per concern
+Separation of Concerns:: Parser handles syntax only, Builder handles transformation only, Identifier handles rendering only
 Extensibility:: Use inheritance and polymorphism, plugin/registry architecture, avoid hardcoding
 Test Quality:: Each class has dedicated spec file, no lowering pass thresholds, test actual behavior
-Autoload Everywhere:: Ruby autoload replaces `require_relative` for internal library code — lazy loading, no circular dependency risk
 
 === Pre-parser Normalization (update_codes.yaml)
 

data/data/iec/update_codes.yaml

@@ -1,7 +1,4 @@
 IECEx TRF 60079-11v3-4:2002: IECEx TRF 60079-11v4C:2002
-# IECEE TRF data-source anomaly: the OD-010-1 ampersand separator (&) was
-# mistyped as a semicolon (;) in IEC's source data. See pubid/pubid#239.
-IECEE TRF 60335-2-4;7F:2012: IECEE TRF 60335-2-4&7F:2012
 IECEE TRF cispr 15N:2022: IECEE TRF CISPR 15N:2022
 IECEE TRF cispr 15M:2021: IECEE TRF CISPR 15M:2021
 IECEE TRF cispr 15L:2020: IECEE TRF CISPR 15L:2020

data/data/ieee/update_codes.yaml

@@ -1,9 +1,4 @@
 IEEE Unapproved Draft Std PC37.110/D911Oct 07: IEEE Unapproved Draft Std PC37.110/D711, Oct 07
-# Issue #206: "IEEE Unapproved Draft Std P15289, 06" — the ", 06" suffix
-# has no clear meaning in IEEE's own grammar. Treating it as a draft
-# iteration number (D6) gives a parseable form. Conservative targeted
-# normalization rather than a general rule; revisit if more cases surface.
-IEEE Unapproved Draft Std P15289, 06: IEEE Unapproved Draft Std P15289/D6
 IEEE C57.139/D14June 2010: IEEE C57.139/D14, June 2010
 IEEE P1653.5/D7d1 November, 2019: IEEE P1653.5/D7.1 November, 2019
 IEEE P1017/D062012: P1017/D062012, Jun 2012
@@ -37,13 +32,7 @@ ISO/IEC/IEEE P26515 FDIS, May 2018: ISO/IEC/IEEE FDIS P26515, May 2018
 IEEE Std Std 1139-2008: IEEE Std 1139-2008
 IEC/IEEE P60214-2, FDIS 2018: IEC/IEEE FDIS P60214-2-2018(E)
 IEC/IEEE P62582-6, FDIS 2018: IEC/IEEE FDIS P62582-6-2018(E)
-# ISO/IEC DIS P26511.2 (May 2017) is an IEEE-style citation of an ISO/IEC
-# DIS draft — ".2" is a draft version, not a part, so the prior mapping
-# to "ISO/IEC DIS P26511-2" produced a phantom document that doesn't exist
-# (ISO/IEC 26511 has no part 2). The ISO parser doesn't yet support the
-# IEEE-style "P" prefix or the ", Month Year" date suffix on ISO/IEC DIS
-# citations, so normalize to the bare DIS base + year. See pubid/pubid#212.
-ISO/IEC DIS P26511.2, May 2017: ISO/IEC DIS 26511.2:2017
+ISO/IEC DIS P26511.2, May 2017: ISO/IEC DIS P26511-2, May 2017
 ISO/IEC/IEEE P90003_FDIS, August 2018: ISO/IEC/IEEE FDIS P90003, August 2018
 ISO/IEC/IEEE P29119-1/FDIS, September 2021: ISO/IEC/IEEE FDIS P29119-1, September 2021
 ISO/IEC/IEEE/ P12207-2/D3_FDIS, July 2020: ISO/IEC/IEEE FDIS P12207-2/D3, July 2020
@@ -113,98 +102,3 @@ IEEE Unapproved Draft Std P1635/ASHRAE 21_D4, Jan 2010: IEEE Unapproved Draft St
 IEC/IEEE 62582-1:2011 Edition 1.0 2011-08: IEC/IEEE 62582-1-2011 Edition 1.0 2011-08
 ISO/IEC/IEEE CD P26513/D1, August 2015: ISO/IEC/IEEE P26513/D1, August 2015
 /C37.0I0d-1984/: C37.010d-1984
-
-# --- month spellings pubid rejects -> canonical (relaton-ieee normtitles) ---
-# Surgical, case-sensitive: only forms the grammar genuinely REJECTS. Do NOT
-# add full-name->abbr rules (pubid accepts "June"/"September") or a blanket
-# underscore rule — a broader ruleset regressed 12 already-parsing normtitles.
-# Validated over relaton's 8,767 normtitles: +33 gained, 0 regressions.
-# 4-letter abbreviation
-/\bSept\b/: Sep
-# OCR typos seen in the IEEE rawbib feed
-/\bFeburary\b/: Feb
-/\bNovemer\b/: Nov
-/\bOctobor\b/: Oct
-/\bJanurary\b/: Jan
-# lowercase-only month words -> proper case (case-sensitive: leaves correct case alone)
-/\bjanuary\b/: January
-/\bfebruary\b/: February
-/\bmarch\b/: March
-/\bapril\b/: April
-/\bjune\b/: June
-/\bjuly\b/: July
-/\baugust\b/: August
-/\bseptember\b/: September
-/\boctober\b/: October
-/\bnovember\b/: November
-/\bdecember\b/: December
-
-# --- one-off IEEE normtitles migrated from relaton-ieee RawbibIdParser ---
-# Exact-match, anchored (plain keys compile to /^…$/), zero-regression: each
-# maps a specific malformed catalog string to relaton's canonical id, which
-# pubid parses losslessly. (hand-off: ieee-update-codes-oneoffs.) Group 1
-# parses on its own; the "dotted-draft" group relies on the verbatim-draft fix.
-"IEEE Std P1073.1.3.4/D3.0": "IEEE Std P11073.00101"
-"IEEE P802.1Qbu/03.0, July 2015": "IEEE P802.1Qbu/D-3.0-2015"
-"IEEE P802.11aqTM/013.0 October 2017": "IEEE P802.11aqTM/D-13.0-2017"
-"IEC/IEEE P62271-37-013:2015 D13.4": "IEC/IEEE P62271.37-013/D-13.4-2015"
-"ISO/IEC/IEEE DIS P42020:201x(E), June 2017": "ISO/IEC/IEEE DIS P42020-2017-06"
-"ISO/IEC/IEEE DIS P16326/201x, December 2018": "ISO/IEC/IEEE DIS P16326-2018-12"
-"ISO/IEC/IEEE/P21839, 2019(E)": "ISO/IEC/IEEE P21839-2019"
-"ISO/IEC/IEEE CD2 P12207-2: 201x(E), February 2019": "ISO/IEC/IEEE CD2 P12207.2-2019-02"
-"ISO/IEC/IEEE P42010.WD4:2019(E)": "ISO/IEC/IEEE P42010/D-4-2019"
-"IEC/IEEE P63195_CDV/V3, February 2020": "IEC/IEEE CDV P63195-2020-02"
-"ISO/IEC/IEEE/P16085_DIS, March 2020": "ISO/IEC/IEEE DIS P16085-2020-03"
-"ANSI/IEEE Std: Outdoor Apparatus Bushings": "ANSI/IEEE Std 21-1976-11"
-"Draft National Electrical Safety Code, January 2016": "IEEE PC2-2016-01"
-"International Standard ISO/IEC 8802-9: 1996(E) ANSI/IEEE Std 802.9, 1996 Edition": "ISO/IEC/IEEE Std 802.9-1996"
-"ISO/IEC13210: 1994 (E) ANSI/IEEE Std 1003.3-1991": "ISO/IEC/IEEE 13210-1994"
-"J-STD-016-1995": "IEEE 016-1995"
-"Nuclear EQ Sourcebook and Supplement": "IEEE 7438946"
-"PC37.30.2/D043 Rev 18, May 2015": "IEEE PC37.30-2/D-043/R-18-2015"
-"IEEE/IEC P62582 CD2 proposal, May 2017": "IEEE/IEC CD2 P62582-2017-05"
-"ISO/IEC/IEEE P16326:201x WD.4a, July 2017": "ISO/IEC/IEEE P16326/D-4a-2017-07"
-"ISO/IEC/IEEE CD.1 P21839, October 2017": "ISO/IEC/IEEE CD1 P21839-2017-10"
-"ISO/IEC/IEEE P16326:201x WD5, December 2017": "ISO/IEC/IEEE P16326/D-5-2017-12"
-"IEEE/ISO/IEC P42010.CD1-V1.0, April 2020": "IEEE/ISO/IEC CD1 P42010-2020-04"
-"Unapproved Draft Std ISO/IEC FDIS 15288:2007(E) IEEE P15288/D3,": "ISO/IEC/IEEE FDIS Std P15288/D-3-2007"
-"IS0/IEC/IEEE 8802-11:2012/Amd.5:2015(E) (Adoption of IEEE Std 802.11af-2014)": "ISO/IEC/IEEE 802.11/Amd5-2012"
-# `/D-` corrupted IEEE draft docids — malformed draft designations emitted by
-# relaton-ieee's RawbibIdParser fallback rendering (the `/D-`, `_CDV_`, `.pdf`,
-# `201x`, stray dots/spaces). Each maps to a canonical parseable form that
-# retains number/part/draft/stage/date in the hash (the relaton index-v2 gate
-# is the hash round-trip + non-empty root.number, not `to_s == input`).
-# Interim measure; the durable fix is upstream in RawbibIdParser. See
-# HANDOFFS/metanorma__pubid__ieee-update-codes-dashD-drafts.md.
-# --- 8 pre-verified ---
-"IEEE Approved Std P1609.3/D-23.pdf-2007-02": "IEEE Approved Std P1609.3/D23, 02 2007"
-"IEEE P3004.5/D-6.2.": "IEEE P3004.5/D6.2"
-"IEEE P730/D-0.16.-2025": "IEEE P730/D0.16-2025"
-"IEEE PC37.107/D-4.-2023-11": "IEEE PC37.107/D4, 11 2023"
-"IEEE PC37.113/D-8.0.-2015-08": "IEEE PC37.113/D8.0, 08 2015"
-"IEEE PC37.98/D-5.1D-2013": "IEEE PC37.98/D5.1D-2013"
-"IEEE PC57.637/D-6.2.-2014-03": "IEEE PC57.637/D6.2, 03 2014"
-"IEEE Std P650/D-9.-2006": "IEEE Std P650/D9-2006"
-# --- 21 derived (revision markers dropped, corrigendum reordered, joint
-#     stage+draft repositions year onto number with stage moved front) ---
-"IEC/IEEE P63198.2775/D-6.1_CDV_March-2022": "IEC/IEEE CDV P63198.2775/D6.1, March 2022"
-"IEEE 3.Rev.B/D-4.0-2023-01": "IEEE P3/D4.0, 01 2023"
-"IEEE 3.Rev.B/D-5.0-2023-03": "IEEE P3/D5.0, 03 2023"
-"IEEE P1003.1/D-5/Cor1-201x-2012-04": "IEEE P1003.1/Cor 1/D5, 04 2012"
-"IEEE P1003.1/D-5/Cor1-201x-2012-08": "IEEE P1003.1/Cor 1/D5, 08 2012"
-"IEEE P1127/D-4.1_July-2023": "IEEE P1127/D4.1, July 2023"
-"IEEE P2660_1/D-2-2020-06": "IEEE P2660.1/D2, 06 2020"
-"IEEE P802.1AE/D-1.0/R-/Cor1": "IEEE P802.1AE/Cor 1/D1.0"
-"IEEE P802.1AE_Rev/D-1.2-2018": "IEEE P802.1AE/D1.2-2018"
-"IEEE P802.1AE_Rev/D-1.3-2018": "IEEE P802.1AE/D1.3-2018"
-"IEEE Unapproved Std P802.16Rev2/D-9-2009-01": "IEEE Unapproved Std P802.16Rev2/D9-2009"
-"IEEE Unapproved Std P802.1X_REV/D-4.5-2009": "IEEE Unapproved Std P802.1X/D4.5-2009"
-"IEEE Unapproved Std PC37.91/D-8-2007-20": "IEEE Unapproved Std PC37.91/D8-2007"
-"IEEEE P1243/D-3-2023-02": "IEEE P1243/D3, 02 2023"
-"ISO/IEC/IEEE FDIS P15289./E-3/D-2-2016": "ISO/IEC/IEEE FDIS P15289-2016/D2"
-"ISO/IEC/IEEE P24641/D-2_CD-2020": "ISO/IEC/IEEE CD P24641-2020/D2"
-"ISO/IEC/IEEE P24641/D-3_CD2": "ISO/IEC/IEEE CD2 P24641/D3"
-"ISO/IEC/IEEE P24748.3/D-3_FDIS-2020": "ISO/IEC/IEEE FDIS P24748.3-2020/D3"
-"ISO/IEC/IEEE/ P12207.2/D-3_FDIS-2020": "ISO/IEC/IEEE FDIS P12207.2-2020/D3"
-"ISO/IEC/IEEE/ P24748.3/D-IS-2019": "ISO/IEC/IEEE DIS P24748.3-2019"
-"P1635/D10/ASHARE 21/D-10-2016": "IEEE P1635/D10-2016"

data/data/nist/update_codes.yaml

@@ -1,40 +1,7 @@
-# NIST pre-parser normalization rules.
-#
-# This file is applied to every NIST identifier string BEFORE any Ruby
-# preprocessing (see lib/pubid/nist/preprocessor.rb). Each entry is one
-# of:
-#
-#   "plain string": "replacement"
-#       Full-line match (^...$), literal. Use for specific malformed IDs
-#       that have a single canonical form.
-#
-#   "/regex/": "replacement"          (no flags)
-#   "/regex/imx": "replacement"       (i = IGNORECASE, m = MULTILINE,
-#                                       x = EXTENDED)
-#       Applied via gsub. Use for general patterns that are pure
-#       string→string substitutions.
-#
-# Design split (MECE):
-#   - This file: data-driven lookups and pure subs that any maintainer
-#     (including non-Rubyists) can extend safely.
-#   - Preprocessor (Ruby): stateful or interdependent transformations
-#     where stage order, conditional logic, or external state (e.g.,
-#     Roman numeral conversion, year-range reverts) make YAML unsuitable.
-#
-# Reorder entries with care — later entries often match patterns produced
-# by earlier ones. Run `bundle exec rspec spec/pubid/nist/` after edits.
 NBS MN: NBS MONO
 NIST MN: NIST MONO
-# Long-form series names — normalize to the abbreviated form the parser expects.
-/\bMonograph\b/: MONO
-# Citation-form comma before long parameter prefixes — strip so the parser's
-# " Rev. " / " Part. " / " Vol. " prefix rules match (issue #197).
-'/,\s+(Rev\.|Part\.|Vol\.|Revision|Volume|Part)(?=\s|\d)/': ' \1'
 NIST MP: NBS MP
 NIST SP 260-162 2006ed.: NIST SP 260-162e2006
-# Doubled publisher+series prefix — an error in the NIST Tech Pubs source data
-# (pubid/pubid#152). Collapse the repeated "NIST AI" so the remainder parses.
-NIST AI NIST AI 100-2e2023 ipd: NIST AI 100-2e2023 ipd
 NBS CIRC 154suprev: NBS CIRC 154r1sup
 NBS CIRC supJun1925-Jun1926: NBS CIRC 24e7sup2
 NBS CIRC supJun1925-Jun1927: NBS CIRC 24e7sup3
@@ -59,9 +26,7 @@ NIST.CSWP.01162020pt: NIST.CSWP.01162020(por)
 FIPS PUB: FIPS
 NBS CRPL c4-4: NBS CRPL 4-4
 NIST AMS 300-8r1 (February 2021 update): NIST AMS 300-8r1/Upd1-202102
-NIST AMS 300-8r1/upd: NIST AMS 300-8r1/Upd1-202102
 NIST IR 8115r1-upd: NIST IR 8115r1/Upd1-202103
-NIST IR 8170-upd: NIST IR 8170/Upd1-202003
 NIST TN 2150-upd: NIST TN 2150/Upd1-202102
 NBS IR 73-197r: NBS IR 73-197r1
 NBS.HB.105-1r1990: NIST.HB.105-1r1990

data/lib/pubid/amca/builder.rb

@@ -3,17 +3,17 @@
 module Pubid
   module Amca
     # Builder class for constructing ACMA identifier scheme from parsed data
-    # Single Responsibility: Transform parsed data into identifier objects
+    # Single Responsibility: Transform parsed data into Scheme objects
     class Builder
       attr_reader :identifier_class
 
-      def initialize(identifier_class = Identifier)
+      def initialize(identifier_class = Identifiers::Base)
         @identifier_class = identifier_class
       end
 
       # Build a scheme object from parsed data
       # @param parsed [Hash, Array] the parsed identifier data
-      # @return [identifier] the constructed scheme object
+      # @return [Scheme] the constructed scheme object
       def build(parsed)
         # Parslet can return array of hashes - merge them
         parsed_hash = parsed.is_a?(Array) ? merge_parsed_array(parsed) : parsed
@@ -46,7 +46,7 @@ module Pubid
 
       # Class method to build an identifier from parsed data
       # @param parsed [Hash, Array] the parsed identifier data
-      # @return [Identifier] the constructed identifier object
+      # @return [Identifiers::Base] the constructed identifier object
       def self.build(parsed)
         new.build(parsed)
       end
@@ -78,7 +78,7 @@ module Pubid
         if parsed[:code_with_year]
           code_year_data = parsed[:code_with_year]
           if code_year_data && code_year_data[:code]
-            attributes[:number] =
+            attributes[:code] =
               extract_value(code_year_data[:code])
           end
           if code_year_data && code_year_data[:year]
@@ -86,7 +86,7 @@ module Pubid
               extract_value(code_year_data[:year])
           end
         elsif parsed[:code]
-          attributes[:number] = extract_value(parsed[:code])
+          attributes[:code] = extract_value(parsed[:code])
         end
 
         # Extract year if not already extracted from code_with_year

data/lib/pubid/amca/identifier.rb

@@ -1,4 +1,18 @@
 # frozen_string_literal: true
 
-# Pubid::Amca::Identifier is the AMCA base class (a real Pubid::Identifier
-# subclass); its body and `.parse` live in identifiers/base.rb. This file just ensures it is loaded.
+module Pubid
+  module Amca
+    module Identifier
+      # Parse an ACMA identifier string into an identifier object
+      # @param identifier [String] The ACMA identifier string to parse
+      # @return [Pubid::Amca::Identifier] The appropriate identifier object
+      # @raise [Parslet::ParseFailed] If parsing fails
+      def self.parse(identifier)
+        parsed = Parser.parse(identifier)
+        Builder.build(parsed)
+      rescue Parslet::ParseFailed => e
+        raise "Failed to parse ACMA identifier '#{identifier}': #{e.message}"
+      end
+    end
+  end
+end

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

@@ -2,90 +2,62 @@
 
 module Pubid
   module Amca
-    # Base identifier class for AMCA identifiers. Canonical name
-    # Pubid::Amca::Identifier; common
-    # functionality for all AMCA identifier types.
-    class Identifier < ::Pubid::Identifier
-      # @raise [Pubid::Errors::ParseError] If parsing fails
-      def self.parse(identifier)
-        unless identifier.is_a?(String)
-          raise Pubid::Errors::InvalidInputError,
-                Pubid::INPUT_NOT_A_STRING_MESSAGE
+    module Identifiers
+      # Base identifier class for ACMA identifiers
+      # Single Responsibility: Common functionality for all ACMA identifier types
+      class Base < Pubid::Identifier
+        # Override base_hash to handle AMCA-specific copublisher format (string, not array)
+        def base_hash
+          hash = super
+          # AMCA's copublisher is a string, not an array, so remove it from copublishers
+          hash.delete(:copublishers) if hash[:copublishers]
+          hash
         end
 
-        if identifier.length > Pubid::MAX_INPUT_LENGTH
-          raise Pubid::Errors::InvalidInputError, Pubid::INPUT_TOO_LONG_MESSAGE
+        attribute :copublisher, :string
+        attribute :code, Components::Code
+        attribute :year, Components::Date
+        attribute :suffix, :string
+        attribute :reaffirmed, :string
+
+        # AMCA uses a fixed publisher string
+        def publisher
+          "AMCA"
         end
 
-        parsed = Parser.parse(identifier)
-        Builder.build(parsed)
-      end
+        # Render the identifier as a string
+        def to_s
+          parts = []
+          parts << copublisher if copublisher
+          # type is a hash, get the title
+          t = self.class.attributes.key?(:type) ? type : nil
+          if t.is_a?(Hash) && t[:title]
+            parts << t[:title].to_s
+          end
+          parts << code.to_s
+          parts << "-#{year}" if year
 
-      # Stored as a plain string (always "AMCA") so it round-trips through
-      # to_hash/from_hash. Was a `def publisher` method, which made lutaml
-      # serialize a String against the Components::Publisher attribute and raise.
-      attribute :publisher, :string, default: -> { "AMCA" }
-      attribute :copublisher, :string
-      # The document number used to live in AMCA's own `code` attribute, leaving
-      # the `number` inherited from ::Pubid::Identifier nil — so relaton-index,
-      # which sorts and bsearches on `id.root.number.to_s`, keyed every AMCA row
-      # on "". `code` is gone; each LEAF now declares `attribute :number,
-      # :string` (see standard.rb / publication.rb / interpretation.rb).
-      #
-      # It is declared on the leaves, never here: this class is inherited by all
-      # three of them, and redefining the parent's Components::Code-typed
-      # `number` on an inherited-from class resolves nondeterministically under
-      # multi-flavor load. Do not reintroduce `code`, and do not move `number`
-      # up here.
-      #
-      # A bare 2-digit edition year ("21", "02"). Declared :string, not
-      # Components::Date: the builder assigns a String and lutaml does not cast
-      # it, so a Date declaration left the PARSE path holding a String while
-      # from_hash produced a Components::Date — making
-      # `parse(x) == from_hash(parse(x).to_hash)` false for every AMCA id and
-      # breaking #matches?, which is built on ==. to_hash and to_s agreed, so
-      # the relaton index gate never caught it.
-      attribute :year, :string
-      attribute :suffix, :string
-      attribute :reaffirmed, :string
+          result = parts.compact.join(" ")
 
-      # Explicit key_value mapping: only these keys serialize (the inherited
-      # Pubid::Identifier attributes — including :type, which subclasses expose
-      # as a class-metadata Hash via `self.type` — are intentionally dropped).
-      # Every mapped attribute is a plain scalar, so no custom converters are
-      # needed; the canonical to_hash already drops empty and default values.
-      key_value do
-        map "_type", to: :_type
-        map "publisher", to: :publisher
-        map "copublisher", to: :copublisher
-        map "number", to: :number
-        map "year", to: :year
-        map "suffix", to: :suffix
-        map "reaffirmed", to: :reaffirmed
-      end
+          # Handle additional copublisher after year (e.g., /ASHRAE 51-16)
+          if copublisher&.include?("/") && year
+            type_title = t.is_a?(Hash) ? t[:title].to_s : ""
+            result = "#{copublisher} #{type_title} #{code}-#{year}"
+          end
 
-      def to_urn
-        UrnGenerator.new(self).generate
-      end
+          result += " (#{reaffirmed})" if reaffirmed
 
-      # AMCA models its document type as class metadata (`self.type`), not as a
-      # `typed_stage`, so the base `mr_type` hook found nothing. Without it an
-      # interpretation and the standard it interprets share a slug — and
-      # `to_slug` is an output FILENAME. Before the index columns landed the
-      # whole flavor collapsed onto two slugs ("amca" and "").
-      def mr_type
-        return nil unless self.class.respond_to?(:type)
+          result
+        end
 
-        self.class.type[:key]&.to_s
-      end
+        def self.parse(string)
+          Amca::Identifier.parse(string)
+        end
 
-      # AMCA keeps the edition in its own `year` string, not in the inherited
-      # `date`, so the base `mr_year` hook read nil and two editions of one
-      # standard — "ANSI/AMCA 300-14" and "ANSI/AMCA Standard 300-24" —
-      # produced the same slug. Same shape as the BIPM year recorded in
-      # CLAUDE.md.
-      def mr_year
-        year&.to_s
+        def to_urn
+          require_relative "../urn_generator"
+          UrnGenerator.new(self).generate
+        end
       end
     end
   end

data/lib/pubid/amca/identifiers/interpretation.rb

@@ -8,29 +8,42 @@ module Pubid
       # - AMCA 99 JW Interp
       # - AMCA 204 – 1
       # - ANSI/AMCA 204 Interp
-      class Interpretation < Identifier
-        attribute :number, :string
+      class Interpretation < Base
+        attr_reader :interpretation_code
 
-        # See Publication: the hand-written keyword initializer bypassed lutaml,
-        # costing this class its `_type`, its `publisher` default and the
-        # serialization of `interpretation_code`.
-        attribute :interpretation_code, :string
+        def initialize(code:, year: nil, copublisher: nil, suffix: nil,
+reaffirmed: nil, interpretation_code: nil)
+          @code = Components::Code.new(value: code.to_s)
+          @year = Components::Date.new(year: year.to_s) if year
+          @copublisher = copublisher
+          @suffix = suffix
+          @reaffirmed = reaffirmed
+          @interpretation_code = interpretation_code
+        end
 
-        key_value do
-          map "interpretation_code", to: :interpretation_code
+        def self.type
+          { key: :interpretation, title: "Interpretation", short: "Interp" }
         end
 
-        # The interpretation letter is what distinguishes one interpretation of
-        # a standard from another ("AMCA 99 JW Interp" vs "AMCA 99 KB Interp" —
-        # different documents, and #== agrees). It is in `==` and in `to_s`, so
-        # it must reach the slug too, or three interpretations of standard 99
-        # share one filename.
-        def mr_number_with_part
-          mr_join(super, interpretation_code&.to_s&.downcase)
+        def type
+          Interpretation.type
         end
 
-        def self.type
-          { key: :interpretation, title: "Interpretation", short: "Interp" }
+        # @return [String] the rendered interpretation identifier
+        def to_s
+          parts = []
+          parts << @copublisher if @copublisher
+          parts << @code.to_s
+
+          if @interpretation_code
+            parts << "– #{@interpretation_code}"
+          elsif @year
+            parts << "-#{@year}"
+          end
+
+          parts << " #{@suffix}" if @suffix
+
+          parts.join(" ").squeeze(" ")
         end
       end
     end