relaton-nist 0.6.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e3fe0082c96d14813be5f97e804a0a18388dddef792c2a568f1c8eafbe2ab3e
-  data.tar.gz: e17bcac5fbf0a88421e0ad1f323df1757a5d3ef0d2afe340dac1b129a873bbb7
+  metadata.gz: abd608217be8e9fa36bc9e6d387d76bcac0655cc9ae9cb2ad6dd8a10981f15ec
+  data.tar.gz: 80e6d48a013bb510009ffc968bb7332daac07a9858bf42895183d848c4ba7e5c
 SHA512:
-  metadata.gz: adfa7e515816d96492539b8a0a58eca2ea0c4b0b04ea6db630185ed0acd4297bfc50eb3d6c74a7b7ad39a4c6ca259efbf511a47028e689adc4f2e2344f93def0
-  data.tar.gz: 649054e40e9449bb87b120683cd50027d9f2fbbfd55884cffbff5db678ac9d3f181adcce7ebd6f4379a1b95eeaa5c846cf28e5d66744f0ee5b7d096c7721128f
+  metadata.gz: 1d79eddb9c2a1f58fe7478c1de1d7fd4444a7db3c84b2f59b8b8f3447bedd9ee84cf55297e0b32abbaf42c632f90b7952615203fbc3d1e5c4adfff330446d8ac
+  data.tar.gz: d327e6358a7f2f5a3b9761c9106b17c6b04c9db026359d217a35a7d501759a26f5767bc68b6ebd01f6a04eaa95693732f34c1e1b701b1d98b6055080bfc1b89b

data/lib/relaton_nist/hit.rb

@@ -3,9 +3,6 @@
 module RelatonNist
   # Hit.
   class Hit < RelatonBib::Hit
-    # @return [RelatonNist::HitCollection]
-    attr_reader :hit_collection
-
     # Parse page.
     # @return [RelatonNist::NistBliographicItem]
     def fetch

data/lib/relaton_nist/hit_collection.rb

@@ -13,30 +13,24 @@ module RelatonNist
     DATAFILEDIR = File.expand_path ".relaton/nist", Dir.home
     DATAFILE = File.expand_path "pubs-export.zip", DATAFILEDIR
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-
     # @param ref_nbr [String]
     # @param year [String]
     # @param opts [Hash]
     # @option opts [String] :stage
     def initialize(ref_nbr, year = nil, opts = {})
-      @text = ref_nbr
-      @year = year
+      super ref_nbr, year
 
       /(?<docid>(SP|FIPS)\s[0-9-]+)/ =~ text
-      hits = docid ? from_json(docid, **opts) : from_csrc(**opts)
+      @array = docid ? from_json(docid, **opts) : from_csrc(**opts)
 
-      hits.sort! do |a, b|
+      @array.sort! do |a, b|
         if a.sort_value != b.sort_value
           b.sort_value - a.sort_value
         else
           (b.hit[:release_date] - a.hit[:release_date]).to_i
         end
       end
-      concat hits
-      @fetched = false
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     private
 

data/lib/relaton_nist/nist_bibliography.rb

@@ -60,9 +60,12 @@ module RelatonNist
       def nistbib_get1(code, year, opts)
         result = nistbib_search_filter(code, year, opts) || (return nil)
         ret = nistbib_results_filter(result, year, opts)
-        return ret[:ret] if ret[:ret]
-
-        fetch_ref_err(code, year, ret[:years])
+        if ret[:ret]
+          warn "[relaton-nist] (\"#{code}\") found #{ret[:ret].docidentifier.first.id}"
+          ret[:ret]
+        else
+          fetch_ref_err(code, year, ret[:years])
+        end
       end
 
       # Sort through the results from RelatonNist, fetching them three at a time,
@@ -119,7 +122,7 @@ module RelatonNist
       def nistbib_search_filter(code, year, opts)
         docid = code.match(%r{[0-9-]{3,}}).to_s
         serie = code.match(%r{(FISP|SP|NISTIR)(?=\s)})
-        warn "fetching #{code}..."
+        warn "[relaton-nist] (\"#{code}\") fetching..."
         result = search(code, year, opts)
         result.select do |i|
           i.hit[:code]&.include?(docid) && (!serie || i.hit[:serie] == serie.to_s)
@@ -128,12 +131,12 @@ module RelatonNist
 
       def fetch_ref_err(code, year, missed_years)
         id = year ? "#{code}:#{year}" : code
-        warn "WARNING: no match found online for #{id}. "\
+        warn "[relaton-nist] WARNING: no match found online for #{id}. "\
           "The code must be exactly like it is on the standards website."
-        warn "(There was no match for #{year}, though there were matches "\
+        warn "[relaton-nist] (There was no match for #{year}, though there were matches "\
           "found for #{missed_years.join(', ')}.)" unless missed_years.empty?
         if /\d-\d/ =~ code
-          warn "The provided document part may not exist, or the document "\
+          warn "[relaton-nist] The provided document part may not exist, or the document "\
             "may no longer be published in parts."
         end
         nil

data/lib/relaton_nist/scrapper.rb

@@ -235,7 +235,7 @@ module RelatonNist
             )
           end
           if contr["surname"]
-            affiliation = RelatonBib::Affilation.new organization: org
+            affiliation = RelatonBib::Affiliation.new organization: org
             entity = RelatonBib::Person.new(
               name: full_name(contr, lang, script), affiliation: [affiliation],
             )
@@ -271,7 +271,7 @@ module RelatonNist
               url = nil
             end
             org = RelatonBib::Organization.new name: org_name, url: url, abbreviation: abbrev
-            affiliation = RelatonBib::Affilation.new organization: org
+            affiliation = RelatonBib::Affiliation.new organization: org
             entity = RelatonBib::Person.new(
               name: fullname, affiliation: [affiliation],
             )

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "0.6.0".freeze
+  VERSION = "0.9.0".freeze
 end

data/lib/relaton_nist/xml_parser.rb

@@ -3,8 +3,13 @@ module RelatonNist
     class << self
       def from_xml(xml)
         doc = Nokogiri::XML xml
+        doc.remove_namespaces!
         nistitem = doc.at("/bibitem|/bibdata")
-        NistBibliographicItem.new(item_data(nistitem))
+        if nistitem
+          NistBibliographicItem.new(item_data(nistitem))
+        elsif
+          warn "[relaton-nist] can't find bibitem or bibdata element in the XML"
+        end
       end
 
       private

data/relaton_nist.gemspec

@@ -23,18 +23,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_development_dependency "byebug"
   spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "ruby-debug-ide"
+  spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "ruby-jing"
 
-  spec.add_dependency "relaton-bib", "~> 0.6.0"
+  spec.add_dependency "relaton-bib", "~> 0.9.0"
   spec.add_dependency "rubyzip"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-15 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: debase
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-jing
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -170,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement