pubid-nist 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 385c609c6c253b90710e676e371d6466951a0a4146d0791ad6a16a299a9190d0
-  data.tar.gz: 3bdf39dc5fecc613eca35cbf74f6026e4e8771c1f89c584406a88c680fbc1f22
+  metadata.gz: ae5b75b8cb77b433b69d107ca44d6f828602da328419436c24c25968412d1719
+  data.tar.gz: 1377f4285c99bd9f1582f5ca1daff8ed79cf90543405bf43d4a8a9659d2ae21b
 SHA512:
-  metadata.gz: 7c6282be01f402f63283faed9d7a227bc8ed06e77569c7371c50b71566f3ce38e1f04f13a228df4997140858fa7c1c65c147730465fad7231d5930e31cd594f6
-  data.tar.gz: 07f422c88625fac8bfc24599db548ab0d4e33230f25376a435c6c2731469704c1d75930362f9a03ee0c82d4d3d3a0a64ad21b2a7d41ed1df409b9c30da5efc97
+  metadata.gz: f0252ea5cf1e0f418d15b29a051dbaa203ff0765dcf1d45124b3fb123a5d0baaaa6aac5e2cca8de138e0fbf21f20d4b7aba0ecaf79de7fbc79164a119763d971
+  data.tar.gz: a8e8a4c490568753bd6233432825c7cf717dbd379c1eb56155082bdbe9ce74040365e9579f802c241ca6c98631da38ca7caa6ac6ff2687e6ada9003cc21e28de

data/lib/pubid/nist/identifier.rb

@@ -93,7 +93,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

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]
@@ -109,7 +116,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.2".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.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-17 00:00:00.000000000 Z
+date: 2023-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake