pubid-nist 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: effbdd3a2d023969c91461079bcb6b2ac8fc24d1260a7655cdacaf50858a6084
-  data.tar.gz: '07885e3191c545d7f5796c5ad431094af88a4334fa12b3f97357c8dbebc71d6f'
+  metadata.gz: 9ac016ca575f6b9815da56cb9424c1ba9bce844f494822e8bf407d9bb51de4cd
+  data.tar.gz: 5fe93360f4980550e766cffc5b7c0ad6ae00124fa818cfd6ac4ba6b6eb2bf445
 SHA512:
-  metadata.gz: f5612165d60141ecccaf5c757f5cf30a8eb7d9dd4c62855d44d4a67489b7ff32216fdc81baa5f8d17fd8b5a58bfe38602421083a0ac23e36f2cc7bda62bb5206
-  data.tar.gz: d5b169cb694230dbb1d9667a6c38d7b7b0a900dac783412364026ea3d58a330d6045440a26770f01a63d3afb805f2d86907bdf42171e57b5e0258363a89bf226
+  metadata.gz: afdb479f21109aaf05b75d9ae2d0d783b347fe2cea4734e18ec01cabfe3129bba69cb36e444f9005d12bb153516097642147a3a464ee576f1b9866ce03030eaf
+  data.tar.gz: 9a41dd6a27fda08447e56b1c128971fec36057739fd48a802ac503af1078247addf9329fe4a9d9b2a839d3e827b39be60108f536f39633eb798152ef431cff8c

data/lib/pubid/nist/edition.rb

@@ -1,26 +1,38 @@
 module Pubid::Nist
   class Edition < Pubid::Core::Entity
-    attr_accessor :year, :month, :day, :parsed, :sequence
+    attr_accessor :year, :month, :day, :parsed, :number
 
-    def initialize(parsed: nil, year: nil, month: nil, day: nil, sequence: nil)
+    def initialize(parsed: nil, year: nil, month: nil, day: nil, number: nil)
       @parsed = parsed
       @year = year
       @month = month
       @day = day
-      @sequence = sequence
+      @number = number
     end
 
-    def to_s
-      result = (@sequence && [@sequence]) || []
-      if @day
-        result << Date.new(@year, @month, @day).strftime("%Y%m%d")
-      elsif @month
-        result << Date.new(@year, @month).strftime("%Y%m")
-      elsif @year
-        result << Date.new(@year).strftime("%Y")
-      end
+    def to_s(format: :short)
 
-      result.join("-")
+      if format == :long
+        result = (@number && ["Edition #{@number}"]) || []
+        if @day
+          result << Date.new(@year, @month, @day).strftime("(%B %d, %Y)")
+        elsif @month
+          result << Date.new(@year, @month).strftime("(%B %Y)")
+        elsif @year
+          result << Date.new(@year).strftime("(%Y)")
+        end
+        result.join(" ")
+      else
+        result = (@number && [@number]) || []
+        if @day
+          result << Date.new(@year, @month, @day).strftime("%Y%m%d")
+        elsif @month
+          result << Date.new(@year, @month).strftime("%Y%m")
+        elsif @year
+          result << Date.new(@year).strftime("%Y")
+        end
+        result.join("-")
+      end
     end
   end
 end

data/lib/pubid/nist/identifier.rb

@@ -8,19 +8,24 @@ UPDATE_CODES = YAML.load_file(File.join(File.dirname(__FILE__), "../../../update
 module Pubid::Nist
   class Identifier < Pubid::Core::Identifier::Base
     extend Forwardable
-    attr_accessor :serie, :code, :revision, :publisher, :version, :volume,
+    attr_accessor :series, :code, :revision, :publisher, :version, :volume,
                   :part, :addendum, :stage, :translation,
                   :edition, :supplement, :update,
                   :section, :appendix, :errata, :index, :insert
 
-    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)
+    def initialize(publisher: "NIST", series:, number: nil, stage: nil, supplement: nil,
+                   edition_month: nil, edition_year: nil, edition_day: nil, update: nil,
+                   edition: nil, **opts)
+      @publisher = publisher.is_a?(Publisher) ? publisher : Publisher.new(publisher: publisher.to_s)
+      @series = series.is_a?(Series) ? series : Series.new(series: series)
       @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
+      if edition_month || edition_year
+        @edition = parse_edition(edition_month, edition_year, edition_day)
+      elsif edition
+        @edition = Edition.new(number: edition)
+      end
       @update = update
       opts.each { |key, value| send("#{key}=", value.to_s) }
     end
@@ -56,7 +61,7 @@ module Pubid::Nist
       document.instance_variables.each do |var|
         val = document.instance_variable_get(var)
         current_val = instance_variable_get(var)
-        if [:@serie, :@publisher].include?(var) ||
+        if [:@series, :@publisher].include?(var) ||
             (val && current_val.nil?) ||
             (val && current_val.to_s.length < val.to_s.length)
           instance_variable_set(var, val)

data/lib/pubid/nist/parser.rb

@@ -5,7 +5,7 @@ module Pubid::Nist
     rule(:series) do
       (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))) >>
+        ((str("NBS") | str("NIST")).as(:publisher) >> (space | dot) >> array_to_str(SERIES["long"].keys.sort_by(&:length).reverse.flatten).as(:series))) >>
         any.repeat.as(:remaining)
     end
 
@@ -18,7 +18,8 @@ module Pubid::Nist
                else
                  SERIES["mr"].key(parsed[:series_mr].to_s)
                end
-      parser = find_parser(series)
+      publisher = parsed[:publisher]
+      parser = find_parser(publisher, series)
       begin
         parsed = parser.new.parse(parsed[:remaining].to_s)
       rescue Parslet::ParseFailed
@@ -26,11 +27,15 @@ module Pubid::Nist
         # 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 })
+      if publisher
+        parsed.is_a?(Array) ? parsed << { series: series, publisher: publisher } : parsed.merge({ series: series, publisher: publisher })
+      else
+        parsed.is_a?(Array) ? parsed << { series: series } : parsed.merge({ series: series })
+      end
     end
 
-    def find_parser(series)
-      PARSERS_CLASSES[series] || Pubid::Nist::Parsers::Default
+    def find_parser(publisher, series)
+      PARSERS_CLASSES[series] || PARSERS_CLASSES["#{publisher} #{series}"] || Pubid::Nist::Parsers::Default
     end
   end
 end

data/lib/pubid/nist/parsers/{nbs_circ.rb → circ.rb}

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

data/lib/pubid/nist/parsers/{nbs_crpl.rb → crpl.rb}

@@ -1,6 +1,6 @@
 module Pubid::Nist
   module Parsers
-    class NbsCrpl < Default
+    class Crpl < Default
       rule(:first_report_number) do
         (digits >> (str("-m") | str("-M")).maybe).as(:first_report_number)
       end

data/lib/pubid/nist/parsers/{nbs_csm.rb → csm.rb}

@@ -1,6 +1,6 @@
 module Pubid::Nist
   module Parsers
-    class NbsCsm < Default
+    class Csm < Default
       rule(:identifier) do
         (str(" ") | str(".")) >> report_number.maybe >> parts.repeat.as(:parts)
       end

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

@@ -1,8 +1,15 @@
-require_relative "nbs_fips"
-
 module Pubid::Nist
   module Parsers
-    class Fips < NbsFips
+    class Fips < Default
+      rule(:edition) do
+        str("-") >> (
+          (month_letters.as(:edition_month) >> year_digits.as(:edition_year)) |
+            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
 end

data/lib/pubid/nist/parsers/{nist_gcr.rb → gcr.rb}

@@ -1,6 +1,6 @@
 module Pubid::Nist
   module Parsers
-    class NistGcr < Default
+    class Gcr < Default
       rule(:report_number) do
         (digits >>
           str("-") >> digits >> (str("-") >> digits).maybe).as(:report_number)

data/lib/pubid/nist/parsers/{nbs_hb.rb → hb.rb}

@@ -1,15 +1,7 @@
 module Pubid::Nist
   module Parsers
-    class NbsHb < Default
-      # found patterns:
-      # 44e2-1955 -> 44e2
-      # 146v1-1991
-      # 105-1-1990 -> 105-1e1990
-      # 111r1977 / 146v1
-      # 130-1979 -> 130e1979
-      # 105-8 -> 105-8
-      # 28supp1957pt1
-      # 67suppFeb1965
+    class Hb < Default
+      rule(:number_suffix) { match("[a-zA-Z]") }
 
       rule(:edition) do
         (str("supp") >> str("").as(:supplement) >>

data/lib/pubid/nist/parsers/{nbs_mp.rb → mp.rb}

@@ -1,6 +1,6 @@
 module Pubid::Nist
   module Parsers
-    class NbsMp < Default
+    class Mp < Default
       rule(:edition) do
         (str("e") >> digits.as(:edition)) | (str("(") >> digits.as(:edition) >> str(")"))
       end

data/lib/pubid/nist/parsers/{nist_ncstar.rb → ncstar.rb}

@@ -1,6 +1,6 @@
 module Pubid::Nist
   module Parsers
-    class NistNcstar < Default
+    class Ncstar < Default
       rule(:number_suffix) { match("[abcdefghijA-Z]") }
     end
   end

data/lib/pubid/nist/parsers/{nist_owmwp.rb → owmwp.rb}

@@ -1,6 +1,6 @@
 module Pubid::Nist
   module Parsers
-    class NistOwmwp < Default
+    class Owmwp < Default
       rule(:report_number) do
         digits_with_suffix.as(:first_report_number) >>
           (str("-") >> (digits_with_suffix >> (str("-") >> digits_with_suffix).maybe)

data/lib/pubid/nist/parsers/{nbs_rpt.rb → rpt.rb}

@@ -1,6 +1,6 @@
 module Pubid::Nist
   module Parsers
-    class NbsRpt < Default
+    class Rpt < Default
       rule(:report_number) do
         (month_letters >>
           str("-") >> (month_letters >> year_digits)).as(:report_number) |

data/lib/pubid/nist/parsers/{nist_sp.rb → sp.rb}

@@ -1,6 +1,6 @@
 module Pubid::Nist
   module Parsers
-    class NistSp < Default
+    class Sp < Default
       rule(:version) do
         (((str("ver") | str(" Ver. ") | str(" Version ")) >> (digits >> (str(".") >> digits).repeat).as(:version)) |
           (str("v") >>
@@ -50,10 +50,12 @@ module Pubid::Nist
       end
 
       rule(:volume) do
-        (str("v") | str(" Vol. ")) >> digits.as(:volume)
+        # hack for NBS SP 535v2a-l vs NBS SP 535v2m-z
+        # https://github.com/metanorma/pubid-nist/issues/98
+        (str("v") | str(" Vol. ")) >> (digits >> (str("a-l") | str("m-z")).maybe >> match("[A-Z]").repeat).as(:volume)
       end
 
-      rule(:part_prefixes) { str("pt") | str("p") | str(" Part ") }
+      rule(:part_prefixes) { str("pt") | str("p") | str("P") | str(" Part ") }
     end
   end
 end

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

@@ -0,0 +1,17 @@
+module Pubid::Nist
+  module Parsers
+    class Tn < Default
+      # rule(:report_number) do
+      #   first_report_number
+      # end
+
+      rule(:edition_prefixes) do
+        str("-") | str("e")
+      end
+
+      rule(:second_report_number) do
+        year_digits.absent? >> (digits_with_suffix | str("A")).as(:second_report_number)
+      end
+    end
+  end
+end

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

@@ -10,22 +10,24 @@ module Pubid::Nist
       def render_identifier(params, opts)
         case opts[:format]
         when :short, :mr
-          "%{serie}%{code}%{volume}%{part}%{edition}%{revision}%{version}"\
+          "%{series}%{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}"\
+          "%{series}%{code}%{stage}%{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])
+      def render_series(series, opts, params)
+        if series.to_s(opts[:format]).include?(params[:publisher].to_s(opts[:format]))
+          return series.to_s(opts[:format])
         end
 
-        "#{params[:publisher].to_s(opts[:format])} #{serie.to_s(opts[:format])}"
+        "#{params[:publisher].to_s(opts[:format])}" +
+          (opts[:format] == :mr ? "." : " ") +
+          "#{series.to_s(opts[:format])}"
       end
 
       def render_code(code, opts, _params)
@@ -37,12 +39,12 @@ module Pubid::Nist
 
         case opts[:format]
         when :long
-          " Edition "
+          " #{edition.to_s(format: :long)}"
         when :abbrev
-          " Ed. "
+          " Ed. " + edition.to_s
         when :short, :mr
-          "e"
-        end + edition.to_s
+          "e" + edition.to_s
+        end
       end
 
       def render_revision(revision, opts, _params)

data/lib/pubid/nist/series.rb

@@ -0,0 +1,30 @@
+SERIES = YAML.load_file(File.join(File.dirname(__FILE__), "../../../series.yaml"))
+
+module Pubid::Nist
+  class Series
+    attr_accessor :series, :parsed
+
+    def initialize(series:, parsed: nil)
+      raise Errors::SerieInvalidError, "#{series} is not valid series" unless SERIES["long"].key?(series)
+
+      @series = series
+      @parsed = parsed
+    end
+
+    def to_s(format = :short)
+      # return SERIES["abbrev"][@serie] ||
+      return @series if format == :short
+
+      result = SERIES[format.to_s][@series]
+      return @series if result.nil? && format == :mr
+
+      return SERIES["long"][@series] if result.nil?
+
+      result
+    end
+
+    def ==(other)
+      other.series == @series
+    end
+  end
+end

data/lib/pubid/nist/stage.rb

@@ -17,7 +17,7 @@ module Pubid::Nist
       when :mr
         "#{@id}#{@type}"
       else
-        "#{STAGES['id'][@id]} #{STAGES['type'][@type]}"
+        "(#{STAGES['id'][@id]} #{STAGES['type'][@type]})"
       end
     end
 

data/lib/pubid/nist/transformer.rb

@@ -10,8 +10,16 @@ module Pubid::Nist
     end
 
     rule(series: subtree(:series)) do |context|
-      { serie: Serie.new(serie: context[:series].to_s.gsub(".", " ")),
-        publisher: Publisher.parse(context[:series]) }
+      if context[:publisher]
+        if context[:series]
+          { series: Series.new(series: context[:series].to_s.gsub(".", " ")) }
+        else
+          {}
+        end
+      else
+        { series: Series.new(series: context[:series].to_s.gsub(".", " ")),
+          publisher: Publisher.parse(context[:series]) }
+      end
     end
 
     # remove :second_report_number from output

data/lib/pubid/nist/version.rb

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

data/lib/pubid/nist.rb

@@ -10,7 +10,7 @@ module Pubid
   end
 end
 
-require_relative "nist/serie"
+require_relative "nist/series"
 require_relative "nist/parsers/default"
 require_relative "nist/update"
 require_relative "nist/transformer"

data/series.yaml

@@ -1,137 +1,115 @@
 long:
-  NIST AMS: Advanced Manufacturing Standard
-  NIST BSS: Building Science Series
-  NBS BSS: Building Science Series
-  NBS BMS: Building Material Structures Report
+  AMS: Advanced Manufacturing Series
+  BSS: Building Science Series
+  BMS: Building Material Structures Report
   NBS BRPD-CRPL-D: Basic Radio Propagation Predictions Series
-  NBS BH: Building and Housing Reports
-  NBS CRPL: Central Radio Propagation Laboratory Reports
+  BH: Building and Housing
+  CRPL: Central Radio Propagation Laboratory Reports
   NBS CRPL-F-A: CRPL Ionospheric Data
   NBS CRPL-F-B: CRPL Solar-Geophysical Data
   NBS IP: CRPL Ionospheric Predictions
-  NBS CIRC: Circulars
+  CIRC: Circulars
   NBS CIS: Consumer Information Series
-  NBS CS: Commercial Standards
+  CS: Commercial Standards
   NBS CS-E: Commercial Standards (emergency)
-  NBS CSM: Commercial Standards Monthly
-  NBS FIPS: Federal Information Processing Standards Publication
+  CSM: Commercial Standards Monthly
   FIPS: Federal Information Processing Standards Publication
-  NIST GCR: Grant/Contract Reports
-  NBS GCR: Grant/Contract Reports
-  NIST HB: Handbook
-  NBS HB: Handbook
+  GCR: Grant/Contract Reports
+  HB: Handbooks
   NBS HR: Hydraulic Research in the United States
   NBS IRPL: Interservice Radio Propagation Laboratory
   ITL Bulletin: ITL Bulletin
   NIST LC: Letter Circular
   NBS LC: Letter Circular
-  NIST MN: Monograph
-  NBS MN: Monograph
-  NBS MP: Miscellaneous Publications
-  NIST NCSTAR: National Construction Safety Team Report
-  NIST NSRDS: National Standard Reference Data Series
+  MONO: Monograph
+  MP: Miscellaneous Publications
+  NCSTAR: National Construction Safety Team Act Reports
+  NSRDS: National Standard Reference Data Series
   NSRDS-NBS: National Standard Reference Data Series
-  NIST IR: Interagency or Internal Report
-  NBS IR: Interagency or Internal Report
-  NIST OWMWP: Office of Weights and Measures White Papers
-  NBS PC: Photographic Circulars
-  NBS RPT: Reports
+  IR: Interagency or Internal Report
+  OWMWP: Office of Weights and Measures White Papers
+  PC: Photographic Laboratory Circulars
+  RPT: Reports
   NIST PS: Voluntary Product Standards
-  NBS SIBS: Special Interior Ballistics Studies
+  SIBS: Special Interior Ballistics Studies
   NBS PS: Voluntary Product Standards
-  NIST SP: Special Publication
-  NBS SP: Special Publication
-  NIST TN: Technical Note
-  NBS TN: Technical Note
-  NBS TIBM: Technical Information on Building Materials
-  NIST TTB: Technology Transfer Brief
+  SP: Special Publication
+  TN: Technical Notes
+  TIBM: Technical Information on Building Materials for Use in the Design of Low Cost Housing
+  TTB: Technology Transfer Briefs
   NIST DCI: Data Collection Instruments
-  NIST EAB: Economic Analysis Brief
+  EAB: Economic Analysis Brief
   NIST Other: Other
-  CSRC White Paper: Cybersecurity Resource Center White Paper
+  CSWP: Cybersecurity White Papers
   CSRC Book: Cybersecurity Resource Center Book
   CSRC Use Case: Cybersecurity Resource Center Use Case
   CSRC Building Block: Cybersecurity Resource Center Building Block
   JPCRD: Journal of Physical and Chemical Reference Data
   JRES: Journal of Research of NIST
 abbrev:
-  NIST AMS: Adv. Man. Ser
-  NIST BSS: Bldg. Sci. Ser.
-  NBS BSS: Bldg. Sci. Ser.
-  NBS FIPS: Federal Inf. Process. Stds.
+  AMS: Adv. Man. Ser
+  BSS: Bldg. Sci. Ser.
   FIPS: Federal Inf. Process. Stds.
-  NIST HB: Handb.
-  NBS HB: Handb.
-  NIST MN: Monogr.
-  NBS MN: Monogr.
-  NIST NCSTAR: Natl. Constr. Tm. Act Rpt.
-  NIST NSRDS: Natl. Stand. Ret. Data Ser.
+  HB: Handb.
+  MONO: Monogr.
+  NCSTAR: Natl. Constr. Tm. Act Rpt.
+  NSRDS: Natl. Stand. Ret. Data Ser.
   NSRDS-NBS: Natl. Stand. Ret. Data Ser.
   NIST PS: Prod. Stand.
   NBS PS: Prod. Stand.
-  NIST SP: Spec. Publ.
-  NBS SP: Spec. Publ.
-  NIST TN: Tech. Note
-  NBS TN: Tech. Note
+  SP: Spec. Publ.
+  TN: Tech. Note
   NIST DCI: Data Collect. Instr.
   NIST Other: Other
-  CSRC White Paper: CSWP
+  CSWP: CSWP
   CSRC Book: CSRC Book
   CSRC Use Case: CSRC Use Case
   CSRC Building Block: CSRC Building Block
   JPCRD: J. Phys. & Chem. Ref. Data
   JRES: J. Res. Natl. Inst. Stan.
 mr:
-  NIST AMS: NIST.AMS
-  NIST BSS: NIST.BSS
-  NBS BSS: NBS.BSS
-  NBS BMS: NBS.BMS
+  AMS: AMS
+  BSS: BSS
+  BMS: BMS
   NBS BRPD-CRPL-D: NBS.BRPD-CRPL-D
-  NBS BH: NBS.BH
-  NBS CRPL: NBS.CRPL
+  BH: BH
+  CRPL: CRPL
   NBS CRPL-F-A: NBS.CRPL-F-A
   NBS CRPL-F-B: NBS.CRPL-F-B
   NBS IP: NBS.IP
-  NBS CIRC: NBS.CIRC
+  CIRC: CIRC
   NBS CIS: NBS.CIS
-  NBS CS: NBS.CS
+  CS: CS
   NBS CS-E: NBS.CS-E
-  NBS CSM: NBS.CSM
-  NBS FIPS: NBS.FIPS
-  FIPS: NIST.FIPS
-  NIST GCR: NIST.GCR
-  NBS GCR: NBS.GCR
-  NIST HB: NIST.HB
-  NBS HB: NBS.HB
+  CSM: CSM
+  FIPS: FIPS
+  GCR: GCR
+  HB: HB
   NBS HR: NBS.HR
   NBS IRPL: NBS.IRPL
   ITL Bulletin: NIST.ITLB
   NIST LC: NIST.LC
   NBS LC: NBS.LC
-  NIST MN: NIST.MN
-  NBS MN: NBS.MN
-  NBS MP: NBS.MP
-  NIST NCSTAR: NIST.NCSTAR
-  NIST NSRDS: NIST.NSRDS
+  MONO: MN
+  MP: MP
+  NCSTAR: NCSTAR
+  NSRDS: NSRDS
   NSRDS-NBS: NBS.NSRDS
-  NIST IR: NIST.IR
-  NBS IR: NBS.IR
-  NIST OWMWP: NIST.OWMWP
-  NBS PC: NBS.PC
-  NBS RPT: NBS.RPT
+  IR: IR
+  OWMWP: OWMWP
+  PC: PC
+  RPT: RPT
   NIST PS: NIST.PS
-  NBS SIBS: NBS.SIBS
+  SIBS: SIBS
   NBS PS: NBS.PS
-  NIST SP: NIST.SP
-  NBS SP: NBS.SP
-  NIST TN: NIST.TN
-  NBS TN: NBS.TN
-  NBS TIBM: NBS.TIBM
-  NIST TTB: NIST.TTB
+  SP: SP
+  TN: TN
+  TIBM: TIBM
+  TTB: TTB
   NIST DCI: NIST.DCI
-  NIST EAB: NIST.EAB
+  EAB: EAB
   NIST Other: NIST.O
-  CSRC White Paper: NIST.CSWP
+  CSWP: CSWP
   CSRC Book: NIST.CSB
   CSRC Use Case: NIST.CSUC
   CSRC Building Block: NIST.CSBB

data/update_codes.yaml

@@ -1,5 +1,5 @@
-NBS MONO: NBS MN
-NIST MONO: NIST MN
+NBS MN: NBS MONO
+NIST MN: NIST MONO
 NIST MP: NBS MP
 NIST SP 260-162 2006ed.: NIST SP 260-162e2006
 NBS CIRC 154suprev: NBS CIRC 154r1sup
@@ -9,7 +9,7 @@ NBS CIRC supJun1925-Jun1927: NBS CIRC 24e7sup3
 NBS CIRC e2: NBS CIRC 2e2
 NBS CIRC 25sup-1924: NBS CIRC 25sup
 NIST SP 260-126 rev 2013: NIST SP 260-126r2013
-NIST CSWP: CSRC White Paper
+NIST CSRC White Paper: NIST CSWP
 NIST SP 800-56ar: NIST SP 800-56Ar1
 NIST.LCIRC: NIST.LC
 NBS.LCIRC: NBS.LC

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-nist
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -171,32 +171,26 @@ files:
 - lib/pubid/nist/identifier.rb
 - lib/pubid/nist/nist_tech_pubs.rb
 - lib/pubid/nist/parser.rb
+- lib/pubid/nist/parsers/circ.rb
+- lib/pubid/nist/parsers/crpl.rb
+- lib/pubid/nist/parsers/csm.rb
 - lib/pubid/nist/parsers/default.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
-- lib/pubid/nist/parsers/nbs_csm.rb
-- lib/pubid/nist/parsers/nbs_fips.rb
-- lib/pubid/nist/parsers/nbs_hb.rb
+- lib/pubid/nist/parsers/gcr.rb
+- lib/pubid/nist/parsers/hb.rb
+- lib/pubid/nist/parsers/mp.rb
 - lib/pubid/nist/parsers/nbs_ir.rb
 - lib/pubid/nist/parsers/nbs_lc.rb
-- lib/pubid/nist/parsers/nbs_mn.rb
-- lib/pubid/nist/parsers/nbs_mp.rb
-- lib/pubid/nist/parsers/nbs_rpt.rb
-- lib/pubid/nist/parsers/nbs_sp.rb
-- lib/pubid/nist/parsers/nbs_tn.rb
-- lib/pubid/nist/parsers/nist_gcr.rb
-- lib/pubid/nist/parsers/nist_hb.rb
+- lib/pubid/nist/parsers/ncstar.rb
 - lib/pubid/nist/parsers/nist_ir.rb
-- lib/pubid/nist/parsers/nist_ncstar.rb
-- lib/pubid/nist/parsers/nist_owmwp.rb
-- lib/pubid/nist/parsers/nist_sp.rb
-- lib/pubid/nist/parsers/nist_tn.rb
+- lib/pubid/nist/parsers/owmwp.rb
+- lib/pubid/nist/parsers/rpt.rb
+- lib/pubid/nist/parsers/sp.rb
+- lib/pubid/nist/parsers/tn.rb
 - lib/pubid/nist/publisher.rb
 - lib/pubid/nist/renderer/addendum.rb
 - lib/pubid/nist/renderer/base.rb
-- lib/pubid/nist/serie.rb
+- lib/pubid/nist/series.rb
 - lib/pubid/nist/stage.rb
 - lib/pubid/nist/transformer.rb
 - lib/pubid/nist/update.rb

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

@@ -1,6 +0,0 @@
-module Pubid::Nist
-  module Parsers
-    class NbsBh < Default
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-module Pubid::Nist
-  module Parsers
-    class NbsFips < Default
-      rule(:edition) do
-        str("-") >> (
-          (month_letters.as(:edition_month) >> year_digits.as(:edition_year)) |
-            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
-end

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

@@ -1,6 +0,0 @@
-module Pubid::Nist
-  module Parsers
-    class NbsMn < Default
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-module Pubid::Nist
-  module Parsers
-    class NbsSp < Default
-      rule(:part_prefixes) do
-        str("pt") | str("p") | str("P")
-      end
-
-      rule(:volume) do
-        str("v") >> (match('[\da-z-]').repeat(1) >> match("[A-Z]").repeat).as(:volume)
-      end
-    end
-  end
-end

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

@@ -1,9 +0,0 @@
-module Pubid::Nist
-  module Parsers
-    class NbsTn < Default
-      rule(:second_report_number) do
-        (digits_with_suffix | str("A")).as(:second_report_number)
-      end
-    end
-  end
-end

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

@@ -1,9 +0,0 @@
-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_tn.rb

@@ -1,13 +0,0 @@
-module Pubid::Nist
-  module Parsers
-    class NistTn < Default
-      rule(:report_number) do
-        first_report_number
-      end
-
-      rule(:edition_prefixes) do
-        str("-") | str("e")
-      end
-    end
-  end
-end

data/lib/pubid/nist/serie.rb

@@ -1,29 +0,0 @@
-SERIES = YAML.load_file(File.join(File.dirname(__FILE__), "../../../series.yaml"))
-
-module Pubid::Nist
-  class Serie
-    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
-
-    def to_s(format = :short)
-      return @serie if format == :short
-
-      result = SERIES[format.to_s][@serie]
-      return @serie if result.nil? && format == :mr
-
-      return SERIES["long"][@serie] if result.nil?
-
-      result
-    end
-
-    def ==(other)
-      other.serie == @serie
-    end
-  end
-end