reverse_adoc 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 906cadff19bcc530a5aa527f3a7cb87bd80050163638ce87d052d3615e82c68d
-  data.tar.gz: ffaf10410be78e4971c80a7c45c946aa4d4803546102b90c0c5bc01342dd962d
+  metadata.gz: abd0bf0dce3d437c176a1c3486d565fedd235d4b4e58cfdb4259188a1a94e090
+  data.tar.gz: '08926fcde9721aecc4672ac81c1dce18bf750763fe60621f57eb4cc32605eb70'
 SHA512:
-  metadata.gz: 1436a34f5bd46e9c73d41028562f9edd78970bc5c88acf3cf815c6b76975c228045266c32e6cbc63ffcef3fc9d05101f51de446476f10ace57d565cc306d8629
-  data.tar.gz: 78e5514b5d5e01e5407d12644db5deda0d73e9d62f274932a2dee50de098dd65e36ddd96ef0a523726ec1915d80e42ab847d6227e8d927b5a85e229f53aaff86
+  metadata.gz: 39bf9ee3868bbb02440e2d853839a267f4c385e84204aedaeabe1000a7fa3fdc3f9e6baf381025548633b02b5c9e8f7d87925044c3ec992ca1eca2b83e7722b6
+  data.tar.gz: 5c34f9d71fa904a05c2e726b627d944f61a09f08e50ff587a102cc6e42c107600e08ad4b583fb5c9a07d678c09f06bc86fe25c15b94ae2dbefa0f29d046796bf

data/.github/workflows/macos.yml

@@ -33,6 +33,9 @@ jobs:
         run: |
           sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
+      - name: Install LibreOffice
+        run: |
+          brew cask install libreoffice
       - name: Run specs
         run: |
           bundle exec rake

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    reverse_adoc (0.2.8)
+    reverse_adoc (0.2.10)
       mathml2asciimath
       mimemagic
       nokogiri (>= 1.10.4)
+      premailer (~> 1.11.0)
       word-to-markdown
 
 GEM
@@ -28,7 +29,7 @@ GEM
       nokogiri (>= 1.10.4)
     mimemagic (0.3.5)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     nokogiri-styles (0.1.2)
       nokogiri
@@ -36,7 +37,7 @@ GEM
       addressable
       css_parser (>= 1.6.0)
       htmlentities (>= 4.0.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rake (13.0.1)
     redcarpet (3.5.0)
     reverse_markdown (1.4.0)
@@ -58,7 +59,7 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.1)
-    sys-proctable (1.2.5)
+    sys-proctable (1.2.6)
       ffi
     word-to-markdown (1.1.8)
       cliver (~> 0.3)

data/README.adoc

@@ -44,31 +44,6 @@ $ reverse_adoc file.html > file.adoc
 $ cat file.html | reverse_adoc > file.adoc
 ----
 
-=== XML smrl description to AsciiDoc: `reverse_adoc`
-
-Convert XML smrl description files to AsciiDoc:
-
-[source,console]
-----
-$ reverse_adoc -f smrl_description descriptions.xml > file.adoc
-$ cat descriptions.xml | reverse_adoc -f smrl_description > file.adoc
-----
-
-[source,console]
-----
-$ reverse_adoc -h
-Usage: reverse_adoc [options] <file>
-    -f, --input_format               Supply input format to choose converter(html or smrl_description)
-    -m, --mathml2asciimath           Convert MathML to AsciiMath
-    -o, --output=FILENAME            Output file to write to
-    -e, --external-images            Export images if data URI
-    -u [pass_through, drop, bypass, raise],
-        --unknown_tags               Unknown tag handling (default: pass_through)
-    -v, --version                    Version information
-    -h, --help                       Prints this help
-----
-
-
 
 === Microsoft Word to AsciiDoc: `w2a`
 

data/bin/reverse_adoc

@@ -23,10 +23,6 @@ OptionParser.new do |opts|
     ReverseAdoc.config.external_images = true
   end
 
-  opts.on('-f', '--input_format [html, smrl_description]', 'Unknown input format (default: html)') do |v|
-    ReverseAdoc.config.input_format = v
-  end
-
   opts.on('-u', '--unknown_tags [pass_through, drop, bypass, raise]', 'Unknown tag handling (default: pass_through)') do |v|
     ReverseAdoc.config.unknown_tags = v
   end

data/lib/reverse_adoc.rb

@@ -8,14 +8,11 @@ require 'reverse_adoc/cleaner'
 require 'reverse_adoc/config'
 require 'reverse_adoc/converters'
 require 'reverse_adoc/converters/base'
+require "reverse_adoc/html_converter"
 
 module ReverseAdoc
   def self.convert(input, options = {})
-    type = config.input_format
-    name = "#{type}_converter"
-    require "reverse_adoc/#{type}_converter"
-    constant = name.split('_').map(&:capitalize).join.to_s
-    ReverseAdoc.const_get(constant).convert(input, options)
+    ReverseAdoc::HtmlConverter.convert(input, options)
   end
 
   def self.config

data/lib/reverse_adoc/version.rb

@@ -1,3 +1,3 @@
 module ReverseAdoc
-  VERSION = '0.2.9'
+  VERSION = '0.2.10'
 end

data/reverse_adoc.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |s|
 
   # All the following are for bin/w2m
   s.add_dependency 'word-to-markdown'
+  s.add_dependency 'premailer', '~> 1.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reverse_adoc
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: premailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.0
 description: Generate AsciiDoc from HTML and Microsoft Word via CLI or library.
 email:
 - open.source@ribose.com
@@ -172,10 +186,6 @@ files:
 - lib/reverse_adoc/converters/div.rb
 - lib/reverse_adoc/converters/drop.rb
 - lib/reverse_adoc/converters/em.rb
-- lib/reverse_adoc/converters/example.rb
-- lib/reverse_adoc/converters/express_ref.rb
-- lib/reverse_adoc/converters/ext_description.rb
-- lib/reverse_adoc/converters/ext_descriptions.rb
 - lib/reverse_adoc/converters/figure.rb
 - lib/reverse_adoc/converters/h.rb
 - lib/reverse_adoc/converters/head.rb
@@ -185,7 +195,6 @@ files:
 - lib/reverse_adoc/converters/li.rb
 - lib/reverse_adoc/converters/mark.rb
 - lib/reverse_adoc/converters/math.rb
-- lib/reverse_adoc/converters/note.rb
 - lib/reverse_adoc/converters/ol.rb
 - lib/reverse_adoc/converters/p.rb
 - lib/reverse_adoc/converters/pass_through.rb
@@ -202,7 +211,6 @@ files:
 - lib/reverse_adoc/converters/video.rb
 - lib/reverse_adoc/errors.rb
 - lib/reverse_adoc/html_converter.rb
-- lib/reverse_adoc/smrl_description_converter.rb
 - lib/reverse_adoc/version.rb
 - reverse_adoc.gemspec
 - spec/assets/anchors.html
@@ -242,15 +250,10 @@ files:
 - spec/lib/reverse_adoc/converters/br_spec.rb
 - spec/lib/reverse_adoc/converters/code_spec.rb
 - spec/lib/reverse_adoc/converters/div_spec.rb
-- spec/lib/reverse_adoc/converters/example_spec.rb
-- spec/lib/reverse_adoc/converters/express_ref_spec.rb
-- spec/lib/reverse_adoc/converters/ext_description_spec.rb
-- spec/lib/reverse_adoc/converters/ext_descriptions_spec.rb
 - spec/lib/reverse_adoc/converters/figure_spec.rb
 - spec/lib/reverse_adoc/converters/img_spec.rb
 - spec/lib/reverse_adoc/converters/li_spec.rb
 - spec/lib/reverse_adoc/converters/mark_spec.rb
-- spec/lib/reverse_adoc/converters/note_spec.rb
 - spec/lib/reverse_adoc/converters/p_spec.rb
 - spec/lib/reverse_adoc/converters/pre_spec.rb
 - spec/lib/reverse_adoc/converters/q_spec.rb
@@ -264,7 +267,7 @@ homepage: http://github.com/metanorma/reverse_adoc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -279,8 +282,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Generate AsciiDoc from HTML and Microsoft Word via CLI or library.
 test_files:
@@ -321,15 +324,10 @@ test_files:
 - spec/lib/reverse_adoc/converters/br_spec.rb
 - spec/lib/reverse_adoc/converters/code_spec.rb
 - spec/lib/reverse_adoc/converters/div_spec.rb
-- spec/lib/reverse_adoc/converters/example_spec.rb
-- spec/lib/reverse_adoc/converters/express_ref_spec.rb
-- spec/lib/reverse_adoc/converters/ext_description_spec.rb
-- spec/lib/reverse_adoc/converters/ext_descriptions_spec.rb
 - spec/lib/reverse_adoc/converters/figure_spec.rb
 - spec/lib/reverse_adoc/converters/img_spec.rb
 - spec/lib/reverse_adoc/converters/li_spec.rb
 - spec/lib/reverse_adoc/converters/mark_spec.rb
-- spec/lib/reverse_adoc/converters/note_spec.rb
 - spec/lib/reverse_adoc/converters/p_spec.rb
 - spec/lib/reverse_adoc/converters/pre_spec.rb
 - spec/lib/reverse_adoc/converters/q_spec.rb

data/lib/reverse_adoc/converters/example.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module ReverseAdoc
-  module Converters
-    class Example < Base
-      def convert(node, state = {})
-        <<~TEMPLATE
-          [example]
-          ====
-          #{treat_children(node, state)}
-          ====
-        TEMPLATE
-      end
-    end
-    register :example, Example.new
-  end
-end

data/lib/reverse_adoc/converters/express_ref.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module ReverseAdoc
-  module Converters
-    class ExpressRef < Base
-      def convert(node, _state = {})
-        "express_ref:[#{node['linkend']}]"
-      end
-    end
-    register :express_ref, ExpressRef.new
-  end
-end

data/lib/reverse_adoc/converters/ext_description.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module ReverseAdoc
-  module Converters
-    class ExtDescription < Base
-      def convert(node, state = {})
-        <<~TEMPLATE
-          (*"#{node['linkend']}"
-          #{treat_children(node, state)}
-          *)
-        TEMPLATE
-      end
-    end
-    register :ext_description, ExtDescription.new
-  end
-end

data/lib/reverse_adoc/converters/ext_descriptions.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module ReverseAdoc
-  module Converters
-    class ExtDescriptions < Base
-      def convert(node, state = {})
-        treat_children(node, state)
-      end
-    end
-    register :ext_descriptions, ExtDescriptions.new
-  end
-end

data/lib/reverse_adoc/converters/note.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module ReverseAdoc
-  module Converters
-    class Note < Base
-      def convert(node, state = {})
-        <<~TEMPLATE
-          [NOTE]
-          --
-          #{treat_children(node, state)}
-          --
-        TEMPLATE
-      end
-    end
-    register :note, Note.new
-  end
-end

data/lib/reverse_adoc/smrl_description_converter.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require 'reverse_adoc/converters/a'
-require 'reverse_adoc/converters/blockquote'
-require 'reverse_adoc/converters/bypass'
-require 'reverse_adoc/converters/br'
-require 'reverse_adoc/converters/code'
-require 'reverse_adoc/converters/drop'
-require 'reverse_adoc/converters/em'
-require 'reverse_adoc/converters/example'
-require 'reverse_adoc/converters/ext_descriptions'
-require 'reverse_adoc/converters/ext_description'
-require 'reverse_adoc/converters/express_ref'
-require 'reverse_adoc/converters/head'
-require 'reverse_adoc/converters/hr'
-require 'reverse_adoc/converters/ignore'
-require 'reverse_adoc/converters/note'
-require 'reverse_adoc/converters/p'
-require 'reverse_adoc/converters/pass_through'
-require 'reverse_adoc/converters/q'
-require 'reverse_adoc/converters/strong'
-require 'reverse_adoc/converters/sup'
-require 'reverse_adoc/converters/sub'
-require 'reverse_adoc/converters/text'
-
-module ReverseAdoc
-  class SmrlDescriptionConverter
-    def self.convert(input, options = {})
-      root = if input.is_a?(String)
-                then Nokogiri::XML(input).root
-              elsif input.is_a?(Nokogiri::XML::Document)
-                then input.root
-              elsif input.is_a?(Nokogiri::XML::Node)
-                then input
-              end
-
-      root || (return '')
-
-      ReverseAdoc.config.with(options) do
-        result = ReverseAdoc::Converters.lookup(root.name).convert(root)
-        ReverseAdoc.cleaner.tidy(result)
-      end
-    end
-  end
-end

data/spec/lib/reverse_adoc/converters/example_spec.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'reverse_adoc/converters/example'
-
-describe ReverseAdoc::Converters::Example do
-  let(:converter) { described_class.new }
-  let(:output) do
-    <<~TEXT
-    [example]
-    ====
-     foo
-
-    ====
-    TEXT
-  end
-
-  it 'converts example` children' do
-    input = node_for('<example><li>foo</li></example>')
-    expect(converter.convert(input)).to eq(output)
-  end
-end

data/spec/lib/reverse_adoc/converters/express_ref_spec.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'reverse_adoc/converters/express_ref'
-
-describe ReverseAdoc::Converters::ExpressRef do
-  let(:converter) { described_class.new }
-  let(:schema) { 'schema' }
-
-  it 'converts supplied tag by format' do
-    input = node_for("<express_ref linkend='#{schema}' />")
-    expect(converter.convert(input)).to eq("express_ref:[#{schema}]")
-  end
-end

data/spec/lib/reverse_adoc/converters/ext_description_spec.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'reverse_adoc/converters/ext_description'
-
-describe ReverseAdoc::Converters::ExtDescription do
-  let(:converter) { described_class.new }
-  let(:schema) { 'schema' }
-
-  it 'takes ext_description linkend attribute' do
-    input = node_for("<ext_description linkend='#{schema}'></ext_description>")
-    expect(converter.convert(input)).to include(%{(*"#{schema}"})
-  end
-
-  it 'converts html children' do
-    input = node_for(
-      "<ext_description linkend='#{schema}'><li>foo</li></ext_description>")
-    expect(converter.convert(input)).to include(" foo\n")
-  end
-end

data/spec/lib/reverse_adoc/converters/ext_descriptions_spec.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'reverse_adoc/converters/ext_descriptions'
-
-describe ReverseAdoc::Converters::ExtDescriptions do
-  let(:converter) { described_class.new }
-
-  it 'converts ext_descriptions children' do
-    input = node_for('<ext_descriptions><li>foo</li></ext_descriptions>')
-    expect(converter.convert(input)).to eq " foo\n"
-  end
-end

data/spec/lib/reverse_adoc/converters/note_spec.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'reverse_adoc/converters/note'
-
-describe ReverseAdoc::Converters::Note do
-  let(:converter) { described_class.new }
-  let(:output) do
-    <<~TEXT
-    [NOTE]
-    --
-     foo
-
-    --
-    TEXT
-  end
-
-  it 'converts note` children' do
-    input = node_for('<note><li>foo</li></note>')
-    expect(converter.convert(input)).to eq(output)
-  end
-end