relaton-nist 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09e8864fd84f2638653bf2de8ad8a97839020201'
-  data.tar.gz: ac1ed9a3c13a5e24a46452075b08d71bf04271d7
+  metadata.gz: 860bed641e26ef2dd9e431c754d38d0dffb81a69
+  data.tar.gz: e7a3cddcdab9e27866ff220374bd73d6f3253b0f
 SHA512:
-  metadata.gz: 3ceb50427aa4ab2376730b8ae38f8e487e0584d254577b4fc79a0bcb3ebc221d151e5a64bcb4279317ec2331afb47a712774ef4e2e0749af829712f1c22107b0
-  data.tar.gz: d8a267a1d314e6d98a64961b781c5c181e4d455f21ade2ade2b17e31b64d6f44f66e75174d25cf15260834a481420196cf0700f6b532c8c9751db135a4793bee
+  metadata.gz: 8afdc827eaa9d984bf344138f7965099fbb7ec717cb283f2ab5d5cfa2feb910432f26fd1d22608c9de3e3364d8706acbb0d55419382808610e050c40a35065e9
+  data.tar.gz: 01e02e9dfd1b33d0ed24ae1b7f8181637c77ed7694fc725092882ca327044219bc8871a70999808bcd4c93890994cf39705ea43d9b48059357265b3099e1c88e

data/.gitignore

@@ -11,3 +11,4 @@
 
 # rspec failure tracking
 .rspec_status
+pubs-export.json

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    relaton-nist (0.2.3)
-      relaton-bib (~> 0.2.0)
+    relaton-nist (0.3.0)
+      relaton-bib (~> 0.3.0)
       rubyzip
 
 GEM
@@ -35,7 +35,7 @@ GEM
       pry (~> 0.10)
     public_suffix (3.1.1)
     rake (10.5.0)
-    relaton-bib (0.2.5)
+    relaton-bib (0.3.0)
       addressable
       nokogiri (~> 1.10)
     rspec (3.8.0)

data/lib/relaton_nist/hit_collection.rb

@@ -146,6 +146,7 @@ module RelatonNist
         if !ctime || ctime < resp.last_modified
           @data = nil
           zip = OpenURI.open_uri "https://csrc.nist.gov/CSRC/media/feeds/metanorma/pubs-export.zip"
+          zip.close
           FileUtils.mv zip.path, DATAFILE
         end
       end

data/lib/relaton_nist/nist_bibliographic_item.rb

@@ -33,17 +33,17 @@ module RelatonNist
     # @param keyword [Array<RelatonNist::Keyword>]
     # @param commentperiod [RelatonNist::CommentPeriod]
     #
-    # @param dates [Array<Hash>]
-    # @option dates [String] :type
-    # @option dates [String] :from
-    # @option dates [String] :to
+    # @param date [Array<Hash>]
+    # @option date [String] :type
+    # @option date [String] :from
+    # @option date [String] :to
     #
-    # @param contributors [Array<Hash>]
-    # @option contributors [String] :type
-    # @option contributors [String] :from
-    # @option contributirs [String] :to
-    # @option contributors [String] :abbreviation
-    # @option contributors [Array<String>] :roles
+    # @param contributor [Array<Hash>]
+    # @option contributor [String] :type
+    # @option contributor [String] :from
+    # @option contributor [String] :to
+    # @option contributor [String] :abbreviation
+    # @option contributor [Array<String>] :role
     #
     # @param abstract [Array<Hash>]
     # @option abstract [String] :content
@@ -51,10 +51,10 @@ module RelatonNist
     # @option abstract [String] :script
     # @option abstract [String] :type
     #
-    # @param relations [Array<Hash>]
-    # @option relations [String] :type
-    # @option relations [RelatonBib::BibliographicItem] :bibitem
-    # @option relations [Array<RelatonBib::BibItemLocality>] :bib_locality
+    # @param relation [Array<Hash>]
+    # @option relation [String] :type
+    # @option relation [RelatonBib::BibliographicItem] :bibitem
+    # @option relation [Array<RelatonBib::BibItemLocality>] :bib_locality
     def initialize(**args)
       @doctype = args.delete(:doctype) || "standard"
       @keyword = args.delete(:keyword) || []

data/lib/relaton_nist/nist_bibliography.rb

@@ -91,16 +91,16 @@ module RelatonNist
         result.each_slice(3) do |s| # ISO website only allows 3 connections
           fetch_pages(s, 3).each_with_index do |r, _i|
             if opts[:issued_date]
-              ids = r.dates.select { |d| d.type == "issued" && d.on == opts[:issued_date] }
+              ids = r.date.select { |d| d.type == "issued" && d.on == opts[:issued_date] }
               next if ids.empty?
             elsif opts[:updated_date]
-              pds = r.dates.select { |d| d.type == "published" && d.on == opts[:updated_date] }
+              pds = r.date.select { |d| d.type == "published" && d.on == opts[:updated_date] }
               next if pds.empty?
             end
             next if iter && r.status.iteration != iteration
             return { ret: r } if !year
 
-            r.dates.select { |d| d.type == "published" }.each do |d|
+            r.date.select { |d| d.type == "published" }.each do |d|
               return { ret: r } if year.to_i == d.on.year
 
               missed_years << d.on.year

data/lib/relaton_nist/scrapper.rb

@@ -26,7 +26,7 @@ module RelatonNist
         end
         item_data[:fetched] = Date.today.to_s
         item_data[:type] = "standard"
-        item_data[:titles] = titles
+        item_data[:title] = titles
         item_data[:doctype] = doctype
 
         NistBibliographicItem.new(**item_data)
@@ -39,15 +39,15 @@ module RelatonNist
         {
           link: fetch_link(json),
           docid: fetch_docid(json["docidentifier"]),
-          dates: fetch_dates(json, hit_data[:release_date]),
-          contributors: fetch_contributors(json),
+          date: fetch_dates(json, hit_data[:release_date]),
+          contributor: fetch_contributors(json),
           edition: fetch_edition(json),
           language: [json["language"]],
           script: [json["script"]],
           # abstract: fetch_abstract(doc),
           docstatus: fetch_status(json, hit_data[:status]),
           copyright: fetch_copyright(json["published-date"]),
-          relations: fetch_relations_json(json),
+          relation: fetch_relations_json(json),
           # series: fetch_series(json),
           keyword: fetch_keywords(json),
           commentperiod: fetch_commentperiod_json(json),
@@ -60,15 +60,15 @@ module RelatonNist
           # id: fetch_id(doc),
           link: fetch_link(doc),
           docid: fetch_docid(doc),
-          dates: fetch_dates(doc, hit_data[:release_date]),
-          contributors: fetch_contributors(doc),
+          date: fetch_dates(doc, hit_data[:release_date]),
+          contributor: fetch_contributors(doc),
           edition: fetch_edition(hit_data[:code]),
           language: ["en"],
           script: ["Latn"],
           abstract: fetch_abstract(doc),
           docstatus: fetch_status(doc, hit_data[:status]),
           copyright: fetch_copyright(doc),
-          relations: fetch_relations(doc),
+          relation: fetch_relations(doc),
           series: fetch_series(doc),
           keyword: fetch_keywords(doc),
           commentperiod: fetch_commentperiod(doc),
@@ -285,8 +285,8 @@ module RelatonNist
       def full_name(name, lang, script)
         RelatonBib::FullName.new(
           surname: RelatonBib::LocalizedString.new(name["surname"], lang, script),
-          forenames: name_parts(name["givenName"], lang, script),
-          additions: name_parts(name["suffix"], lang, script),
+          forename: name_parts(name["givenName"], lang, script),
+          addition: name_parts(name["suffix"], lang, script),
           prefix: name_parts(name["title"], lang, script),
           completename: RelatonBib::LocalizedString.new(name["fullName"], lang, script),
         )

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "0.2.3".freeze
+  VERSION = "0.3.0".freeze
 end

data/relaton_nist.gemspec

@@ -35,6 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 0.2.0"
+  spec.add_dependency "relaton-bib", "~> 0.3.0"
   spec.add_dependency "rubyzip"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement