pubid 2.0.0.pre.alpha.2 → 2.0.0.pre.alpha.4

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

@@ -22,7 +22,8 @@ module Pubid
           end
 
           def type
-            { key: :circ, title: "NBS Circular", short: "CIRC" }
+            { key: :circ,
+            web: :circular, title: "NBS Circular", short: "CIRC" }
           end
         end
 
@@ -41,8 +42,12 @@ 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&.to_s || series_code
+          super || Components::Code.new(value: series_code)
         end
 
         # Override to_s for CIRC-specific edition+year rendering

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

@@ -27,7 +27,8 @@ module Pubid
           end
 
           def type
-            { key: :circ_supp, title: "NBS Circular Supplement", short: "CIRC" }
+            { key: :circ_supp,
+            web: :circular_supplement, title: "NBS Circular Supplement", short: "CIRC" }
           end
         end
 

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

@@ -24,7 +24,8 @@ module Pubid
           end
 
           def type
-            { key: :cs, title: "Commercial Standard", short: "CS" }
+            { key: :cs,
+            web: :commercial_standard, title: "Commercial Standard", short: "CS" }
           end
         end
 

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

@@ -21,7 +21,8 @@ module Pubid
           end
 
           def type
-            { key: :cse, title: "NBS Commercial Standard Emergency",
+            { key: :cse,
+            web: :commercial_standard_emergency, title: "NBS Commercial Standard Emergency",
               short: "CS-E" }
           end
         end
@@ -30,7 +31,7 @@ module Pubid
           "CS-E"
         end
 
-        private
+        public
 
         def to_short_style
           result = ""
@@ -45,8 +46,9 @@ module Pubid
           # Number (already extracted from e104 → 104 in builder)
           result += " #{number.value}" if number
 
-          # Edition (e1943 for e104-43 pattern)
-          result += edition.to_s if edition
+          # Edition (e1943 for e104-43 pattern) plus any other component the
+          # parser attached (volume, supplement, version, ...).
+          result += append_short_components
 
           result
         end

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

@@ -21,7 +21,8 @@ module Pubid
           end
 
           def type
-            { key: :csm, title: "Commercial Standards Monthly", short: "CSM" }
+            { key: :csm,
+            web: :commercial_standards_monthly, title: "Commercial Standards Monthly", short: "CSM" }
           end
         end
 
@@ -29,11 +30,17 @@ 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
-          "CSM"
+          Components::Code.new(value: "CSM")
         end
 
-        def to_s
+        def to_s(format = nil)
           result = "#{publisher} #{series}"
 
           # Proper Volume and Part components

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

@@ -24,7 +24,8 @@ module Pubid
           end
 
           def type
-            { key: :crpl, title: "NBS CRPL Report", short: "CRPL" }
+            { key: :crpl,
+            web: :crpl_report, title: "NBS CRPL Report", short: "CRPL" }
           end
         end
 
@@ -83,10 +84,10 @@ module Pubid
           end
 
           # Return new Code object with normalized value
-          Components::Code.new(number: num_value)
+          Components::Code.new(value: num_value)
         end
 
-        def to_s
+        def to_s(format = nil)
           # 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-")
@@ -117,11 +118,10 @@ module Pubid
             result += " #{num_value}"
           end
 
-          # Add part component (pt3-1)
-          result += part.to_s if part
-
-          # Add supplement with "sup" prefix for CRPL identifiers
-          result += supplement_short
+          # 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
 
           result += range_notation if range_notation
           result

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Pubid
+  module Nist
+    module Identifiers
+      # NIST date-style identifier with no series.
+      # Examples:
+      # - "NIST 2022-04-15 001" (short) / "NIST.2022-04-15.001" (mr/doi)
+      #   DOI 10.6028/NIST.2022-04-15.001
+      class DatedDocument < Base
+        # Empty so the bare "NIST" abbr never shadows a series lookup; the
+        # Router guard (parsed_hash[:dated_date] && :dated_seq) is the dispatch path.
+        TYPED_STAGES = [].freeze
+
+        attribute :date_year, :string
+        attribute :date_month, :string
+        attribute :date_day, :string
+        attribute :dated_seq, :string
+
+        class << self
+          def typed_stages
+            TYPED_STAGES
+          end
+
+          def type
+            { key: :dated, title: "NIST Dated Document" }
+          end
+        end
+
+        def to_short_style
+          "#{publisher || 'NIST'} #{date_year}-#{date_month}-#{date_day} #{dated_seq}"
+        end
+
+        def to_mr_style
+          "#{publisher || 'NIST'}.#{date_year}-#{date_month}-#{date_day}.#{dated_seq}"
+        end
+
+        # No series/number to expand; non-default formats fall back to short.
+        def to_full_style
+          to_short_style
+        end
+
+        def to_abbreviated_style
+          to_short_style
+        end
+      end
+    end
+  end
+end

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

@@ -22,7 +22,8 @@ module Pubid
           end
 
           def type
-            { key: :fips, title: "Federal Information Processing Standards",
+            { key: :fips,
+            web: :federal_information_processing_standards, title: "Federal Information Processing Standards",
               short: "FIPS" }
           end
         end
@@ -41,21 +42,20 @@ 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
 
-          if number
-            result += ".#{number}"
-            # Append edition directly to number (no dot) for FIPS MR format
-            if edition
-              result += edition.to_s
-            end
-          end
-
+          # 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?
 
+          result += append_mr_components(skip_part: true)
+
           result
         end
 
-        private
+        public
 
         def to_short_style
           # FIPS format: "FIPS 14e1971" or "NIST FIPS 140-3" (preserve publisher if set)
@@ -77,24 +77,15 @@ module Pubid
             end
           end
 
-          # FIPS uses dash notation for parts: -1, -2, -3 (not pt1, pt2, pt3)
+          # 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.
           if part.is_a?(Components::Part)
             result += "-#{part.value}"
           end
-          # Render edition for FIPS
-          # FIPS editions use "e" prefix: e1971, e198503, e19770930
-          if edition
-            result += "#{edition.type}#{edition.id}"
-          end
 
-          # Mirror Base#to_short_style update rendering — FIPS overrides
-          # to_short_style entirely, so update (e.g. /Upd2) would otherwise
-          # be dropped.
-          if update_component
-            result += update_component.to_s(:short)
-          elsif update
-            result += "-upd#{update}"
-          end
+          result += append_short_components(skip_part: true)
 
           result
         end

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

@@ -22,7 +22,8 @@ module Pubid
           end
 
           def type
-            { key: :gcr, title: "NIST Grant/Contractor Report", short: "GCR" }
+            { key: :gcr,
+            web: :grant_contractor_report, title: "NIST Grant/Contractor Report", short: "GCR" }
           end
         end
 

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

@@ -22,7 +22,8 @@ module Pubid
           end
 
           def type
-            { key: :hb, title: "NIST Handbook", short: "HB" }
+            { key: :hb,
+            web: :handbook, title: "NIST Handbook", short: "HB" }
           end
         end
 

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

@@ -23,7 +23,8 @@ module Pubid
           end
 
           def type
-            { key: :ir, title: "NIST Interagency Report", short: "IR" }
+            { key: :ir,
+            web: :interagency_report, title: "NIST Interagency Report", short: "IR" }
           end
         end
 

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

@@ -26,7 +26,8 @@ module Pubid
           end
 
           def type
-            { key: :lc, title: "Letter Circular", short: "LCIRC" }
+            { key: :lc,
+            web: :letter_circular, title: "Letter Circular", short: "LCIRC" }
           end
         end
 

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

@@ -23,7 +23,8 @@ module Pubid
           end
 
           def type
-            { key: :mp, title: "Miscellaneous Publication", short: "MP" }
+            { key: :mp,
+            web: :miscellaneous_publication, title: "Miscellaneous Publication", short: "MP" }
           end
         end
 
@@ -44,19 +45,19 @@ module Pubid
           end
         end
 
-        private
+        public
 
         def to_short_style
           result = "#{default_publisher} #{series_code}"
           result += " #{number.value}" if number
-          result += edition.to_s if edition
+          result += append_short_components
           result
         end
 
         def to_mr_style
           result = "#{default_publisher}.#{series_code}"
           result += ".#{number.value}" if number
-          result += edition.to_s if edition
+          result += append_mr_components
           result
         end
       end

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

@@ -25,7 +25,8 @@ module Pubid
           end
 
           def type
-            { key: :mono, title: "Monograph", short: "MONO" }
+            { key: :mono,
+            web: :monograph, title: "Monograph", short: "MONO" }
           end
         end
 
@@ -59,8 +60,11 @@ module Pubid
           result = (publisher || default_publisher).to_s
           result += ".MN" # MR format uses MN per spec
           result += ".#{number}" if number
-          # Part is already included in compound number (e.g., "1-1B")
-          result += "v#{volume}" if volume
+          # 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
           result
         end
       end

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

@@ -26,7 +26,8 @@ module Pubid
           end
 
           def type
-            { key: :rpt, title: "NBS Report", short: "RPT" }
+            { key: :rpt,
+            web: :report, title: "NBS Report", short: "RPT" }
           end
         end
 
@@ -52,13 +53,14 @@ module Pubid
         def to_short_style
           result = "#{default_publisher} #{series_code}"
           result += " #{number}" if number
-          result += supplement_short
+          result += append_short_components
           result
         end
 
         def to_mr_style
           result = "#{default_publisher}.#{series_code}"
           result += ".#{number}" if number
+          result += append_mr_components
           result
         end
       end

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

@@ -23,7 +23,8 @@ module Pubid
           end
 
           def type
-            { key: :sp, title: "NIST Special Publication", short: "SP" }
+            { key: :sp,
+            web: :special_publication, title: "NIST Special Publication", short: "SP" }
           end
         end
 

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

@@ -22,7 +22,8 @@ module Pubid
           end
 
           def type
-            { key: :tn, title: "NIST Technical Note", short: "TN" }
+            { key: :tn,
+            web: :technical_note, title: "NIST Technical Note", short: "TN" }
           end
         end
 
@@ -66,7 +67,7 @@ module Pubid
           super
         end
 
-        private
+        public
 
         def to_short_style
           # Call parent implementation

data/lib/pubid/nist/identifiers.rb

@@ -12,6 +12,7 @@ module Pubid
       autoload :CommercialStandardsMonthly,
                "#{__dir__}/identifiers/commercial_standards_monthly"
       autoload :CrplReport, "#{__dir__}/identifiers/crpl_report"
+      autoload :DatedDocument, "#{__dir__}/identifiers/dated_document"
       autoload :FederalInformationProcessingStandards,
                "#{__dir__}/identifiers/federal_information_processing_standards"
       autoload :GrantContractorReport,