relaton-nist 0.7.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c87f09763dbcc319401cbc3b2c86de4a1cdd60743f00db8526d2a28e52a71dfd
-  data.tar.gz: 9d690b4c771ae2f7256c6dd0770022b7709e00f08ee4efa625cbb144d3ba80b6
+  metadata.gz: b76a47785318a2497fae5a3fdab022b16d6117ad91470a23c46e73773e1e59ea
+  data.tar.gz: b33350d778c2c378f208443e5d9a7b636d2f22ee1908a953b6200abed97a7fb5
 SHA512:
-  metadata.gz: ad3251b6140a8b79de2a952eed6ba721011efe3d77dff8f195147e0a0819356a6dcd52b48868d883bbb8572d32ff27216ec29bc76f942e2da51c2f69f5a687e7
-  data.tar.gz: a6f32c9121980c23c324e6a1c7daead5baf266401dcad3efab1dfe0f46e6d886b21c84fe9750df2ed1a14f3cfc2377183b497e95c84f739c8277e727514459f2
+  metadata.gz: 6ae73a5ae455ca08d1cefaf446a419c07fd1984f7f2e6105666aa87ed2dc01206c8c832d2b0a01cd273cbd5b6248b93b971ab8e68bfb36b2fe8a46a1e95bd09a
+  data.tar.gz: 20c7e25ea1fdaa2af341213dfe85ad81357bd40abd035a18468c0f168c5b149eb3e8e5a35d724bbc8838e184233774e6a66fdaaef6a5b1aaf8dc4c12dee63502

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,
@@ -108,32 +111,33 @@ module RelatonNist
         { years: missed_years }
       end
 
-      def fetch_pages(s, n)
-        workers = RelatonBib::WorkersPool.new n
+      def fetch_pages(hits, threads)
+        workers = RelatonBib::WorkersPool.new threads
         workers.worker { |w| { i: w[:i], hit: w[:hit].fetch } }
-        s.each_with_index { |hit, i| workers << { i: i, hit: hit } }
+        hits.each_with_index { |hit, i| workers << { i: i, hit: hit } }
         workers.end
-        workers.result.sort { |x, y| x[:i] <=> y[:i] }.map { |x| x[:hit] }
+        workers.result.sort_by { |a| a[:i] }.map { |x| x[:hit] }
       end
 
       def nistbib_search_filter(code, year, opts)
-        docid = code.match(%r{[0-9-]{3,}}).to_s
+        idregex = %r{[0-9-]{3,}}
+        docid = code.match(idregex).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)
+          i.hit[:code]&.match(idregex).to_s == docid && (!serie || i.hit[:serie] == serie.to_s)
         end
       end
 
       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.7.0".freeze
+  VERSION = "0.9.1".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.7.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.7.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-04-23 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.7.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement