pubid 2.0.0.pre.alpha.59 → 2.0.0.pre.alpha.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f64146bcb3c4024625550d2628fd26b41532d75e47152bc4b75aae5cc106fd2b
-  data.tar.gz: ecb7b76f593f90bfab3a4aa62b1fcbb16bbfa801d3063349269bab807e0e2a62
+  metadata.gz: c5afd984209314db5f3b13fa48ef4d24e3f90ffb08802b9362fa8e52b66f35af
+  data.tar.gz: 1fe21dc3bebe7cba7606d7b7df25ea2f2c0277b111193e6e260b2ceb922d3a30
 SHA512:
-  metadata.gz: 5ef3dd986568cc780c61bfad05a4c57c9116ea0dfd946e914e92e8a0c3c59fc0ff8bb505bb500e072743dce6183603390528c17bfd6c3dd709aede61a5d78817
-  data.tar.gz: 27cad2287fa638e2ff8b670a9c674d3a6225c8ca2344c4ad34e68dc32f3361c64591fc07cfebf367863e4e24e6e2fc0f4e076aa3a6cf8b1b752f54e7e7a0f86f
+  metadata.gz: 5d3f796d89995bdc9c994fffb5ac713b317c65e1b6ff46c102b4b72ce2ce7078e08ca3ee5471e00c6403b2d18a815df838b420fa124e4229dbe86daee42e9074
+  data.tar.gz: 5ed1785a22c19d5ffe47ca3733380d8e5bdfb37d66d57c0535866b71f4050a5a95c090ac35cc76403eab5aba4cab67568963f8643a4b414141a46d5160539d22

data/lib/pubid/ieee/builder.rb

@@ -1987,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/parser.rb

@@ -1349,6 +1349,26 @@ module Pubid
             Regexp.last_match(0)
           end
         end
+        # The crawl glues the month onto the stage after the code's slash
+        # ("IEEE/IEC/ISO P80005-1/FDIS_March 2012", and its canonical
+        # comma form "… Draft P80005-1/FDIS_March, 2012"): the stage is
+        # the ISO/IEC token and the month belongs to the date (the
+        # 2026-10-25 ruling) — decode onto the D= designator face. Scoped
+        # to a real month name glued to a stage token; stage iteration
+        # ("_CDV/V3", "_CDV July 2015") has its own routes.
+        cleaned = cleaned.gsub(
+          %r{\A((?:IEEE|ISO|IEC)(?:/(?:IEEE|ISO|IEC))*\s+(?:Draft\s+)?P?[A-Z0-9][A-Z0-9.-]*/)(FDIS|FCD|CDV|DIS|CD|WD|PWI|NP)_([A-Za-z]+),?\s+(\d{4})\z}
+        ) do
+          month = ::Pubid::Ieee::Builder::REV_MONTH_NUMBERS[
+            Regexp.last_match(3).capitalize
+          ]
+          if month
+            "#{Regexp.last_match(1)}D=#{Regexp.last_match(2)}-" \
+              "#{Regexp.last_match(4)}#{month}"
+          else
+            Regexp.last_match(0)
+          end
+        end
         # The lettered REV spellings glue to the number ("P1310Rev3",
         # "P1722Rev1") or carry an after-word separator ("REV.ma",
         # "REV-ma"); the rev rules read a space or a bare word

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.59"
+  VERSION = "2.0.0.pre.alpha.61"
 end

metadata

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