relaton-nist 0.2.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09e8864fd84f2638653bf2de8ad8a97839020201'
-  data.tar.gz: ac1ed9a3c13a5e24a46452075b08d71bf04271d7
+  metadata.gz: 6ad28b9e4eda9f14ac735a69842d2e4d63c7c88e
+  data.tar.gz: e20f4b0086adbe773a420d22d0ee30c352001149
 SHA512:
-  metadata.gz: 3ceb50427aa4ab2376730b8ae38f8e487e0584d254577b4fc79a0bcb3ebc221d151e5a64bcb4279317ec2331afb47a712774ef4e2e0749af829712f1c22107b0
-  data.tar.gz: d8a267a1d314e6d98a64961b781c5c181e4d455f21ade2ade2b17e31b64d6f44f66e75174d25cf15260834a481420196cf0700f6b532c8c9751db135a4793bee
+  metadata.gz: 8ac638788da72901abd8373f68a1c6228584b4754823251e597b20b4898a3f14de21ad870b5dc7e27deccb09f2c18e0af7dee8e8952f5395ea5f001ca824094e
+  data.tar.gz: 46f960c6178eebaeb1ed9a36bf9989746e59b3266691e07aa4d5ce457f2c7e6d871905d8e51ba025d3409457126bfc8c1dcbdd4924935843243b143fd012528f

data/.gitignore

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

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    relaton-nist (0.2.3)
-      relaton-bib (~> 0.2.0)
+    relaton-nist (0.3.4)
+      relaton-bib (~> 0.3.0)
       rubyzip
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     byebug (11.0.1)
     coderay (1.1.2)
     crack (0.4.3)
@@ -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)
@@ -33,11 +33,11 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rake (10.5.0)
-    relaton-bib (0.2.5)
+    relaton-bib (0.3.6)
       addressable
-      nokogiri (~> 1.10)
+      nokogiri
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -53,7 +53,7 @@ GEM
     rspec-support (3.8.2)
     ruby-debug-ide (0.7.0)
       rake (>= 0.8.1)
-    rubyzip (1.2.3)
+    rubyzip (1.2.4)
     safe_yaml (1.0.5)
     simplecov (0.16.1)
       docile (~> 1.1)

data/README.adoc

@@ -113,6 +113,22 @@ fetching 8200...
 ...
 ----
 
+=== Create bibliographic item from 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.rb

@@ -1,27 +1,11 @@
 require "relaton_nist/version"
 require "relaton_nist/nist_bibliography"
 
-if defined? Relaton
-  require_relative "relaton/processor"
-  Relaton::Registry.instance.register(Relaton::RelatonNist::Processor)
-end
+# if defined? Relaton
+#   require_relative "relaton/processor"
+#   Relaton::Registry.instance.register(Relaton::RelatonNist::Processor)
+# end
 
 module RelatonNist
   class Error < StandardError; end
-
-  class << self
-    # @param date [String]
-    # @return [Date, NilClass]
-    def parse_date(sdate)
-      if /(?<date>\w+\s\d{4})/ =~ sdate # February 2012
-        Date.strptime(date, "%B %Y")
-      elsif /(?<date>\w+\s\d{1,2},\s\d{4})/ =~ sdate # February 11, 2012
-        Date.strptime(date, "%B %d, %Y")
-      elsif /(?<date>\d{4}-\d{2}-\d{2})/ =~ sdate # 2012-02-11
-        Date.parse(date)
-      elsif /(?<date>\d{4}-\d{2})/ =~ sdate # 2012-02
-        Date.strptime date, "%Y-%m"
-      end
-    end
-  end
 end

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
@@ -26,5 +26,13 @@ module RelatonNist
         builder.extended extended.to_s if extended
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = { "from" => from.to_s }
+      hash["to"] = to.to_s if to
+      hash["extended"] = extended.to_s if extended
+      hash
+    end
   end
 end

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/hit.rb

@@ -2,45 +2,16 @@
 
 module RelatonNist
   # Hit.
-  class Hit
+  class Hit < RelatonBib::Hit
     # @return [RelatonNist::HitCollection]
     attr_reader :hit_collection
 
-    # @return [Array<Hash>]
-    attr_reader :hit
-
-    # @param hit [Hash]
-    # @param hit_collection [RelatonNist:HitCollection]
-    def initialize(hit, hit_collection = nil)
-      @hit            = hit
-      @hit_collection = hit_collection
-    end
-
     # Parse page.
     # @return [RelatonNist::NistBliographicItem]
     def fetch
       @fetch ||= Scrapper.parse_page @hit
     end
 
-    # @return [String]
-    def to_s
-      inspect
-    end
-
-    # @return [String]
-    def inspect
-      "<#{self.class}:#{format('%#.14x', object_id << 1)} "\
-      "@text=\"#{@hit_collection&.text}\" "\
-      "@fetched=\"#{!@fetch.nil?}\" "\
-      "@fullIdentifier=\"#{@fetch&.shortref(nil)}\" "\
-      "@title=\"#{@hit[:code]}\">"
-    end
-
-    # @return [String]
-    def to_xml(**opts)
-      fetch.to_xml **opts
-    end
-
     # @return [Iteger]
     def sort_value
       @sort_value ||= begin

data/lib/relaton_nist/hit_collection.rb

@@ -8,19 +8,10 @@ require "open-uri"
 
 module RelatonNist
   # Page of hit collection.
-  class HitCollection < Array
+  class HitCollection < RelatonBib::HitCollection
     DOMAIN = "https://csrc.nist.gov"
     DATAFILE = File.expand_path "data/pubs-export.zip", __dir__
 
-    # @return [TrueClass, FalseClass]
-    attr_reader :fetched
-
-    # @return [String]
-    attr_reader :text
-
-    # @return [String]
-    attr_reader :year
-
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
     # @param ref_nbr [String]
@@ -46,28 +37,6 @@ module RelatonNist
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
-    # @return [Iecbib::HitCollection]
-    def fetch
-      workers = RelatonBib::WorkersPool.new 4
-      workers.worker(&:fetch)
-      each do |hit|
-        workers << hit
-      end
-      workers.end
-      workers.result
-      @fetched = true
-      self
-    end
-
-    def to_s
-      inspect
-    end
-
-    # @return [String]
-    def inspect
-      "<#{self.class}:#{format('%#.14x', object_id << 1)} @fetched=#{@fetched}>"
-    end
-
     private
 
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
@@ -107,49 +76,78 @@ module RelatonNist
         )
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     # Fetches data form json
     # @param docid [String]
+    # @param stage [String]
+    # @return [Array<RelatonNist::Hit>]
     def from_json(docid, **opts)
+      select_data(docid, **opts).map do |h|
+        /(?<serie>(?<=-)\w+$)/ =~ h["series"]
+        title = [h["title-main"], h["title-sub"]].compact.join " - "
+        release_date = RelatonBib.parse_date h["published-date"]
+        Hit.new({ code: h["docidentifier"], serie: serie.upcase, title: title,
+                  url: h["uri"], status: h["status"],
+                  release_date: release_date, json: h }, self)
+      end
+    end
+
+    # @param docid [String]
+    # @param stage [String]
+    # @return [Array<Hach>]
+    def select_data(docid, **opts)
+      d = Date.strptime year, "%Y" if year
       data.select do |doc|
-        if year
-          d = Date.strptime year, "%Y"
-          idate = RelatonNist.parse_date doc["issued-date"]
-          next unless idate.between? d, d.next_year.prev_day
-        end
+        next unless match_year?(doc, d)
+
         if /PD/ =~ opts[:stage]
           next unless %w[draft-public draft-prelim].include? doc["status"]
         else
           next unless doc["status"] == "final"
         end
         doc["docidentifier"] =~ Regexp.new(docid)
-      end.map do |h|
-        /(?<serie>(?<=-)\w+$)/ =~ h["series"]
-        title = [h["title-main"], h["title-sub"]].compact.join " - "
-        release_date = RelatonNist.parse_date h["published-date"]
-        Hit.new(
-          {
-            code: h["docidentifier"], serie: serie.upcase, title: title,
-            url: h["uri"], status: h["status"], release_date: release_date,
-            json: h
-          }, self
-        )
       end
     end
 
-    # Fetches json data
+    # @param doc [Hash]
+    # @param date [Date] first day of year
+    # @return [TrueClass, FalseClass]
+    def match_year?(doc, date)
+      return true unless year
+
+      idate = RelatonBib.parse_date doc["issued-date"]
+      idate.between? date, date.next_year.prev_day
+    end
+
+    # Fetches json data form server
     # @return [Hash]
     def data
       ctime = File.ctime DATAFILE if File.exist? DATAFILE
       if !ctime || ctime.to_date < Date.today
-        resp = OpenURI.open_uri("https://csrc.nist.gov/CSRC/media/feeds/metanorma/pubs-export.meta")
-        if !ctime || ctime < resp.last_modified
-          @data = nil
-          zip = OpenURI.open_uri "https://csrc.nist.gov/CSRC/media/feeds/metanorma/pubs-export.zip"
-          FileUtils.mv zip.path, DATAFILE
-        end
+        fetch_data(ctime)
+      end
+      unzip
+    end
+
+    # Fetch data form server and save it to file
+    #
+    # @prarm ctime [Time, NilClass]
+    def fetch_data(ctime)
+      resp = OpenURI.open_uri("https://csrc.nist.gov/CSRC/media/feeds/metanorma/pubs-export.meta")
+      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
-      return if @data
+    end
+
+    # upack zip file
+    #
+    # @return [Hash]
+    def unzip
+      return @data if @data
 
       Zip::File.open(DATAFILE) do |zf|
         zf.each do |f|
@@ -159,6 +157,5 @@ module RelatonNist
       end
       @data
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end
 end

data/lib/relaton_nist/keyword.rb

@@ -1,5 +1,7 @@
 module RelatonNist
   class Keyword
+    include RelatonBib
+
     # @return [Nokogiri::XML::DocumentFragment]
     attr_reader :element
 
@@ -12,5 +14,10 @@ module RelatonNist
     def to_xml(builder)
       builder.keyword element.to_xml
     end
+
+    # @return [String]
+    def to_hash
+      element.text
+    end
   end
 end

data/lib/relaton_nist/nist_bibliographic_item.rb

@@ -6,7 +6,7 @@ module RelatonNist
     # @return [Array<RelatonNist::Keyword>]
     attr_reader :keyword
 
-    # @return [RelatonNist::CommentPeriod]
+    # @return [RelatonNist::CommentPeriod, NilClass]
     attr_reader :commentperiod
 
     # @param id [String, NilClass]
@@ -31,19 +31,19 @@ module RelatonNist
     # @param fetched [Date, NilClass] default nil
     # @param doctype [String]
     # @param keyword [Array<RelatonNist::Keyword>]
-    # @param commentperiod [RelatonNist::CommentPeriod]
+    # @param commentperiod [RelatonNist::CommentPeriod, NilClass]
     #
-    # @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) || []
@@ -74,5 +74,13 @@ module RelatonNist
         end
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      hash = super
+      hash["keyword"] = single_element_array(keyword) if keyword&.any?
+      hash["commentperiod"] = commentperiod.to_hash if commentperiod
+      hash
+    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
@@ -50,11 +51,7 @@ module RelatonNist
         end
 
         code += "-1" if opts[:all_parts]
-        ret = nistbib_get1(code, year, opts)
-        # return nil if ret.nil?
-        # ret.to_most_recent_reference unless year || opts[:keep_year]
-        # ret.to_all_parts if opts[:all_parts]
-        ret
+        nistbib_get1(code, year, opts)
       end
 
       private
@@ -91,16 +88,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/processor.rb

@@ -0,0 +1,33 @@
+require "relaton/processor"
+
+module RelatonNist
+  class Processor < Relaton::Processor
+    def initialize
+      @short = :relaton_nist
+      @prefix = "NIST"
+      @defaultprefix = %r{^(NIST|NISTGCR|ITL Bulletin|JPCRD|NISTIR|CSRC)[ /]}
+      @idtype = "NIST"
+    end
+
+    # @param code [String]
+    # @param date [String, NilClass] year
+    # @param opts [Hash]
+    # @return [RelatonNist::GbBibliographicItem]
+    def get(code, date = nil, opts = {})
+      ::RelatonNist::NistBibliography.get(code, date, opts)
+    end
+
+    # @param xml [String]
+    # @return [RelatonNist::GbBibliographicItem]
+    def from_xml(xml)
+      ::RelatonNist::XMLParser.from_xml xml
+    end
+
+    # @param hash [Hash]
+    # @return [RelatonNist::GbBibliographicItem]
+    def hash_to_bib(hash)
+      item_hash = ::RelatonNist::HashConverter.hash_to_bib(hash)
+      ::RelatonNist::NistBibliographicItem.new item_hash
+    end
+  end
+end

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,16 +39,14 @@ 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),
-          # series: fetch_series(json),
+          relation: fetch_relations_json(json),
           keyword: fetch_keywords(json),
           commentperiod: fetch_commentperiod_json(json),
         }
@@ -60,15 +58,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),
@@ -91,7 +89,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
 
@@ -178,14 +177,14 @@ module RelatonNist
         dates = [{ type: "published", on: release_date.to_s }]
 
         if doc.is_a? Hash
-          issued = RelatonNist.parse_date doc["issued-date"]
-          updated = RelatonNist.parse_date doc["updated-date"]
+          issued = RelatonBib.parse_date doc["issued-date"]
+          updated = RelatonBib.parse_date doc["updated-date"]
           dates << { type: "updated", on: updated.to_s } if updated
-          obsoleted = RelatonNist.parse_date doc["obsoleted-date"]
+          obsoleted = RelatonBib.parse_date doc["obsoleted-date"]
           dates << { type: "obsoleted", on: obsoleted.to_s } if obsoleted
         else
           d = doc.at("//span[@id='pub-release-date']").text.strip
-          issued = RelatonNist.parse_date d
+          issued = RelatonBib.parse_date d
         end
         dates << { type: "issued", on: issued.to_s }
         dates
@@ -208,7 +207,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 +229,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 +265,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
@@ -285,8 +284,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),
         )
@@ -455,13 +454,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.2.3".freeze
+  VERSION = "0.3.4".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)

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.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-09-12 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
@@ -211,16 +211,17 @@ files:
 - appveyor.yml
 - bin/console
 - bin/setup
-- lib/relaton/processor.rb
 - lib/relaton_nist.rb
 - 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
 - lib/relaton_nist/nist_bibliographic_item.rb
 - lib/relaton_nist/nist_bibliography.rb
+- lib/relaton_nist/processor.rb
 - lib/relaton_nist/scrapper.rb
 - lib/relaton_nist/version.rb
 - lib/relaton_nist/xml_parser.rb

data/lib/relaton/processor.rb

@@ -1,23 +0,0 @@
-require "relaton/processor"
-
-module Relaton
-  module RelatonNist
-    class Processor < Relaton::Processor
-
-      def initialize
-        @short = :relaton_nist
-        @prefix = "NIST"
-        @defaultprefix = %r{^(NIST|NISTGCR|ITL Bulletin|JPCRD|NISTIR|CSRC)[ /]}
-        @idtype = "NIST"
-      end
-
-      def get(code, date = nil, opts = {})
-        ::RelatonNist::NistBibliography.get(code, date, opts)
-      end
-
-      def from_xml(xml)
-        ::RelatonNist::XMLParser.from_xml xml
-      end
-    end
-  end
-end