relaton-cli 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04d8382b4df126c9cf97b5023c57fe0a21baa72b49a7e1a5e0720e32d9605bc8
-  data.tar.gz: 763637577152158f00ad709ea9356971005bbf057e120c796d7c3a1869dc2471
+  metadata.gz: b19614f9f5484181337571cbc881a8f45d7131bbb8c1fea9ca77f8573935d8f3
+  data.tar.gz: 45429bb98e29ebfd54a2b1525a793b34f93a453f143ed1b9a9b2e0529eea6d9c
 SHA512:
-  metadata.gz: 0e58eb85e22293f1b9a840a5084463c7d762c72b1ef49fc05d9cbb46b6f7f2e7bce03aeb1df167ac2980c9a770010bebb1377e0f53553b65aa05e791268c174c
-  data.tar.gz: 84276b69b1d35f12af984eaa0dfff7b8c6fdaf68572c156410ffe74e9d74753eb6725f8610a666b16b0e705177bb31afcbbe4a4c5cff8664ad852de0ddb70615
+  metadata.gz: 2af0e98a901968e3751a1c209dc98b326098aae82b0ba0eb6d4562f9826da83e380ff05a3e8ff9884d4bb32a12e4ca43de933bd77754d31377e29052287364ee
+  data.tar.gz: 268053ca0bd8992ad7125829b3718e896b3bcbec6ca6220ccf3df98ebfce7d8680d062a89ffa3971b74474f2bdfa8ee57740d282fcdd67b869972b605cba202d

data/Gemfile.lock

@@ -0,0 +1,93 @@
+PATH
+  remote: .
+  specs:
+    relaton-cli (0.1.1)
+      liquid
+      relaton (~> 0.2.4)
+      uuidtools
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    algoliasearch (1.23.2)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    byebug (10.0.2)
+    cnccs (0.1.3)
+    diff-lcs (1.3)
+    equivalent-xml (0.6.0)
+      nokogiri (>= 1.4.3)
+    gb-agencies (0.0.3)
+    gbbib (0.3.1)
+      cnccs (~> 0.1.1)
+      gb-agencies (~> 0.0.1)
+      iso-bib-item (~> 0.3.0)
+    httpclient (2.8.3)
+    iecbib (0.1.2)
+      addressable
+      iso-bib-item (~> 0.3.0)
+    ietfbib (0.4.1)
+      iso-bib-item (~> 0.3.0)
+    iso-bib-item (0.3.1)
+      isoics (~> 0.1.6)
+      nokogiri (~> 1.8.4)
+      ruby_deep_clone (~> 0.8.0)
+    isobib (0.3.1)
+      algoliasearch
+      iso-bib-item (~> 0.3.0)
+    isoics (0.1.7)
+    json (2.1.0)
+    liquid (4.0.0)
+    mini_portile2 (2.3.0)
+    mixlib-shellout (2.4.0)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
+    public_suffix (3.0.3)
+    rake (12.3.1)
+    relaton (0.2.4)
+      algoliasearch
+      gbbib (~> 0.3.1)
+      iecbib (~> 0.1.1)
+      ietfbib (~> 0.4.1)
+      iso-bib-item (~> 0.3.0)
+      isobib (~> 0.3.1)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-command (1.0.3)
+      mixlib-shellout (~> 2.0)
+      rspec (~> 3.2)
+      rspec-its (~> 1.2)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    ruby_deep_clone (0.8.0)
+    uuidtools (2.1.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.16)
+  byebug (~> 10.0)
+  equivalent-xml (~> 0.6)
+  rake (~> 12.0)
+  relaton-cli!
+  rspec (~> 3.0)
+  rspec-command (~> 1.0.3)
+  rspec-core (~> 3.4)
+
+BUNDLED WITH
+   1.16.2

data/README.adoc

@@ -7,3 +7,142 @@ image:https://codeclimate.com/github/riboseinc/relaton-cli/badges/gpa.svg["Code
 Documentation in development.
 
 Please refer to https://github.com/riboseinc/relaton.
+
+== Executables
+
+The following executables are included:
+
+=== relaton-concatenate
+
+```
+relaton-concatenate DIRECTORY
+```
+
+Iterates through all the Relaton YAML files in DIRECTORY, and converts them in-place into Relaton XML.
+
+Iterates through all the Relaton XML files in DIRECTORY (including those just converted from Relaton YAML),
+and outputs to stdout a `relaton-collection` document containing all the Relaton XML objects read in.
+
+=== relaton-fetch
+
+```
+relaton-fetch -t TYPE -y YEAR code
+```
+
+Fetch the Relaton XML entry corresponding to the document identifier `code`. 
+
+* `YEAR` is optional, and specifies the year of publication of the standard.
+* `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`.
+
+=== relaton-metanorma-extract
+
+```
+relaton-metanorma-extract Metanorma-XML-Directory Relaton-XML-Directory
+```
+
+Iterate through all the Metanorma XML files in `Metanorma-XML-Directory`, and extract the `bibdata`
+element from each. Save the `bibdata` element for each file to `Relaton-XML-Directory`, as the Relaton XML
+description for that file. If a document identifier is present in `bibdata`, it is used as the name of the
+file; otherwise, the original file name is used.
+
+=== relaton-xml-html
+
+```
+relaton-xml-html <relaton-xml> <stylesheet> <output-root> <html-template>
+```
+
+Render a Relaton Collection XML as an HTML file. Used to generate an HTML index of standards.
+
+* `relaton-xml` is the Relaton Collection XML file.
+* `stylesheet` is the CSS stylesheet to be used to style the output. For the CSS styling of each bibliographic element, see below.
+* `output-root` is the directory containing the Relaton XML for each file, named after the document identifier (as generated by `relaton-metanorma-extract`)
+* `html-template` is the HTML Liquid Template file into which the bibliographic entries are to be inserted.  The HTML Template recognises the following parameters:
+** `css`: where the CSS stylesheet `stylesheet` is injected
+** `title`: the Title of the collection, `./relaton-collection/title` in `relaton-xml`
+** `author`: the Author of the collection, `./relaton-collection/contributor[role/@type = 'author']/organization/name` in `relaton-xml`
+** `content`: the list of resources generated by the script
+
+Sample HTML output for a bibliographic entry:
+
+```xml
+  <div class="document">
+    <div class="doc-line">
+      <div class="doc-identifier">
+        <h2>
+          <a href="http://calconnect.org/pubdocs/CD0507%20CalDAV%20Use%20Cases%20V1.0.html">CC/R 3101</a>
+        </h2>
+      </div>
+      <div class="doc-type-wrap">
+        <div class="doc-type report">report</div>
+      </div>
+    </div>
+    <div class="doc-title">
+      <h3>
+        <a href="http://calconnect.org/pubdocs/CD0507%20CalDAV%20Use%20Cases%20V1.0.html">CalConnect XLIII -- Position on the European Union daylight-savings timezone change</a>
+      </h3>
+    </div>
+    <div class="doc-info cancelled">
+      <div class="doc-stage cancelled">cancelled</div>
+      <div class="doc-dates">
+        <div class="doc-updated">2019-10-17</div>
+      </div>
+    </div>
+    <div class="doc-bib">
+      <div class="doc-bib-relaton">
+        <a href="csd/cc-r-3101.xml">Relaton XML</a>
+      </div>
+    </div>
+    <div class="doc-access">
+      <div class="doc-access-button-html">
+        <a href="http://calconnect.org/pubdocs/CD0507%20CalDAV%20Use%20Cases%20V1.0.html">HTML</a>
+      </div>
+      <div class="doc-access-button-pdf">
+        <a href="http://calconnect.org/pubdocs/CD0507%20CalDAV%20Use%20Cases%20V1.0.pdf">PDF</a>
+      </div>
+      <div class="doc-access-button-doc">
+        <a href="http://calconnect.org/pubdocs/CD0507%20CalDAV%20Use%20Cases%20V1.0.doc">Word</a>
+      </div>
+      <div class="doc-access-button-xml">
+        <a href="http://calconnect.org/pubdocs/CD0507%20CalDAV%20Use%20Cases%20V1.0.xml">XML</a>
+      </div>
+    </div>
+  </div>
+```
+
+=== relaton-yaml-xml
+
+```
+relaton-yaml-xml -R relaton-dir yaml-file
+```
+
+Convert a Relaton YAML file into a Relaton Collection XML.
+
+The Relaton YAML file contains some initial metadata, and a list of metadata about each bibliographic entry. The following is a sample:
+
+```yaml
+htmlstylesheet: ./index-style.css
+root:
+  title: CalConnect Standards Registry
+  author: "CalConnect: The Calendaring and Scheduling Consortium"
+  items:
+    - technical_committee: TC VCARD
+      docid: CC 18001
+      doctype: standard
+      title: "Date and time -- Representations for information interchange -- Part 1: Basic rules"
+      stage: Published
+      revdate: 2018-10-17
+      xml: standards/csd-datetime-explict/csd-datetime-explict.xml
+      html: standards/csd-datetime-explict/csd-datetime-explict.html
+      pdf: standards/csd-datetime-explict/csd-datetime-explict.pdf
+      doc: standards/csd-datetime-explict/csd-datetime-explict.doc
+      relaton: standards/csd-datetime-explict/cc-18001.xml
+    - technical_committee: TC PUBLISH
+      docid: CC/DIR 10001
+      doctype: governance
+      title: "Standardization and publication"
+      stage: proposal
+      revdate: 2018-10-17
+      uri: standards/csd-standardization/csd-standardization.xml
+```
+

data/exe/relaton-concatenate

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+unless ARGV.size == 1 
+  warn "./relaton-concatenate DIRECTORY (containing Relaton-XML or YAML)"
+end
+dir = ARGV.pop
+
+ret = ""
+
+Dir.foreach dir do |f|
+  if /\.yaml$/.match f
+    puts "#{__dir__}/relaton-yaml-xml -R #{dir} #{dir}/#{f}"
+    system "#{__dir__}/relaton-yaml-xml -R #{dir} #{dir}/#{f}"
+  end
+end
+
+Dir.foreach dir do |f|
+  if /\.xml$/.match f
+    ret += File.read("#{dir}/#{f}", encoding: "utf-8")
+  end
+end
+
+ret = "<relaton-collection>\n#{ret}\n</relaton-collection>"
+puts ret

data/exe/relaton-fetch

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+
+require "relaton"
+require "optparse"
+
+cache = "#{Dir.home}/.relaton-bib.pstore"
+relaton = Relaton::Db.new(cache, nil)
+types = Relaton::Db::SUPPORTED_GEMS.join(', ')
+
+options = {}
+
+opt_parser = OptionParser.new do |opts|
+  opts.banner += " <file>"
+  opts.on(
+    '-t',
+    '--type TYPE',
+    "Type of standard to get bibliographic entry for: #{types}"
+  ) { |v| options[:type] = v.to_sym }
+
+  opts.on(
+    '-y',
+    '--year YEAR',
+    "Year the standard was published"
+  ) { |v| options[:year] = v }
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+end
+
+opt_parser.parse!(ARGV)
+options[:code] = ARGV.pop
+
+ret = relaton.fetch_std(options[:code], options[:year], options[:type], {})
+
+if ret.nil?
+  warn "No matching bibliographic entry found"
+else
+  puts ret.to_xml
+end

data/exe/relaton-metanorma-extract

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require "nokogiri"
+
+unless ARGV.size == 2
+  warn "./relaton-metanorma-extract Metanorma-XML-Directory Relaton-XML-Directory"
+end
+indir = ARGV[0]
+outdir = ARGV[1]
+
+Dir.foreach indir do |f|
+  if /\.xml$/.match f
+    file = File.read("#{indir}/#{f}", encoding: "utf-8")
+    xml = Nokogiri::XML(file)
+    bibdata = xml.at("//xmlns:bibdata") || next
+    docid = bibdata&.at("./xmlns:docidentifier")&.text || f.sub(/\.xml$/, "")
+    outname = docid.sub(/^\s+/, "").sub(/\s+$/, "").gsub(/\s+/, "-") + ".xml"
+    File.open("#{outdir}/#{outname}", "w:UTF-8") { |f| f.write bibdata.to_xml }
+  end
+end

data/exe/relaton-xml-html

@@ -1,23 +1,28 @@
 #!/usr/bin/env ruby
 
 # Invoke as: ./relaton-doc FILENAME STYLESHEET RELATON-ROOT
-require "nokogiri"
+require "yaml"
+require "optparse"
+require "fileutils"
 require "relaton/cli"
 
-unless ARGV.size == 3
-  warn "Invoke as: ./relaton-doc <relaton-xml> <stylesheet> <output-root>"
+
+if ARGV.size < 2 || ARGV.size > 3
+  warn "Invoke as: ./relaton-xml-html <relaton-index-xml> <stylesheet> <liquid-template-dir>"
   exit
 end
 
 filename = ARGV[0]
-stylesheet = ARGV[1]
-relaton_root = ARGV[2] || "relaton"
+file = File.read(filename, encoding: "utf-8")
 
-file = File.read(ARGV[0], encoding: "utf-8")
+puts ARGV.inspect
 
-xml_to_html = Relaton::Cli::XmlToHtmlRenderer.new
+xml_to_html = Relaton::Cli::XmlToHtmlRenderer.new({
+  stylesheet: ARGV[1],
+  liquid_dir: ARGV[2]
+})
 
 File.open(filename.sub(/\.xml$/, ".html"), "w:UTF-8") do |f|
-  f.write(xml_to_html.render(file, stylesheet, relaton_root))
+  f.write(xml_to_html.render(file))
 end
 

data/exe/relaton-yaml-xml

@@ -2,21 +2,13 @@
 
 require "yaml"
 require "optparse"
-# require "metanorma"
-# require "byebug"
 require "fileutils"
 require "relaton/cli"
 
-
 options = {}
 
 opt_parser = OptionParser.new do |opts|
   opts.banner += " <file>"
-  opts.on(
-    '-t',
-    '--type TYPE',
-    "Type of standard to generate"
-  ) { |v| options[:type] = v.to_sym }
 
   opts.on(
     '-r',
@@ -59,26 +51,18 @@ File.open(outfilename, "w") do |f|
   f.write index_collection.to_xml
 end
 
-outdir = options[:outdir] || "relaton"
+outdir = options[:outdir]
 
-FileUtils.mkdir_p(outdir)
-# Write out relaton/#{id}.xml
-index_collection.items_flattened.each do |item|
-  filename = File.join(outdir, "#{item.docid_code}.xml")
+if outdir
+  FileUtils.mkdir_p(outdir)
+  # Write out relaton/#{id}.xml
+  index_collection.items_flattened.each do |item|
+    filename = File.join(outdir, "#{item.docid_code}.xml")
 
-  File.open(filename, "w:UTF-8") do |f|
-    f.write(item.to_xml)
-  end
+    File.open(filename, "w:UTF-8") do |f|
+      f.write(item.to_xml)
+    end
 
+  end
 end
 
-# cmd = "#{File.dirname(__FILE__)}/relaton-doc #{outfilename} #{ manifest["htmlstylesheet"] || '""' } #{ options[:relaton] || '""' }"
-# system cmd
-
-#processor = registry.find_processor(options[:type].to_sym)
-#ext = :html
-#file_extension = "html" || processor.output_formats[ext]
-#outfilename = options[:filename].sub(/\.[^.]+$/, ".#{file_extension}")
-#isodoc_options = { suppressheadingnumbers: true }
-#isodoc_options[:htmlstylesheet] = manifest["htmlstylesheet"] if manifest["htmlstylesheet"]
-#processor.output(out, outfilename, ext, isodoc_options)

data/lib/relaton/bibcollection.rb

@@ -5,24 +5,32 @@ module Relaton
       title
       items
       doctype
+      author
     ]
 
     attr_accessor *ATTRIBS
 
+    def self.ns(xpath)
+      xpath.gsub(%r{/([a-zA-z])}, "/xmlns:\\1").
+        gsub(%r{::([a-zA-z])}, "::xmlns:\\1").
+        gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]* ?=)}, "[xmlns:\\1").
+        gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]*\])}, "[xmlns:\\1")
+    end
+
     def initialize(options)
       self.items = []
       ATTRIBS.each do |k|
         method = "#{k}="
-        value = options[k.to_s]
-        # puts "K #{method}"
-        # puts value.inspect
+        value = options[k] || options[k.to_s]
+        puts "K #{method}"
+        puts value.inspect
 
-        self.send("#{k}=", options[k.to_s])
-        # puts "SET! to #{self.send(k).inspect}"
+        self.send("#{k}=", value)
+        puts "SET! to #{self.send(k).inspect}"
       end
 
       # puts items.inspect
-      self.items = self.items.inject([]) do |acc,item|
+      self.items = (self.items || []).inject([]) do |acc,item|
         acc << if item.is_a?(::Relaton::Bibcollection) ||
           item.is_a?(::Relaton::Bibdata)
 
@@ -37,6 +45,36 @@ module Relaton
       # byebug
     end
 
+    def self.from_xml(source)
+      # source = Nokogiri::XML(content)
+
+      title = source&.at(ns("./relaton-collection/title"))&.text
+      author = source&.at(ns("./relaton-collection/contributor[role/@type = 'author']/organization/name"))&.text
+
+      puts "!!!!!!!!!!"*3
+      puts "BC: title #{title}"
+      puts "BC: author #{author}"
+      puts "!!!!!!!!!!"*3
+
+      items = source.xpath(ns("./relaton-collection/relation")).map do |item|
+        puts "========="*3
+        puts "item #{item.to_s}"
+        klass = item.at(ns("./bibdata")) ? Bibdata : Bibcollection
+        klass.from_xml(item.at(ns("./bibdata")))
+      end
+
+      opts = {
+        title: title,
+        author: author,
+        items: items
+      }
+
+      puts "X"*38
+      puts opts.inspect
+      puts "X"*38
+      new(opts)
+    end
+
     def new_bib_item_class(options)
       if options["items"]
         ::Relaton::Bibcollection.new(options)
@@ -66,6 +104,9 @@ module Relaton
 
       ret = "<relaton-collection #{collection_type}>"
       ret += "<title>#{title}</title>" if title
+      if author
+        ret += "<contributor><role type='author'/><organization><name>#{author}</name></organization></contributor>"
+      end
       unless items.empty?
         items.each do |item|
           ret += "<relation type='partOf'>"
@@ -76,5 +117,16 @@ module Relaton
       ret += "</relaton-collection>\n"
     end
 
+    def to_h
+      a = ATTRIBS.inject({}) do |acc, k|
+        acc[k] = send(k)
+        acc
+      end
+
+      a[:items] = a[:items].map(&:to_h)
+
+      a
+    end
+
   end
-end
+end

data/lib/relaton/bibdata.rb

@@ -7,7 +7,12 @@ module Relaton
       title
       stage
       relation
+      xml
+      pdf
+      doc
+      html
       uri
+      relaton
       revdate
       abstract
       technical_committee
@@ -15,22 +20,64 @@ module Relaton
 
     attr_accessor *ATTRIBS
 
+    def self.ns(xpath)
+      xpath.gsub(%r{/([a-zA-z])}, "/xmlns:\\1").
+        gsub(%r{::([a-zA-z])}, "::xmlns:\\1").
+        gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]* ?=)}, "[xmlns:\\1").
+        gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]*\])}, "[xmlns:\\1")
+    end
+
     def initialize(options)
       options.each_pair do |k,v|
         send("#{k.to_s}=", v)
       end
+
+      puts "*+"*30
+      puts self.inspect
+
+      self
     end
 
     def docid_code
       docid.downcase.gsub(/[\s\/]/, "-") || ""
     end
 
+    def self.from_xml(source)
+
+      # bib.relaton_xml_path = URI.escape("#{relaton_root}/#{id_code}.xml")
+
+      datetype = source.at(ns("./date[@type]")).text
+      revdate = source.at(ns("./date/on")).text
+
+      new({
+        uri: source.at(ns("./uri"))&.text,
+        xml: source.at(ns("./uri[@type='xml']"))&.text,
+        pdf: source.at(ns("./uri[@type='pdf']"))&.text,
+        html: source.at(ns("./uri[@type='html']"))&.text,
+        relaton: source.at(ns("./uri[@type='relaton']"))&.text,
+        doc: source.at(ns("./uri[@type='doc']"))&.text,
+        docid: source.at(ns("./docidentifier"))&.text,
+        title: source.at(ns("./title"))&.text,
+        doctype: source.at(ns("./@type"))&.text,
+        stage: source.at(ns("./status"))&.text,
+        technical_committee: source.at(ns("./technical-committee"))&.text,
+        abstract: source.at(ns("./abstract"))&.text,
+        revdate: Date.parse(revdate)
+        # revdate TODO
+      })
+    end
+
     def to_xml
       datetype = stage.casecmp("published") == 0 ? "published" : "updated"
 
       ret = "<bibdata type='#{doctype}'>\n"
       ret += "<title>#{title}</title>\n"
-      ret += "<uri>#{uri}</uri>\n"
+      ret += "<uri>#{uri}</uri>\n" if uri
+      ret += "<uri type='xml'>#{xml}</uri>\n" if xml
+      ret += "<uri type='html'>#{html}</uri>\n" if html
+      ret += "<uri type='pdf'>#{pdf}</uri>\n" if pdf
+      ret += "<uri type='doc'>#{doc}</uri>\n" if doc
+      ret += "<uri type='relaton'>#{relaton}</uri>\n" if relaton
       ret += "<docidentifier>#{docid}</docidentifier>\n"
       ret += "<date type='#{datetype}'><on>#{revdate}</on></date>\n" if revdate
       ret += "<abstract>#{abstract}</abstract>\n" if abstract
@@ -39,5 +86,13 @@ module Relaton
       ret += "</bibdata>\n"
     end
 
+    def to_h
+      ATTRIBS.inject({}) do |acc, k|
+        value = send(k)
+        acc[k] = value unless value.nil?
+        acc
+      end
+    end
+
   end
 end

data/lib/relaton/cli/_document.liquid

@@ -0,0 +1,82 @@
+{%- 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 }}
+      {% else %}
+        <a href="{{ document.html }}">{{ document.docid }}</a>
+      {% endif %}
+      </h{{ depth }}>
+    </div>
+
+    <div class="doc-type-wrap">
+      <div class="doc-type {{ document.doctype | downcase | split: " " | join: "-" }}">
+      {{ document.doctype }}
+      </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.stage | downcase }}">
+    <div class="doc-stage {{ document.stage | downcase }}">
+      {{ document.stage }}
+    </div>
+    <div class="doc-dates">
+      {% unless document.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

@@ -0,0 +1,53 @@
+<!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>

data/lib/relaton/cli/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Cli
-    VERSION = "0.1.1".freeze
+    VERSION = "0.1.2".freeze
   end
 end

data/lib/relaton/cli/xml_to_html_renderer.rb

@@ -1,8 +1,20 @@
+require "nokogiri"
+require "liquid"
+require 'pp'
 
 module Relaton::Cli
   class XmlToHtmlRenderer
 
-    # require "byebug"; byebug
+    def initialize(options)
+      @liquid_dir = options[:liquid_dir]
+      @stylesheet = File.read(options[:stylesheet], encoding: "utf-8")
+
+      puts "HTML html_template_dir #{@liquid_dir}"
+      @file_system = Liquid::LocalFileSystem.new(@liquid_dir)
+      @template = File.read(@file_system.full_path("index"), encoding: "utf-8")
+      Liquid::Template.file_system = @file_system
+    end
+
     def ns(xpath)
       xpath.gsub(%r{/([a-zA-z])}, "/xmlns:\\1").
         gsub(%r{::([a-zA-z])}, "::xmlns:\\1").
@@ -10,269 +22,45 @@ module Relaton::Cli
         gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]*\])}, "[xmlns:\\1")
     end
 
-    NOKOHEAD = <<~HERE.freeze
-    <!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-    <html xmlns="http://www.w3.org/1999/xhtml">
-    <head></head>
-    <body></body>
-    </html>
-    HERE
-
-    # block for processing XML document fragments as XHTML,
-    # to allow for HTMLentities
-    def noko(&block)
-      doc = ::Nokogiri::XML.parse(NOKOHEAD)
-      fragment = doc.fragment("")
-      ::Nokogiri::XML::Builder.with fragment, &block
-      fragment.to_xml(encoding: "US-ASCII").lines.map do |l|
-        l.gsub(/\s*\n/, "")
-      end
-    end
-
-    def script_cdata(result)
-      result.gsub(%r{<script>\s*<!\[CDATA\[}m, "<script>").
-        gsub(%r{\]\]>\s*</script>}, "</script>").
-        gsub(%r{<!\[CDATA\[\s*<script>}m, "<script>").
-        gsub(%r{</script>\s*\]\]>}, "</script>")
+    def empty2nil(v)
+      return nil if !v.nil? && v.is_a?(String) && v.empty?
+      v
     end
 
-    def render(file_content, css_path, relaton_root)
-      doc = Nokogiri::XML(file_content)
-      stylesheet = File.read(css_path)
-
-      result = noko do |xml|
-        xml.html do |html|
-          define_head(
-            html,
-            stylesheet,
-            doc&.at(ns("./relaton-collection/title"))&.text || "Untitled"
-          )
-          make_body html, doc, relaton_root
-        end
-      end.join("\n")
-
-      script_cdata(result)
+    # TODO: This should be recursive, but it's not
+    def hash_to_liquid(hash)
+      hash.map { |k, v| [k.to_s, empty2nil(v)] }.to_h
     end
 
-    def define_head(html, stylesheet, title)
-      html.head do |head|
-        head.title { |t| t << title }
-        head.style do |style|
-          style.comment "\n#{stylesheet}\n"
-        end
-        head.meta **{ "http-equiv": "Content-Type", content: "text/html", charset: "utf-8" }
-
-        [
-          "https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js",
-          "https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"
-        ].each do |url|
-          head.script **{ src: url, type: "text/javascript" } do |s|
-            s.text nil
-          end
-        end
-
-        [
-          {
-            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"
-          },
-          {
-            href: "https://use.fontawesome.com/releases/v5.0.8/css/solid.css",
-            integrity: "sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk",
-            crossorigin: "anonymous"
-          },
-          {
-            href: "https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css",
-            integrity: "sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P",
-            crossorigin: "anonymous"
-          }
-
-        ].each do |attribs|
-          head.link **attribs
-        end
-
-      end
-    end
-
-    def make_body(html, xml, relaton_root)
-      # require "byebug"; byebug
-      body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
-      html.body **body_attr do |body|
-        make_body1(body, xml)
-        make_body2(body, xml)
-        make_body3(body, xml, relaton_root)
-        scripts(body)
-      end
-    end
-
-    def make_body1(body, docxml)
-      body.div **{ class: "title-section" } do |div1|
-        div1 << <<~END
-      <header>
-        <div class="coverpage">
-          <div class="wrapper-top">
-            <div class="coverpage-doc-identity">
-              <div class="coverpage-title">
-                <span class="title-first">#{docxml&.at(ns("./relaton-collection/title"))&.text}</span>
-              </div>
-            </div>
-          </div>
-        <div>
-      </header>
-        END
-      end
-    end
-
-    def make_body2(body, docxml)
-      body.div **{ class: "prefatory-section" } do |div2|
-        div2.p { |p| p << "&nbsp;" } # placeholder
-      end
-    end
+    def render(index_xml)
+      source = Nokogiri::XML(index_xml)
+      bibcollection = ::Relaton::Bibcollection.from_xml(source)
 
-    def make_body3(body, docxml, relaton_root)
-      # require "byebug"; byebug
-      body.main **{ class: "main-section" } do |div3|
-        docxml.xpath(ns("./relaton-collection/relation")).each do |x|
-          iterate(div3, x.at(ns("./bibdata | ./relaton-collection")), 2, relaton_root)
-        end
-      end
+      # puts "@"*38
+      # puts bibcollection.inspect
+      # puts "@"*38
 
-      body.div **{ class: "copyright" } do |div1|
-        div1 << <<~END
-          <p class="year">
-            © The Calendaring and Scheduling Consortium, Inc.
-          </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. Permission can be requested from the address below.
-          </p>
-        END
-      end
+      locals = {
+        css: @stylesheet,
+        title: bibcollection.title,
+        author: bibcollection.author,
+        documents: bibcollection.to_h[:items].map { |i| hash_to_liquid(i) },
+        depth: 2
+      }
 
-    end
+      # puts "template: #{template}"
+      # puts "B"*30
+      # puts "#{bibcollection.inspect}"
+      # puts "B"*30
+      # puts "#{bibcollection.items.size}"
+      # pp bibcollection.to_h[:items]
 
-    def script
-      <<~"END"
-    <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>
-      END
+      Liquid::Template.parse(@template).render(hash_to_liquid(locals))
     end
 
-    def scripts(body)
-      body.parent.add_child script
-    end
-
-    EXTENSION_TYPES = [
-      {
-        text: "HTML",
-        extension: ".html"
-      },
-      {
-        text: "PDF",
-        extension: ".pdf"
-      },
-      {
-        text: "Word",
-        extension: ".doc"
-      },
-      {
-        text: "XML",
-        extension: ".xml"
-      }
-    ]
-
     def uri_for_extension(uri, extension)
-      uri.sub(/\.[^.]+$/, extension.to_s)
-    end
-
-    def iterate(d0, bib, depth, relaton_root)
-      # require "byebug"; byebug
-      uri = bib.at(ns("./uri"))&.text
-      id = bib.at(ns("./docidentifier"))&.text
-      id_code = id.downcase.gsub(/[\s\/]/, "-") unless id.nil?
-      title = bib.at(ns("./title"))&.text
-
-      d0.div **{ class: bib.name == "bibdata" ? "document" : "doc-section" } do |d|
-        d.div **{ class: "doc-line" } do |d1|
-
-          d1.div **{ class: "doc-identifier" } do |d2|
-            d2.send "h#{depth}" do |h|
-              if uri
-                h.a **{ href: uri_for_extension(uri, :html) } do |a|
-                  a << id
-                end
-              else
-                h << id
-              end
-            end
-          end
-
-          d1.div **{ class: "doc-type-wrap" } do |d2|
-            d2.div bib.at(ns("./@type"))&.text, **{ class: "doc-type #{bib.at(ns("./@type"))&.text&.downcase}" }
-          end
-        end
-
-        d.div **{ class: "doc-title" } do |d1|
-          d1.send "h#{depth+1}" do |h|
-
-            if uri
-              h.a **{ href: uri_for_extension(uri, :html) } do |a|
-                a << title
-              end
-            else
-              h << title
-            end
-          end
-        end
-
-        d.div **{ class: "doc-info #{bib.at(ns("./status"))&.text&.downcase}" } do |d1|
-          d1.div bib.at(ns("./status"))&.text, **{ class: "doc-stage #{bib.at(ns("./status"))&.text&.downcase}" }
-          d1.div **{ class: "doc-dates" } do |d2|
-            if bib.at(ns("./date[@type = 'published']/on"))
-              d2.div bib.at(ns("./date[@type = 'published']/on"))&.text, **{ class: "doc-published" }
-            end
-            if bib.at(ns("./date[@type = 'updated']/on"))
-              d2.div bib.at(ns("./date[@type = 'updated']/on"))&.text, **{ class: "doc-updated" }
-            end
-          end
-        end
-
-        if id
-          d.div **{ class: "doc-bib" } do |d1|
-            d1.div **{ class: "doc-bib-relaton" } do |d2|
-              d2.a **{ href: URI.escape("#{relaton_root}/#{id_code}.xml") } do |a|
-                a << "Relaton XML"
-              end
-            end
-          end
-        end
-
-        if uri
-          d.div **{ class: "doc-access" } do |d1|
-
-            EXTENSION_TYPES.each do |attribs|
-              d1.div **{ class: "doc-access-button-#{attribs[:extension]}" } do |d2|
-                d2.a **{ href: uri_for_extension(uri, attribs[:extension]) } do |a|
-                  a << attribs[:text]
-                end
-              end
-            end
-          end
-        end
-
-        bib.xpath(ns("./relation")).each do |x|
-          iterate(d, x.at(ns("./bibdata | ./relaton-collection")), depth + 1, relaton_root)
-        end
-      end
+      return nil if uri.nil?
+      uri.sub(/\.[^.]+$/, ".#{extension.to_s}")
     end
 
   end

data/relaton-cli.gemspec

@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'relaton', "~> 0.2.4"
   spec.add_runtime_dependency 'uuidtools'
+  spec.add_runtime_dependency 'liquid'
 end

data/templates/_document.liquid

@@ -0,0 +1,82 @@
+{%- 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 }}
+      {% else %}
+        <a href="{{ document.html }}">{{ document.docid }}</a>
+      {% endif %}
+      </h{{ depth }}>
+    </div>
+
+    <div class="doc-type-wrap">
+      <div class="doc-type {{ document.doctype | downcase | split: " " | join: "-" }}">
+      {{ document.doctype }}
+      </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.stage | downcase }}">
+    <div class="doc-stage {{ document.stage | downcase }}">
+      {{ document.stage }}
+    </div>
+    <div class="doc-dates">
+      {% unless document.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 -%}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,10 +136,27 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: liquid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Relaton Command-line Interface
 email:
 - open.source@ribose.com
 executables:
+- relaton-concatenate
+- relaton-fetch
+- relaton-metanorma-extract
 - relaton-xml-html
 - relaton-yaml-xml
 extensions: []
@@ -152,18 +169,25 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.adoc
 - Rakefile
+- exe/relaton-concatenate
+- exe/relaton-fetch
+- exe/relaton-metanorma-extract
 - exe/relaton-xml-html
 - exe/relaton-yaml-xml
 - i18n.yaml
 - 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/version.rb
 - lib/relaton/cli/xml_to_html_renderer.rb
 - relaton-cli.gemspec
+- templates/_document.liquid
 homepage: https://github.com/riboseinc/relaton-cli
 licenses:
 - BSD-2-Clause