relaton-nist 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c27ee448a739133b46c5b46073a5370b8407ff9389deab931df5a450586a2694
-  data.tar.gz: 6a53926d3e09a53e53d37de7b45c62b72111c85e30d9cc1cf4d97a838d7c4980
+  metadata.gz: d852851cf220ab63699584b62e0d5a051ad39eb9b7ef287840cbd782ce67bed9
+  data.tar.gz: 25208ad1822a38f658cb9d1a857451f614598b2dddcc969a84c31fd3c204ac1d
 SHA512:
-  metadata.gz: a12935d087796f27121b84bc8d78bae367533da85e89487643f13bb4cffbd81c1dc104f6f05f4f77298b7a8940b82ca5e237e17522541bd1bbfd48449257ca64
-  data.tar.gz: a602a206c6d2dcdcade816ef4596c4c374984b5b2eb8a45fce161102d31709706c33b7c783b7f2eb3be0bdeff183356ce484ad4c7d5e154f7b7db9673a8ad5c4
+  metadata.gz: 8e60c1f19d96a5d289a780ea29cec5830db57ca84c3007d5f0380b0fca6338538d75456bf963fb2f64208105a18b3b08073f642c66b2323fe481fd2d15f578c1
+  data.tar.gz: c19983c79a538c1bd0357ffbefc2b3e4450115f505f01b38fbf44e5028e67d8a544e339d2f4e88b5532c4d8ec6e22caa6e12e3b7e592ecf4849f7c34064a5cb3

data/lib/relaton_nist/document_relation.rb

@@ -0,0 +1,5 @@
+module RelatonNist
+  class DocumentRelation < RelatonBib::DocumentRelation
+    TYPES += %w[obsoletedBy supersedes supersededBy].freeze
+  end
+end

data/lib/relaton_nist/hash_converter.rb

@@ -26,6 +26,24 @@ module RelatonNist
 
         ret[:commentperiod] = CommentPeriod.new ret[:commentperiod]
       end
+
+      # @param ret [Hash]
+      def relations_hash_to_bib(ret)
+        super
+        return unless ret[:relation]
+
+        ret[:relation] = ret[:relation].map { |r| DocumentRelation.new r }
+
+        # ret[:relation] = array(ret[:relation])
+        # ret[:relation]&.each do |r|
+        #   if r[:description]
+        #     r[:description] = FormattedString.new r[:description]
+        #   end
+        #   relation_bibitem_hash_to_bib(r)
+        #   relation_locality_hash_to_bib(r)
+        #   relation_source_locality_hash_to_bib(r)
+        # end
+      end
     end
   end
 end

data/lib/relaton_nist/nist_bibliographic_item.rb

@@ -51,7 +51,7 @@ module RelatonNist
     # @option abstract [String] :script
     # @option abstract [String] :type
     #
-    # @param relation [Array<Hash>]
+    # @param relation [Array<Hash, RelatonNist::DocumentRelation>]
     # @option relation [String] :type
     # @option relation [RelatonBib::BibliographicItem] :bibitem
     # @option relation [Array<RelatonBib::BibItemLocality>] :bib_locality

data/lib/relaton_nist/nist_bibliography.rb

@@ -1,5 +1,6 @@
 require "relaton_bib"
 require "relaton_nist/nist_bibliographic_item"
+require "relaton_nist/document_relation"
 require "relaton_nist/scrapper"
 require "relaton_nist/hit_collection"
 require "relaton_nist/xml_parser"

data/lib/relaton_nist/scrapper.rb

@@ -235,15 +235,18 @@ module RelatonNist
             )
           end
           if contr["surname"]
-            affiliation = RelatonBib::Affiliation.new organization: org
+            affiliation = []
+            affiliation << RelatonBib::Affiliation.new(organization: org) if org
             entity = RelatonBib::Person.new(
-              name: full_name(contr, lang, script), affiliation: [affiliation],
+              name: full_name(contr, lang, script), affiliation: affiliation,
             )
-          else
+          elsif org
             entity = org
           end
-          RelatonBib::ContributionInfo.new entity: entity, role: [type: role]
-        end
+          if entity
+            RelatonBib::ContributionInfo.new entity: entity, role: [type: role]
+          end
+        end.compact
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity
@@ -373,7 +376,7 @@ module RelatonNist
 
       # Fetch relations.
       # @param doc [Nokogiri::HTML::Document]
-      # @return [Array<RelatonBib::DocumentRelation>]
+      # @return [Array<RelatonNist::DocumentRelation>]
       def fetch_relations(doc)
         relations = doc.xpath('//span[@id="pub-supersedes-container"]/a').map do |r|
           doc_relation "supersedes", r.text, DOMAIN + r[:href]
@@ -402,9 +405,9 @@ module RelatonNist
       # @param type [String]
       # @param ref [String]
       # @param uri [String]
-      # @return [RelatonBib::DocumentRelation]
+      # @return [RelatonNist::DocumentRelation]
       def doc_relation(type, ref, uri, lang = "en", script = "Latn")
-        RelatonBib::DocumentRelation.new(
+        DocumentRelation.new(
           type: type,
           bibitem: RelatonBib::BibliographicItem.new(
             formattedref: RelatonBib::FormattedRef.new(

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.2.0".freeze
+  VERSION = "1.2.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -204,6 +204,7 @@ files:
 - grammars/reqt.rng
 - lib/relaton_nist.rb
 - lib/relaton_nist/comment_period.rb
+- lib/relaton_nist/document_relation.rb
 - lib/relaton_nist/document_status.rb
 - lib/relaton_nist/hash_converter.rb
 - lib/relaton_nist/hit.rb