pubid 2.0.0.pre.alpha.41 → 2.0.0.pre.alpha.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b4cbb25ba50fae05ff215becf19f4edfe4b4cdea3d470e0ae1d7447d9e50c9d
-  data.tar.gz: 859a16d7d83590fc3a0ada0d7b0e78d631b3b923d7c85fbdc08bf1f170c78b98
+  metadata.gz: 4c915fac429239e42864c114fd0dca2785ad263d1627c89ee39a6f3c256715e3
+  data.tar.gz: c0be866761e0cd25618b3a64de4b31a3cf411224cf3fa36777d252b62b94c38b
 SHA512:
-  metadata.gz: 7e6c74d29a9cb81d4e3cf829bfb707ce236e8e5f41af17cd5e6ac79ffe2712e7914c50c610be2f4ccb57534dc5ad3c1d087d71bb985500833780e01adf57b7b5
-  data.tar.gz: 3ded5e29bd316cdc19e52e380cc987446c2173c4d428e90084406aa224862e9c66df4c673d86b3f975d8bb6e60dabbb289896d8116ff4d95fc24bc6a8b967d46
+  metadata.gz: 95dd99ebb2fd768ad3722805233f1cfb9ae7787a576fdb02c5848d978340dc4367266065213381335ea5c5149d40489ea2614df075c98354290f3b816ac9f77f
+  data.tar.gz: 2bc35c15d575a6952cf820d7ede48fb0439ccd4bd181a4c9cd5d2a5231c945520363be3d2000676c9ec52b03eece14c3f082ba1625ede01115208e83451f2bf8

data/lib/pubid/bsi/CLAUDE.md

@@ -90,4 +90,4 @@ The general fix (`metanorma__pubid__exclude-recursion-depth` hand-off) promotes
 
 Verified: `spec/pubid/supplement_date_attributes_spec.rb` exercises the mechanism directly; `spec/pubid/bsi/parse_gaps_spec.rb`, `match_primitives_spec.rb` and `adoption_base_spec.rb`, and `spec/pubid/cen_cenelec/relaton_blockers_spec.rb`'s 10 pinned `:supplement_year` cases, all pass unchanged. Because the new logic only fires when `supplement_date_attributes` is non-empty, every other flavor (including ISO/IEC, which deliberately keep a supplement's year in `date` with no protection — see `lib/pubid/cen_cenelec/CLAUDE.md`) is untouched.
 
-**Open question, not resolved here: `#dated_version_of?`/`#draft_of?` on a bare BSI supplement.** Both build on `matches?(other, ignore: [:date, :year, …])`, which — like every other bare `:date`/`:year` exclusion — now protects a supplement's own date unless `:supplement_year` is also passed. Two standalone `BS 7273-4:2015+A1:2021`/`...+A1:2022` objects were `dated_version_of?` each other before this branch (BSI's old `year`-attribute dodge never protected against `exclude(:year)`) and are not after. **Whether that's the right answer is genuinely unclear and deliberately left open pending feedback** — one reading is that this just makes BSI consistent with CEN/CENELEC, which already behaved this way before this branch (its pre-existing per-flavor `#exclude` override had the same protection); the other is that these two generic relational predicates should be widened to accept a `:supplement_year`-aware `ignore` set so they can still recognize two differently-dated editions of the *same supplement* as related. Neither predicate was touched in this branch — this is recorded, not decided. Locked (as current behavior, not as a verdict) by `spec/pubid/supplement_date_attributes_spec.rb`.
+**Open question, not resolved here: `#dated_version_of?`/`#draft_of?` on a bare BSI supplement.** Both compare `exclude(:date, :year[, …])`, which — like every other bare `:date`/`:year` exclusion — now protects a supplement's own date unless `:supplement_year` is also passed. Two standalone `BS 7273-4:2015+A1:2021`/`...+A1:2022` objects were `dated_version_of?` each other before this branch (BSI's old `year`-attribute dodge never protected against `exclude(:year)`) and are not after. **Whether that's the right answer is genuinely unclear and deliberately left open pending feedback** — one reading is that this just makes BSI consistent with CEN/CENELEC, which already behaved this way before this branch (its pre-existing per-flavor `#exclude` override had the same protection); the other is that these two generic relational predicates should be widened to accept a `:supplement_year`-aware exclusion set so they can still recognize two differently-dated editions of the *same supplement* as related. (The predicates switched from `matches?(other, ignore: …)` to the equivalent `exclude(…)` comparison so NIST's asymmetric `#matches?` override no longer breaks them; BSI behavior is unchanged.) Locked (as current behavior, not as a verdict) by `spec/pubid/supplement_date_attributes_spec.rb`.

data/lib/pubid/identifier.rb

@@ -1177,10 +1177,46 @@ module Pubid
 
     # Self and +other+ refer to the same document but differ only in the
     # trailing date / year — the "dated vs undated" reference pattern.
+    # Compares #exclude, not #matches?: NIST overrides #matches? as an
+    # asymmetric wildcard query (and takes no ignore: keyword).
     def dated_version_of?(other)
       return false unless other.is_a?(::Pubid::Identifier)
 
-      matches?(other, ignore: [:date, :year]) && self != other
+      exclude(:date, :year) == other.exclude(:date, :year) && self != other
+    end
+
+    # The attributes that carry a revision marker. Flavors spell it
+    # differently: OGC and IEEE hold a string (+revision+), NIST folds the
+    # lettered revision and its date into an +update+ component.
+    REVISION_ATTRIBUTES = %i[revision update update_component].freeze
+
+    # The revision marker this identifier carries, or nil. See
+    # REVISION_ATTRIBUTES.
+    # @return [String, Components::Update, nil]
+    def revision_marker
+      REVISION_ATTRIBUTES.each do |name|
+        next unless self.class.attributes.key?(name)
+
+        value = public_send(name)
+        return value unless value.nil? || value == ""
+      end
+      nil
+    end
+
+    # Self is a revision of +other+: the same document, where self carries a
+    # revision marker ("OGC 06-121r9", "NBS LC 800 rJun1992") that +other+
+    # lacks or spells differently. A document whose revision is modelled as
+    # an edition is covered by #edition_of? instead.
+    def revision_of?(other)
+      return false unless other.is_a?(::Pubid::Identifier)
+      return false if self == other
+      return false if revision_marker.nil?
+
+      # #exclude, not #matches?: NIST overrides #matches? as an asymmetric
+      # wildcard query (and takes no ignore: keyword), which would compare a
+      # query against a candidate rather than two concrete documents.
+      exclude(*REVISION_ATTRIBUTES) == other.exclude(*REVISION_ATTRIBUTES) &&
+        revision_marker != other.revision_marker
     end
 
     # The document a wrapper stands in front of: a supplement's base, or
@@ -1289,7 +1325,8 @@ module Pubid
 
       root == other.root &&
         self != other &&
-        matches?(other, ignore: [:date, :year, :stage, :typed_stage])
+        exclude(:date, :year, :stage, :typed_stage) ==
+          other.exclude(:date, :year, :stage, :typed_stage)
     end
 
     # Self and +other+ are editions of the same document: the edition-year
@@ -1315,7 +1352,7 @@ module Pubid
     # Any relational predicate holds.
     def related_to?(other)
       %i[supplement_of? has_supplement? dated_version_of? edition_of?
-         sibling_of? includes? draft_of?].any? do |m|
+         revision_of? sibling_of? includes? draft_of?].any? do |m|
         public_send(m, other)
       end
     end

data/lib/pubid/parser/grammar.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "parslet"
-require_relative "../errors"
 
 module Pubid
   module Parser

data/lib/pubid/urn_parser/errors.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../errors"
-
 module Pubid
   module UrnParser
     # Deprecated. The URN error moved to {Pubid::Errors::UrnParseError}, so

data/lib/pubid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubid
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.41
+  version: 2.0.0.pre.alpha.43
 platform: ruby
 authors:
 - Ribose Inc.