relaton-nist 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 860bed641e26ef2dd9e431c754d38d0dffb81a69
-  data.tar.gz: e7a3cddcdab9e27866ff220374bd73d6f3253b0f
+  metadata.gz: 2eafbe4c1cb7719d3f782f77547db4b759bd8c41
+  data.tar.gz: 912039be62b33bdf6fab94966614e5de7adea3ac
 SHA512:
-  metadata.gz: 8afdc827eaa9d984bf344138f7965099fbb7ec717cb283f2ab5d5cfa2feb910432f26fd1d22608c9de3e3364d8706acbb0d55419382808610e050c40a35065e9
-  data.tar.gz: 01e02e9dfd1b33d0ed24ae1b7f8181637c77ed7694fc725092882ca327044219bc8871a70999808bcd4c93890994cf39705ea43d9b48059357265b3099e1c88e
+  metadata.gz: e49aaf8910c7fc910da3f7581fd4f6dcc3fb9beb0dba9575ca266d4bc5edf2d9a0b013470308553c9a30f563aad84c5c7ae9d85ccbc4715bc8480e7bcb27ccc4
+  data.tar.gz: 84105c9c7612a47a9f3d6bebd873434147fa5a8e9ba0bedcc8ff0961939902eaf087fd3d08682eb2e45cbec10c262afabb4c5ec364d4f0e44262a061a6507048

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-nist (0.3.0)
+    relaton-nist (0.3.2)
       relaton-bib (~> 0.3.0)
       rubyzip
 
@@ -25,7 +25,7 @@ GEM
     json (2.2.0)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -35,7 +35,7 @@ GEM
       pry (~> 0.10)
     public_suffix (3.1.1)
     rake (10.5.0)
-    relaton-bib (0.3.0)
+    relaton-bib (0.3.4)
       addressable
       nokogiri (~> 1.10)
     rspec (3.8.0)

data/README.adoc

@@ -113,6 +113,22 @@ fetching 8200...
 ...
 ----
 
+=== Create bibliographic item form YAML
+[source,ruby]
+----
+hash = YAML.load_file 'spec/examples/nist_bib_item.yml'
+=> {"id"=>"NISTIR 8011 Vol. 3",
+...
+
+bib_hash = RelatonNist::HashConverter.hash_to_bib hash
+=> {:id=>"NISTIR 8011 Vol. 3",
+...
+
+RelatonNist::NistBibliographicItem.new bib_hash
+=> #<RelatonNist::NistBibliographicItem:0x007f8b708505b8
+...
+----
+
 == Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/relaton_nist/comment_period.rb

@@ -12,7 +12,7 @@ module RelatonNist
     # @param from [Date]
     # @param to [Date, NilClass]
     # @param extended [Date, NilClass]
-    def initialize(from, to = nil, extended = nil)
+    def initialize(from:, to: nil, extended: nil)
       @from = from
       @to = to
       @extended = extended

data/lib/relaton_nist/hash_converter.rb

@@ -0,0 +1,30 @@
+module RelatonNist
+  class HashConverter < RelatonBib::HashConverter
+    class << self
+      # @override RelatonBib::HashConverter.hash_to_bib
+      # @param args [Hash]
+      # @param nested [TrueClass, FalseClass]
+      # @return [Hash]
+      def hash_to_bib(args, nested = false)
+        ret = super
+        return if ret.nil?
+
+        keyword_hash_to_bib(ret)
+        commentperiod_hash_to_bib(ret)
+        ret
+      end
+
+      private
+
+      def keyword_hash_to_bib(ret)
+        ret[:keyword]&.map! { |kw| Keyword.new kw }
+      end
+
+      def commentperiod_hash_to_bib(ret)
+        return unless ret[:commentperiod]
+
+        ret[:commentperiod] = CommentPeriod.new ret[:commentperiod]
+      end
+    end
+  end
+end

data/lib/relaton_nist/nist_bibliography.rb

@@ -6,6 +6,7 @@ require "relaton_nist/xml_parser"
 require "relaton_nist/keyword"
 require "relaton_nist/comment_period"
 require "relaton_nist/document_status"
+require "relaton_nist/hash_converter"
 
 module RelatonNist
   class NistBibliography
@@ -14,7 +15,7 @@ module RelatonNist
       # @return [RelatonNist::HitCollection]
       def search(text, year = nil, opts = {})
         HitCollection.new text, year, opts
-      rescue OpenURI::HTTPError, SocketError
+      rescue OpenURI::HTTPError, SocketError, OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Could not access https://www.nist.gov"
       end
 
@@ -33,9 +34,9 @@ module RelatonNist
           code = code2.strip
           if date2
             if /\w+\s\d{4}/ =~ date2
-              opts[:issued_date] = Time.strptime date2, "%B %Y"
+              opts[:issued_date] = Date.strptime date2, "%B %Y"
             elsif /\w+\s\d{2},\s\d{4}/ =~ date2
-              opts[:updated_date] = Time.strptime date2, "%B %d, %Y"
+              opts[:updated_date] = Date.strptime date2, "%B %d, %Y"
             end
           end
           opts[:stage] = stage if stage

data/lib/relaton_nist/scrapper.rb

@@ -91,7 +91,8 @@ module RelatonNist
         resp = Net::HTTP.get_response(uri) # .encode("UTF-8")
         Nokogiri::HTML(resp.body)
       rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
-             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError
+             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
+             OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Could not access #{url}"
       end
 
@@ -208,7 +209,7 @@ module RelatonNist
           org = RelatonBib::Organization.new(
             name: name, url: "www.nist.gov", abbreviation: "NIST",
           )
-          contribs << RelatonBib::ContributionInfo.new(entity: org, role: ["publisher"])
+          contribs << RelatonBib::ContributionInfo.new(entity: org, role: [type: "publisher"])
           authors = doc.at('//h4[.="Author(s)"]/following-sibling::p')
           contribs += contributors(authors, "author")
           editors = doc.at('//h4[.="Editor(s)"]/following-sibling::p')
@@ -230,14 +231,14 @@ module RelatonNist
             )
           end
           if contr["surname"]
-            affiliation = RelatonBib::Affilation.new org
+            affiliation = RelatonBib::Affilation.new organization: org
             entity = RelatonBib::Person.new(
               name: full_name(contr, lang, script), affiliation: [affiliation],
             )
           else
             entity = org
           end
-          RelatonBib::ContributionInfo.new entity: entity, role: [role]
+          RelatonBib::ContributionInfo.new entity: entity, role: [type: role]
         end
       end
 
@@ -266,14 +267,14 @@ module RelatonNist
               url = nil
             end
             org = RelatonBib::Organization.new name: org_name, url: url, abbreviation: abbrev
-            affiliation = RelatonBib::Affilation.new org
+            affiliation = RelatonBib::Affilation.new organization: org
             entity = RelatonBib::Person.new(
               name: fullname, affiliation: [affiliation],
             )
           else
             entity = RelatonBib::Organization.new name: an, abbreviation: abbrev
           end
-          RelatonBib::ContributionInfo.new entity: entity, role: [role]
+          RelatonBib::ContributionInfo.new entity: entity, role: [type: role]
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength
@@ -455,13 +456,15 @@ module RelatonNist
         ex = doc.at "//strong[contains(.,'The comment closing date has been extended to')]"
         ext = ex&.text&.match(/\w+\s\d{2},\s\d{4}/).to_s
         extended = ext.empty? ? nil : Date.strptime(ext, "%B %d, %Y")
-        CommentPeriod.new from, to, extended
+        CommentPeriod.new from: from, to: to, extended: extended
       end
 
       # @param json [Hash]
       # @return [RelatonNist::CommentPeriod, NilClass]
       def fetch_commentperiod_json(json)
-        CommentPeriod.new json["comment-from"], json["comment-to"] if json["comment-from"]
+        return unless json["comment-from"]
+
+        CommentPeriod.new from: json["comment-from"], to: json["comment-to"]
       end
     end
   end

data/lib/relaton_nist/version.rb

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

data/lib/relaton_nist/xml_parser.rb

@@ -34,7 +34,10 @@ module RelatonNist
         cp = item.at "./commentperiod"
         return unless cp
 
-        CommentPeriod.new cp.at("from").text, cp.at("to")&.text, cp.at("extended")&.text
+        CommentPeriod.new(
+          from: cp.at("from").text, to: cp.at("to")&.text,
+          extended: cp.at("extended")&.text
+        )
       end
 
       def fetch_keyword(item)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -216,6 +216,7 @@ files:
 - lib/relaton_nist/comment_period.rb
 - lib/relaton_nist/data/pubs-export.zip
 - lib/relaton_nist/document_status.rb
+- lib/relaton_nist/hash_converter.rb
 - lib/relaton_nist/hit.rb
 - lib/relaton_nist/hit_collection.rb
 - lib/relaton_nist/keyword.rb