pubid 2.0.18 → 2.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 185124a260b71738ef7c333b0f9ceb23f867cd3886cece12810ed6420aff7a46
-  data.tar.gz: '081f7312e5c76b76bdd7fc8c61d4a7e5c70c1de4a70f2491c69227f1fa7b8f70'
+  metadata.gz: d2bbeed2065311312a5f62f6315be2f0d29cf03245755bf5a95b741567e08a96
+  data.tar.gz: cd32eefaf7a17f10fae7b4a78055e3f241758e544848d4b1dac239a0d1ff30c1
 SHA512:
-  metadata.gz: 07d685cf60518b38c66d21e65186aa942df8a279536ddf1907edd4bb5fb0eb2b52eb9de627c44994aee7a520d51aeedf05de9f917992c194cfc829883eef587d
-  data.tar.gz: 9c153f3a31750860224084b31802eb65654af9948b9688b5493ca51cb946a18da5601710d3c74b18c7250d1edba33d855020bead796558c087a772ba16a99174
+  metadata.gz: 9b543322085f97459a47b0ccd67541b9ae9106695e4779e4e385294460aa9c702f5247623d19762ee33c37810031c3d97e030d5d67e5859fde2e932b18f0e140
+  data.tar.gz: e147a8e6484951b7a31db7f013942aae7ebad11fe63b321c325fe71d72025e27415dce3cbcfa85f4159f6d2cedf2369da1a77dbce80702708333b7a4c2f62a0a

data/lib/pubid/components/typed_stage.rb

@@ -8,12 +8,7 @@ module Pubid
     # URN render: stage code (RFC 5141-bis: stage-XX.XX format handled by urn_generator).
     class TypedStage < Lutaml::Model::Serializable
       include ::Pubid::SubsetMatch
-
-      # `original_abbr` records the input spelling ("Amd" or "AMD"), not the
-      # stage, so a subset match skips it.
-      def self.subset_ignored_attributes
-        %i[original_abbr]
-      end
+      include ::Pubid::EqualityIgnored
 
       attribute :name, :string
       attribute :code, :string
@@ -25,6 +20,12 @@ module Pubid
       attribute :short_abbr, :string
       attribute :long_abbr, :string
 
+      # `original_abbr` records the input spelling ("Amd.", "AMD", "DAmd"),
+      # not the stage, so `==`, `hash` and `===` skip it (issue #656). It is
+      # not serialized: the parse path keeps the input spelling and
+      # `from_hash` rebuilds the canonical one, and the two ids must be ==.
+      equality_ignored :original_abbr
+
       def to_stage
         Stage.new(
           name: name,

data/lib/pubid/iso/CLAUDE.md

@@ -143,3 +143,18 @@
     (`data/parg/iso.parg`) must move together — the twin is the embedded
     source's provenance copy.
 
+- **`typed_stage.original_abbr` is spelling, so `==` skips it (issue #656).**
+  The parse path stores the input token (`Amd.`, `COR`, `DAmd`, `pDCOR`) and
+  `stage_from_kv` stores the canonical one (`Amd`, `Cor`, `DAM`); the value is
+  not serialized. Before the fix, 90 pass ids (supplements, Directives,
+  Guides, `ISO/NWIP`) were not `==` after `from_hash(to_hash)`, so
+  `#matches?` against an index row returned false with no error. ISO cannot
+  delete the write as JCGM and IEC did, because `detect_stage_format_long`
+  reads it. `Components::TypedStage` now declares
+  `equality_ignored :original_abbr`. Since `to_s` reads the value, two `==`
+  ids may render differently, which the #656 rule allows. Locked by
+  `spec/pubid/iso/typed_stage_round_trip_spec.rb`.
+  **Still open, and not covered by that spec**: 14 pass ids stay unequal for
+  another reason — `DirectivesSupplement#supplement_publisher` is an
+  `Iso::Components::Publisher` after `parse` and a `Pubid::Components::Publisher`
+  after `from_hash` (11 supplements, 3 bundles).

data/lib/pubid/subset_match.rb

@@ -169,9 +169,7 @@ module Pubid
     # Exactness composes rather than flattening: a nested value that
     # includes this module is matched in BOTH directions with its own
     # `===`, so the class that owns it keeps its rule. A plain `==` would
-    # override it — `Components::TypedStage` ignores `original_abbr`
-    # (the input spelling, `Amd` against `AMD`), and CEN/CENELEC declares
-    # `typed_stage` strict.
+    # override it — CEN/CENELEC declares `typed_stage` strict.
     # @return [Boolean]
     def self.exact_match?(mine, theirs)
       return true if blank?(mine) && blank?(theirs)

data/lib/pubid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pubid
-  VERSION = "2.0.18"
+  VERSION = "2.0.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubid
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.0.19
 platform: ruby
 authors:
 - Ribose Inc.