relaton-nist 1.11.0 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3efd113d39aa3ae5803492db6fedb79c6c77b8e6c346f545d7e56aedf5ccb90c
-  data.tar.gz: 15bbf418f6ea804ccfb295fd566029bebf6e197d0d5985d5ee63f19909ce3bdc
+  metadata.gz: b6b0ce8787fdc41eb5b334df6e1d8f65c2bbfe6437ab8b36124d917c7549a869
+  data.tar.gz: d9b3bd1f467450a874ba8f9bc8d98c669a3296a0014c6083b248522bb4f6cd2a
 SHA512:
-  metadata.gz: 69b106a55f829e861510cd4cd71eda6c11e689f0b78742cafe8333d81a0e6fcba87d708825439d85eb88543ea6a223749565b6d99469c34cf2889f87e429a88e
-  data.tar.gz: 00fba574ac9177d32e8af0d9fc3d09947c13c2075a6bcdcf01d3525ee296e9b993f53033f6213dee59a8c33250606cb5034201697a1c1e022bfab2daa770ef2f
+  metadata.gz: beb5e04d0d431263d209e5172a419b940afe614888fd7a9158c360b7277d61312edf8824fef3989608a543c3bb36bd8612d1e737a07e7349d027aa9578d6c829
+  data.tar.gz: f46f37e146aedc51b9d91896ba38604af5bb95cc93e2d19c17e4f3894cffe5adac98fd05b176aa6830bed802b30e8163371d38caa25021742dc91fc8b0d11a10

data/Gemfile

@@ -1,6 +1,3 @@
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
-
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in relaton_nist.gemspec

data/lib/relaton_nist/data_fetcher.rb

@@ -75,7 +75,9 @@ module RelatonNist
       t = doc.xpath("titles/title|titles/subtitle")
       return [] unless t.any?
 
-      RelatonBib::TypedTitleString.from_string t.map(&:text).join, "en", "Latn"
+      # RelatonBib::TypedTitleString.from_string t.map(&:text).join, "en", "Latn"
+      [{ content: t.map(&:text).join, language: "en", script: "Latn",
+         format: "text/plain" }]
     end
 
     # @param doc [Nokogiri::XML::Element]
@@ -156,20 +158,37 @@ module RelatonNist
         { entity: person, role: [{ type: p["contributor_role"] }] }
       end
       contribs + doc.xpath("publisher").map do |p|
-        abbr = p.at("../institution/institution_acronym")&.text
-        place = p.at("./publisher_place")
-        cont = []
-        if place
-          city, state = place.text.split(", ")
-          cont << RelatonBib::Address.new(street: [], city: city, state: state, country: "US")
-        end
-        org = RelatonBib::Organization.new(
-          name: p.at("publisher_name").text, abbreviation: abbr, contact: cont,
-        )
-        { entity: org, role: [{ type: "publisher" }] }
+        { entity: create_org(p), role: [{ type: "publisher" }] }
+      end
+    end
+
+    #
+    # Create publisher organization
+    #
+    # @param [Nokogiri::XML::Element] pub publisher element
+    #
+    # @return [RelatonBib::Organization] publisher organization
+    #
+    def create_org(pub)
+      name = pub.at("publisher_name").text
+      abbr = pub.at("../institution[institution_name[.='#{name}']]/institution_acronym")&.text
+      place = pub.at("./publisher_place") ||
+        pub.at("../institution[institution_name[.='#{name}']]/institution_place")
+      cont = []
+      if place
+        city, state = place.text.split(", ")
+        cont << RelatonBib::Address.new(street: [], city: city, state: state, country: "US")
       end
+      RelatonBib::Organization.new name: name, abbreviation: abbr, contact: cont
     end
 
+    #
+    # Create affiliation organization
+    #
+    # @param [Nokogiri::XML::Element] doc affiliation element
+    #
+    # @return [Array<RelatonBib::Affiliation>] affiliation
+    #
     def affiliation(doc)
       doc.xpath("./institution/institution_department").map do |id|
         org = RelatonBib::Organization.new name: id.text
@@ -183,9 +202,20 @@ module RelatonNist
       doc.xpath("institution/institution_place").map(&:text)
     end
 
+    #
+    # Fetches series
+    #
+    # @param [Nokogiri::XML::Element] doc document element
+    #
+    # @return [Array<RelatonBib::Series>] series
+    #
     def fetch_series(doc)
-      title = RelatonBib::TypedTitleString.new(content: "NIST")
-      [RelatonBib::Series.new(title: title, number: pub_id(doc))]
+      series_path = File.expand_path("series.yaml", __dir__)
+      series = YAML.load_file series_path
+      prf, srs, = pub_id(doc).split
+      sname = series[srs] || srs
+      title = RelatonBib::TypedTitleString.new(content: "#{prf} #{sname}")
+      [RelatonBib::Series.new(title: title, number: "#{prf} #{srs}")]
     end
 
     #

data/lib/relaton_nist/hit_collection.rb

@@ -137,7 +137,7 @@ module RelatonNist
     # @return [Hash]
     def data
       ctime = File.ctime DATAFILE if File.exist? DATAFILE
-      if !ctime || ctime.to_date < Date.today
+      if !ctime || ctime.to_date < Date.today || File.size(DATAFILE).zero?
         fetch_data(ctime)
       end
       unzip
@@ -163,10 +163,7 @@ module RelatonNist
       return @data if @data
 
       Zip::File.open(DATAFILE) do |zf|
-        zf.each do |f|
-          @data = JSON.parse f.get_input_stream.read
-          break
-        end
+        @data = JSON.parse zf.first.get_input_stream.read
       end
       @data
     end

data/lib/relaton_nist/series.yaml

@@ -0,0 +1,49 @@
+---
+AMS: Advanced Manufacturing Series
+BRPD: Basic Radio Propagation Predictions Series
+BH: Building and Housing Reports
+BMS: Building Materials and Structures Reports
+BSS: Building Science Series
+CRPL: CRPL Solar-Geophysical Data
+IP: CRPL Ionospheric Predictions
+CIRC: Circulars
+CIS: Consumer Information Series
+CS: Commercial Standards
+CSM: Commercial Standards Monthly
+CSWP: Cybersecurity White Papers
+EAB: Economic Analysis Briefs
+FIPS: Federal Information Processing Standards Publications
+GCR: Grant/Contractor Reports
+HB: Handbooks
+HR: Hydraulic Research in the United States
+IRPL: Interservice Radio Propagation Laboratory
+LCIRC: Letter Circular
+MONO: Monographs
+MP: Miscellaneous Publications
+NCSTAR: National Construction Safety Team Act Reports
+NSRDS: National Standard Reference Data Series
+IR: NISTIRs (Interagency/Internal Reports)
+OWMWP: Office of Weights and Measures White Papers
+PC: Photographic Circulars
+RPT: NBS Reports
+SIBS: Special Interior Ballistics Studies
+SP: Special Publications (General)
+SP250: 'SP 250: Calibration Services'
+SP260: 'SP 260: Standard Reference Materials'
+SP300: 'SP 300: Precision Measurement and Calibration'
+SP400: 'SP 400: Semiconductor Measurement Technology'
+SP480: 'SP 480: Law Enforcement Technology'
+SP500: 'SP 500: Computer Systems Technology'
+SP700: 'SP 700: Industrial Measurement Series'
+SP800: 'SP 800: Computer Security Series'
+SP823: 'SP 823: Integrated Services Digital Network Series'
+SP960: 'SP 960: NIST Recommended Practice Guides'
+SP1200: 'SP 1200: Protocols'
+SP1500: 'SP 1500: Working Group Papers'
+SP1800: 'SP 1800: NIST Cybersecurity Practice Guides'
+SP1900: 'SP 1900: Cyber-Physical Systems'
+SP2000: 'SP 2000: Standards Coordination'
+SP2100: 'SP 2100: Conference Proceedings'
+TIBM: Technical Information on Building Materials
+TN: Technical Notes
+TTB: Technology Transfer Brief

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.11.0".freeze
+  VERSION = "1.11.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -185,6 +185,7 @@ files:
 - lib/relaton_nist/nist_bibliography.rb
 - lib/relaton_nist/processor.rb
 - lib/relaton_nist/scrapper.rb
+- lib/relaton_nist/series.yaml
 - lib/relaton_nist/version.rb
 - lib/relaton_nist/xml_parser.rb
 - relaton_nist.gemspec