relaton-nist 1.14.3 → 1.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e235a74aee86bfb4fce55d8e7a89b4ab4afc2df13ae0a733512f30a7f63cd4c
-  data.tar.gz: bc8e8144f15c430618d0b2d6447d33dc607cf0fac165ebffdfa9ff816c18da37
+  metadata.gz: 2b442dc75e9c4b20221b94bd56200f5391f479709cb44bda543827bdeca67cf7
+  data.tar.gz: 553d1a834486c36d3febec1046480f5e803d98865c34f119c5698b253f3186fd
 SHA512:
-  metadata.gz: 2ce74d0722ef6ba698eb73f07e990c011b7247beed74e3750629a81da24f0ffd5ea1a4fc1028ad2102828f93a0076a641f9bbb9bb992bbecce34c8d494192809
-  data.tar.gz: 8ca7b46ccb2a5f2c689f78cb8d4c964b6c93334e6ff04f6748f9e651995607baa0cc0c4b164a1104aee41aa2c46243372a35b5c41ab0740e6dc405289becb3c2
+  metadata.gz: d1b1c058632239fefd0bb171f645eba0a7036e806fc3064faa4f2742d386e01e07f891b4c89172ae6b9811e75d6d05b0603391e68b58ae88789cb2d9cbd8ed35
+  data.tar.gz: '07039ccd91afca1ebc62471d0c7b3fa64695f7f5ed88f0eb11fd12d00c87851a33f66c08d7ba4e69f61ff0b1a82bb9e0a88eaf613d18d00b4a4e52ac051916f4'

data/.github/workflows/rake.yml

@@ -5,6 +5,7 @@ name: rake
 on:
   push:
     branches: [ master, main ]
+    tags: [ v* ]
   pull_request:
 
 jobs:

data/.github/workflows/release.yml

@@ -10,8 +10,9 @@ on:
           Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
         required: true
         default: 'skip'
-  push:
-    tags: [ v* ]
+  repository_dispatch:
+    types: [ do-release ]
+
 
 jobs:
   release:

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /tmp/
 .vscode/
+/vendor/
 .rubocop-https---raw-githubusercontent-com-riboseinc-oss-guides-master-ci-rubocop-yml
 
 # rspec failure tracking

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.6
+  TargetRubyVersion: 2.7
 Rails:
   Enabled: false

data/Gemfile

@@ -2,3 +2,12 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in relaton_nist.gemspec
 gemspec
+
+gem "equivalent-xml", "~> 0.6"
+gem "pry-byebug"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "ruby-jing"
+gem "simplecov"
+gem "vcr"
+gem "webmock"

data/lib/relaton_nist/data_fetcher.rb

@@ -24,6 +24,10 @@ module RelatonNist
       @files = []
     end
 
+    def index
+      @index ||= Relaton::Index.find_or_create :nist, file: "index-v1.yaml"
+    end
+
     def parse_docid(doc) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       # case doi
       # when "10.6028/NBS.CIRC.12e2revjune" then doi.sub!("13e", "12e")
@@ -296,6 +300,7 @@ module RelatonNist
                when "xml" then bib.to_xml bibdata: true
                else bib.send "to_#{@format}"
                end
+      index.add_or_update bib.docidentifier[0].id, file
       File.write file, output, encoding: "UTF-8"
     end
 
@@ -337,6 +342,7 @@ module RelatonNist
       docs.xpath("/body/query/doi_record/report-paper/report-paper_metadata")
         .each { |doc| parse_doc doc }
 
+      index.save
       t2 = Time.now
       puts "Stopped at: #{t2}"
       puts "Done in: #{(t2 - t1).round} sec."

data/lib/relaton_nist/hit_collection.rb

@@ -9,7 +9,8 @@ require "open-uri"
 module RelatonNist
   # Hit collection.
   class HitCollection < RelatonBib::HitCollection
-    GHNISTDATA = "https://raw.githubusercontent.com/relaton/relaton-data-nist/main/data/"
+    GHNISTDATA = "https://raw.githubusercontent.com/relaton/relaton-data-nist/main/"
+    INDEX_FILE = "index-v1.yaml"
 
     #
     # @param [String] text reference
@@ -57,14 +58,11 @@ module RelatonNist
         parts = doi_parts(item.hit[:json]) || code_parts(item.hit[:code])
         (refparts[:code] && [parts[:series], item.hit[:series]].include?(refparts[:series]) &&
           refparts[:code].casecmp(parts[:code].upcase).zero? &&
-          (!refparts[:prt] || refparts[:prt] == parts[:prt]) &&
-          (!refparts[:vol] || refparts[:vol] == parts[:vol]) &&
-          (!refparts[:ver] || refparts[:ver] == parts[:ver]) &&
-          (!refparts[:rev] || refparts[:rev] == parts[:rev]) &&
-          refparts[:draft] == parts[:draft] && refparts[:add] == parts[:add] &&
-          refparts[:res] == parts[:res]) # ||
-          # (refparts[:code] && !refparts[:code].empty? &&
-          #   item.hit[:title]&.include?("#{refparts[:series]} #{refparts[:code]}"))
+          (refparts[:prt] == parts[:prt]) &&
+          (refparts[:vol] == parts[:vol]) &&
+          (refparts[:ver] == parts[:ver]) &&
+          (refparts[:rev] == parts[:rev]) &&
+          refparts[:draft] == parts[:draft] && refparts[:add] == parts[:add])
       end
     end
 
@@ -72,7 +70,7 @@ module RelatonNist
 
     def code_parts(code) # rubocop:disable Metrics/MethodLength
       {
-        prefix: match(/^(?:NIST|NBS)\s?/, code),
+        # prefix: match(/^(?:NIST|NBS)\s?/, code),
         series: match(/(?<val>(?:SP|FIPS|IR|ITL\sBulletin|White\sPaper))\s/, code),
         code: match(/(?<val>[0-9-]{3,}[A-Z]?)/, code),
         prt: match(/(?:pt|\sPart\s)(?<val>\d+)/, code),
@@ -85,7 +83,6 @@ module RelatonNist
         # (?:\s(?<rev2>Rev\.\s\d+))?
         add: match(/\sAdd(?:endum)?(?<val>\d*)/, code),
         draft: !match(/\((?:Retired\s)?Draft\)/, code).nil?,
-        res: match(/(?<=\s)RES/, text),
       }
     end
 
@@ -94,7 +91,7 @@ module RelatonNist
 
       id = json["doi"].split("/").last
       {
-        prefix: match(/^(?:NIST|NBS)\./, id),
+        # prefix: match(/^(?:NIST|NBS)\./, id),
         series: match(/(?:SP|FIPS|IR|ITL\sBulletin|White\sPaper)(?=\.)/, id),
         code: match(/(?<=\.)\d{3,}(?:-\d+)*(?:[[:alpha:]](?!\d|raft|er|t?\d))?/, id),
         prt: match(/pt?(?<val>\d+)/, id),
@@ -122,7 +119,6 @@ module RelatonNist
         rev: match(/(?:(?:(?<dl>\.)|[^a-z])r|\sRev\.\s)(?(<dl>)-)(?<val>\d+)/, text),
         add: match(/(?:(?<dl>\.)?add|\/Add)(?(<dl>)-)(?<val>\d*)/, text),
         draft: !(match(/\((?:Draft|PD)\)/, text).nil? && @opts[:stage].nil?),
-        res: match(/(?<=\s)RES/, text),
         # prt2: match(/(?<=\s)Part\s[A-Z\d]+/, text),
         # vol2: match(/(?<=\s)Vol\.\s\d+/, text),
         # ver2: match(/(?<=\s)Ver\.\s\d+/, text),
@@ -186,8 +182,12 @@ module RelatonNist
     #
     def from_ga # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       ref = full_ref
-      fn = ref.gsub(%r{[/\s:.]}, "_").upcase
-      yaml = OpenURI.open_uri "#{GHNISTDATA}#{fn}.yaml"
+      # fn = ref.gsub(%r{[/\s:.]}, "_").upcase
+      index = Relaton::Index.find_or_create :nist, url: "#{GHNISTDATA}index-v1.zip", file: INDEX_FILE
+      row = index.search { |r| r[:id] == ref }.min_by { |r| r[:id] }
+      return [] unless row
+
+      yaml = OpenURI.open_uri "#{GHNISTDATA}#{row[:file]}"
       hash = YAML.safe_load yaml
       hash["fetched"] = Date.today.to_s
       bib = RelatonNist::NistBibliographicItem.from_hash hash

data/lib/relaton_nist/nist_bibliographic_item.rb

@@ -120,7 +120,7 @@ module RelatonNist
     #
     def ref_attrs
       docidentifier.detect(&:primary)&.tap do |di|
-        return { anchor: di.id.gsub(" ", ".") }
+        return { anchor: di.id.gsub(" ", ".").squeeze(".") }
       end
     end
   end

data/lib/relaton_nist/nist_bibliography.rb

@@ -19,7 +19,7 @@ module RelatonNist
       # @return [RelatonNist::HitCollection] search result
       #
       def search(text, year = nil, opts = {})
-        ref = text.sub(/^NIST\sIR/, "NISTIR")
+        ref = text.sub(/^NISTIR/, "NIST IR")
         HitCollection.search ref, year, opts
       rescue OpenURI::HTTPError, SocketError, OpenSSL::SSL::SSLError => e
         raise RelatonBib::RequestError, e.message

data/lib/relaton_nist/processor.rb

@@ -47,5 +47,12 @@ module RelatonNist
     def grammar_hash
       @grammar_hash ||= ::RelatonNist.grammar_hash
     end
+
+    #
+    # Remove index file
+    #
+    def remove_index_file
+      Relaton::Index.find_or_create(:nist, url: true, file: HitCollection::INDEX_FILE).remove_file
+    end
   end
 end

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.14.3".freeze
+  VERSION = "1.14.5".freeze
 end

data/lib/relaton_nist.rb

@@ -1,4 +1,5 @@
 require "singleton"
+require "relaton/index"
 require "relaton_nist/version"
 require "relaton_nist/nist_bibliography"
 require "relaton_nist/data_fetcher"

data/relaton_nist.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "relaton_nist/version"
 
@@ -21,17 +21,9 @@ 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.6.0")
-
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "ruby-jing"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "relaton-bib", "~> 1.14.0"
+  spec.add_dependency "relaton-index", "~> 0.2.0"
   spec.add_dependency "rubyzip"
 end

metadata

@@ -1,141 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.14.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-01 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: pry-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: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
+  name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: 1.14.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: ruby-jing
-  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: simplecov
-  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: vcr
-  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: webmock
-  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'
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
-  name: relaton-bib
+  name: relaton-index
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -204,14 +106,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: 'RelatonNist: retrive NIST standards.'