pubid-nist 0.2.3 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7f76d8947ccd706282e78b94eb9c4284671b866acc1630c08a1fdd398dbd73e
-  data.tar.gz: 01dfd5d1e8afbe479916a906566406f2d3a7d8d3235053a86be6d0cf1c09de5c
+  metadata.gz: effbdd3a2d023969c91461079bcb6b2ac8fc24d1260a7655cdacaf50858a6084
+  data.tar.gz: '07885e3191c545d7f5796c5ad431094af88a4334fa12b3f97357c8dbebc71d6f'
 SHA512:
-  metadata.gz: 051144f72ccff63f56b875f2bb843750b14b86d3b9014f27ecd15cfd61e084052df6ae44be931a2c9b7a7e63dee3e03a927e4c6123cf6ff3727cb134fcb43340
-  data.tar.gz: 7b26bc1e82271f82286079bda318834594dc93eca2ef6e3569109e2323d47c06708404aed1f1dd02aead5a1d03d60efe14d900556696976945fa4778fd2a032a
+  metadata.gz: f5612165d60141ecccaf5c757f5cf30a8eb7d9dd4c62855d44d4a67489b7ff32216fdc81baa5f8d17fd8b5a58bfe38602421083a0ac23e36f2cc7bda62bb5206
+  data.tar.gz: d5b169cb694230dbb1d9667a6c38d7b7b0a900dac783412364026ea3d58a330d6045440a26770f01a63d3afb805f2d86907bdf42171e57b5e0258363a89bf226

data/lib/pubid/nist/addendum.rb

@@ -0,0 +1,21 @@
+
+module Pubid::Nist
+  class Addendum < Identifier
+    def_delegators 'Pubid::Nist::Addendum', :type
+
+    attr_accessor :base
+
+    def initialize(base:, number: nil)
+      @number = number
+      @base = base
+    end
+
+    def self.type
+      { key: :add, title: "Addendum" }
+    end
+
+    def self.get_renderer_class
+      Renderer::Addendum
+    end
+  end
+end

data/lib/pubid/nist/edition.rb

@@ -1,5 +1,5 @@
 module Pubid::Nist
-  class Edition
+  class Edition < Pubid::Core::Entity
     attr_accessor :year, :month, :day, :parsed, :sequence
 
     def initialize(parsed: nil, year: nil, month: nil, day: nil, sequence: nil)

data/lib/pubid/nist/identifier.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 require "json"
+require "forwardable"
 
 UPDATE_CODES = YAML.load_file(File.join(File.dirname(__FILE__), "../../../update_codes.yaml"))
 
 module Pubid::Nist
   class Identifier < Pubid::Core::Identifier::Base
+    extend Forwardable
     attr_accessor :serie, :code, :revision, :publisher, :version, :volume,
                   :part, :addendum, :stage, :translation,
                   :edition, :supplement, :update,
@@ -73,7 +75,7 @@ module Pubid::Nist
 
     # @param without_edition [Boolean] render pubid without rendering edition
     def to_s(format = :short, without_edition: false)
-      self.class.get_renderer_class.new(get_params).render(format: format, without_edition: without_edition)
+      self.class.get_renderer_class.new(to_h(deep: false)).render(format: format, without_edition: without_edition)
     end
 
     def to_json(*args)
@@ -98,11 +100,6 @@ module Pubid::Nist
         new(**opts)
       end
 
-      # def transform(params)
-      #   identifier_params = get_transformer_class.new.apply(params)
-      #
-      #   Identifier.create(**identifier_params)
-      # end
       def transform(params)
         # run transform through each element,
         # like running transformer.apply(number: 1) and transformer.apply(year: 1999)
@@ -114,11 +111,12 @@ module Pubid::Nist
           get_transformer_class.new.apply({ k => v }, params)
         end.inject({}, :merge)
 
+        if identifier_params[:addendum]
+          return Addendum.new(base: new(
+            **identifier_params.dup.tap { |h| h.delete(:addendum) }
+          ), **identifier_params[:addendum])
+        end
 
-        # identifier_params = params.map do |k, v|
-        #   get_transformer_class.new.apply({k => v}, params).to_a.first
-        # end.compact.to_h
-        #
         new(**identifier_params)
       end
 
@@ -131,7 +129,7 @@ module Pubid::Nist
       end
 
       def get_renderer_class
-        Renderer
+        Renderer::Base
       end
     end
   end

data/lib/pubid/nist/nist_tech_pubs.rb

@@ -45,7 +45,13 @@ module Pubid::Nist
       def parse_docid(doc)
         id = doc.at("publisher_item/item_number", "publisher_item/identifier")
                &.text&.sub(%r{^/}, "")
-        doi = doc.at("doi_data/doi").text.gsub("10.6028/", "")
+        if id == "NBS BH 10"
+          # XXX: "doi" attribute is missing for doi_data
+          doi = "NBS.BH.10"
+        else
+          doi = doc.at("doi_data/doi").text.gsub("10.6028/", "")
+        end
+
         title = doc.at("titles/title").text
         title += " #{doc.at('titles/subtitle').text}" if doc.at("titles/subtitle")
         case doi

data/lib/pubid/nist/parser.rb

@@ -1,17 +1,12 @@
 module Pubid::Nist
-  class Parser < Parslet::Parser
+  class Parser < Pubid::Core::Parser
     attr_accessor :parsed
 
     rule(:series) do
-      ((SERIES["long"].keys
-                     .sort_by(&:length).reverse
-                     .flatten
-                     .reduce do |acc, s|
-          (acc.is_a?(String) ? str(acc) : acc) | str(s)
-        end).as(:series) |
-        (SERIES["mr"].values.reduce do |acc, s|
-          (acc.is_a?(String) ? str(acc) : acc) | str(s)
-        end).as(:series_mr)) >> any.repeat.as(:remaining)
+      (array_to_str(SERIES["long"].keys.sort_by(&:length).reverse.flatten).as(:series) |
+        array_to_str(SERIES["mr"].values).as(:series_mr) |
+        (str("NIST ") >> array_to_str(SERIES["long"].keys.sort_by(&:length).reverse.flatten).as(:series))) >>
+        any.repeat.as(:remaining)
     end
 
     root(:series)
@@ -24,7 +19,13 @@ module Pubid::Nist
                  SERIES["mr"].key(parsed[:series_mr].to_s)
                end
       parser = find_parser(series)
-      parsed = parser.new.parse(parsed[:remaining].to_s)
+      begin
+        parsed = parser.new.parse(parsed[:remaining].to_s)
+      rescue Parslet::ParseFailed
+        # for PubID 1.0 identifier series specific parser might fail,
+        # so parse using Default parser which is comply with PubID 1.0
+        parsed = Parsers::Default.new.parse(parsed[:remaining].to_s)
+      end
       parsed.is_a?(Array) ? parsed << { series: series } : parsed.merge({ series: series })
     end
 

data/lib/pubid/nist/parsers/default.rb

@@ -19,11 +19,11 @@ module Pubid::Nist
       end
 
       rule(:supplement) do
-        (str("supp") | str("sup")) >> match('\d').repeat.as(:supplement)
+        (str("supp") | str("sup")) >> match('[A-Z\d]').repeat.as(:supplement)
       end
 
       rule(:errata) do
-        str("-").maybe >> str("errata").as(:errata)
+        str("-").maybe >> (str("errata") | str("err")).as(:errata)
       end
 
       rule(:index) do
@@ -40,7 +40,8 @@ module Pubid::Nist
       end
 
       rule(:stage) do
-        (space >> (array_to_str(STAGES["id"].keys).as(:id) >> array_to_str(STAGES["type"].keys).as(:type)).as(:stage))
+        ((space | dot) >> (array_to_str(STAGES["id"].keys + STAGES["id"].keys.map(&:upcase)).as(:id) >>
+          array_to_str(STAGES["type"].keys + STAGES["type"].keys.map(&:upcase)).as(:type)).as(:stage))
       end
 
       rule(:draft) do
@@ -67,7 +68,7 @@ module Pubid::Nist
       rule(:part_prefixes) { str("pt") | str("p") }
 
       rule(:part) do
-        part_prefixes >> digits.as(:part)
+        part_prefixes >> (digits >> (str("-") >> digits).maybe).as(:part)
       end
 
       rule(:revision) do
@@ -83,7 +84,7 @@ module Pubid::Nist
       end
 
       rule(:update) do
-        (str("/Upd") | str("/upd")) >> (digits.as(:number) >> str("-") >> digits.as(:year)).as(:update)
+        (str("/Upd") | str("/upd")) >> (digits.as(:number) >> (str("-") >> digits.as(:year)).maybe).as(:update)
       end
 
       rule(:translation) do
@@ -98,7 +99,8 @@ module Pubid::Nist
       end
 
       rule(:addendum) do
-        (str("-add") | str(".add-1")).as(:addendum)
+        (str("-add") | str(".add") | str(" Add.")) >>
+          (str(" ") | str("-")).maybe >> (digits | str("")).as(:number).as(:addendum)
       end
 
       rule(:section) do

data/lib/pubid/nist/parsers/{fips_pub.rb → fips.rb}

@@ -2,7 +2,7 @@ require_relative "nbs_fips"
 
 module Pubid::Nist
   module Parsers
-    class FipsPub < NbsFips
+    class Fips < NbsFips
     end
   end
 end

data/lib/pubid/nist/parsers/nbs_circ.rb

@@ -3,7 +3,7 @@ module Pubid::Nist
     class NbsCirc < Default
       rule(:revision) do
         ((str("rev") >> (words >> year_digits).as(:revision)) |
-          (str("r") >> digits.as(:revision))
+          (str("r") >> (digits | (words >> year_digits)).as(:revision))
         )
       end
 

data/lib/pubid/nist/parsers/nbs_crpl.rb

@@ -2,11 +2,11 @@ module Pubid::Nist
   module Parsers
     class NbsCrpl < Default
       rule(:first_report_number) do
-        (digits >> str("-m").maybe).as(:first_report_number)
+        (digits >> (str("-m") | str("-M")).maybe).as(:first_report_number)
       end
 
       rule(:part) do
-        str("_") >> (digits >> str("-") >> digits).as(:part)
+        (str("_") | str("pt")) >> (digits >> str("-") >> digits).as(:part)
       end
 
       rule(:supplement) do

data/lib/pubid/nist/parsers/nbs_csm.rb

@@ -5,7 +5,7 @@ module Pubid::Nist
         (str(" ") | str(".")) >> report_number.maybe >> parts.repeat.as(:parts)
       end
 
-      rule(:part_prefixes) { str("n") }
+      rule(:part_prefixes) { str("n") | str("pt") }
     end
   end
 end

data/lib/pubid/nist/parsers/nbs_fips.rb

@@ -7,7 +7,8 @@ module Pubid::Nist
             year_digits.as(:edition_year) |
           (month_letters.as(:edition_month) >> match('\d').repeat(2, 2).as(:edition_day) >>
             str("/") >> year_digits.as(:edition_year))
-        )
+        ) |
+        (str("e") >> year_digits.as(:edition_year) >> month_digits.as(:edition_month).maybe)
       end
     end
   end

data/lib/pubid/nist/parsers/nbs_sp.rb

@@ -2,7 +2,7 @@ module Pubid::Nist
   module Parsers
     class NbsSp < Default
       rule(:part_prefixes) do
-        str("p") | str("P")
+        str("pt") | str("p") | str("P")
       end
 
       rule(:volume) do

data/lib/pubid/nist/parsers/nist_sp.rb

@@ -2,7 +2,7 @@ module Pubid::Nist
   module Parsers
     class NistSp < Default
       rule(:version) do
-        (((str("ver") | str(" Ver. ")) >> (digits >> (str(".") >> digits).repeat).as(:version)) |
+        (((str("ver") | str(" Ver. ") | str(" Version ")) >> (digits >> (str(".") >> digits).repeat).as(:version)) |
           (str("v") >>
             (match('\d') >> str(".") >> match('\d') >> (str(".") >> match('\d')).maybe).as(:version)))
       end
@@ -39,15 +39,21 @@ module Pubid::Nist
 
       rule(:edition) do
         ((str("e") >> year_digits.as(:edition_year)) | (str("-") >> year_digits.as(:edition_year)) |
-          (str("e") >> digits.as(:edition)))
+          ((str("e") | str(" E")) >> digits.as(:edition)))
       end
 
       rule(:revision) do
-        ((str("rev") | str("r")) >> (digits >> match("[a-z]").maybe).as(:revision)) |
+        ((str("rev") | str("r") | str(" Rev. ")) >> (digits >> match("[a-z]").maybe).as(:revision)) |
           (str("-") >> digits.as(:revision)) |
           (str("r") >> match("[a-z]").as(:revision)) |
-          (str("r") >> str("").as(:revision))
+          ((str("r") | str(" Revision (r)")) >> str("").as(:revision))
       end
+
+      rule(:volume) do
+        (str("v") | str(" Vol. ")) >> digits.as(:volume)
+      end
+
+      rule(:part_prefixes) { str("pt") | str("p") | str(" Part ") }
     end
   end
 end

data/lib/pubid/nist/publisher.rb

@@ -2,7 +2,7 @@ PUBLISHERS = YAML.load_file(File.join(File.dirname(__FILE__),
                                       "../../../publishers.yaml"))
 
 module Pubid::Nist
-  class Publisher
+  class Publisher < Pubid::Core::Entity
     attr_accessor :publisher
 
     def initialize(publisher:)
@@ -17,10 +17,6 @@ module Pubid::Nist
       PUBLISHERS[format.to_s][@publisher]
     end
 
-    def ==(other)
-      other.publisher == @publisher
-    end
-
     def self.publishers_keys
       PUBLISHERS["long"].keys
     end

data/lib/pubid/nist/renderer/addendum.rb

@@ -0,0 +1,20 @@
+require_relative "base"
+
+module Pubid::Nist::Renderer
+  class Addendum < Base
+    def render_identifier(params, opts)
+       # = "%{base}" % params
+      result = params[:base].to_s(opts[:format])
+      case opts[:format]
+      when :long
+        "Addendum to #{result}"
+      when :abbrev
+        "Add. to #{result}"
+      when :short
+        "#{result} Add."
+      when :mr
+        "#{result}.add-1"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,200 @@
+module Pubid::Nist
+  module Renderer
+    class Base < Pubid::Core::Renderer::Base
+      def render_base_identifier(**opts)
+        prerender(**opts)
+
+        render_identifier(@prerendered_params, opts)
+      end
+
+      def render_identifier(params, opts)
+        case opts[:format]
+        when :short, :mr
+          "%{serie}%{code}%{volume}%{part}%{edition}%{revision}%{version}"\
+          "%{supplement}%{section}%{appendix}%{errata}%{index}%{insert}%{update}"\
+          "%{stage}%{translation}" % params
+        else
+          "%{serie}%{stage}%{code}%{volume}%{part}%{edition}%{revision}%{version}"\
+          "%{supplement}%{section}%{appendix}%{errata}%{index}%{insert}%{update}"\
+          "%{translation}" % params
+        end
+      end
+
+      def render_serie(serie, opts, params)
+        if serie.to_s(opts[:format]).include?(params[:publisher].to_s(opts[:format]))
+          return serie.to_s(opts[:format])
+        end
+
+        "#{params[:publisher].to_s(opts[:format])} #{serie.to_s(opts[:format])}"
+      end
+
+      def render_code(code, opts, _params)
+        (opts[:format] == :mr ? "." : " ") + code.to_s
+      end
+
+      def render_edition(edition, opts, _params)
+        return if opts[:without_edition]
+
+        case opts[:format]
+        when :long
+          " Edition "
+        when :abbrev
+          " Ed. "
+        when :short, :mr
+          "e"
+        end + edition.to_s
+      end
+
+      def render_revision(revision, opts, _params)
+        case opts[:format]
+        when :long
+          ", Revision "
+        when :abbrev
+          ", Rev. "
+        when :short, :mr
+          "r"
+        end + (revision == '' ? '1' : revision).to_s
+      end
+
+      def render_version(version, opts, _params)
+        case opts[:format]
+        when :long
+          ", Version "
+        when :abbrev
+          ", Ver. "
+        when :short, :mr
+          "ver"
+        end + version
+      end
+
+      def render_volume(volume, opts, params)
+        case opts[:format]
+        when :long
+          ", Volume "
+        when :abbrev
+          ", Vol. "
+        when :short
+          params[:code] ? "v" : " v"
+        when :mr
+          params[:code] ? "v" : ".v"
+        end + volume
+      end
+
+      def render_update(update, opts, _params)
+        update_text = update.number.to_s
+        update_text += "-#{update.year}" if update.year
+        update_text += sprintf("%02d", update.month) if update.month
+
+        case opts[:format]
+        when :long
+          " Update #{update_text}"
+        when :abbrev
+          " Upd. #{update_text}"
+        when :short
+          "/Upd#{update_text}"
+        when :mr
+          ".u#{update_text}"
+        end
+      end
+
+      def render_translation(translation, opts, _params)
+        case opts[:format]
+        when :long, :abbrev
+          " (#{translation.upcase})"
+        when :mr
+          ".#{translation}"
+        when :short
+          " #{translation}"
+        end
+      end
+
+      def render_part(part, opts, _params)
+        case opts[:format]
+        when :long
+          " Part "
+        when :abbrev
+          " Pt. "
+        when :short, :mr
+          "pt"
+        end + part
+      end
+
+      def render_supplement(supplement, opts, _params)
+        case opts[:format]
+        when :long
+          " Supplement "
+        when :abbrev
+          " Suppl. "
+        when :short, :mr
+          "sup"
+        end + supplement
+      end
+
+      def render_appendix(appendix, opts, _params)
+        case opts[:format]
+        when :long
+          " Appendix "
+        when :abbrev
+          " App. "
+        when :short, :mr
+          "app"
+        end
+      end
+
+      def render_section(section, opts, _params)
+        case opts[:format]
+        when :long
+          " Section "
+        when :abbrev
+          " Sec. "
+        when :short, :mr
+          "sec"
+        end + section
+      end
+
+      def render_errata(errata, opts, _params)
+        case opts[:format]
+        when :long
+          " Errata "
+        when :abbrev
+          " Err. "
+        when :short, :mr
+          "err"
+        end
+      end
+
+      def render_index(index, opts, _params)
+        case opts[:format]
+        when :long
+          " Index "
+        when :abbrev
+          " Index. "
+        when :short, :mr
+          "indx"
+        end
+      end
+
+      def render_insert(insert, opts, _params)
+        case opts[:format]
+        when :long
+          " Insert "
+        when :abbrev
+          " Ins. "
+        when :short, :mr
+          "ins"
+        end
+      end
+
+      def render_stage(stage, opts, _params)
+        case opts[:format]
+        when :mr
+          "."
+        when :short
+          " "
+        else
+          " "
+        end + stage.to_s(opts[:format])
+      end
+    end
+  end
+end

data/lib/pubid/nist/stage.rb

@@ -1,7 +1,7 @@
 STAGES = YAML.load_file(File.join(File.dirname(__FILE__), "../../../stages.yaml"))
 
 module Pubid::Nist
-  class Stage
+  class Stage < Pubid::Core::Entity
     attr_accessor :id, :type
 
     def initialize(id:, type:)
@@ -13,7 +13,7 @@ module Pubid::Nist
 
       case format
       when :short
-        " #{@id}#{@type}"
+        "#{@id}#{@type}"
       when :mr
         "#{@id}#{@type}"
       else

data/lib/pubid/nist/update.rb

@@ -1,5 +1,5 @@
 module Pubid::Nist
-  class Update
+  class Update < Pubid::Core::Entity
     attr_accessor :number, :year, :month
 
     def initialize(number: nil, year: nil, month: nil)

data/lib/pubid/nist/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Nist
-    VERSION = "0.2.3".freeze
+    VERSION = "0.2.6".freeze
   end
 end

data/lib/pubid/nist.rb

@@ -15,7 +15,8 @@ require_relative "nist/parsers/default"
 require_relative "nist/update"
 require_relative "nist/transformer"
 require_relative "nist/parser"
-require_relative "nist/renderer"
+require_relative "nist/renderer/base"
+require_relative "nist/renderer/addendum"
 
 Dir[File.join(__dir__, 'nist/parsers', '*.rb')].each do |file|
   require file
@@ -34,3 +35,4 @@ require_relative "nist/stage"
 require_relative "nist/errors"
 require_relative "nist/nist_tech_pubs"
 require_relative "nist/edition"
+require_relative "nist/addendum"

data/series.yaml

@@ -15,7 +15,7 @@ long:
   NBS CS-E: Commercial Standards (emergency)
   NBS CSM: Commercial Standards Monthly
   NBS FIPS: Federal Information Processing Standards Publication
-  FIPS PUB: Federal Information Processing Standards Publication
+  FIPS: Federal Information Processing Standards Publication
   NIST GCR: Grant/Contract Reports
   NBS GCR: Grant/Contract Reports
   NIST HB: Handbook
@@ -59,7 +59,7 @@ abbrev:
   NIST BSS: Bldg. Sci. Ser.
   NBS BSS: Bldg. Sci. Ser.
   NBS FIPS: Federal Inf. Process. Stds.
-  FIPS PUB: Federal Inf. Process. Stds.
+  FIPS: Federal Inf. Process. Stds.
   NIST HB: Handb.
   NBS HB: Handb.
   NIST MN: Monogr.
@@ -98,7 +98,7 @@ mr:
   NBS CS-E: NBS.CS-E
   NBS CSM: NBS.CSM
   NBS FIPS: NBS.FIPS
-  FIPS PUB: NIST.FIPS
+  FIPS: NIST.FIPS
   NIST GCR: NIST.GCR
   NBS GCR: NBS.GCR
   NIST HB: NIST.HB

data/update_codes.yaml

@@ -5,7 +5,7 @@ NIST SP 260-162 2006ed.: NIST SP 260-162e2006
 NBS CIRC 154suprev: NBS CIRC 154r1sup
 NBS CIRC supJun1925-Jun1926: NBS CIRC 24e7sup2
 NBS CIRC supJun1925-Jun1927: NBS CIRC 24e7sup3
-NBS CIRC sup: NBS CIRC 24e7sup
+/^NBS CIRC sup$/: NBS CIRC 24e7sup
 NBS CIRC e2: NBS CIRC 2e2
 NBS CIRC 25sup-1924: NBS CIRC 25sup
 NIST SP 260-126 rev 2013: NIST SP 260-126r2013
@@ -17,12 +17,14 @@ NIST LCIRC: NIST LC
 NBS LCIRC: NBS LC
 NIST SP 800-57Pt3r1: NIST SP 800-57pt3r1
 NISTIR: NIST IR
-NIST FIPS: FIPS PUB
+NIST FIPS: FIPS
 NIST.CSWP.01162020pt: NIST.CSWP.01162020(por)
 /^NBS FIPS 11-1-Sep30$/: NBS FIPS 11-1-Sep30/1977
 /^NBS FIPS 89-Sep1$/: NBS FIPS 89-Sep1981
-/^FIPS PUB 54-1-Jan15$/: FIPS PUB 54-1
-/^FIPS PUB 54-1-Jan17$/: FIPS PUB 54-1-Jan17/1991
+/^FIPS PUB 54-1-Jan15$/: FIPS 54-1
+/^FIPS 54-1-Jan15$/: FIPS 54-1
+/^FIPS 54-1-Jan17$/: FIPS 54-1-Jan17/1991
+FIPS PUB: FIPS
 NBS CRPL c4-4: NBS CRPL 4-4
 NIST AMS 300-8r1 (February 2021 update): NIST AMS 300-8r1/Upd1-202102
 NIST AMS 300-8r1/upd: NIST AMS 300-8r1/Upd1-202102

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-nist
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -128,14 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.12.2
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library to generate, parse and manipulate NIST PubID.
 email:
 - open.source@ribose.com
@@ -151,13 +165,14 @@ files:
 - exe/pubid-nist
 - lib/pubid-nist.rb
 - lib/pubid/nist.rb
+- lib/pubid/nist/addendum.rb
 - lib/pubid/nist/edition.rb
 - lib/pubid/nist/errors.rb
 - lib/pubid/nist/identifier.rb
 - lib/pubid/nist/nist_tech_pubs.rb
 - lib/pubid/nist/parser.rb
 - lib/pubid/nist/parsers/default.rb
-- lib/pubid/nist/parsers/fips_pub.rb
+- lib/pubid/nist/parsers/fips.rb
 - lib/pubid/nist/parsers/nbs_bh.rb
 - lib/pubid/nist/parsers/nbs_circ.rb
 - lib/pubid/nist/parsers/nbs_crpl.rb
@@ -179,7 +194,8 @@ files:
 - lib/pubid/nist/parsers/nist_sp.rb
 - lib/pubid/nist/parsers/nist_tn.rb
 - lib/pubid/nist/publisher.rb
-- lib/pubid/nist/renderer.rb
+- lib/pubid/nist/renderer/addendum.rb
+- lib/pubid/nist/renderer/base.rb
 - lib/pubid/nist/serie.rb
 - lib/pubid/nist/stage.rb
 - lib/pubid/nist/transformer.rb

data/lib/pubid/nist/renderer.rb

@@ -1,213 +0,0 @@
-module Pubid::Nist
-  class Renderer < Pubid::Core::Renderer::Base
-    def render_base_identifier(**opts)
-      prerender(**opts)
-
-      render_identifier(@prerendered_params, opts)
-    end
-
-    def render_identifier(params, opts)
-      result = case opts[:format]
-               when :short, :mr
-                 "%{serie}%{code}%{volume}%{part}%{edition}%{revision}%{version}"\
-                 "%{supplement}%{section}%{appendix}%{errata}%{index}%{insert}%{update}"\
-                 "%{stage}%{translation}" % params
-               else
-                 "%{serie}%{stage}%{code}%{volume}%{part}%{edition}%{revision}%{version}"\
-                 "%{supplement}%{section}%{appendix}%{errata}%{index}%{insert}%{update}"\
-                 "%{translation}" % params
-               end
-
-      if params[:addendum] && !params[:addendum].empty?
-        case opts[:format]
-        when :long
-          "Addendum to #{result}"
-        when :abbrev
-          "Add. to #{result}"
-        when :short
-          "#{result} Add."
-        when :mr
-          "#{result}.add-1"
-        end
-      else
-        result
-      end
-    end
-
-    def render_serie(serie, opts, params)
-      if serie.to_s(opts[:format]).include?(params[:publisher].to_s(opts[:format]))
-        return serie.to_s(opts[:format])
-      end
-
-      "#{params[:publisher].to_s(opts[:format])} #{serie.to_s(opts[:format])}"
-    end
-
-    def render_code(code, opts, _params)
-      (opts[:format] == :mr ? "." : " ") + code.to_s
-    end
-
-    def render_edition(edition, opts, _params)
-      return if opts[:without_edition]
-
-      case opts[:format]
-      when :long
-        " Edition "
-      when :abbrev
-        " Ed. "
-      when :short, :mr
-        "e"
-      end + edition.to_s
-    end
-
-    def render_revision(revision, opts, _params)
-      case opts[:format]
-      when :long
-        ", Revision "
-      when :abbrev
-        ", Rev. "
-      when :short, :mr
-        "r"
-      end + (revision == '' ? '1' : revision).to_s
-    end
-
-    def render_version(version, opts, _params)
-      case opts[:format]
-      when :long
-        ", Version "
-      when :abbrev
-        ", Ver. "
-      when :short, :mr
-        "ver"
-      end + version
-    end
-
-    def render_volume(volume, opts, params)
-      case opts[:format]
-      when :long
-        ", Volume "
-      when :abbrev
-        ", Vol. "
-      when :short
-        params[:code] ? "v" : " v"
-      when :mr
-        params[:code] ? "v" : ".v"
-      end + volume
-    end
-
-    def render_update(update, opts, _params)
-      update_text = update.number.to_s
-      update_text += "-#{update.year}" if update.year
-      update_text += sprintf("%02d", update.month) if update.month
-
-      case opts[:format]
-      when :long
-        " Update #{update_text}"
-      when :abbrev
-        " Upd. #{update_text}"
-      when :short
-        "/Upd#{update_text}"
-      when :mr
-        ".u#{update_text}"
-      end
-    end
-
-    def render_translation(translation, opts, _params)
-      case opts[:format]
-      when :long, :abbrev
-        " (#{translation.upcase})"
-      when :mr
-        ".#{translation}"
-      when :short
-        " #{translation}"
-      end
-    end
-
-    def render_part(part, opts, _params)
-      case opts[:format]
-      when :long
-        " Part "
-      when :abbrev
-        " Pt. "
-      when :short, :mr
-        "pt"
-      end + part
-    end
-
-    def render_supplement(supplement, opts, _params)
-      case opts[:format]
-      when :long
-        " Supplement "
-      when :abbrev
-        " Suppl. "
-      when :short, :mr
-        "sup"
-      end + supplement
-    end
-
-    def render_appendix(appendix, opts, _params)
-      case opts[:format]
-      when :long
-        " Appendix "
-      when :abbrev
-        " App. "
-      when :short, :mr
-        "app"
-      end
-    end
-
-    def render_section(section, opts, _params)
-      case opts[:format]
-      when :long
-        " Section "
-      when :abbrev
-        " Sec. "
-      when :short, :mr
-        "sec"
-      end + section
-    end
-
-    def render_errata(errata, opts, _params)
-      case opts[:format]
-      when :long
-        " Errata "
-      when :abbrev
-        " Err. "
-      when :short, :mr
-        "err"
-      end
-    end
-
-    def render_index(index, opts, _params)
-      case opts[:format]
-      when :long
-        " Index "
-      when :abbrev
-        " Index. "
-      when :short, :mr
-        "indx"
-      end
-    end
-
-    def render_insert(insert, opts, _params)
-      case opts[:format]
-      when :long
-        " Insert "
-      when :abbrev
-        " Ins. "
-      when :short, :mr
-        "ins"
-      end
-    end
-
-    def render_stage(stage, opts, _params)
-      case opts[:format]
-      when :mr
-        "."
-      when :short
-        ""
-      else
-        " "
-      end + stage.to_s(opts[:format])
-    end
-  end
-end