relaton-nist 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e37bb40effbc27c40ce57904429d2f12d7aac6dfa50bc5acfab0e5f98bebf526
-  data.tar.gz: '095ce08a137c804dc88df5d465fbf2a43180dc8b195c8db50ebe5168ce23d025'
+  metadata.gz: dac2975c8efc8f3fb1fe8720fb852daba9bd66fb0e7bfc5fd87e24b69ed08ff1
+  data.tar.gz: 84503272191f86d904c947bbe6143c4363bc5fe03d0bb4f40b56162ef45f6c7d
 SHA512:
-  metadata.gz: f69913864ef1c4331a952430cefb2bf8eeebab49e60bb75bbd2a3fc1d44df33bb12ed4096c73e2a39eece18708067adc1ac3b0a6ec44db68bce6966d8e1301f9
-  data.tar.gz: a5a254e8bc1d9ba8c78a1174b3e89641a937235cce439a2a488be86604229bf38022c8b809629f10437e38b88a7039bd83f2072c2cbf8dd9120aa3800ea98ce1
+  metadata.gz: b82763b595daf55b2d09643804f5caf2351e11f8de4f1e61b0c8f98273770da35aaa4161209ad21a137e04dbfc35fa6cc8ff14f9f15ad2e7c450e2e8bcb7e9a2
+  data.tar.gz: 23f6829e141eb6b2f3f90f23de5b6f8b731b8659060ca7459599727ff5652368f8f8970a1234b0c551ffd40321b1a99e4a9e212b84669c803e4483f0eba079ad

data/.github/workflows/ubuntu.yml

@@ -29,4 +29,5 @@ jobs:
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |
+          unset JAVA_TOOL_OPTIONS
           bundle exec rake

data/.rubocop.yml

@@ -5,6 +5,6 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 Rails:
-  Enabled: true
+  Enabled: false

data/lib/relaton_nist/comment_period.rb

@@ -34,5 +34,16 @@ module RelatonNist
       hash["extended"] = extended.to_s if extended
       hash
     end
+
+    # @param prefix [String]
+    # @return [String]
+    def to_asciibib(prefix)
+      pref = prefix.empty? ? prefix : prefix + "."
+      pref += "commentperiod"
+      out = "#{pref}.from:: #{from}\n"
+      out += "#{pref}.to:: #{to}\n" if to
+      out += "#{pref}.extended:: #{extended}\n" if extended
+      out
+    end
   end
 end

data/lib/relaton_nist/nist_bibliographic_item.rb

@@ -83,5 +83,13 @@ module RelatonNist
       hash["commentperiod"] = commentperiod.to_hash if commentperiod
       hash
     end
+
+    # @param prefix [String]
+    # @return [String]
+    def to_asciibib(prefix = "")
+      out = super
+      out += commentperiod.to_asciibib prefix if commentperiod
+      out
+    end
   end
 end

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.2.2".freeze
+  VERSION = "1.3.0".freeze
 end

data/lib/relaton_nist/xml_parser.rb

@@ -1,28 +1,25 @@
 module RelatonNist
   class XMLParser < RelatonBib::XMLParser
     class << self
-      def from_xml(xml)
-        doc = Nokogiri::XML xml
-        doc.remove_namespaces!
-        nistitem = doc.at("/bibitem|/bibdata")
-        if nistitem
-          NistBibliographicItem.new(item_data(nistitem))
-        elsif
-          warn "[relaton-nist] can't find bibitem or bibdata element in the XML"
-        end
-      end
-
       private
 
-      def item_data(nistitem)
+      # @param intem [Nokogiri::XML::Document]
+      # @return [Hash]
+      def item_data(item)
         data = super
-        ext = nistitem.at "./ext"
+        ext = item.at "./ext"
         return data unless ext
 
         data[:commentperiod] = fetch_commentperiod(ext)
         data
       end
 
+      # @param item_hash [Hash]
+      # @return [RelatonNist::NistBibliographicItem]
+      def bib_item(item_hash)
+        NistBibliographicItem.new item_hash
+      end
+
       def fetch_status(item)
         status = item.at "./status"
         return unless status
@@ -47,15 +44,7 @@ module RelatonNist
       # @param item [Nokogiri::XML::Element]
       # @return [Array<RelatonBib::DocumentRelation>]
       def fetch_relations(item)
-        item.xpath("./relation").map do |rel|
-          DocumentRelation.new(
-            type: rel[:type]&.empty? ? nil : rel[:type],
-            description: relation_description(rel),
-            bibitem: bib_item(item_data(rel.at("./bibitem"))),
-            locality: localities(rel),
-            source_locality: source_localities(rel),
-          )
-        end
+        super item, DocumentRelation
       end
     end
   end

data/relaton_nist.gemspec

@@ -34,6 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.2.0"
+  spec.add_dependency "relaton-bib", "~> 1.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: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement