pubid-nist 0.1.8 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76af4a82e63775b038ebfbd73f2c43b9756f1f3da689cbe13329d05efb4a06f4
-  data.tar.gz: 37a6787cc14b4629c04dee83e42bb054e9a150b33d0ea00bfcbdfca936de09ed
+  metadata.gz: ae5b75b8cb77b433b69d107ca44d6f828602da328419436c24c25968412d1719
+  data.tar.gz: 1377f4285c99bd9f1582f5ca1daff8ed79cf90543405bf43d4a8a9659d2ae21b
 SHA512:
-  metadata.gz: ea789ee1abc40a9716e45388f4667c39c9da31ac244e331c1d36f401183cd087d13484d2f58f0c985fecfb2cd2b641d1aaffd90752f19c609bb548501115d693
-  data.tar.gz: a6d32b2267aa0e853437a524ad7cfc4c8f32f741adb1e945736597453d825c74699b9d299232975ceb6c67a3a8cd1796032600a736c203cce2210696ca1954a9
+  metadata.gz: f0252ea5cf1e0f418d15b29a051dbaa203ff0765dcf1d45124b3fb123a5d0baaaa6aac5e2cca8de138e0fbf21f20d4b7aba0ecaf79de7fbc79164a119763d971
+  data.tar.gz: a8e8a4c490568753bd6233432825c7cf717dbd379c1eb56155082bdbe9ce74040365e9579f802c241ca6c98631da38ca7caa6ac6ff2687e6ada9003cc21e28de

data/exe/pubid-nist

@@ -84,9 +84,9 @@ class Pubid::Nist::CLI < Thor
 
     unless code.empty?
       if options[:format] == "string"
-        puts Pubid::Nist::Document.parse(code).to_s(options[:style].to_sym)
+        puts Pubid::Nist::Identifier.parse(code).to_s(options[:style].to_sym)
       else
-        puts Pubid::Nist::Document.parse(code).to_json
+        puts Pubid::Nist::Identifier.parse(code).to_json
       end
     end
   rescue Pubid::Nist::Errors::ParseError

data/lib/pubid/nist/errors.rb

@@ -1,5 +1,7 @@
 module Pubid::Nist
   module Errors
     class ParseError < StandardError; end
+    class SerieInvalidError < StandardError; end
+    class PublisherInvalidError < StandardError; end
   end
 end

data/lib/pubid/nist/{document.rb → identifier.rb}

@@ -82,20 +82,21 @@ INSERT_DESC = {
 }.freeze
 
 module Pubid::Nist
-  class Document
+  class Identifier < Pubid::Core::Identifier::Base
     attr_accessor :serie, :code, :revision, :publisher, :version, :volume,
-                  :part, :addendum, :stage, :translation, :update_number,
-                  :edition, :supplement, :update_year, :update_month,
+                  :part, :addendum, :stage, :translation,
+                  :edition, :supplement, :update,
                   :section, :appendix, :errata, :index, :insert
 
-    def initialize(publisher:, serie:, docnumber:, stage: nil, supplement: nil,
-                   edition_month: nil, edition_year: nil, edition_day: nil, **opts)
-      @publisher = publisher
-      @serie = serie
-      @code = docnumber
-      @stage = Stage.new(stage.to_s) if stage
+    def initialize(publisher: "NIST", serie:, number: nil, stage: nil, supplement: nil,
+                   edition_month: nil, edition_year: nil, edition_day: nil, update: nil, **opts)
+      @publisher = publisher.is_a?(Publisher) ? publisher : Publisher.new(publisher: publisher)
+      @serie = serie.is_a?(Serie) ? serie : Serie.new(serie: serie)
+      @code = number
+      @stage = Stage.new(**stage) if stage
       @supplement = (supplement.is_a?(Array) && "") || supplement
       @edition = parse_edition(edition_month, edition_year, edition_day) if edition_month || edition_year
+      @update = update
       opts.each { |key, value| send("#{key}=", value.to_s) }
     end
 
@@ -142,32 +143,30 @@ module Pubid::Nist
 
     def self.update_old_code(code)
       UPDATE_CODES.each do |from, to|
-        code = code.gsub(from, to)
+        code = code.gsub(from.match?(/^\/.*\/$/) ? Regexp.new(from[1..-2]) : from, to)
       end
       code
     end
 
-    def self.parse(code)
-      code = update_old_code(code)
-      DocumentTransform.new.apply(DocumentParser.new.parse(code))
-    rescue Parslet::ParseFailed => failure
-      raise Pubid::Nist::Errors::ParseError, "#{failure.message}\ncause: #{failure.parse_failure_cause.ascii_tree}"
-    end
+    # def to_s(format = :short)
+    #   result = render_serie(format)
+    #   result += " " unless format == :short || stage.nil?
+    #   result += "#{stage&.to_s(format)}"\
+    #             " #{code}#{render_part(format)}#{render_edition(format)}"\
+    #             "#{render_localities(format)}"\
+    #             "#{render_update(format)}#{render_translation(format)}"
+    #   result = render_addendum(result, format)
+    #
+    #   return result.gsub(" ", ".") if format == :mr
+    #
+    #   result
+    # end
 
     def to_s(format = :short)
-      result = render_serie(format)
-      result += " " unless format == :short || stage.nil?
-      result += "#{stage&.to_s(format)}"\
-                " #{code}#{render_part(format)}#{render_edition(format)}"\
-                "#{render_localities(format)}"\
-                "#{render_update(format)}#{render_translation(format)}"
-      result = render_addendum(result, format)
-
-      return result.gsub(" ", ".") if format == :mr
-
-      result
+      self.class.get_renderer_class.new(get_params).render(format: format)
     end
 
+
     def to_json(*args)
       result = {
         styles: {
@@ -282,5 +281,47 @@ module Pubid::Nist
         "#{input}.add-1"
       end
     end
+
+    class << self
+      def create(**opts)
+        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)
+        # instead of running transformer on whole hash, like running transformer.apply({ number: 1, year: 1999 })
+        # where rule for number or year only will be not applied
+        # transformation only applied to rules matching the whole hash
+
+        identifier_params = params.map do |k, v|
+          get_transformer_class.new.apply({ k => v }, params)
+        end.inject({}, :merge)
+
+
+        # 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
+
+      def get_parser_class
+        Parser
+      end
+
+      def get_transformer_class
+        Transformer
+      end
+
+      def get_renderer_class
+        Renderer
+      end
+    end
   end
 end

data/lib/pubid/nist/nist_tech_pubs.rb

@@ -1,4 +1,3 @@
-require "relaton_nist/data_fetcher"
 require "nokogiri"
 require "open-uri"
 require "lightly"
@@ -28,24 +27,24 @@ module Pubid::Nist
       end
 
       def convert(doc)
-        id = @converted_id[doc[:id]] ||= Pubid::Nist::Document.parse(doc[:id])
+        id = @converted_id[doc[:id]] ||= Pubid::Nist::Identifier.parse(doc[:id])
         return id unless doc.key?(:doi)
 
         begin
           doi = @converted_doi[doc[:doi]] ||=
-            Pubid::Nist::Document.parse(doc[:doi])
-        rescue Errors::ParseError
+            Pubid::Nist::Identifier.parse(doc[:doi])
+        rescue Pubid::Core::Errors::ParseError
           return id
         end
         # return more complete pubid
         id.merge(doi)
-      rescue Errors::ParseError
-        @converted_doi[doc[:doi]] ||= Pubid::Nist::Document.parse(doc[:doi])
+      rescue Pubid::Core::Errors::ParseError
+        @converted_doi[doc[:doi]] ||= Pubid::Nist::Identifier.parse(doc[:doi])
       end
 
       def parse_docid(doc)
         id = doc.at("publisher_item/item_number", "publisher_item/identifier")
-          .text.sub(%r{^/}, "")
+               &.text&.sub(%r{^/}, "")
         doi = doc.at("doi_data/doi").text.gsub("10.6028/", "")
         title = doc.at("titles/title").text
         title += " #{doc.at('titles/subtitle').text}" if doc.at("titles/subtitle")
@@ -57,13 +56,13 @@ module Pubid::Nist
         when "10.6028/NIST.HB.150-10-1995" then id.sub!(/150-10$/, "150-10-1995")
         end
 
-        { id: id, doi: doi, title: title }
+        { id: id || doi, doi: doi, title: title }
       end
 
       def comply_with_pubid
         fetch.select do |doc|
           convert(doc).to_s == doc[:id]
-        rescue Errors::ParseError
+        rescue Pubid::Core::Errors::ParseError
           false
         end
       end
@@ -71,7 +70,7 @@ module Pubid::Nist
       def different_with_pubid
         fetch.reject do |doc|
           convert(doc).to_s == doc[:id]
-        rescue Errors::ParseError
+        rescue Pubid::Core::Errors::ParseError
           true
         end
       end
@@ -79,7 +78,7 @@ module Pubid::Nist
       def parse_fail_with_pubid
         fetch.select do |doc|
           convert(doc).to_s && false
-        rescue Errors::ParseError
+        rescue Pubid::Core::Errors::ParseError
           true
         end
       end
@@ -95,7 +94,7 @@ module Pubid::Nist
             finalPubId: final_doc.to_s,
             mr: final_doc.to_s(:mr),
           }
-        rescue Errors::ParseError
+        rescue Pubid::Core::Errors::ParseError
           {
             id: doc[:id],
             doi: doc[:doi],

data/lib/pubid/nist/{document_parser.rb → parser.rb}

@@ -1,5 +1,5 @@
 module Pubid::Nist
-  class DocumentParser < Parslet::Parser
+  class Parser < Parslet::Parser
     attr_accessor :parsed
 
     rule(:series) do
@@ -24,7 +24,8 @@ module Pubid::Nist
                  SERIES["mr"].key(parsed[:series_mr].to_s)
                end
       parser = find_parser(series)
-      parser.new.parse(parsed[:remaining].to_s).merge({ series: series })
+      parsed = parser.new.parse(parsed[:remaining].to_s)
+      parsed.is_a?(Array) ? parsed << { series: series } : parsed.merge({ series: series })
     end
 
     def find_parser(series)

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

@@ -1,19 +1,16 @@
 module Pubid::Nist
   module Parsers
-    class Default < Parslet::Parser
+    class Default < Pubid::Core::Parser
       rule(:identifier) do
-        stage.maybe >> (str(" ") | str(".")) >> report_number >> parts.repeat.as(:parts)
+        old_stage.maybe >> (str(" ") | str(".")) >> report_number >>
+          parts.repeat >> draft.maybe >> stage.maybe >> translation.maybe
       end
 
-      rule(:digits) { match('\d').repeat(1) }
-      rule(:letters) { match('[A-Za-z]').repeat(1) }
-      rule(:year_digits) { match('\d').repeat(4, 4) }
       rule(:month_letters) { match('[A-Za-z]').repeat(3, 3) }
       rule(:number_suffix) { match("[aA-Z]") }
-      # rule(:small)
 
       rule(:parts) do
-        (edition | revision | version | volume | part | update | addendum | translation |
+        (edition | revision | version | volume | part | update | addendum |
            supplement | errata | index | insert | section | appendix)
       end
 
@@ -37,10 +34,17 @@ module Pubid::Nist
         (str("insert") | str("ins")).as(:insert)
       end
 
+      rule(:old_stage) do
+        (str("(") >> (array_to_str(STAGES["id"].keys.map(&:upcase)).as(:id) >>
+          array_to_str(STAGES["type"].keys.map(&:upcase)).as(:type)).as(:stage) >> str(")"))
+      end
+
       rule(:stage) do
-        (str("(") >> (STAGES.keys.reduce do |acc, s|
-          (acc.is_a?(String) ? str(acc) : acc) | str(s)
-        end).as(:stage) >> str(")"))
+        (space >> (array_to_str(STAGES["id"].keys).as(:id) >> array_to_str(STAGES["type"].keys).as(:type)).as(:stage))
+      end
+
+      rule(:draft) do
+        space >> str("(Draft)").as(:draft)
       end
 
       rule(:digits_with_suffix) do
@@ -79,12 +83,12 @@ module Pubid::Nist
       end
 
       rule(:update) do
-        (str("/Upd") | str("/upd")) >> digits.as(:update_number) >> str("-") >> digits.as(:update_year)
+        (str("/Upd") | str("/upd")) >> (digits.as(:number) >> str("-") >> digits.as(:year)).as(:update)
       end
 
       rule(:translation) do
         (str("(") >> match('\w').repeat(3, 3).as(:translation) >> str(")")) |
-          (str(".") >> match('\w').repeat(3, 3).as(:translation))
+          ((str(".") | space) >> match('\w').repeat(3, 3).as(:translation))
       end
 
       rule(:edition_prefixes) { str("e") }

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

@@ -2,7 +2,7 @@ module Pubid::Nist
   module Parsers
     class NbsCirc < Default
       rule(:revision) do
-        ((str("rev") >> (letters >> year_digits).as(:revision)) |
+        ((str("rev") >> (words >> year_digits).as(:revision)) |
           (str("r") >> digits.as(:revision))
         )
       end
@@ -13,8 +13,8 @@ module Pubid::Nist
 
       rule(:edition) do
         (str("sup") >> str("").as(:supplement) >>
-          (letters.as(:edition_month) >> year_digits.as(:edition_year))) |
-          ((str("e") | str("-")) >> (digits.as(:edition) | letters.as(:edition_month) >> year_digits.as(:edition_year)))
+          (words.as(:edition_month) >> year_digits.as(:edition_year))) |
+          ((str("e") | str("-")) >> (digits.as(:edition) | words.as(:edition_month) >> year_digits.as(:edition_year)))
       end
     end
   end

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

@@ -13,7 +13,7 @@ module Pubid::Nist
 
       rule(:edition) do
         (str("supp") >> str("").as(:supplement) >>
-          (letters.as(:edition_month) >> year_digits.as(:edition_year)) |
+          (words.as(:edition_month) >> year_digits.as(:edition_year)) |
           str("e") >> year_digits.as(:edition_year)
         )
       end

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

@@ -3,13 +3,13 @@ module Pubid::Nist
     class NbsLc < Default
       rule(:supplement) do
         (str("supp") | str("sup")) >>
-          ((str("").as(:supplement) >> digits.as(:update_month) >> str("/") >> digits.as(:update_year)) |
+          ((str("").as(:supplement) >> (digits.as(:month) >> str("/") >> digits.as(:year)).as(:update)) |
           match('\d').repeat.as(:supplement))
       end
 
       rule(:revision) do
         str("r") >>
-          ((digits.as(:update_month) >> str("/") >> digits.as(:update_year)) |
+          ((digits.as(:month) >> str("/") >> digits.as(:year)).as(:update) |
             digits.as(:revision))
       end
 

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

@@ -3,6 +3,7 @@ require_relative "nbs_hb"
 module Pubid::Nist
   module Parsers
     class NistHb < NbsHb
+      rule(:number_suffix) { match("[a-zA-Z]") }
     end
   end
 end

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

@@ -8,7 +8,7 @@ module Pubid::Nist
       end
 
       rule(:report_number) do
-        (year_digits.as(:first_report_number) >>
+        (digits.as(:first_report_number) >>
           str("-") >> year_digits.as(:edition_year)) |
           first_report_number >> (str("-") >>
             ((digits | match("[aAB]") | str("CAS") | str("FRA")) >>
@@ -18,8 +18,8 @@ module Pubid::Nist
 
       rule(:revision) do
         str("r") >>
-          ((digits.as(:update_month) >> str("/") >> digits.as(:update_year)) |
-            (month_letters.as(:update_month) >> year_digits.as(:update_year)) |
+          ((digits.as(:month) >> str("/") >> digits.as(:year)).as(:update) |
+            (month_letters.as(:month) >> year_digits.as(:year)).as(:update) |
             digits.as(:revision) |
             str("").as(:revision))
       end

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") >> (digits >> (str(".") >> digits).maybe).as(:version)) |
+        (((str("ver") | str(" Ver. ")) >> (digits >> (str(".") >> digits).repeat).as(:version)) |
           (str("v") >>
             (match('\d') >> str(".") >> match('\d') >> (str(".") >> match('\d')).maybe).as(:version)))
       end

data/lib/pubid/nist/publisher.rb

@@ -6,6 +6,8 @@ module Pubid::Nist
     attr_accessor :publisher
 
     def initialize(publisher:)
+      raise Errors::PublisherInvalidError, "#{publisher} is not valid publisher" unless PUBLISHERS["long"].key?(publisher)
+
       @publisher = publisher
     end
 

data/lib/pubid/nist/renderer.rb

@@ -0,0 +1,211 @@
+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)
+      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

data/lib/pubid/nist/serie.rb

@@ -5,6 +5,8 @@ module Pubid::Nist
     attr_accessor :serie, :parsed
 
     def initialize(serie:, parsed: nil)
+      raise Errors::SerieInvalidError, "#{serie} is not valid serie" unless SERIES["long"].key?(serie)
+
       @serie = serie
       @parsed = parsed
     end

data/lib/pubid/nist/stage.rb

@@ -2,10 +2,10 @@ STAGES = YAML.load_file(File.join(File.dirname(__FILE__), "../../../stages.yaml"
 
 module Pubid::Nist
   class Stage
-    attr_accessor :stage
+    attr_accessor :id, :type
 
-    def initialize(stage)
-      @stage = stage
+    def initialize(id:, type:)
+      @id, @type = id.to_s.downcase, type.to_s.downcase
     end
 
     def to_s(format = :short)
@@ -13,16 +13,16 @@ module Pubid::Nist
 
       case format
       when :short
-        "(#{@stage})"
+        " #{@id}#{@type}"
       when :mr
-        @stage
+        "#{@id}#{@type}"
       else
-        STAGES[@stage]
+        "#{STAGES['id'][@id]} #{STAGES['type'][@type]}"
       end
     end
 
     def nil?
-      @stage.nil?
+      @id.nil? && @type.nil?
     end
   end
 end

data/lib/pubid/nist/transformer.rb

@@ -0,0 +1,43 @@
+module Pubid::Nist
+  class Transformer < Parslet::Transform
+    rule(first_report_number: subtree(:first_report_number)) do |context|
+      { number:
+          context.values_at(:first_report_number, :second_report_number).compact.join("-").upcase }
+    end
+
+    rule(report_number: subtree(:report_number)) do |context|
+      { number: context[:report_number] }
+    end
+
+    rule(series: subtree(:series)) do |context|
+      { serie: Serie.new(serie: context[:series].to_s.gsub(".", " ")),
+        publisher: Publisher.parse(context[:series]) }
+    end
+
+    # remove :second_report_number from output
+    rule(second_report_number: simple(:second_report_number)) do
+      {}
+    end
+
+    rule(parts: subtree(:parts)) do |context|
+      context[:parts].inject({}, :merge)
+    end
+
+    rule(update: subtree(:update)) do |context|
+      { update: Update.new(**context[:update]) }
+    end
+
+    rule(stage: subtree(:stage)) do |context|
+      case context[:stage][:id]
+      when "1"
+        { stage: { id: "i", type: context[:stage][:type] } }
+      else
+        { stage: context[:stage] }
+      end
+    end
+
+    rule(draft: subtree(:draft)) do |context|
+      { stage: { id: "i", type: "prd"} }
+    end
+  end
+end

data/lib/pubid/nist/update.rb

@@ -0,0 +1,15 @@
+module Pubid::Nist
+  class Update
+    attr_accessor :number, :year, :month
+
+    def initialize(number: nil, year: nil, month: nil)
+      @number = number || 1
+      @year = year&.to_s&.length == 2 ? "19#{year}" : year
+
+      if month
+        date = Date.parse("01/#{month}/#{@year}")
+        @month = date.month
+      end
+    end
+  end
+end

data/lib/pubid/nist/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Nist
-    VERSION = "0.1.8".freeze
+    VERSION = "0.2.2".freeze
   end
 end

data/lib/pubid/nist.rb

@@ -2,6 +2,7 @@
 
 require "yaml"
 require "parslet"
+require "pubid-core"
 
 module Pubid
   module Nist
@@ -11,8 +12,10 @@ end
 
 require_relative "nist/serie"
 require_relative "nist/parsers/default"
-require_relative "nist/document_transform"
-require_relative "nist/document_parser"
+require_relative "nist/update"
+require_relative "nist/transformer"
+require_relative "nist/parser"
+require_relative "nist/renderer"
 
 Dir[File.join(__dir__, 'nist/parsers', '*.rb')].each do |file|
   require file
@@ -25,7 +28,7 @@ end.map do |parser_class|
   [parser.name.split("::").last.gsub(/(.)([A-Z])/, '\1 \2').upcase, parser]
 end.to_h
 
-require_relative "nist/document"
+require_relative "nist/identifier"
 require_relative "nist/publisher"
 require_relative "nist/stage"
 require_relative "nist/errors"

data/series.yaml

@@ -90,7 +90,7 @@ mr:
   NBS BH: NBS.BH
   NBS CRPL: NBS.CRPL
   NBS CRPL-F-A: NBS.CRPL-F-A
-  NBS CRPL-F-B: NBS CRPL-F-B
+  NBS CRPL-F-B: NBS.CRPL-F-B
   NBS IP: NBS.IP
   NBS CIRC: NBS.CIRC
   NBS CIS: NBS.CIS

data/stages.yaml

@@ -1,5 +1,16 @@
-IPD: Initial Public Draft
-2PD: Second Public Draft
-FPD: Final Public Draft
-WD: Work-in-Progress Draft
-PRD: Preliminary Draft
+id:
+  i: Initial
+  F: Final
+  "1": Initial
+  "2": Second
+  "3": Third
+  "4": Fourth
+  "5": Fifth
+  "6": Sixth
+  "7": Seventh
+  "8": Eight
+  "9": Ninth
+type:
+  pd: Public Draft
+  wd: Work-in-Progress Draft
+  prd: Preliminary Draft

data/update_codes.yaml

@@ -13,15 +13,19 @@ NIST CSWP: CSRC White Paper
 NIST SP 800-56ar: NIST SP 800-56Ar1
 NIST.LCIRC: NIST.LC
 NBS.LCIRC: NBS.LC
+NIST LCIRC: NIST LC
+NBS LCIRC: NBS LC
 NIST SP 800-57Pt3r1: NIST SP 800-57pt3r1
 NISTIR: NIST IR
 NIST FIPS: FIPS PUB
 NIST.CSWP.01162020pt: NIST.CSWP.01162020(por)
-NBS FIPS 11-1-Sep30: NBS FIPS 11-1-Sep30/1977
-FIPS PUB 54-1-Jan15: FIPS PUB 54-1
-FIPS PUB 54-1-Jan17: FIPS PUB 54-1-Jan17/1991
+/^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
 NBS CRPL c4-4: NBS CRPL 4-4
-NIST AMS 300-8r1 (February 2021 update): NIST AMS 300-8r1/Upd1-201502
+NIST AMS 300-8r1 (February 2021 update): NIST AMS 300-8r1/Upd1-202102
+NIST AMS 300-8r1/upd: NIST AMS 300-8r1/Upd1-202102
 NIST IR 8115r1-upd: NIST IR 8115r1/Upd1-202103
 NIST SP 500-300-upd: NIST SP 500-300/Upd1-202105
 NIST TN 2150-upd: NIST TN 2150/Upd1-202102
@@ -32,6 +36,7 @@ NBS.HB.28p11969: NBS.HB.28-1969pt1
 NIST HB 105-1-1990: NIST HB 105-1r1990
 NBS.FIPS.100-1-1991: NIST.FIPS.100-1-1991
 NBS.LC.1088sp: NBS.LC.1088.spa
+NBS LC 1088sp: NBS LC 1088 spa
 #NBS.LC.145r11/1925: NBS.LC.145/Upd1-192511
 #NBS.LC.118sup12/1926: NBS.LC.118sup/Upd1-192612
 NIST SP 955 Suppl.: NIST SP 955sup
@@ -41,18 +46,47 @@ NIST FIPS 54-Jan15: NIST FIPS 54
 NBS report ;: NBS RPT
 NBS TN 467p1adde1: NBS TN 467pt1-add
 NIST SP 1011-II-1.0: NIST SP 1011v2ver1.0
+NIST SP 1011-II-1 0: NIST SP 1011v2ver1.0
 NIST SP 1011-I-2.0: NIST SP 1011v1ver2.0
+NIST SP 1011-I-2 0: NIST SP 1011v1ver2.0
 NIST SP 500-281-v1.0: NIST SP 500-281v1.0
 NIST IR 8259Aes: NIST IR 8259A(spa)
 NIST IR 8259Apt: NIST IR 8259A(por)
 NIST IR 8211-upd: NIST IR 8211/Upd1-2021
 NIST IR 8115r1/upd: NIST IR 8115r1/Upd1-2021
 NBS CS v: NBS CSM v
-!ruby/regexp /NBS CRPL-F-B(?=\d+)/: "NBS CRPL-F-B "
-!ruby/regexp /NBS[.\s]CS[.\s]e/: "NBS CS-E "
-!ruby/regexp /(?<=\d)es/: (spa)
-!ruby/regexp /(?<=\d)chi/: (zho)
-!ruby/regexp /(?<=\d)viet/: (vie)
-!ruby/regexp /(?<=\d)port/: (por)
-!ruby/regexp /(?<=\d)(pt)(?!\d)/: (por)
-!ruby/regexp /(?<=\d)id/: (ind)
+NIST SP 800-57p1r2006: NIST SP 800-57pt1r1
+NIST SP 800-57p1r2007: NIST SP 800-57pt1r2
+NIST SP 500-268v1 1: NIST SP 500-268v1.1
+NIST SP 500-270v1 1: NIST SP 500-270v1.1
+NIST SP 500-280v2 1: NIST SP 500-280v2.1
+NIST SP 500-281-v1 0: NIST SP 500-281v1.0
+NIST SP 800-63v1 0 1: NIST SP 800-63v1.0.1
+NIST SP 800-63v1 0 2: NIST SP 800-63v1.0.2
+NIST SP 955 Suppl: NIST SP 955sup
+NIST SP 984 4: NIST SP 984-4
+NISTPUB 0413171251: NIST TN 1648-2009
+NIST IR 8286C-draft: NIST IR 8286C (Draft)
+NIST SP 800-140Cr1-draft2: NIST SP 800-140Cr1 2pd
+NIST SP 800-140Dr1-draft2: NIST SP 800-140Dr1 2pd
+NIST SP 800-219-draft: NIST SP 800-219 (Draft)
+NIST IR 8270-draft2: NIST IR 8270 2pd
+NIST HB 135e2022-upd1: NIST HB 135e2022/Upd1-202205
+NIST SP 1900-206-upd1: NIST SP 1900-206/Upd1-202202
+NIST TN 2207-upd1: NIST TN 2207/Upd1-202205
+NIST IR 8290-upd1: NIST IR 8290/Upd1-202205
+NIST IR 8413-upd1: NIST IR 8413/Upd1-202207
+NIST IR 85-3273-37-upd1: NIST IR 85-3273-37/Upd1-202205
+NIST IR 8352-draft: NIST IR 8352 (Draft)
+NIST SP 1273-draft: NIST SP 1273 (Draft)
+NIST IR 8323-draft: NIST IR 8323 (Draft)
+/NBS CRPL-F-B(?=\d+)/: "NBS CRPL-F-B "
+/NBS[.\s]CS[.\s]e/: "NBS CS-E "
+NBS NSRDS: NSRDS-NBS
+nist ir: NIST IR
+/(?<=\d)es/: (spa)
+/(?<=\d)chi/: (zho)
+/(?<=\d)viet/: (vie)
+/(?<=\d)port/: (por)
+/(?<=\d)(pt)(?!\d)/: (por)
+/(?<=\d)id/: (ind)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-nist
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.2
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-06 00:00:00.000000000 Z
+date: 2023-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: relaton-nist
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: lightly
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: lightly
+  name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: parslet
+  name: pubid-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 description: Library to generate, parse and manipulate NIST PubID.
 email:
 - open.source@ribose.com
@@ -151,12 +151,11 @@ files:
 - exe/pubid-nist
 - lib/pubid-nist.rb
 - lib/pubid/nist.rb
-- lib/pubid/nist/document.rb
-- lib/pubid/nist/document_parser.rb
-- lib/pubid/nist/document_transform.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/nbs_bh.rb
@@ -180,8 +179,11 @@ 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/serie.rb
 - lib/pubid/nist/stage.rb
+- lib/pubid/nist/transformer.rb
+- lib/pubid/nist/update.rb
 - lib/pubid/nist/version.rb
 - publishers.yaml
 - series.yaml
@@ -191,7 +193,7 @@ homepage: https://github.com/metanorma/pubid-nist
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -206,8 +208,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: Library to generate, parse and manipulate NIST PubID.
 test_files: []

data/lib/pubid/nist/document_transform.rb

@@ -1,21 +0,0 @@
-module Pubid::Nist
-  class DocumentTransform
-    def apply(tree, context = nil)
-      series = tree[:series].to_s.gsub(".", " ")
-      document_parameters = tree.reject do |k, _|
-        %i[report_number first_report_number second_report_number series parts].include?(k)
-      end
-      tree[:parts]&.each { |part| document_parameters.merge!(part) }
-      report_number = tree.values_at(:first_report_number,
-                                     :second_report_number).compact.join("-").upcase
-
-      # using :report_number when need to keep original words case
-      report_number = tree[:report_number] if report_number.empty?
-
-      Document.new(publisher: Publisher.parse(series),
-                   serie: Serie.new(serie: series),
-                   docnumber: report_number,
-                   **document_parameters)
-    end
-  end
-end