relaton-cli 0.8.0 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f3f1068167e41ee92061daddb839f00405fb515e7ded6018beb56677e6b8062
-  data.tar.gz: ab93c3caccc0153751af71ee0856bb3d440baa7e844123cca2445d475f6a7f02
+  metadata.gz: e0530904a05044b494f2201804192f271cb2e74a08de8896119ae52867fee775
+  data.tar.gz: '08817d6f72628b6503d5536f236be59c47266136767e70ed0522ef3168dd916b'
 SHA512:
-  metadata.gz: c862ab2b9cc8015c94020924aab802ad376502e41a429e9d15af9b45bbd4d953a108250f0422e8b46893351d97e9dcceb3565d7a70c7f26835f0ed2169d70cec
-  data.tar.gz: 468582587449b34a76042812672f8f339c4970082a9b786a1f6ee6736edd53347f6ada1c090220e34a76a06044b20239b5cde47ff6ec35c6a44b329bc42b8a10
+  metadata.gz: 84edf40ecd9cf391548640708f9c21d32628ad8c409054b30c749f0fd266ebd6d30ee707d7fd007d7516bbf2eec156982e73b898a0db531cedd5f85848f982ae
+  data.tar.gz: d20fd413254c6b073f659fb4cce1cc4278503b7e7ac20f99a35a69f53803a543e5e9aa488d5f603175220c8e604163a4e2072eb5e243e74dadfa9db103a9865e

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.8.0".freeze
+    VERSION = "0.8.5".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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake