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

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

@@ -11,7 +11,7 @@ module Pubid
       # - "NBS RPT ADHOC" - Ad hoc report
       # - "NBS RPT div9" - Division report
       # - "NBS RPT 4817-A" - Report with letter suffix
-      class Report < Identifier
+      class Report < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["RPT", "NBS RPT"],
@@ -26,8 +26,7 @@ module Pubid
           end
 
           def type
-            { key: :rpt,
-            web: :report, title: "NBS Report", short: "RPT" }
+            { key: :rpt, title: "NBS Report", short: "RPT" }
           end
         end
 
@@ -39,21 +38,13 @@ module Pubid
           "RPT"
         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
 
         private
@@ -61,14 +52,14 @@ module Pubid
         def to_short_style
           result = "#{default_publisher} #{series_code}"
           result += " #{number}" if number
-          result += append_short_components
+          result += "sup#{supplement}" if supplement && !supplement.empty?
+          result += "sup" if supplement == ""
           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

@@ -8,16 +8,7 @@ module Pubid
       # - "NIST SP 800-53" = Special Publication 800-53
       # - "NIST SP 800-53r5" = Special Publication 800-53 revision 5
       # - "NIST SP 800-57pt1r4" = Special Publication 800-57 part 1 revision 4
-      class SpecialPublication < Identifier
-        # Per Appendix A.2 of the NIST PubID Syntax (April 2022), the SP series
-        # is subdivided into named subseries. The subseries number is the
-        # leading token of a report-num like "800-53" or "1190GB-12". The
-        # Builder exposes this as `identifier.subseries` so callers can query
-        # which subseries a document belongs to.
-        SP_SUBSERIES = %w[
-          250 260 300 400 480 500 700 800 823 960 1190GB 1200 1500 1800 1900 2000 2100
-        ].freeze
-
+      class SpecialPublication < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["SP", "NIST SP", "NBS SP"], # Compound series
@@ -32,8 +23,7 @@ module Pubid
           end
 
           def type
-            { key: :sp,
-            web: :special_publication, title: "NIST Special Publication", short: "SP" }
+            { key: :sp, title: "NIST Special Publication", short: "SP" }
           end
         end
 

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

@@ -7,7 +7,7 @@ module Pubid
       # Examples:
       # - "NIST TN 1234" = Technical Note 1234
       # - "NBS TN 567" = NBS Technical Note 567
-      class TechnicalNote < Identifier
+      class TechnicalNote < Base
         TYPED_STAGES = [
           Pubid::Components::TypedStage.new(
             abbr: ["TN", "NIST TN", "NBS TN"],
@@ -22,8 +22,7 @@ module Pubid
           end
 
           def type
-            { key: :tn,
-            web: :technical_note, title: "NIST Technical Note", short: "TN" }
+            { key: :tn, title: "NIST Technical Note", short: "TN" }
           end
         end
 
@@ -67,7 +66,7 @@ module Pubid
           super
         end
 
-        public
+        private
 
         def to_short_style
           # Call parent implementation

data/lib/pubid/nist/identifiers.rb

@@ -3,6 +3,7 @@
 module Pubid
   module Nist
     module Identifiers
+      autoload :Base, "#{__dir__}/identifiers/base"
       autoload :Circular, "#{__dir__}/identifiers/circular"
       autoload :CircularSupplement, "#{__dir__}/identifiers/circular_supplement"
       autoload :CommercialStandard, "#{__dir__}/identifiers/commercial_standard"
@@ -11,7 +12,6 @@ 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,