relaton-cli 0.7.0 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f64d80902cdeac95d97fd9b0df66ef413903c2395fc5dc18b5654aca8c83e5c0
-  data.tar.gz: ae59ddb87405cc169ba7d315e31ce1f712517704cdba5cf8ec3f40ad0289466e
+  metadata.gz: 3f0916d1d6fef45c2de0f3d48059ac096c8999968f07932501958b8a1a19fd69
+  data.tar.gz: 48f4cd861c5b449a15a8752237ccef556a2213e7c7e5676c97eb53350668d53a
 SHA512:
-  metadata.gz: 10f93960db82d97c4a6c306d22d6ce08ff18d2ce5a2d9c1e64c6a2e3b64d46a9f1861f5ab8f57ed1c48d415c6c02db6fc31acb78dfc58685d0d4b36ba09bc14c
-  data.tar.gz: c7e85111953a782ed2baa51089a1020a6e30d085a9ee512f488d488e7a1752717022403428cd3d88d4f48c1e2b1cd71df64f6a9337f158673583819a815f3370
+  metadata.gz: b0bdbb4bcf160f3360e7c336fe68ec02d30f5ed23caef2ad94f1cfc08725b61b6774eaba5cd7f10fb3630c4cbe1b99bcec1268ac603d4b38106003652d72c351
+  data.tar.gz: 1ae1189d0e97dac1d1d46c567b16f45dd0a3493fc15437812840a1ea3fac06cf163f504431a421f21760f1dd19bce9f1fc9c857504c5e1d21985ce39447ac607

data/lib/relaton/bibdata.rb

@@ -46,7 +46,8 @@ module Relaton
     end
 
     def self.from_xml(source)
-      new(Relaton::Cli.parse_xml(source))
+      bi = Relaton::Cli.parse_xml(source)
+      new(bi) if bi
     end
 
     def to_xml(opts = {})

data/lib/relaton/cli/base_convertor.rb

@@ -53,9 +53,9 @@ module Relaton
         )
       end
 
-      # def xml_content(file)
-      #   File.read(file, encoding: "utf-8")
-      # end
+      def xml_content(file)
+        File.read(file, encoding: "utf-8")
+      end
 
       def install_dependencies(dependencies)
         dependencies.each { |dependency| require(dependency) }

data/lib/relaton/cli/relaton_file.rb

@@ -126,9 +126,11 @@ module Relaton
           bib.root.add_namespace(nil, "xmlns")
 
           bibdata = Relaton::Bibdata.from_xml(bib.root)
-          build_bibdata_relaton(bibdata, file)
+          if bibdata
+            build_bibdata_relaton(bibdata, file)
 
-          write_to_file(bibdata.send(output_type), outdir, build_filename(file))
+            write_to_file(bibdata.send(output_type), outdir, build_filename(file))
+          end
         end
       end
 
@@ -143,7 +145,7 @@ module Relaton
             ietf = RelatonIetf::Scrapper.fetch_rfc rfc
             doc = nokogiri_document ietf.to_xml(bibdata: true)
           end
-          bibdata_instance(doc, xml[:file]) if doc.root.name == "bibdata"
+          bibdata_instance(doc, xml[:file]) if doc&.root&.name == "bibdata"
         end.compact
       end
 
@@ -183,7 +185,7 @@ module Relaton
       def bibdata_instance(document, file)
         document = clean_nokogiri_document(document)
         bibdata = Relaton::Bibdata.from_xml document.root
-        build_bibdata_relaton(bibdata, file)
+        build_bibdata_relaton(bibdata, file) if bibdata
 
         bibdata
       end

data/lib/relaton/cli/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Cli
-    VERSION = "0.7.0".freeze
+    VERSION = "0.8.4".freeze
   end
 end

data/lib/relaton/cli/xml_to_html_renderer.rb

@@ -61,7 +61,17 @@ module Relaton::Cli
 
     # TODO: This should be recursive, but it's not
     def hash_to_liquid(hash)
-      hash.map { |key, value| [key.to_s, empty2nil(value)] }.to_h
+      hash.map do |key, value|
+        if key == "title" && value.is_a?(Array)
+          title = value.detect { |t| t["type"] == "main" } || value.first
+          v = title ? title["content"] : nil
+        elsif key == "title" && value.is_a?(Hash)
+          v = value["content"]
+        else
+          v = value
+        end
+        [key.to_s, empty2nil(v)]
+      end.to_h
     end
 
     def empty2nil(value)

data/relaton-cli.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "debase"
   spec.add_development_dependency "simplecov"
 
-  spec.add_runtime_dependency "relaton", "~> 0.9.0"
+  spec.add_runtime_dependency "relaton", "~> 0.10.0"
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "liquid"
   # spec.add_runtime_dependency 'byebug'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement