pubid-nist 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae5b75b8cb77b433b69d107ca44d6f828602da328419436c24c25968412d1719
-  data.tar.gz: 1377f4285c99bd9f1582f5ca1daff8ed79cf90543405bf43d4a8a9659d2ae21b
+  metadata.gz: 7e7f47e08604ec704f0cf6468e57bf119027caf37ccba4043269374d2e9381a3
+  data.tar.gz: ec580488f65954d7fcbbfff5dd17e0cdc2dc88f7d07cb81d0bada5812beae2fe
 SHA512:
-  metadata.gz: f0252ea5cf1e0f418d15b29a051dbaa203ff0765dcf1d45124b3fb123a5d0baaaa6aac5e2cca8de138e0fbf21f20d4b7aba0ecaf79de7fbc79164a119763d971
-  data.tar.gz: a8e8a4c490568753bd6233432825c7cf717dbd379c1eb56155082bdbe9ce74040365e9579f802c241ca6c98631da38ca7caa6ac6ff2687e6ada9003cc21e28de
+  metadata.gz: d3c2ec778fb99af9427532d92404c60fef8a4e1f65342ab61b0925ade00849c9e151604e2bc2b3cf2d71877dbad840c017c581036e0dc22b1a307bafd06ae2f4
+  data.tar.gz: 787c614f6716d8cc8044821c1ff90ae1afebbe2731673adef5aef5150fa77a5e8d32d633f7367d2929620578d84ed6b6bb81e39367e422f017704d2b34cc65e0

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,
@@ -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(to_h).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

@@ -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 >> (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
@@ -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

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/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/renderer.rb

@@ -47,6 +47,8 @@ module Pubid::Nist
     end
 
     def render_edition(edition, opts, _params)
+      return if opts[:without_edition]
+
       case opts[:format]
       when :long
         " Edition "
@@ -202,7 +204,7 @@ module Pubid::Nist
       when :mr
         "."
       when :short
-        ""
+        " "
       else
         " "
       end + stage.to_s(opts[:format])

data/lib/pubid/nist/stage.rb

@@ -13,7 +13,7 @@ module Pubid::Nist
 
       case format
       when :short
-        " #{@id}#{@type}"
+        "#{@id}#{@type}"
       when :mr
         "#{@id}#{@type}"
       else

data/lib/pubid/nist/version.rb

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

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

@@ -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.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-08 00:00:00.000000000 Z
+date: 2023-11-15 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.10.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.10.3
+- !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
@@ -157,7 +171,7 @@ files:
 - 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