pubid 2.0.0.pre.alpha.26 → 2.0.0.pre.alpha.28

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

@@ -438,32 +438,42 @@ module Pubid
       end
 
       def to_full_style
-        # "National Institute of Standards and Technology Special Publication 800-27, Revision A"
+        # "National Institute of Standards and Technology Special
+        # Publication 1000 Part 1 Supplement 3 Section 2 Index Update 5
+        # (2021)(en)" - the edition renders its own long form ("Revision
+        # 5" / "(2021)"), never the derived revision view alongside it
         result = publisher_full_name
         result += " #{series_full_name}" if series
         result += " #{number}" if number
         result += parts.map { |p| "-#{p}" }.join if parts&.any?
 
-        # Render volume and issue number in long form: "Vol. 6, No. 12"
+        # The 1.x corpus order: stage, volume, part, revision, version,
+        # supplement, section, update; an edition date trails as the
+        # parenthesised date before the translation
+        result += " #{stage.to_s(:long)}" if stage
+
+        # Volume and issue number in long form: "Volume 6, No. 12" - the
+        # component's own v-notation must not leak into the worded form
         if volume && issue_number
-          result += " Vol. #{volume}, #{issue_number.to_s(:long)}"
+          result += " Volume #{volume.value}, #{issue_number.to_s(:long)}"
         elsif volume
-          result += " Vol. #{volume}"
+          result += " Volume #{volume.value}"
         end
 
-        # NEW: Use edition component properly
-        result += " #{edition.to_s(:long)}" if edition
-
-        result += ", Revision #{revision.sub(/^r/, '')}" if revision
-
-        # V2: Use version_component
+        result += " Part #{part.value}" if part
+        result += " #{edition.to_s(:long)}" if edition && !edition_year?
+        # A revision riding on a date edition composes at the revision
+        # slot ("... Part 2, Revision 3 ... (2001)")
+        if edition&.additional_text.to_s =~ /\Ar(\d+)\z/
+          result += " Revision #{Regexp.last_match[1]}"
+        end
         result += " #{version_component.to_s(:long)}" if version_component
-
-        # V2: Use update_component
+        result += " #{supplement.to_s(:long)}" if supplement
+        result += " Section #{section}" if section
+        result += " Index" if index
         result += " #{update_component.to_s(:long)}" if update_component
 
-        # V2: Use stage
-        result += " #{stage.to_s(:long)}" if stage
+        result += " #{edition.to_s(:long)}" if edition && edition_year?
 
         # V2: Use translation_component (already includes space)
         result += translation_component.to_s(:long) if translation_component
@@ -478,10 +488,9 @@ module Pubid
         result += " #{number}" if number
         result += " Part #{parts.first}" if parts&.any?
 
-        # NEW: Use edition component properly
-        result += " #{edition.to_s(:abbrev)}" if edition
-
-        result += ", Revision #{revision}" if revision
+        # The edition renders its own form ("Revision 5" / "(2021)");
+        # the derived revision view never renders alongside it
+        result += " #{edition.to_s(:long)}" if edition
 
         # V2: Use version_component
         result += " #{version_component.to_s(:abbrev)}" if version_component
@@ -565,7 +574,8 @@ module Pubid
 
         # Volume and Part components (v6n1 notation for CSM, pt1 for SP)
         if volume.is_a?(Components::Volume) && effective_part.is_a?(Components::Part)
-          # CSM series: v#n# notation
+          # the volume keeps its leading space before the part
+          # ("535 v1pt1"), the corpus form (testsuite 10491/10492)
           result += " #{volume}#{effective_part}"
         elsif effective_part.is_a?(Components::Part)
           # SP and other series: use Part.type to determine format
@@ -578,6 +588,11 @@ module Pubid
           # Render volume and issue number in short form: "v6n12"
           vol_str = volume.is_a?(Components::Volume) ? volume.to_s : "v#{volume}"
           result += "#{vol_str}n#{issue_number.number}"
+        elsif issue_number
+          # A standalone issue renders its own short form (pubid#497 -
+          # the metanorma-nist port passes the index here; n4 must not
+          # silently drop).
+          result += issue_number.to_s(:short)
         end
 
         # Use edition component properly (e2, e2021, r5, -3)
@@ -615,9 +630,12 @@ module Pubid
 
         # Add other attributes
         result += errata.to_s if errata
-        result += "index" if index
         result += "insert" if insert
+        # The 1.x order is section before index ("sup3sec2indx"); the index
+        # spelling is the abbreviated indx (pubid#497) — the full "index"
+        # input spelling canonicalizes onto it.
         result += "sec#{section}" if section
+        result += "indx" if index
         result += "app" if appendix
 
         # Add addendum - render as " Add." suffix
@@ -694,6 +712,9 @@ module Pubid
         elsif volume && issue_number
           vol_str = volume.is_a?(Components::Volume) ? volume.to_s : "v#{volume}"
           result += "#{vol_str}n#{issue_number.number}"
+        elsif issue_number
+          # A standalone issue renders its own short form (pubid#497)
+          result += issue_number.to_s(:mr)
         end
 
         # With a number, the edition glues to it per the NIST spec
@@ -727,19 +748,31 @@ module Pubid
           result += ".Add."
         end
 
+        # Section and index travel with the identifier in MR form too
+        # (pubid#497 - sec<N> / indx must not drop)
+        result += ".sec#{section}" if section
+        result += ".indx" if index
+
         # Use translation_component
         result += translation_component.to_s(:mr) if translation_component
 
         result
       end
 
+      # An e-type edition whose id is a date (year or full date)
+      # composes as the trailing parenthesised date
+      def edition_year?
+        edition&.type == "e" && edition.id.to_s =~ /\A\d{4}(\d{2}(\d{2})?)?\z/
+      end
+
       def series_full_name
         {
           "SP" => "Special Publication",
-          "FIPS" => "Federal Information Processing Standards",
+          "FIPS" => "Federal Information Processing Standards Publication",
           "IR" => "Interagency Report",
           "TN" => "Technical Note",
-        }[series] || series
+          "CSWP" => "Cybersecurity White Papers",
+        }[series.to_s] || series.to_s
       end
 
       def series_abbreviated_name

data/lib/pubid/nist/parser.rb

@@ -142,6 +142,7 @@ module Pubid
           # Match suffixes
           str("ec") |
           str("ndex") |
+          str("ndx") |
           str("nsert") |
           str("rrata") |
           str("raft") | # NEW: Exclude "draft" from number suffix matching

data/lib/pubid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.26
+  version: 2.0.0.pre.alpha.28
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-04 00:00:00.000000000 Z
+date: 2026-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -652,6 +652,7 @@ files:
 - lib/pubid/ieee/ire/builder.rb
 - lib/pubid/ieee/ire/identifier.rb
 - lib/pubid/ieee/ire/parser.rb
+- lib/pubid/ieee/long_renderer.rb
 - lib/pubid/ieee/nesc.rb
 - lib/pubid/ieee/nesc/builder.rb
 - lib/pubid/ieee/nesc/parser.rb