pubid 2.0.0.alpha.10 → 2.0.0.pre.alpha.1

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

@@ -7,7 +7,7 @@ module Pubid
       # Examples:
       # - "NBS CIRC 13e2revJune1908" = Circular 13, edition 2, revised June 1908
       # - "NBS CIRC 13" = Circular 13
-      class Circular < Identifier
+      class Circular < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["CIRC", "NBS CIRC"],
@@ -22,8 +22,7 @@ module Pubid
           end
 
           def type
-            { key: :circ,
-            web: :circular, title: "NBS Circular", short: "CIRC" }
+            { key: :circ, title: "NBS Circular", short: "CIRC" }
           end
         end
 
@@ -42,25 +41,14 @@ module Pubid
           super&.to_s || default_publisher
         end
 
-        # Return the stored Code, or a default Code built from series_code when
-        # unset. Must return Components::Code (not a String): the lutaml-model
-        # key-value serializer reads attributes through this public getter, so a
-        # String here breaks to_hash for the Code-typed :series attribute.
         def series
-          super || Components::Code.new(value: series_code)
+          super&.to_s || series_code
         end
 
         # Override to_s for CIRC-specific edition+year rendering
         # CIRC uses dot notation: "NBS CIRC 11e2.1915" instead of "NBS CIRC 11e2-1915"
         def to_s(format = nil)
-          # The rewrite below is `$`-anchored, so it has to run on the PLAIN
-          # string: with the flag set, `super` returns a string ending in
-          # "</span>" and the anchor no longer matches. Render plain, rewrite,
-          # then annotate.
-          annotated = format.is_a?(Hash) ? format[:annotated] : nil
-          format = format[:format] if format.is_a?(Hash)
-
-          result = super(format)
+          result = super
 
           # For CIRC edition patterns with additional_text (year), render with dot notation
           # "11e2-1915" format: edition.id="2", additional_text="1915" → render as "11e2.1915"
@@ -72,7 +60,7 @@ module Pubid
                                  "e#{edition.id || '?'}.#{edition.additional_text}")
           end
 
-          annotate_plain_render(result, annotated: annotated)
+          result
         end
       end
     end

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

@@ -27,8 +27,7 @@ module Pubid
           end
 
           def type
-            { key: :circ_supp,
-            web: :circular_supplement, title: "NBS Circular Supplement", short: "CIRC" }
+            { key: :circ_supp, title: "NBS Circular Supplement", short: "CIRC" }
           end
         end
 
@@ -37,22 +36,13 @@ module Pubid
         attribute :implicit_supplement, :boolean # true for implicit supplements (e.g., "145r11/1925")
 
         def to_s(format = :short)
-          # A caller passing `annotated:` reaches this positional parameter as a
-          # Hash. Normalise it away before `super`, so the annotation is applied
-          # once, here, and covers the date-range branch too — that branch
-          # returns a hand-composed string and never reached `super` at all.
-          annotated = format.is_a?(Hash) ? format[:annotated] : nil
-          format = format[:format] || :short if format.is_a?(Hash)
-
           # Handle date range supplements (no base identifier)
-          result = if supplement_date_range_start && supplement_date_range_end
-                     "NBS CIRC sup#{supplement_date_range_start}-#{supplement_date_range_end}"
-                   else
-                     # Use parent's rendering for base + supplement
-                     super(format)
-                   end
+          if supplement_date_range_start && supplement_date_range_end
+            return "NBS CIRC supp#{supplement_date_range_start}-#{supplement_date_range_end}"
+          end
 
-          annotate_plain_render(result, annotated: annotated)
+          # Use parent's rendering for base + supplement
+          super
         end
       end
     end

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

@@ -9,7 +9,7 @@ module Pubid
       # - "NBS CS 102" - Basic commercial standard
       # - "NBS CS 102E-42" - With letter suffix and number
       # - "CS 190-58" - With year
-      class CommercialStandard < Identifier
+      class CommercialStandard < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["CS", "NBS CS"],
@@ -24,8 +24,7 @@ module Pubid
           end
 
           def type
-            { key: :cs,
-            web: :commercial_standard, title: "Commercial Standard", short: "CS" }
+            { key: :cs, title: "Commercial Standard", short: "CS" }
           end
         end
 

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

@@ -6,7 +6,7 @@ module Pubid
       # NBS Commercial Standard (Emergency) Identifier
       # Format: NBS CS eNNN-YY where NNN is edition number, YY is 2-digit year
       # Example: "NBS CS e104-43" = Commercial Standard Emergency edition 104, year 1943
-      class CommercialStandardEmergency < Identifier
+      class CommercialStandardEmergency < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["CS-E", "NBS CS-E"],
@@ -21,8 +21,7 @@ module Pubid
           end
 
           def type
-            { key: :cse,
-            web: :commercial_standard_emergency, title: "NBS Commercial Standard Emergency",
+            { key: :cse, title: "NBS Commercial Standard Emergency",
               short: "CS-E" }
           end
         end
@@ -31,7 +30,7 @@ module Pubid
           "CS-E"
         end
 
-        public
+        private
 
         def to_short_style
           result = ""
@@ -46,9 +45,8 @@ module Pubid
           # Number (already extracted from e104 → 104 in builder)
           result += " #{number.value}" if number
 
-          # Edition (e1943 for e104-43 pattern) plus any other component the
-          # parser attached (volume, supplement, version, ...).
-          result += append_short_components
+          # Edition (e1943 for e104-43 pattern)
+          result += edition.to_s if edition
 
           result
         end

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

@@ -6,7 +6,7 @@ module Pubid
       # NBS Commercial Standards Monthly Identifier
       # Format: NBS CSM N where N is simple number
       # Example: "NBS CSM 1", "NBS CSM 40"
-      class CommercialStandardsMonthly < Identifier
+      class CommercialStandardsMonthly < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["CSM", "NBS CSM"],
@@ -21,8 +21,7 @@ module Pubid
           end
 
           def type
-            { key: :csm,
-            web: :commercial_standards_monthly, title: "Commercial Standards Monthly", short: "CSM" }
+            { key: :csm, title: "Commercial Standards Monthly", short: "CSM" }
           end
         end
 
@@ -30,23 +29,11 @@ module Pubid
           "NBS"
         end
 
-        # Always the normalized "CSM" code, regardless of the parsed series
-        # (CS vNnN variants are routed here and stored with series "CS", but
-        # must still render/serialize as CSM). Returns a Components::Code (not a
-        # bare String): the lutaml-model key-value serializer reads attributes
-        # through this public getter, so a String breaks to_hash for the
-        # Code-typed :series attribute.
         def series
-          Components::Code.new(value: "CSM")
+          "CSM"
         end
 
-        def to_s(format = nil)
-          # A caller passing `annotated:` reaches this positional parameter as
-          # a Hash — Ruby converts keywords for a method that accepts none.
-          # The same idiom `Identifiers::Base#to_s` uses. This renderer
-          # ignores `format`, so only the flag is read.
-          annotated = format.is_a?(Hash) ? format[:annotated] : nil
-
+        def to_s
           result = "#{publisher} #{series}"
 
           # Proper Volume and Part components
@@ -61,7 +48,7 @@ module Pubid
             result += " #{vol_str}n#{issue_number.number}"
           end
 
-          annotate_plain_render(result, annotated: annotated)
+          result
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Pubid
       # - "NBS CRPL 1-2_3-1" = Reports 1-2 and 3-1 jointly
       # - "NBS CRPL 4-m-5" = Report 4, month m, issue 5
       # - "NBS CRPL c4-4" = Report c4, issue 4
-      class CrplReport < Identifier
+      class CrplReport < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["CRPL", "NBS CRPL", "CRPL-F-B", "CRPL-F-A", "NBS CRPL-F-B",
@@ -24,8 +24,7 @@ module Pubid
           end
 
           def type
-            { key: :crpl,
-            web: :crpl_report, title: "NBS CRPL Report", short: "CRPL" }
+            { key: :crpl, title: "NBS CRPL Report", short: "CRPL" }
           end
         end
 
@@ -84,16 +83,10 @@ module Pubid
           end
 
           # Return new Code object with normalized value
-          Components::Code.new(value: num_value)
+          Components::Code.new(number: num_value)
         end
 
-        def to_s(format = nil)
-          # A caller passing `annotated:` reaches this positional parameter as
-          # a Hash — Ruby converts keywords for a method that accepts none.
-          # The same idiom `Identifiers::Base#to_s` uses. This renderer
-          # ignores `format`, so only the flag is read.
-          annotated = format.is_a?(Hash) ? format[:annotated] : nil
-
+        def to_s
           # Use actual series attribute if it contains subseries (e.g., "CRPL-F-B")
           # Otherwise use default series_code ("CRPL")
           series_to_render = if series&.value&.include?("CRPL-F-")
@@ -124,13 +117,17 @@ module Pubid
             result += " #{num_value}"
           end
 
-          # Append the shared component tail (part, supplement, edition,
-          # index, section, ...) so distinct CRPL reports do not collide.
-          # range_notation is CRPL-specific and always trails the identifier.
-          result += append_short_components
+          # Add part component (pt3-1)
+          result += part.to_s if part
+
+          # Add supplement with "sup" prefix for CRPL identifiers
+          if supplement
+            # Check if supplement already has "sup" prefix (for backward compatibility)
+            result += (supplement.start_with?("sup") ? supplement : "sup#{supplement}")
+          end
 
           result += range_notation if range_notation
-          annotate_plain_render(result, annotated: annotated)
+          result
         end
       end
     end

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

@@ -7,7 +7,7 @@ module Pubid
       # Examples:
       # - "FIPS 140-3" (no NIST prefix)
       # - "NIST FIPS 140-3" (also accepted, normalizes to FIPS 140-3)
-      class FederalInformationProcessingStandards < Identifier
+      class FederalInformationProcessingStandards < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["FIPS", "NIST FIPS"],
@@ -22,8 +22,7 @@ module Pubid
           end
 
           def type
-            { key: :fips,
-            web: :federal_information_processing_standards, title: "Federal Information Processing Standards",
+            { key: :fips, title: "Federal Information Processing Standards",
               short: "FIPS" }
           end
         end
@@ -42,20 +41,21 @@ module Pubid
           # "FIPS.46e1977" (machine-readable with dots, no publisher prefix)
           # Note: edition is appended directly to number without dot for FIPS
           result = series_code
-          result += ".#{number}" if number
 
-          # FIPS uses dash notation for parts; render here and skip the generic
-          # part rendering in the shared tail (which appends volume, edition,
-          # supplement, version, update, etc.).
-          result += "-#{part.value}" if part.is_a?(Components::Part)
-          result += parts.map { |p| "-#{p}" }.join if parts&.any?
+          if number
+            result += ".#{number}"
+            # Append edition directly to number (no dot) for FIPS MR format
+            if edition
+              result += edition.to_s
+            end
+          end
 
-          result += append_mr_components(skip_part: true)
+          result += parts.map { |p| "-#{p}" }.join if parts&.any?
 
           result
         end
 
-        public
+        private
 
         def to_short_style
           # FIPS format: "FIPS 14e1971" or "NIST FIPS 140-3" (preserve publisher if set)
@@ -77,16 +77,15 @@ module Pubid
             end
           end
 
-          # FIPS uses dash notation for parts: -1, -2, -3 (not pt1, pt2, pt3),
-          # so render the part here and skip the generic part rendering in the
-          # shared tail. The tail still appends volume, edition, version,
-          # supplement, update, etc. — components FIPS previously dropped.
+          # FIPS uses dash notation for parts: -1, -2, -3 (not pt1, pt2, pt3)
           if part.is_a?(Components::Part)
             result += "-#{part.value}"
           end
-
-          result += append_short_components(skip_part: true)
-
+          # Render edition for FIPS
+          # FIPS editions use "e" prefix: e1971, e198503, e19770930
+          if edition
+            result += "#{edition.type}#{edition.id}"
+          end
           result
         end
       end

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

@@ -7,7 +7,7 @@ module Pubid
       # Examples:
       # - "NIST GCR 17-917-45" - Basic 3-part number
       # - "NIST GCR 21-917-48v3B" - With volume and letter suffix
-      class GrantContractorReport < Identifier
+      class GrantContractorReport < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["GCR", "NIST GCR"],
@@ -22,8 +22,7 @@ module Pubid
           end
 
           def type
-            { key: :gcr,
-            web: :grant_contractor_report, title: "NIST Grant/Contractor Report", short: "GCR" }
+            { key: :gcr, title: "NIST Grant/Contractor Report", short: "GCR" }
           end
         end
 

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

@@ -7,7 +7,7 @@ module Pubid
       # Examples:
       # - "NIST HB 130" = Handbook 130
       # - "NBS HB 133" = NBS Handbook 133
-      class Handbook < Identifier
+      class Handbook < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["HB", "NIST HB", "NBS HB"],
@@ -22,8 +22,7 @@ module Pubid
           end
 
           def type
-            { key: :hb,
-            web: :handbook, title: "NIST Handbook", short: "HB" }
+            { key: :hb, title: "NIST Handbook", short: "HB" }
           end
         end
 
@@ -34,15 +33,8 @@ module Pubid
         # Override to_s to handle edition+year pattern with dash instead of dot
         # Pattern: "44e2-1955" (dash separator) not "44e2.1955" (dot separator)
         def to_s(format = nil)
-          # The rewrite below is `$`-anchored, so it has to run on the PLAIN
-          # string: with the flag set, `super` returns a string ending in
-          # "</span>" and the anchor no longer matches. Render plain, rewrite,
-          # then annotate.
-          annotated = format.is_a?(Hash) ? format[:annotated] : nil
-          format = format[:format] if format.is_a?(Hash)
-
           # Use the base to_s method first
-          result = super(format)
+          result = super
 
           # If edition has additional_text (year), replace dot with dash
           if edition&.additional_text && !edition.additional_text.empty?
@@ -50,7 +42,7 @@ module Pubid
                                  "#{edition.type}#{edition.id}-#{edition.additional_text}")
           end
 
-          annotate_plain_render(result, annotated: annotated)
+          result
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Pubid
       # - "NIST IR 8115" = Interagency Report 8115
       # - "NIST IR 8115r1" = Interagency Report 8115 revision 1
       # - "NBS IR 73-197" = NBS Interagency Report 73-197
-      class InteragencyReport < Identifier
+      class InteragencyReport < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["IR", "NIST IR", "NBS IR"],
@@ -23,8 +23,7 @@ module Pubid
           end
 
           def type
-            { key: :ir,
-            web: :interagency_report, title: "NIST Interagency Report", short: "IR" }
+            { key: :ir, title: "NIST Interagency Report", short: "IR" }
           end
         end
 
@@ -37,11 +36,6 @@ module Pubid
         # @param format [Symbol, Hash, nil] output format
         # @return [String] formatted identifier
         def to_s(format = nil)
-          # `super` is handed a SYMBOL below, so the base's annotation hook
-          # never sees the flag. Capture it here and wrap what comes back —
-          # exactly once, because the base returned plain text.
-          annotated = format.is_a?(Hash) ? format[:annotated] : nil
-
           # Handle both keyword argument (hash) and positional argument (symbol/string)
           effective_format = if format.is_a?(Hash)
                                format[:format]
@@ -50,13 +44,11 @@ module Pubid
                              end
 
           # If explicit format is specified, use it. Otherwise, default to short.
-          rendered = if effective_format.nil?
-                       super(:short)
-                     else
-                       super(effective_format)
-                     end
-
-          annotate_plain_render(rendered, annotated: annotated)
+          if effective_format.nil?
+            super(:short)
+          else
+            super(effective_format)
+          end
         end
       end
     end

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

@@ -11,7 +11,7 @@ module Pubid
       # - "NBS LC 378sup12/1926" - With supplement date
       # - "NBS LC 378r11/1925" - With revision date
       # - "NBS LC 378(sp)" - With language code
-      class LetterCircular < Identifier
+      class LetterCircular < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["LCIRC"], # Single definition of truth
@@ -26,8 +26,7 @@ module Pubid
           end
 
           def type
-            { key: :lc,
-            web: :letter_circular, title: "Letter Circular", short: "LCIRC" }
+            { key: :lc, title: "Letter Circular", short: "LCIRC" }
           end
         end
 

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

@@ -8,7 +8,7 @@ module Pubid
       # - "NBS MP 39e1" - Edition with "e" notation
       # - "NBS MP 260e1965" - Edition with year as edition ID
       # NOTE: Parenthetical edition format (e.g., "39(1)") does NOT exist for MP identifiers
-      class MiscellaneousPublication < Identifier
+      class MiscellaneousPublication < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["MP", "NBS MP"],
@@ -23,8 +23,7 @@ module Pubid
           end
 
           def type
-            { key: :mp,
-            web: :miscellaneous_publication, title: "Miscellaneous Publication", short: "MP" }
+            { key: :mp, title: "Miscellaneous Publication", short: "MP" }
           end
         end
 
@@ -36,36 +35,28 @@ module Pubid
           "MP"
         end
 
-        # A caller passing `annotated:` reaches this positional parameter as a
-        # Hash — Ruby converts keywords for a method that accepts none. The same
-        # idiom `Identifiers::Base#to_s` uses.
         def to_s(format = :short)
-          annotated = format.is_a?(Hash) ? format[:annotated] : nil
-          format = format[:format] || :short if format.is_a?(Hash)
-
-          rendered = case format
-                     when :mr
-                       to_mr_style
-                     else
-                       to_short_style
-                     end
-
-          annotate_plain_render(rendered, annotated: annotated)
+          case format
+          when :mr
+            to_mr_style
+          else
+            to_short_style
+          end
         end
 
-        public
+        private
 
         def to_short_style
           result = "#{default_publisher} #{series_code}"
           result += " #{number.value}" if number
-          result += append_short_components
+          result += edition.to_s if edition
           result
         end
 
         def to_mr_style
           result = "#{default_publisher}.#{series_code}"
           result += ".#{number.value}" if number
-          result += append_mr_components
+          result += edition.to_s if edition
           result
         end
       end

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

@@ -10,7 +10,7 @@ module Pubid
       # - "NBS MONO 128pt1" - Monograph with part
       # - "NIST MONO 1-1F" - Monograph with letter suffix
       # - "NIST MONO 1-2Bv1" - Monograph with letter suffix and volume
-      class Monograph < Identifier
+      class Monograph < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["MONO", "NBS MONO", "NIST MONO"],
@@ -25,8 +25,7 @@ module Pubid
           end
 
           def type
-            { key: :mono,
-            web: :monograph, title: "Monograph", short: "MONO" }
+            { key: :mono, title: "Monograph", short: "MONO" }
           end
         end
 
@@ -35,11 +34,6 @@ module Pubid
         end
 
         def to_s(format = nil)
-          # `super` is handed a SYMBOL below, so the base's annotation hook
-          # never sees the flag. Capture it here and wrap what comes back —
-          # exactly once, because the base returned plain text.
-          annotated = format.is_a?(Hash) ? format[:annotated] : nil
-
           # Handle both keyword argument (hash) and positional argument (symbol/string)
           effective_format = if format.is_a?(Hash)
                                format[:format]
@@ -48,15 +42,13 @@ module Pubid
                              end
 
           # If explicit format is specified, use it. Otherwise, default to short.
-          rendered = if effective_format.nil?
-                       super(:short)
-                     elsif effective_format == :mr
-                       to_mr_style
-                     else
-                       super(effective_format)
-                     end
-
-          annotate_plain_render(rendered, annotated: annotated)
+          if effective_format.nil?
+            super(:short)
+          elsif effective_format == :mr
+            to_mr_style
+          else
+            super(effective_format)
+          end
         end
 
         private
@@ -67,11 +59,8 @@ module Pubid
           result = (publisher || default_publisher).to_s
           result += ".MN" # MR format uses MN per spec
           result += ".#{number}" if number
-          # Append the shared component tail (part, volume, supplement,
-          # edition, ...) so distinct monographs do not collide. Letter-suffix
-          # variants (e.g. "1-1F") carry the letter inside the compound number
-          # and have no separate Part component, so this does not double them.
-          result += append_mr_components
+          # Part is already included in compound number (e.g., "1-1B")
+          result += "v#{volume}" if volume
           result
         end
       end

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

@@ -8,7 +8,7 @@ module Pubid
       # - "NIST NCSTAR 1-1Cv1" → "NIST NCSTAR 1-1Cv1" (round-trips)
       # - "NIST NCSTAR 1-1b" → "NIST NCSTAR 1-1B" (normalizes letter)
       # - "NIST NCSTAR 1-1cv1" → "NIST NCSTAR 1-1Cv1" (normalizes letter, keeps v1 format)
-      class Ncstar < Identifier
+      class Ncstar < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["NCSTAR", "NIST NCSTAR"],
@@ -34,7 +34,7 @@ module Pubid
 
         # NCSTAR-specific: do NOT expand Cv patterns to ", Volume" format
         # The base class would render "1-1Cv1" as is, which is correct for NCSTAR
-        # No custom rendering needed - just inherit from Identifier
+        # No custom rendering needed - just inherit from Base
       end
     end
   end

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

@@ -8,7 +8,7 @@ module Pubid
       # - "NBS NSRDS 1" - Basic NSRDS
       # - "NSRDS-NBS 1" - With hyphen prefix
       # - "NBS NSRDS 1p1" - With part notation
-      class Nsrds < Identifier
+      class Nsrds < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["NSRDS", "NBS NSRDS"],

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

@@ -6,7 +6,7 @@ module Pubid
       # NIST OWMWP (Office of Weights and Measures Workshop Proceedings)
       # Examples:
       # - "NIST OWMWP 06-13-2018" - Date-based format MM-DD-YYYY
-      class Owmwp < Identifier
+      class Owmwp < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["OWMWP", "NIST OWMWP"],