pubid 2.0.0.pre.alpha.29 → 2.0.0.pre.alpha.30

data/lib/pubid/ieee/builder.rb

@@ -5,6 +5,17 @@ module Pubid
     # Builder class for constructing IEEE identifier scheme from parsed data
     # Single Responsibility: Transform parsed data into identifier objects
     class Builder
+      # The month_name vocabulary the REV date embed canonicalizes numeric
+      # (the parg rule's exact spellings, dots already stripped).
+      REV_MONTH_NUMBERS = {
+        "January" => "01", "February" => "02", "March" => "03",
+        "April" => "04", "May" => "05", "June" => "06", "July" => "07",
+        "August" => "08", "September" => "09", "Sept" => "09",
+        "October" => "10", "November" => "11", "December" => "12",
+        "Jan" => "01", "Feb" => "02", "Mar" => "03", "Apr" => "04",
+        "Jun" => "06", "Jul" => "07", "Aug" => "08", "Sep" => "09",
+        "Oct" => "10", "Nov" => "11", "Dec" => "12",
+      }.freeze
       attr_accessor :original_input
       attr_reader :identifier_class
 
@@ -287,6 +298,24 @@ module Pubid
         end
         dash = parsed_hash[:dash_year] ? parsed_hash : nil
         dash ||= drafts.find { |d| d.is_a?(Hash) && d[:dash_year] }
+        if dash.nil? && parsed_hash[:draft]
+          # A numeric month trailing a draft is the draft's own date: it
+          # embeds in the designator ("D09, 04 2011" -> "D09-2011-04")
+          # rather than printing the long-format comma face (a month name
+          # keeps the comma, "D7.2, Nov 2006") — pubid ruling 2026-10-13.
+          m = parsed_hash[:month] || parsed_hash[:trailing_month]
+          y = parsed_hash[:year] || parsed_hash[:trailing_year]
+          if m.to_s.match?(/\A\d{1,2}\z/) && y
+            host = drafts.find { |d| d.is_a?(Hash) && d[:draft_version] }
+            if host
+              host[:draft_version] = [host[:draft_version], y, m].compact.join("-")
+              parsed_hash.delete(:month)
+              parsed_hash.delete(:year)
+              parsed_hash.delete(:trailing_month)
+              parsed_hash.delete(:trailing_year)
+            end
+          end
+        end
         if dash && parsed_hash[:year].nil?
           joined = drafts.filter_map { |d| d.is_a?(Hash) ? d[:draft_version] : nil }
                          .map { |v| v.is_a?(Hash) ? v[:value] : v.to_s }.join
@@ -297,6 +326,15 @@ module Pubid
           dash_led = joined.start_with?("-")
           if bare_joint_draft && dash_led
             parsed_hash[:part] = { value: dash[:dash_year] }
+          elsif dash[:dash_month] &&
+                (host = drafts.find { |d| d.is_a?(Hash) && d[:draft_version] })
+            # The draft's own numeric date embeds in the designator
+            # ("D2-2015-04") — the "D2, 04 2015" comma spelling
+            # normalizes onto it (pubid ruling 2026-10-13).
+            host[:draft_version] =
+              [joined, dash[:dash_year], dash[:dash_month]].compact.join("-")
+            dash.delete(:dash_year)
+            dash.delete(:dash_month)
           elsif dash[:dash_month] || dash_led
             parsed_hash[:year] = dash[:dash_year]
             parsed_hash[:month] = dash[:dash_month]
@@ -307,9 +345,16 @@ module Pubid
             # draft version misses the D-registry), no separate year.
             host = drafts.find { |d| d.is_a?(Hash) && d[:draft_version] }
             if host
-              host[:draft_version] = "#{joined}-#{dash[:dash_year]}"
+              # The draft's own numeric date embeds in the designator
+              # ("D9-2006", and with its month "D2-2015-04") — the
+              # "D2, 04 2015" comma spelling normalizes onto it.
+              host[:draft_version] =
+                [joined, dash[:dash_year], dash[:dash_month]].compact.join("-")
               dash.delete(:dash_year)
               dash.delete(:dash_month)
+              # the hyphenated "/D-2-2007" spelling's year the spine
+              # captured at top level is the draft's own — vacate it
+              parsed_hash.delete(:year) if parsed_hash[:year] == dash[:dash_year]
             else
               parsed_hash[:year] = dash[:dash_year]
               parsed_hash[:month] = dash[:dash_month]
@@ -1548,6 +1593,8 @@ module Pubid
         # Optional attributes (excluding part/subpart since they're in code)
         extract_optional(parsed, attributes, :edition)
         extract_optional(parsed, attributes, :revision)
+        extract_optional(parsed, attributes, :rev_sep)
+        attributes[:rev_bare] = true if parsed[:rev_bare]
 
         # Month/day - always extract if present (but not if already extracted from year)
         unless attributes[:edition_month]
@@ -1663,8 +1710,9 @@ module Pubid
 
             if version
               # relaton's hyphenated "/D-2" spelling captures the dash inside
-              # draft_version; the stage registry keys on "D2".
-              draft_abbr = "D#{version.to_s.sub(/\A-/, "")}"
+              # draft_version; the stage registry keys on "D2". A date-embedded
+              # version ("3-2017-07") keys on its leading ordinal.
+              draft_abbr = "D#{version.to_s.sub(/\A-/, "").sub(/-\d{4}(-\d{2})?\z/, "")}"
               # Check if this specific draft stage is in registry
               stage = Pubid::Ieee.locate_stage(draft_abbr)
               return draft_abbr if stage&.abbr&.include?(draft_abbr)
@@ -1804,6 +1852,18 @@ module Pubid
           year = extract_value(draft_data[:year]) if draft_data[:year]
           day = extract_value(draft_data[:day]) if draft_data[:day]
 
+          # A REV-carrying draft embeds its print date into the designator
+          # with the month canonicalized numeric (pubid ruling 2026-10-14):
+          # "P802.11-REVmc/D8.0, Aug 2016" renders ".../D8.0-2016-08".
+          # Drafts without a REV keep the comma face.
+          if (attributes[:revision] || attributes[:rev_bare]) && month && year
+            number = REV_MONTH_NUMBERS[month.to_s.delete(".")]
+            if number && version
+              version = "#{version}-#{year}-#{number}"
+              month = year = day = nil
+            end
+          end
+
           # Detect comma before month and space before draft by checking the original input
           if original_input
             if month

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

@@ -36,6 +36,12 @@ module Pubid
       # "Rev<id>". `::Pubid::Identifier` has no `revision` attribute, so this is
       # free of the number/stage multi-flavor collision landmine.
       attribute :revision, :string
+      # The lettered revision's printed separator ("P802.11-REVmc" keeps its
+      # dash; a glued "REVi" stays glued) and the bare-word marker (no id
+      # after "Rev" — "802.1AR-Rev/D2.2" keeps "Rev"). pubid ruling
+      # 2026-10-14.
+      attribute :rev_sep, :string
+      attribute :rev_bare, :boolean
       attribute :edition, :string                         # Edition 1.0
       attribute :month, :string
       # Provenance flag (pubid#517): the month arrived glued to the identity
@@ -216,7 +222,7 @@ module Pubid
       # (renderer.rb's `"Edition #{edition} #{year}-#{edition_month}"`),
       # which survived even though its sibling `year` is already stripped.
       def self.all_parts_edition_keys
-        super + %i[revision reaffirmed edition_month]
+        super + %i[revision rev_sep rev_bare reaffirmed edition_month]
       end
 
       # Inverse of the to_hash compaction: expand a scalar `stage` back into the

data/lib/pubid/ieee/renderer.rb

@@ -201,8 +201,12 @@ module Pubid
 
           # Append the numbered/lettered revision inline, in IEEE's native
           # position — right after the code number and before the draft
-          # ("P802.16Rev2/D3"). Keeps a revision distinct from its base standard.
-          result += "Rev#{id.revision}" if id.revision
+          # ("P802.16Rev2/D3"). Keeps a revision distinct from its base
+          # standard. The lettered id keeps its printed separator
+          # ("P802.11-REVmc" renders "P802.11-Revmc"); the bare word with
+          # no id still prints "Rev" (pubid ruling 2026-10-14).
+          result += "#{id.rev_sep}Rev#{id.revision}" if id.revision
+          result += "#{id.rev_sep}Rev" if id.rev_bare
 
           # Append draft to code - with or without space based on original
           # format. An exactly-IEC/IEEE co-published reference prints only the

data/lib/pubid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.29
+  version: 2.0.0.pre.alpha.30
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-12 00:00:00.000000000 Z
+date: 2026-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -484,6 +484,8 @@ files:
 - lib/pubid/evs/builder.rb
 - lib/pubid/evs/identifier.rb
 - lib/pubid/evs/identifiers.rb
+- lib/pubid/evs/identifiers/estonian_standard.rb
+- lib/pubid/evs/identifiers/international_adoption.rb
 - lib/pubid/evs/identifiers/national_adoption.rb
 - lib/pubid/evs/parser.rb
 - lib/pubid/evs/renderer.rb