pubid-nist 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 385c609c6c253b90710e676e371d6466951a0a4146d0791ad6a16a299a9190d0
-  data.tar.gz: 3bdf39dc5fecc613eca35cbf74f6026e4e8771c1f89c584406a88c680fbc1f22
+  metadata.gz: c7f76d8947ccd706282e78b94eb9c4284671b866acc1630c08a1fdd398dbd73e
+  data.tar.gz: 01dfd5d1e8afbe479916a906566406f2d3a7d8d3235053a86be6d0cf1c09de5c
 SHA512:
-  metadata.gz: 7c6282be01f402f63283faed9d7a227bc8ed06e77569c7371c50b71566f3ce38e1f04f13a228df4997140858fa7c1c65c147730465fad7231d5930e31cd594f6
-  data.tar.gz: 07f422c88625fac8bfc24599db548ab0d4e33230f25376a435c6c2731469704c1d75930362f9a03ee0c82d4d3d3a0a64ad21b2a7d41ed1df409b9c30da5efc97
+  metadata.gz: 051144f72ccff63f56b875f2bb843750b14b86d3b9014f27ecd15cfd61e084052df6ae44be931a2c9b7a7e63dee3e03a927e4c6123cf6ff3727cb134fcb43340
+  data.tar.gz: 7b26bc1e82271f82286079bda318834594dc93eca2ef6e3569109e2323d47c06708404aed1f1dd02aead5a1d03d60efe14d900556696976945fa4778fd2a032a

data/lib/pubid/nist/identifier.rb

@@ -4,83 +4,6 @@ require "json"
 
 UPDATE_CODES = YAML.load_file(File.join(File.dirname(__FILE__), "../../../update_codes.yaml"))
 
-REVISION_DESC = {
-  long: ", Revision ",
-  abbrev: ", Rev. ",
-  short: "r",
-  mr: "r",
-}.freeze
-
-VERSION_DESC = {
-  long: ", Version ",
-  abbrev: ", Ver. ",
-  short: "ver",
-  mr: "ver",
-}.freeze
-
-VOLUME_DESC = {
-  long: ", Volume ",
-  abbrev: ", Vol. ",
-  short: "v",
-  mr: "v",
-}.freeze
-
-PART_DESC = {
-  long: " Part ",
-  abbrev: " Pt. ",
-  short: "pt",
-  mr: "pt",
-}.freeze
-
-EDITION_DESC = {
-  long: " Edition ",
-  abbrev: " Ed. ",
-  short: "e",
-  mr: "e",
-}.freeze
-
-SUPPLEMENT_DESC = {
-  long: " Supplement ",
-  abbrev: " Suppl. ",
-  short: "sup",
-  mr: "sup",
-}.freeze
-
-SECTION_DESC = {
-  long: " Section ",
-  abbrev: " Sec. ",
-  short: "sec",
-  mr: "sec",
-}.freeze
-
-APPENDIX_DESC = {
-  long: " Appendix ",
-  abbrev: " App. ",
-  short: "app",
-  mr: "app",
-}.freeze
-
-ERRATA_DESC = {
-  long: " Errata ",
-  abbrev: " Err. ",
-  short: "err",
-  mr: "err",
-}.freeze
-
-INDEX_DESC = {
-  long: " Index ",
-  abbrev: " Index. ",
-  short: "indx",
-  mr: "indx",
-}.freeze
-
-INSERT_DESC = {
-  long: " Insert ",
-  abbrev: " Ins. ",
-  short: "ins",
-  mr: "ins",
-}.freeze
-
 module Pubid::Nist
   class Identifier < Pubid::Core::Identifier::Base
     attr_accessor :serie, :code, :revision, :publisher, :version, :volume,
@@ -93,7 +16,7 @@ module Pubid::Nist
       @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.to_s) if stage
+      @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
@@ -148,25 +71,11 @@ module Pubid::Nist
       code
     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)
-      self.class.get_renderer_class.new(get_params).render(format: format)
+    # @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)
     end
 
-
     def to_json(*args)
       result = {
         styles: {
@@ -184,104 +93,6 @@ module Pubid::Nist
       result.to_json(*args)
     end
 
-    def render_serie(format)
-      if serie.to_s(format).include?(publisher.to_s(format))
-        return serie.to_s(format)
-      end
-
-      "#{publisher.to_s(format)} #{serie.to_s(format)}"
-    end
-
-    def render_part(format)
-      result = ""
-      result += "#{VOLUME_DESC[format]}#{volume}" unless volume.nil?
-      result += "#{PART_DESC[format]}#{part}" unless part.nil?
-      result
-    end
-
-    def render_edition(format)
-      result = ""
-
-      result += "#{EDITION_DESC[format]}#{edition.to_s}" unless edition.nil?
-      result += "#{REVISION_DESC[format]}#{revision == '' ? '1' : revision}" if revision
-      result += "#{VERSION_DESC[format]}#{version}" unless version.nil?
-      result
-    end
-
-    def render_localities(format)
-      result = ""
-      result += "#{SUPPLEMENT_DESC[format]}#{supplement}" unless supplement.nil?
-      result += "#{SECTION_DESC[format]}#{section}" unless section.nil?
-      result += "#{APPENDIX_DESC[format]}" unless appendix.nil?
-      result += "#{ERRATA_DESC[format]}" unless errata.nil?
-      result += INDEX_DESC[format] unless index.nil?
-      result += INSERT_DESC[format] unless insert.nil?
-
-      result
-    end
-
-    def render_update(format)
-      return "" if update_year.nil?
-
-      if update_month && update_number.nil?
-        @update_number = "1"
-      end
-
-      if update_year&.length == 2
-        @update_year = "19#{update_year}"
-      end
-
-      if update_number.match?(/\d+/)
-        update_text = update_number
-        update_text += "-#{update_year}" if update_year && !update_year.empty?
-        if update_month
-          date = Date.parse("01/#{update_month}/#{update_year}")
-          update_text += sprintf("%02d", date.month)
-        end
-      else
-        update_text = "1"
-      end
-
-      case 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(format)
-      return "" if translation.nil?
-
-      case format
-      when :long, :abbrev
-        " (#{translation.upcase})"
-      when :mr
-        ".#{translation}"
-      when :short
-        "(#{translation})"
-      end
-    end
-
-    def render_addendum(input, format)
-      return input unless addendum
-
-      case format
-      when :long
-        "Addendum to #{input}"
-      when :abbrev
-        "Add. to #{input}"
-      when :short
-        "#{input} Add."
-      when :mr
-        "#{input}.add-1"
-      end
-    end
-
     class << self
       def create(**opts)
         new(**opts)

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

@@ -2,14 +2,15 @@ module Pubid::Nist
   module Parsers
     class Default < Pubid::Core::Parser
       rule(:identifier) do
-        stage.maybe >> (str(" ") | str(".")) >> report_number >> parts.repeat
+        old_stage.maybe >> (str(" ") | str(".")) >> report_number >>
+          parts.repeat >> draft.maybe >> stage.maybe >> translation.maybe
       end
 
       rule(:month_letters) { match('[A-Za-z]').repeat(3, 3) }
       rule(:number_suffix) { match("[aA-Z]") }
 
       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
 
@@ -33,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
@@ -80,7 +88,7 @@ module Pubid::Nist
 
       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/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/renderer.rb

@@ -7,9 +7,16 @@ module Pubid::Nist
     end
 
     def render_identifier(params, opts)
-      result = "%{serie}%{stage}%{code}%{volume}%{part}%{edition}%{revision}%{version}"\
-      "%{supplement}%{section}%{appendix}%{errata}%{index}%{insert}%{update}"\
-      "%{translation}" % params
+      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]
@@ -40,6 +47,8 @@ module Pubid::Nist
     end
 
     def render_edition(edition, opts, _params)
+      return if opts[:without_edition]
+
       case opts[:format]
       when :long
         " Edition "
@@ -109,7 +118,7 @@ module Pubid::Nist
       when :mr
         ".#{translation}"
       when :short
-        "(#{translation})"
+        " #{translation}"
       end
     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

@@ -26,5 +26,18 @@ module Pubid::Nist
     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/version.rb

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

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,7 +46,9 @@ 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)
@@ -50,8 +57,33 @@ NIST IR 8115r1/upd: NIST IR 8115r1/Upd1-2021
 NBS CS v: NBS CSM v
 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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-nist
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-17 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake