relaton-nist 1.14.8 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb068b75779f92292d1fef25e9ae392a76df53d5d52bc2a644fb9d16ec0c5998
-  data.tar.gz: f64ba4dd75be3fd93a5a134c4babe39f08d4b6f774e2d488ba8df525f469fa1c
+  metadata.gz: 0c116195f2ab6cfda43f76fea0833d11746ca245ed618e0600b0f212f5ab7400
+  data.tar.gz: 293ac575914bbc0c89380590ea1694ed68af31e473a8610b1e212fc072b6168d
 SHA512:
-  metadata.gz: b2f68dc9000e02d2b23a611d02d84d76222d24811313b88fa5ccef8fbda2564058a93dd6ef1b0f71a7b36e0f278cb1107046c47b5098d3d0c43a423f235c3c70
-  data.tar.gz: c38c9c1d2faf307843417b2be67d52a1064160b8ad3b2412c120b26cbe730ecef57ea1019d75eddf47d3e9d5155109571cf1ba69c2a3bce17d02960576ce9e3d
+  metadata.gz: 01b643f55e58c222395ca2ecbb6b93a43918160663aaf693052081fd1414ce59dc6c78e4c5056bb96661ab0d9d592554d1d474532af351f25f30df0478a9048c
+  data.tar.gz: ff958be3d09d8f48e52dc55757fe15508c9ce4228997585ca939648bc721e82e9fc01460467b45a4441bf3b1e494ffc0d338ca61d761da4bdaacb9c3ece22cf0

data/grammars/biblio.rng

@@ -1283,7 +1283,7 @@
       <value>mergedInto</value>
       <value>splits</value>
       <value>splitInto</value>
-      <value>instance</value>
+      <value>instanceOf</value>
       <value>hasInstance</value>
       <value>exemplarOf</value>
       <value>hasExemplar</value>

data/lib/relaton_nist/hit_collection.rb

@@ -99,7 +99,7 @@ module RelatonNist
         ver: match(/v(?:er)?(?<val>[\d.]+)/, id),
         rev: match(/r(?<val>\d+)/, id),
         add: match(/-Add(?<val>\d*)/, id),
-        draft: !match(/-draft/, id).nil?,
+        draft: !match(/\.ipd/, id).nil?,
       }
     end
 
@@ -150,8 +150,8 @@ module RelatonNist
     def full_ref # rubocop:disable Metrics/AbcSize
       @full_ref ||= begin
         ref = [refparts[:perfix], refparts[:series], refparts[:code]].compact.join " "
-        ref += "pt#{refparts[:prt]}" if refparts[:prt] # long_to_short(refparts, "prt").to_s
-        ref += "ver#{refparts[:ver]}" if refparts[:ver] # long_to_short(refparts, "vol").to_s
+        ref += "pt#{refparts[:prt]}" if refparts[:prt]
+        ref += "ver#{refparts[:ver]}" if refparts[:ver]
         ref += "v#{refparts[:vol]}" if refparts[:vol]
         ref += "r#{refparts[:rev]}" if refparts[:rev]
         ref
@@ -225,7 +225,7 @@ module RelatonNist
       return json["docidentifier"] unless parts
 
       id = parts[:code]
-      id = "#{parts[:series]} #{id}" if parts[:series]
+      id = "NIST #{parts[:series]} #{id}" if parts[:series]
       id += " Part #{parts[:prt]}" if parts[:prt]
       id += " Vol. #{parts[:vol]}" if parts[:vol]
       id += " Ver. #{parts[:ver]}" if parts[:ver]

data/lib/relaton_nist/scrapper.rb

@@ -11,7 +11,7 @@ module RelatonNist
       # @param hit_data [Hash]
       # @return [Hash]
       def parse_page(hit_data)
-        hit_data[:url] ? parse_json(hit_data) : fetch_gh(hit_data)
+        hit_data[:path] ? fetch_gh(hit_data) : parse_json(hit_data)
       end
 
       def fetch_gh(hit_data)
@@ -24,11 +24,11 @@ module RelatonNist
       def parse_json(hit_data)
         item_data = from_json hit_data
         titles = fetch_titles(hit_data)
-        unless /^(SP|NISTIR|FIPS) /.match? item_data[:docid][0].id
-          item_data[:docid][0] = RelatonBib::DocumentIdentifier.new(
-            id: titles[0][:content].upcase, type: "NIST", primary: true,
-          )
-        end
+        # unless /^(SP|NISTIR|FIPS) /.match? item_data[:docid][0].id
+        #   item_data[:docid][0] = RelatonBib::DocumentIdentifier.new(
+        #     id: titles[0][:content].upcase, type: "NIST", primary: true,
+        #   )
+        # end
         item_data[:fetched] = Date.today.to_s
         item_data[:type] = "standard"
         item_data[:title] = titles

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.14.8".freeze
+  VERSION = "1.16.0".freeze
 end

data/relaton_nist.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "relaton-bib", "~> 1.14.0"
+  spec.add_dependency "relaton-bib", "~> 1.16.0"
   spec.add_dependency "relaton-index", "~> 0.2.0"
   spec.add_dependency "rubyzip"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.14.8
+  version: 1.16.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-19 00:00:00.000000000 Z
+date: 2023-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton-bib
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement