metanorma 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb95e4682cc1dd93a06c5c535647d4ad80ce55ed7a5e249de095f523dadfcd33
-  data.tar.gz: 423951596f64008539514331a2b5b5bf0c91c3957bd8853df7cb3c7d8db582b5
+  metadata.gz: 99633abe164a9d72691d8b84c6f24fc55833ecba84c3488c3639c20576dd1c74
+  data.tar.gz: 4253c7ed5ef852b58323623c42b2be8ae75abae69ee2a47d7ee6b2c6d65c0117
 SHA512:
-  metadata.gz: baa84d18f7109e43e04f66052076490ea5c43379a64c0f1b03b548a85dc6d59ca2826436bfbf102923bf91b3206c98279056b3d313754b8f8c0bdd98eb0bead6
-  data.tar.gz: 9f6d285f34a46e4d215cb2b3f8325906b17065d5b3689b709419d6dd3d3f5e792140a3c697bd6f7e03ea043d3e78d8bb6b1573cd4431c4031c543ae8feb485c9
+  metadata.gz: 48593b786f081e33d578e284712f40698989269121464e4b9bab7f7a79e1fff323f97514960364a72a18c8d244f17bd1863a748f679bb046d8d079e3003e7dd1
+  data.tar.gz: fec2ed02e9f5f6016d54dc11f9e2f5709ba09f79c71a4d73dc5070a194b585fc7eac2d8f8f3641087f596e2047505bb99fce64fe3a4ff55ef9d26d79757b3e81

data/.travis.yml

@@ -1,5 +1,12 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.3
-before_install: gem install bundler -v 1.16.1
+  - 2.5.1
+node_js:
+  - "iojs"
+  - "8"
+before_install: 
+  - gem install bundler -v 1.16.1
+  - npm install -g puppeteer
+  - npm install
+

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    metanorma (0.2.1)
+    metanorma (0.2.2)
       asciidoctor-csand (>= 0.3.0)
       asciidoctor-csd (>= 0.4.0)
       asciidoctor-gb (>= 0.3.0)
-      asciidoctor-iso (>= 0.9.0)
+      asciidoctor-iso (>= 0.9.1)
       asciidoctor-m3d (>= 0.3.1)
       asciidoctor-rfc (>= 0.9.0)
       asciidoctor-rsd (>= 0.3.0)
@@ -38,7 +38,7 @@ GEM
       asciidoctor-iso (>= 0.9.0)
       isodoc (>= 0.8.0)
       twitter_cldr
-    asciidoctor-iso (0.9.0)
+    asciidoctor-iso (0.9.1)
       asciidoctor (~> 1.5.7)
       iso-bib-item (~> 0.1.6)
       isobib (~> 0.1.6)
@@ -63,7 +63,7 @@ GEM
       nokogiri
       ruby-jing
       thread_safe
-    asciidoctor-rsd (0.3.0)
+    asciidoctor-rsd (0.3.1)
       asciidoctor (~> 1.5.7)
       asciidoctor-iso (>= 0.8.0)
       asciimath
@@ -77,10 +77,13 @@ GEM
       thread_safe
       uuidtools
     asciimath (1.0.4)
+    byebug (10.0.2)
     camertron-eprun (1.1.1)
     cldr-plurals-runtime-rb (1.0.1)
     diff-lcs (1.3)
     duplicate (1.1.1)
+    equivalent-xml (0.6.0)
+      nokogiri (>= 1.4.3)
     ffi (1.9.25)
     html2doc (0.8.0)
       asciimath
@@ -94,11 +97,11 @@ GEM
     htmlentities (4.3.4)
     httpclient (2.8.3)
     image_size (2.0.0)
-    iso-bib-item (0.1.6)
+    iso-bib-item (0.1.8)
       duplicate
       isoics (~> 0.1.6)
       nokogiri
-    isobib (0.1.6)
+    isobib (0.1.7)
       algoliasearch
       iso-bib-item (~> 0.1.2)
     isodoc (0.8)
@@ -121,6 +124,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
+    mixlib-shellout (2.3.2)
     nokogiri (1.8.3)
       mini_portile2 (~> 2.3.0)
     optout (0.0.2)
@@ -133,11 +137,18 @@ GEM
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
+    rspec-command (1.0.3)
+      mixlib-shellout (~> 2.0)
+      rspec (~> 3.2)
+      rspec-its (~> 1.2)
     rspec-core (3.7.1)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
@@ -164,9 +175,12 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.16)
+  byebug (~> 10.0)
+  equivalent-xml (~> 0.6)
   metanorma!
   rake (~> 10.0)
   rspec (~> 3.0)
+  rspec-command (~> 1.0.3)
 
 BUNDLED WITH
    1.16.2

data/README.adoc

@@ -62,6 +62,7 @@ Usage: metanorma [options] <file>
       :m3d=>{:html=>"html", :doc=>"doc"},
       :rsd=>{:html=>"html"}
     }
+      In addition, xml (outside of rfc2, rfc3) generates IsoDoc XML
     -f, --format FORMAT              Format of source file: asciidoc (current default, only format supported)
     -r, --require LIBRARY            Require LIBRARY prior to execution
     -h, --help                       Show this message

data/exe/metanorma

@@ -41,7 +41,8 @@ opt_parser = OptionParser.new do |opts|
     '-x',
     '--extensions EXT1,EXT2,...',
     Array,
-    "Type of extension to generate per type: #{registry.output_formats}"
+    "Type of extension to generate per type: #{registry.output_formats}\n"\
+    "In addition, xml (outside of rfc2, rfc3) generates IsoDoc XML"
   ) { |v| options[:extension_keys] = v.map(&:to_sym) }
 
   opts.on(
@@ -62,7 +63,7 @@ opt_parser = OptionParser.new do |opts|
   opts.on(
     '-v',
     '--version',
-    "Print version of code",
+    "Print version of code (accompanied with -t)",
   ) { options[:version] = true }
 
   opts.on_tail("-h", "--help", "Show this message") do
@@ -74,23 +75,13 @@ end
 
 opt_parser.parse!(ARGV)
 
-# TODO: move this to individual Processors
 if options[:version]
-  case options[:type]
-  when :iso
-    puts "Asciidoctor::ISO #{Asciidoctor::ISO::VERSION}/IsoDoc #{IsoDoc::VERSION}"
-  when :gb
-    puts "Asciidoctor::Gb #{Asciidoctor::Gb::VERSION}"
-  when :csd
-    puts "Asciidoctor::Csd #{Asciidoctor::Csd::VERSION}"
-  when :csand
-    puts "Asciidoctor::Csand #{Asciidoctor::Csand::VERSION}"
-  when :m3d
-    puts "Asciidoctor::M3d #{Asciidoctor::M3d::VERSION}"
-  when :rsd
-    puts "Asciidoctor::Rsd #{Asciidoctor::Rsd::VERSION}"
+  case options[:format]
+  when :asciidoc
+    processor = registry.find_processor(options[:type].to_sym)
+    puts processor.version
+    exit
   end
-  exit
 end
 
 options[:filename] = ARGV.pop
@@ -126,16 +117,30 @@ case options[:format]
 when :asciidoc
   processor = registry.find_processor(options[:type].to_sym)
 
+  options[:extension_keys] ||= processor.output_formats.inject([]) do |memo, (k, _)|
+    memo << k; memo
+  end
+  extensions = options[:extension_keys].inject([]) do |memo, e|
+    if processor.output_formats[e] || e == :xml then memo << e
+    else
+      warn "[metanorma] Error: #{e} format is not supported for this standard"
+    end
+    memo
+  end
+  exit 0 if extensions.empty?
+
   file = File.read(options[:filename], encoding: "utf-8")
   isodoc = processor.input_to_isodoc(file)
+  isodoc_options = processor.extract_options(file)
 
-  options[:extension_keys].each do |ext|
-
-    file_extension = processor.output_formats[ext]
+  extensions.each do |ext|
+    file_extension = ext == :xml ? "xml" : processor.output_formats[ext]
     outfilename = options[:filename].sub(/\.[^.]+$/, ".#{file_extension}")
-    # puts "made outfilename #{outfilename}"
-    processor.output(isodoc, outfilename, ext)
-
+    if ext == :xml
+      File.open(outfilename, "w:UTF-8") { |f| f.write(isodoc) }
+    else
+      processor.output(isodoc, outfilename, ext, isodoc_options)
+    end
   end
 end
 

data/lib/metanorma/input/asciidoc.rb

@@ -18,12 +18,12 @@ module Metanorma
       def extract_options(file)
         header = file.sub(/\n\n.*$/m, "")
 
-        /\nscript: (?<script>[^\n]+)\n/ =~ header
-        /\nbody-font: (?<bodyfont>[^\n]+)\n/ =~ header
-        /\nheader-font: (?<headerfont>[^\n]+)\n/ =~ header
-        /\nmonospace-font: (?<monospacefont>[^\n]+)\n/ =~ header
-        /\ntitle-font: (?<titlefont>[^\n]+)\n/ =~ header
-        /\ni18nyaml: (?<ni18nyaml>[^\n]+)\n/ =~ header
+        /\n:script: (?<script>[^\n]+)\n/ =~ header
+        /\n:body-font: (?<bodyfont>[^\n]+)\n/ =~ header
+        /\n:header-font: (?<headerfont>[^\n]+)\n/ =~ header
+        /\n:monospace-font: (?<monospacefont>[^\n]+)\n/ =~ header
+        /\n:title-font: (?<titlefont>[^\n]+)\n/ =~ header
+        /\n:i18nyaml: (?<ni18nyaml>[^\n]+)\n/ =~ header
         {
           script: defined?(script) ? script : nil,
           bodyfont: defined?(bodyfont) ? bodyfont : nil,
@@ -31,7 +31,7 @@ module Metanorma
           monospacefont: defined?(monospacefont) ? monospacefont : nil,
           titlefont: defined?(titlefont) ? titlefont : nil,
           i18nyaml: defined?(i18nyaml) ? i18nyaml : nil,
-        }.reject { |_, val| val.nil? }.map
+        }.reject { |_, val| val.nil? }
       end
 
     end

data/lib/metanorma/output/pdf.rb

@@ -5,8 +5,6 @@ module Metanorma
       def convert(url_path, output_path)
         file_url = "file://#{Dir.pwd}/#{url_path}"
         pdfjs = File.join(File.dirname(__FILE__), '../../../exe/metanorma-pdf.js')
-        puts "export NODE_PATH=$(npm root --quiet -g);
-                      node #{pdfjs} #{file_url} #{output_path}"
         system "export NODE_PATH=$(npm root --quiet -g);
                       node #{pdfjs} #{file_url} #{output_path}"
       end

data/lib/metanorma/processor.rb

@@ -23,5 +23,8 @@ module Metanorma
       raise "This is an abstract class!"
     end
 
+    def extract_options(file)
+      Metanorma::Input::Asciidoc.new.extract_options(file)
+    end
   end
 end

data/lib/metanorma/registry.rb

@@ -3,6 +3,9 @@
 
 require 'singleton'
 
+class Error < StandardError
+end
+
 module Metanorma
   class Registry
     include Singleton

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/metanorma.gemspec

@@ -22,13 +22,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "byebug", "~> 10.0"
+  spec.add_development_dependency "rspec-command", "~> 1.0.3"
+  spec.add_development_dependency "equivalent-xml", "~> 0.6"
 
-  spec.add_runtime_dependency 'asciidoctor-iso', ">= 0.9.0"
+  spec.add_runtime_dependency 'asciidoctor-iso', ">= 0.9.1"
   spec.add_runtime_dependency 'asciidoctor-rfc', ">= 0.9.0"
   spec.add_runtime_dependency 'asciidoctor-gb', ">= 0.3.0"
   spec.add_runtime_dependency 'asciidoctor-csd', ">= 0.4.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-command
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: asciidoctor-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: asciidoctor-rfc
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +256,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="