relaton-nist 1.11.1 → 1.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d5db99f4b5678fecd7b926c007b66149d72123c4a6aaaed113589b667c00b8c
-  data.tar.gz: 1f82071f8e6ed586475d915a1d105b5aefba8dedb5042cfe1d0230d0a41a51fa
+  metadata.gz: bd5360f481616f8a73bdc1f9be82bb5f94bb71a5d3d6c495e301862d7e445c4b
+  data.tar.gz: 0563adfa8d462ec73b9546902d426e347c36ef2d286f518dd7dcf25225ad9238
 SHA512:
-  metadata.gz: 14a85ac2317285758f0fd1e18faa6ca70491a53c5dd8aa0a6c53e2d4e91a3bf8c8d8ab63a57aeb68238301bfe07c0e4a97e32ee50f85b26fb576127db309e4b1
-  data.tar.gz: 40e515d019b42731617c8569b40d03a911e9a3c1ba19dec11afa73dec7a52c6762f97085549658c0459ae6d328be28dd4e851a7641f77622f191138666193f93
+  metadata.gz: ade1d018045194a89b6f9e34e7f78ef4979b33c73a9a1dd6a3cbe65101040bc734c188c4e9e658b59412d2c5071d0ea80c74e05c73dde050d795381f685cd023
+  data.tar.gz: cb6339da72a21fb733f5abe3922b2c9e62b1d01214400a872db7244b39a0db52af04233463f0a3093f50c03227cc21a709a86c18b6aff1842340dffee447b75d

data/.github/workflows/rake.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
+        ruby: [ '3.0', '2.7', '2.6' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
     steps:
@@ -24,10 +24,6 @@ jobs:
         with:
           submodules: true
 
-      # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
-      - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
-        run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
-
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.rubocop.yml

@@ -7,6 +7,6 @@ require: rubocop-rails
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
 Rails:
   Enabled: false

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]
@@ -101,12 +103,14 @@ module RelatonNist
 
     # @param doc [Nokogiri::XML::Element]
     # @return [Array<Hash>]
-    def fetch_relation(doc)
+    def fetch_relation(doc) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       ns = "http://www.crossref.org/relations.xsd"
       doc.xpath("./ns:program/ns:related_item", ns: ns).map do |rel|
         rdoi = rel.at_xpath("ns:intra_work_relation|ns:inter_work_relation", ns: ns)
-        fref = RelatonBib::FormattedRef.new content: rdoi.text
-        bibitem = RelatonBib::BibliographicItem.new formattedref: fref
+        id = rdoi.text.split("/")[1..].join("/").gsub(".", " ")
+        fref = RelatonBib::FormattedRef.new content: id
+        docid = RelatonBib::DocumentIdentifier.new(type: "NIST", id: id, primary: true)
+        bibitem = RelatonBib::BibliographicItem.new formattedref: fref, docid: [docid]
         type = RELATION_TYPES[rdoi["relationship-type"]]
         warn "Relation type #{rdoi['relationship-type']} not found" unless type
         { type: type, bibitem: bibitem }
@@ -156,20 +160,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 +204,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/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.1".freeze
+  VERSION = "1.11.4".freeze
 end

data/relaton_nist.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-01 00:00:00.000000000 Z
+date: 2022-05-10 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
@@ -201,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="