relaton-cli 1.0.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b8db31870f272c13e8704dfb09b08a7e56ea703478db5683d72fccb3c92981a
-  data.tar.gz: 15fa2d2786a1c0d0f50054da7e7b0eb8a87a06b64cef492693938243534d9b75
+  metadata.gz: 189c177f77c4ebd844d4df2dbe9deb987d90443e3e91ff50d8ebf1a7ce8d3685
+  data.tar.gz: 73a886c43a4b0262a6f96725143a5714dae88440715122a36360e343d753ea56
 SHA512:
-  metadata.gz: 3ab548b6a6ffd205c9f549bea24e9620a13a8faa3dc9928b88368b085c2b7147add716e59c1efe8aa8137809a79c040ef305d6eb0529b9dfb131a419f24d76d3
-  data.tar.gz: fbb82682d1f7917d10148404ffa046adaed0048bbb330c840cad22a9f0c08fc80cc9c508febedb5355fe51c34656e24d28af6bf587a6d6a8f7585caa3695b06a
+  metadata.gz: 7d7e76cfa44de6d91dc4ce1f631c68b845fa152de4ecbfa76a5deebb59e706784c0f0a5c1dea302336e153d751217e612f42c324498336390ce67891f4f773fa
+  data.tar.gz: ea44768cba9f5a88b46f03c588237d0de5fe91d0fb4952b5761236fafcabe1ec5992b921ecbd87052e3082e0f45c24ee074409825c0f32f934055ffac7eb2b93

data/.gitignore

@@ -13,3 +13,4 @@
 .vscode/
 .byebug_history
 Gemfile.lock
+.DS_Store

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

data/docs/README.adoc

@@ -43,12 +43,13 @@ suports an additional `-x` or `--extension` options to use different extension.
 
 [source,console]
 ----
-$ relaton fetch CODE -t TYPE -y YEAR
+$ relaton fetch CODE -t TYPE -f FORMAT -y YEAR
 ----
 
 Fetch the Relaton XML entry corresponding to the document identifier `CODE`.
 
 * `YEAR` is optional, and specifies the year of publication of the standard.
+* `FORMAT` is optional, and specifies the output format; the recognised values for `FORMAT` are `xml` (default), `bibtex`.
 * `TYPE` specifies the standards class library to be used, that the identifier is part of; the recognised
 values for `TYPE` are `isobib`, `ietfbib`, `iecbib`, `gbbib`.
 

data/lib/relaton-cli.rb

@@ -1,4 +1,10 @@
 require_relative "relaton/bibcollection"
 require_relative "relaton/bibdata"
 require_relative "relaton/element_finder"
-require_relative "relaton/xml_document"
+# require_relative "relaton/xml_document"
+require_relative "relaton/cli/yaml_convertor"
+
+module Relaton
+  module Cli
+  end
+end

data/lib/relaton/bibcollection.rb

@@ -4,15 +4,12 @@ module Relaton
   class Bibcollection
     extend Relaton::ElementFinder
 
-    ATTRIBS = %i[
-      title
-      items
-      doctype
-      author
-    ].freeze
+    ATTRIBS = %i[title items doctype author].freeze
 
     attr_accessor *ATTRIBS
 
+    # rubocop:disable Metrics/MethodLength
+
     def initialize(options)
       self.items = []
       ATTRIBS.each do |k|
@@ -20,30 +17,38 @@ module Relaton
         send("#{k}=", value)
       end
       self.items = (items || []).reduce([]) do |acc, item|
-        acc << if item.is_a?(::Relaton::Bibcollection) || item.is_a?(::Relaton::Bibdata)
+        acc << if item.is_a?(Bibcollection) || item.is_a?(Bibdata)
                  item
                else new_bib_item_class(item)
                end
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     # arbitrary number, must sort after all bib items
     def doc_number
       9999999
     end
 
+    # rubocop:disable Metrics/MethodLength
+
+    # @param source [Nokogiri::XML::Element]
     def self.from_xml(source)
       title = find_text("./relaton-collection/title", source)
-      author = find_text("./relaton-collection/contributor[role/@type = 'author']/organization/name", source)
+      author = find_text(
+        "./relaton-collection/contributor[role/@type='author']/organization/name",
+        source,
+      )
 
       items = find_xpath("./relaton-collection/relation", source)&.map do |item|
-        bibdata = find("./bibdata", item)
+        bibdata = find("./bibdata|./bibitem", item)
         klass = bibdata ? Bibdata : Bibcollection
         klass.from_xml(bibdata || item)
       end
 
       new(title: title, author: author, items: items)
     end
+    # rubocop:enable Metrics/MethodLength
 
     def new_bib_item_class(options)
       if options.is_a?(Hash) && options["items"]
@@ -54,34 +59,35 @@ module Relaton
     end
 
     def items_flattened
-      items.sort_by! do |b|
-        b.docnumber
-      end
+      items.sort_by! &:docnumber
 
-      items.inject([]) do |acc,item|
-        if item.is_a? ::Relaton::Bibcollection
-          acc << item.items_flattened
-        else
-          acc << item
-        end
+      items.reduce([]) do |acc,item|
+        acc << if item.is_a? ::Relaton::Bibcollection
+                 item.items_flattened
+               else
+                 item
+               end
       end
     end
 
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+
+    # @param opts [Hash]
+    # @return [String] XML
     def to_xml(opts = {})
-      items.sort_by! do |b|
-        b.doc_number
-      end
+      items.sort_by! &:doc_number
 
       collection_type = if doctype
-        "type=\"#{doctype}\""
-      else
-        'xmlns="https://open.ribose.com/relaton-xml"'
-      end
+                          "type=\"#{doctype}\""
+                        else
+                          'xmlns="https://open.ribose.com/relaton-xml"'
+                        end
 
       ret = "<relaton-collection #{collection_type}>"
       ret += "<title>#{title}</title>" if title
       if author
-        ret += "<contributor><role type='author'/><organization><name>#{author}</name></organization></contributor>"
+        ret += "<contributor><role type='author'/><organization><name>"\
+        "#{author}</name></organization></contributor>"
       end
       unless items.empty?
         items.each do |item|
@@ -92,17 +98,16 @@ module Relaton
       end
       ret += "</relaton-collection>\n"
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def to_yaml
       to_h.to_yaml
     end
 
     def to_h
-      items.sort_by! do |b|
-        b.doc_number
-      end
+      items.sort_by! &:doc_number
 
-      a = ATTRIBS.inject({}) do |acc, k|
+      a = ATTRIBS.reduce({}) do |acc, k|
         acc[k.to_s] = send(k)
         acc
       end

data/lib/relaton/bibdata.rb

@@ -2,7 +2,7 @@ require "date"
 
 module Relaton
   class Bibdata
-    URL_TYPES = %i[uri xml pdf doc html rxl txt]
+    URL_TYPES = %i[uri xml pdf doc html rxl txt].freeze
 
     attr_reader :bibitem
 
@@ -10,18 +10,6 @@ module Relaton
       @bibitem = bibitem
     end
 
-    # def method_missing(method, *args)
-    #   %r{(?<m>\w+)=$} =~ method
-    #   return unless m && %w[xml pdf doc html rxl txt].include?(m)
-
-    #   uri = @bibitem.link.detect { |u| u.type == m }
-    #   if uri
-    #     uri.content = args[0]
-    #   else
-    #     @bibitem.link << RelatonBib::TypedUri.new(type: m, content: args[0])
-    #   end
-    # end
-
     def docidentifier
       @bibitem.docidentifier.first&.id
     end
@@ -31,16 +19,18 @@ module Relaton
     # end
 
     # From http://gavinmiller.io/2016/creating-a-secure-sanitization-function/
-    FILENAME_BAD_CHARS = [ '/', '\\', '?', '%', '*', ':', '|', '"', '<', '>', '.', ' ' ]
+    FILENAME_BAD_CHARS = ["/", '\\', "?", "%", "*", ":", "|", '"', "<", ">",
+                          ".", " "].freeze
 
     def docidentifier_code
       return "" if docidentifier.nil?
-      a = FILENAME_BAD_CHARS.inject(docidentifier.downcase) do |result, bad_char|
-        result.gsub(bad_char, '-')
+
+      FILENAME_BAD_CHARS.reduce(docidentifier.downcase) do |result, bad_char|
+        result.gsub(bad_char, "-")
       end
     end
 
-    DOC_NUMBER_REGEX = /([\w\/]+)\s+(\d+):?(\d*)/
+    DOC_NUMBER_REGEX = /([\w\/]+)\s+(\d+):?(\d*)/.freeze
     def doc_number
       docidentifier&.match(DOC_NUMBER_REGEX) ? $2.to_i : 999999
     end
@@ -51,18 +41,15 @@ module Relaton
     end
 
     def to_xml(opts = {})
-      options = { bibdata: true, date_format: :full }.merge opts.select { |k,v| k.is_a? Symbol }
+      options = { bibdata: true, date_format: :full }.merge(
+        opts.select { |k, _v| k.is_a? Symbol },
+      )
       @bibitem.to_xml nil, **options
-
-      # #datetype = stage&.casecmp("published") == 0 ? "published" : "circulated"
-
-      # ret = ref ? "<bibitem id= '#{ref}' type='#{doctype}'>\n" : "<bibdata type='#{doctype}'>\n"
-      # ret += "<fetched>#{Date.today.to_s}</fetched>\n"
     end
 
     def to_h
       URL_TYPES.reduce({ items: [] }.merge(@bibitem.to_hash)) do |h, t|
-        value = self.send t
+        value = send t
         h[t.to_s] = value
         h
       end
@@ -72,15 +59,22 @@ module Relaton
       to_h.to_yaml
     end
 
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity, Style/MissingRespondToMissing
+
     def method_missing(meth, *args)
       if @bibitem.respond_to?(meth)
         @bibitem.send meth, *args
       elsif URL_TYPES.include? meth
-        link = @bibitem.link.detect { |l| l.type == meth.to_s || meth == :uri && l.type.nil? }
+        link = @bibitem.link.detect do |l|
+          l.type == meth.to_s || meth == :uri && l.type.nil?
+        end
         link&.content&.to_s
       elsif URL_TYPES.include? meth.match(/^\w+(?==)/).to_s.to_sym
         /^(?<type>\w+)/ =~ meth
-        link = @bibitem.link.detect { |l| l.type == type || type == "uri" && l.type.nil? }
+        link = @bibitem.link.detect do |l|
+          l.type == type || type == "uri" && l.type.nil?
+        end
         if link
           link.content = args[0]
         else
@@ -90,5 +84,7 @@ module Relaton
         super
       end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity, Style/MissingRespondToMissing
   end
 end

data/lib/relaton/cli/base_convertor.rb

@@ -17,6 +17,7 @@ module Relaton
         install_dependencies(options[:require] || [])
       end
 
+      # @return [String] HTML
       def to_html
         content = convert_to_html
         write_to_a_file(content)
@@ -32,12 +33,13 @@ module Relaton
       # @param style [String] Stylesheet file path for styles
       # @param template [String] The liquid tempalte directory
       #
+      # @return [String] HTML
       def self.to_html(file, style = nil, template = nil)
         new(
           file,
           style: style || File.join(File.dirname(__FILE__), "../../../templates/index-style.css"),
           template: template || File.join(File.dirname(__FILE__), "../../../templates/"),
-          extension: "html"
+          extension: "html",
         ).to_html
       end
 
@@ -45,6 +47,7 @@ module Relaton
 
       attr_reader :file, :outdir, :options, :writable, :overwrite
 
+      # @return [String] HTML
       def convert_to_html
         Relaton::Cli::XmlToHtmlRenderer.render(
           xml_content(file),
@@ -53,6 +56,9 @@ module Relaton
         )
       end
 
+      # @param file [String] path to a file
+      # @return [String] the file's content
+      # @return [String] HTML
       def xml_content(file)
         File.read(file, encoding: "utf-8")
       end
@@ -92,7 +98,7 @@ module Relaton
         #     write_to_a_file(item_output(item, format), collection)
         #   end
         # end
-        if outdir && (content.is_a?(Relaton::Bibcollection))
+        if outdir && content.is_a?(Relaton::Bibcollection)
           FileUtils.mkdir_p(outdir)
           content.items_flattened.each do |item|
             collection = collection_filename(extract_docid(item))
@@ -103,19 +109,21 @@ module Relaton
 
       def extract_docid(item)
         @default_filelabel += 1
-        item.docidentifier.nil? and return @default_filelabel.to_s
+        item.docidentifier.nil? && (return @default_filelabel.to_s)
         # item.docidentifier.is_a?(Array) or return @default_filelabel.to_s
-        item.docidentifier.empty? and return @default_filelabel.to_s
+        item.docidentifier.empty? && (return @default_filelabel.to_s)
         docidentifier_code(item.docidentifier)
       end
 
       # From http://gavinmiller.io/2016/creating-a-secure-sanitization-function/
-      FILENAME_BAD_CHARS = [ '/', '\\', '?', '%', '*', ':', '|', '"', '<', '>', '.', ' ' ]
+      FILENAME_BAD_CHARS = ["/", '\\', "?", '%", "*", ":', "|", '"', "<", ">",
+                            ".", " "].freeze
 
       def docidentifier_code(docidentifier)
         return "" if docidentifier.nil?
-        a = FILENAME_BAD_CHARS.inject(docidentifier.downcase) do |result, bad_char|
-          result.gsub(bad_char, '-')
+
+        FILENAME_BAD_CHARS.reduce(docidentifier.downcase) do |result, bad_char|
+          result.gsub(bad_char, "-")
         end
       end
 

data/lib/relaton/cli/command.rb

@@ -73,16 +73,7 @@ module Relaton
         Relaton::Cli::XMLConvertor.to_html(file, style, template)
       end
 
-      # desc "yaml2html RELATON-INDEX-YAML", "Concatenate Relaton Collection YAML into HTML"
-      # option :stylesheet, aliases: :s, desc: "Stylesheet file path for rendering HTML index"
-      # option :templatedir, aliases: :t, desc: "Liquid template directory for rendering Relaton items and collection"
-      # option :overwrite, aliases: :f, type: :boolean, default: false, desc: "Overwrite the existing file"
-
-      # def yaml2html(file, style = nil, template = nil)
-      #   Relaton::Cli::YAMLConvertor.to_html(file, style, template)
-      # end
-
-      desc "yaml2htmlnew RELATON-INDEX-YAML", "Concatenate Relaton Collection YAML into HTML"
+      desc "yaml2html RELATON-INDEX-YAML", "Concatenate Relaton Collection YAML into HTML"
       option :stylesheet, aliases: :s, desc: "Stylesheet file path for rendering HTML index"
       option :templatedir, aliases: :t, desc: "Liquid template directory for rendering Relaton items and collection"
       option :overwrite, aliases: :f, type: :boolean, default: false, desc: "Overwrite the existing file"

data/lib/relaton/cli/relaton_file.rb

@@ -89,6 +89,9 @@ module Relaton
         )
       end
 
+      # @param document [String] XML
+      # @param file [String, nil] path to file
+      # @return [Nokogiri::XML::Document]
       def nokogiri_document(document, file = nil)
         document ||= File.read(file, encoding: "utf-8")
         Nokogiri.XML(document)
@@ -115,7 +118,6 @@ module Relaton
             bib = nokogiri_document(bib.to_xml)
           elsif (rfc = xml.at("//rfc"))
             require "relaton_ietf/scrapper"
-            #ietf = RelatonIetf::Scrapper.bib_item rfc, "rfc"
             ietf = RelatonIetf::Scrapper.fetch_rfc rfc
             bib = nokogiri_document ietf.to_xml(bibdata: true)
           else
@@ -137,16 +139,18 @@ module Relaton
       def concatenate_files
         xml_files = [convert_rxl_to_xml, convert_yamls_to_xml, convert_xml_to_xml]
 
-        xml_files.flatten.map do |xml|
+        xml_files.flatten.reduce([]) do |mem, xml|
           doc = nokogiri_document(xml[:content])
-          if (rfc = doc.at("//rfc"))
+          if (rfc = doc.at("/rfc"))
             require "relaton_ietf/scrapper"
-            #ietf = RelatonIetf::Scrapper.bib_item rfc, "rfc"
             ietf = RelatonIetf::Scrapper.fetch_rfc rfc
-            doc = nokogiri_document ietf.to_xml(bibdata: true)
+            d = nokogiri_document ietf.to_xml(bibdata: true)
+            mem << bibdata_instance(d, xml[:file])
+          elsif %w[bibitem bibdata].include? doc&.root&.name
+            mem << bibdata_instance(doc, xml[:file])
+          else mem
           end
-          bibdata_instance(doc, xml[:file]) if doc&.root&.name == "bibdata"
-        end.compact
+        end.uniq &:id
       end
 
       def concatenate_and_write_to_files
@@ -163,7 +167,7 @@ module Relaton
         end
       end
 
-      def find_available_bibrxl_file(name, ouputdir, content)
+      def find_available_bibrxl_file(name, _ouputdir, content)
         if options[:extension] == "yaml" || options[:extension] == "yml"
           bib_rxl = Pathname.new([outdir, name].join("/")).sub_ext(".rxl")
           content.bib_rxl = bib_rxl.to_s if File.file?(bib_rxl)
@@ -182,6 +186,9 @@ module Relaton
         end
       end
 
+      # @param document [Nokogiri::XML::Document]
+      # @param file [String] path to file
+      # @return [Relaton::Bibdata]
       def bibdata_instance(document, file)
         document = clean_nokogiri_document(document)
         bibdata = Relaton::Bibdata.from_xml document.root
@@ -190,6 +197,8 @@ module Relaton
         bibdata
       end
 
+      # @param bibdata [Relaton::Bibdata]
+      # @param file [String] path to file
       def build_bibdata_relaton(bibdata, file)
         ["xml", "pdf", "doc", "html", "rxl", "txt"].each do |type|
           file = Pathname.new(file).sub_ext(".#{type}")
@@ -202,6 +211,8 @@ module Relaton
       # has an xmlns. We don't want to change the code for bibdata
       # hence this hack #bibdata_doc.root['xmlns'] = "xmlns"
       #
+      # @param document [Nokogiri::XML::Document]
+      # @return [Nokogiri::XML::Document]
       def clean_nokogiri_document(document)
         document.remove_namespaces!
         document.root.add_namespace(nil, "xmlns")
@@ -256,7 +267,7 @@ module Relaton
 
       def replace_bad_characters(string)
         bad_chars = ["/", "\\", "?", "%", "*", ":", "|", '"', "<", ">", ".", " "]
-        bad_chars.inject(string.downcase) { |res, char| res.gsub(char, "-") }
+        bad_chars.reduce(string.downcase) { |res, char| res.gsub(char, "-") }
       end
     end
   end

data/lib/relaton/cli/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Cli
-    VERSION = "1.0.1".freeze
+    VERSION = "1.1.2".freeze
   end
 end

data/lib/relaton/cli/xml_convertor.rb

@@ -32,20 +32,10 @@ module Relaton
       # @param content [Nokogiri::XML::Document]
       # @return [Hash]
       def convert_content(content)
-        if content.root.name == "bibdata"
+        if %w[bibitem bibdata].include? content.root.name
           Bibdata.from_xml(content)
-          # Relaton::Cli.parse_xml(content).to_hash
         else
           Bibcollection.from_xml(content)
-          # title = content.at("relaton-collection/title").text
-          # author = content.at("relaton-collection/contributor/organization/name").text
-          # collection = { "root" => { "title" => title, "author" => author } }
-
-          # collection["root"]["items"] = content.xpath("//bibdata").map do |bib|
-          #   Relaton::Cli.parse_xml(bib).to_hash
-          # end
-
-          # collection
         end
       end
 

data/lib/relaton/cli/xml_to_html_renderer.rb

@@ -1,6 +1,6 @@
 require "nokogiri"
 require "liquid"
-require 'pp'
+require "pp"
 
 module Relaton::Cli
   class XmlToHtmlRenderer
@@ -10,16 +10,16 @@ module Relaton::Cli
       init_liquid_template_and_filesystem
     end
 
+    # @param index_xml [String] Relaton XML
+    # @return [String] HTML
     def render(index_xml)
       Liquid::Template.
         parse(template).
-        render(build_liquid_document(index_xml), { strict_variables: true })
+        render(build_liquid_document(index_xml))
     end
 
     def uri_for_extension(uri, extension)
-      unless uri.nil?
-        uri.sub(/\.[^.]+$/, ".#{extension.to_s}")
-      end
+      uri&.sub(/\.[^.]+$/, ".#{extension}")
     end
 
     # Render HTML
@@ -28,6 +28,9 @@ module Relaton::Cli
     # using the specified liquid template and stylesheets. It
     # also do some minor clean during this conversion.
     #
+    # @param file [String] Relaton XML
+    # @param options [Hash]
+    # @return [String] HTML
     def self.render(file, options)
       new(options).render(file)
     end
@@ -40,16 +43,17 @@ module Relaton::Cli
       File.read(file, encoding: "utf-8")
     end
 
+    # @param source [String] Relaton XML
     def build_liquid_document(source)
       bibcollection = build_bibcollection(source)
 
-      hash_to_liquid({
+      hash_to_liquid(
         depth: 2,
         css: stylesheet,
         title: bibcollection.title,
         author: bibcollection.author,
-        documents: document_items(bibcollection)
-      })
+        documents: document_items(bibcollection),
+      )
     end
 
     def init_liquid_template_and_filesystem
@@ -59,7 +63,17 @@ module Relaton::Cli
       Liquid::Template.file_system = file_system
     end
 
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+
     # TODO: This should be recursive, but it's not
+    # @param hash [Hash]
+    # @option hash [Integer] :dept
+    # @option hash [String] :css path to stylesheet file
+    # @option hash [String] :title
+    # @option hash [String] :author
+    # @option hash [Array<Hash>] :documents
+    #
+    # @return [Hash]
     def hash_to_liquid(hash)
       hash.map do |key, value|
         case key
@@ -71,24 +85,30 @@ module Relaton::Cli
           else v = value
           end
         when "docid"
-          if value.is_a?(Array)
-            v = value.detect { |did| did["id"] !~ /^(http|https):\/\// } || value.first
-          else v = value
-          end
+          v = if value.is_a?(Array)
+                value.detect { |did| did["id"] !~ /^(http|https):\/\// } ||
+                  value.first
+              else value
+              end
         else v = value
         end
         [key.to_s, empty2nil(v)]
       end.to_h
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
     def empty2nil(value)
       value unless value.is_a?(String) && value.empty? && !value.nil?
     end
 
+    # @param source [String] Relaton XML
+    # @return [Relaton::Bibcollection]
     def build_bibcollection(source)
       Relaton::Bibcollection.from_xml(Nokogiri::XML(source))
     end
 
+    # @param bibcollection [Relaton::Bibcollection]
+    # @return [Array<Hash>]
     def document_items(bibcollection)
       bibcollection.to_h["root"]["items"].map { |item| hash_to_liquid(item) }
     end

data/relaton-cli.gemspec

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

data/templates/_document.liquid

@@ -32,12 +32,17 @@
     </h{{ depth | plus: 1 }}>
   </div>
 
-  <div class="doc-info {{ document.docstatus.stage | downcase }}">
-    <div class="doc-stage {{ document.docstatus.stage | downcase }}">
-      {{ document.docstatus.stage }}
+  <div class="doc-info {{ document.docstatus.stage.value | downcase }}">
+    <div class="doc-stage {{ document.docstatus.stage.value | downcase }}">
+      {{ document.docstatus.stage.abbreviation }}
+      {% if document.docstatus.substage %}
+        {{ document.docstatus.stage.value }}.{{ document.docstatus.substage.value }}
+      {% else %}
+        {{ document.docstatus.stage.value }}
+      {% endif %}
     </div>
     <div class="doc-dates">
-      {% unless document.docstatus.stage == "published" %}
+      {% unless document.docstatus.stage.value == "published" %}
       <div class="doc-updated">
       {% else %}
       <div class="doc-published">
@@ -49,7 +54,7 @@
 
   <div class="doc-bib">
     <div class="doc-bib-relaton">
-      <a href="{{ document.relaton }}">Relaton XML</a>
+      <a href="{{ document.rxl }}">Relaton XML</a>
     </div>
   </div>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -223,8 +223,6 @@ files:
 - lib/relaton/bibcollection.rb
 - lib/relaton/bibdata.rb
 - lib/relaton/cli.rb
-- lib/relaton/cli/_document.liquid
-- lib/relaton/cli/_index.liquid
 - lib/relaton/cli/base_convertor.rb
 - lib/relaton/cli/command.rb
 - lib/relaton/cli/relaton_file.rb

data/lib/relaton/cli/_document.liquid

@@ -1,82 +0,0 @@
-{%- if document.items.size > 0 -%}
-<div class="doc-section">
-{%- else -%}
-<div class="document">
-{%- endif -%}
-
-  <div class="doc-line">
-    <div class="doc-identifier">
-      <h{{ depth }}>
-      {% if document.html == "" %}
-        {{ document.docid.id }}
-      {% else %}
-        <a href="{{ document.html }}">{{ document.docid.id }}</a>
-      {% endif %}
-      </h{{ depth }}>
-    </div>
-
-    <div class="doc-type-wrap">
-      <div class="doc-type {{ document.type | downcase | split: " " | join: "-" }}">
-      {{ document.type }}
-      </div>
-    </div>
-  </div>
-
-  <div class="doc-title">
-    <h{{ depth | plus: 1 }}>
-      {% if document.html == blank or document.html == nil %}
-        {{ document.title }}
-      {% else %}
-        <a href="{{ document.html }}">{{ document.title }}</a>
-      {% endif %}
-    </h{{ depth | plus: 1 }}>
-  </div>
-
-  <div class="doc-info {{ document.docstatus.stage | downcase }}">
-    <div class="doc-stage {{ document.docstatus.stage | downcase }}">
-      {{ document.docstatus.stage }}
-    </div>
-    <div class="doc-dates">
-      {% unless document.docstatus.stage == "published" %}
-      <div class="doc-updated">
-      {% else %}
-      <div class="doc-published">
-      {% endunless %}
-        {{ document.revdate }}
-      </div>
-    </div>
-  </div>
-
-  <div class="doc-bib">
-    <div class="doc-bib-relaton">
-      <a href="{{ document.relaton }}">Relaton XML</a>
-    </div>
-  </div>
-
-  <div class="doc-access">
-  {% unless document.html == blank or document.html == nil %}
-    <div class="doc-access-button-html">
-      <a href="{{ document.html }}">HTML</a>
-    </div>
-  {% endunless %}
-  {% unless document.pdf == blank or document.pdf == nil %}
-    <div class="doc-access-button-pdf">
-      <a href="{{ document.pdf }}">PDF</a>
-    </div>
-  {% endunless %}
-  {% unless document.doc == blank or document.doc == nil %}
-    <div class="doc-access-button-doc">
-      <a href="{{ document.doc }}">Word</a>
-    </div>
-  {% endunless %}
-  {% unless document.xml == blank or document.xml == nil %}
-    <div class="doc-access-button-xml">
-      <a href="{{ document.xml }}">XML</a>
-    </div>
-  {% endunless %}
-  </div>
-</div>
-
-{%- if document.items.size > 0 -%}
-  {%- include 'document' for document.items -%}
-{%- endif -%}

data/lib/relaton/cli/_index.liquid

@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-  <head>
-    <title>{{ title }}</title>
-    <style>
-<!--
-{{ css }}
--->
-    </style>
-    <meta http-equiv="Content-Type" content="text/html" charset="utf-8"/>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js" type="text/javascript"></script>
-    <script src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js" type="text/javascript"></script>
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700|Overpass:300,300i,600,900|Ek+Mukta:200" rel="stylesheet" type="text/css"/>
-    <link href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous"/>
-    <link href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous"/>
-  </head>
-  <body>
-    <header>
-      <div id="topbar-inner">
-        <div id="title-bar"><span>{{ author }}</span></div>
-      </div>
-      <div class="title-section">
-        <div class="coverpage">
-          <div class="wrapper-top">
-            <div class="coverpage-doc-identity">
-              <div class="coverpage-title"><span class="title-first">{{ title }}</span></div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </header>
-    <main class="main-section">
-    {% include 'document' for documents %}
-    </main>
-    <footer>
-      <div class="copyright">
-        <p class="year">&copy; {{ author }}</p>
-        <p class="message">All rights reserved. Unless otherwise specified, no part of this publication may be reproduced or utilized otherwise in any form or by any means, electronic or mechanical, including photocopying, or posting on the internet or an intranet, without prior written permission.</p>
-      </div>
-    </footer>
-    <script>
-      $(document).ready(function() {
-        $('[id^=toc]').each(function () {
-           var currentToc = $(this);
-           var url = window.location.href;
-           currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' <\/a>");
-        });
-      });
-      anchors.options = { placement: 'left' };
-      anchors.add('h1, h2, h3, h4');
-    </script>
-  </body>
-</html>