reverse_adoc 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3d387a4fbedd246900150be67a80bf62ee70a70cf697b1a2a7a247080d879ad
-  data.tar.gz: 956f8db0ca1d2f34e1f165f323e6db6d1f5e68a91dc886d6fd3cf3f1f7aa0886
+  metadata.gz: 151922bd17ae4f65700977c109db7d8c55698e7eab9b22f7879df019b84c0923
+  data.tar.gz: b18bfb38f7d53ba8eae5cca00798824c8d4c6726a6d9c7baf0ab3a86f69c0d9a
 SHA512:
-  metadata.gz: a72c96ffc8e41f7e38b28108107b12bec33a22e3b1722416e7b4d5a493ab3f47d6c3fab49a98b27969ba8235cb3ed6fff86f027a8c9ff5e4b3276af8d2d0a752
-  data.tar.gz: 1f0de4f61007133d49c0dfcd0dd85e8a87f8445a59fb41ba5dd1001eeec4e1405402449389b3e1355a453ff5a21bf6fa7d4b8bfd1fc883c654feee83600e55f3
+  metadata.gz: f8cf25df3279d0bd4b33c105be476e15dcb0c8e4aca7812e3332daf3bc5ac4ea671281266ec8c70b83c7d906fa87593ce65e24a0a0a009382eb0921e6072e669
+  data.tar.gz: 5431dacaa7627908c4bb1e2583d56e7b982bd73f6ad44bf6a348ccc99cb632743ea701db79d53c46d5f0e263961abd676570f9c1d02417855dfc9d9b91deb3fa

data/.github/workflows/rake.yml

@@ -0,0 +1,42 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: rake
+
+on:
+  push:
+    branches: [ master, main ]
+    tags: [ v* ]
+  pull_request:
+
+jobs:
+  rake:
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        experimental: [ false ]
+        include:
+          - ruby: '3.0'
+            os: 'ubuntu-latest'
+            experimental: true
+          - ruby: '3.0'
+            os: 'windows-latest'
+            experimental: true
+          - ruby: '3.0'
+            os: 'macos-latest'
+            experimental: true
+    steps:
+      - uses: actions/checkout@master
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - uses: metanorma/metanorma-build-scripts/libreoffice-setup-action@master
+
+      - run: bundle exec rake

data/Gemfile

@@ -1,8 +1,8 @@
 source "https://rubygems.org"
-  
+
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
-# Specify your gem's dependencies in reverse_asciidoctor.gemspec
+# Specify your gem's dependencies in reverse_adoc.gemspec
 gemspec
 
 gem "byebug"

data/README.adoc

@@ -1,9 +1,7 @@
 = AsciiDoc from HTML and Microsoft Word: reverse_adoc
 
 https://github.com/metanorma/reverse_adoc[reverse_adoc] image:https://img.shields.io/gem/v/reverse_adoc.svg["Gem Version", link="https://rubygems.org/gems/reverse_adoc"]::
-image:https://github.com/metanorma/reverse_adoc/workflows/macos/badge.svg["Build Status", link="https://github.com/metanorma/reverse_adoc/actions?workflow=macos"]
-image:https://github.com/metanorma/reverse_adoc/workflows/windows/badge.svg["Build Status", link="https://github.com/metanorma/reverse_adoc/actions?workflow=windows"]
-image:https://github.com/metanorma/reverse_adoc/workflows/ubuntu/badge.svg["Build Status", link="https://github.com/metanorma/reverse_adoc/actions?workflow=ubuntu"]
+image:https://github.com/metanorma/reverse_adoc/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/reverse_adoc/actions?workflow=rake"]
 image:https://codeclimate.com/github/metanorma/reverse_adoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/reverse_adoc"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/reverse_adoc.svg["Pull Requests", link="https://github.com/metanorma/reverse_adoc/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/reverse_adoc/latest.svg["Commits since latest",link="https://github.com/metanorma/reverse_adoc/releases"]
@@ -44,20 +42,6 @@ $ reverse_adoc file.html > file.adoc
 $ cat file.html | reverse_adoc > file.adoc
 ----
 
-[source,console]
-----
-$ reverse_adoc -h
-Usage: reverse_adoc [options] <file>
-    -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`
 
@@ -236,7 +220,7 @@ The gem does not support:
 === MathML support
 
 If you are using this gem in the context of https://www.metanorma.com[Metanorma],
-Metanorma Asciidoctor accepts MathML as a native mathematical format. So you do not need
+Metanorma AsciiDoc accepts MathML as a native mathematical format. So you do not need
 to convert the MathML to AsciiMath.
 
 The gem will optionally invoke the https://github.com/metanorma/mathml2asciimath
@@ -254,7 +238,7 @@ uses the output) as such; so this is still much better than nothing for stem pro
 
 === Word cleanup
 
-This gem is routinely used in the Metanorma project to export Word documents to Asciidoctor.
+This gem is routinely used in the Metanorma project to export Word documents to AsciiDoc.
 The HTML export from Word that the gem uses, from LibreOffice, is much cleaner than the
 native HTML 4 export from Word; but it has some infelicities which this gem cleans up:
 
@@ -273,7 +257,7 @@ Simple to use.
 
 [source,ruby]
 ----
-result = ReverseAsciidoctor.convert input
+result = ReverseAdoc.convert input
 result.inspect # " *feelings* "
 ----
 
@@ -283,7 +267,7 @@ Just pass your chosen configuration options in after the input. The given option
 
 [source,ruby]
 ----
-ReverseAsciidoctor.convert(input, unknown_tags: :raise, mathml2asciimath: true)
+ReverseAdoc.convert(input, unknown_tags: :raise, mathml2asciimath: true)
 ----
 
 
@@ -293,7 +277,7 @@ Or configure it block style on a initializer level. These configurations will la
 
 [source,ruby]
 ----
-ReverseAsciidoctor.config do |config|
+ReverseAdoc.config do |config|
   config.unknown_tags      = :bypass
   config.mathml2asciimath  = true
   config.tag_border  = ''

data/Rakefile

@@ -10,5 +10,5 @@ task :default => :spec
 
 desc 'Open an irb session preloaded with this library'
 task :console do
-  sh 'irb -rubygems -I lib -r reverse_asciidoctor.rb'
+  sh 'irb -rubygems -I lib -r reverse_adoc.rb'
 end

data/bin/reverse_adoc

@@ -1,34 +1,34 @@
 #!/usr/bin/env ruby
-# Usage: reverse_asciidoctor [FILE]...
-# Usage: cat FILE | reverse_asciidoctor
+# Usage: reverse_adoc [FILE]...
+# Usage: cat FILE | reverse_adoc
 require 'rubygems'
 require 'bundler/setup'
 
-require 'reverse_asciidoctor'
+require 'reverse_adoc'
 require 'optparse'
 require 'fileutils'
 
 OptionParser.new do |opts|
   opts.banner = "Usage: reverse_adoc [options] <file>"
   opts.on('-m', '--mathml2asciimath', 'Convert MathML to AsciiMath') do |v|
-    ReverseAsciidoctor.config.mathml2asciimath = true
+    ReverseAdoc.config.mathml2asciimath = true
   end
 
   opts.on('-oFILENAME', '--output=FILENAME', 'Output file to write to') do |v|
-    ReverseAsciidoctor.config.destination = File.expand_path(v)
-    # puts "output goes to #{ReverseAsciidoctor.config.destination}"
+    ReverseAdoc.config.destination = File.expand_path(v)
+    # puts "output goes to #{ReverseAdoc.config.destination}"
   end
 
   opts.on('-e', '--external-images', 'Export images if data URI') do |v|
-    ReverseAsciidoctor.config.external_images = true
+    ReverseAdoc.config.external_images = true
   end
 
   opts.on('-u', '--unknown_tags [pass_through, drop, bypass, raise]', 'Unknown tag handling (default: pass_through)') do |v|
-    ReverseAsciidoctor.config.unknown_tags = v
+    ReverseAdoc.config.unknown_tags = v
   end
 
   opts.on('-v', '--version', 'Version information') do |v|
-    puts "reverse_adoc: v#{ReverseAsciidoctor::VERSION}"
+    puts "reverse_adoc: v#{ReverseAdoc::VERSION}"
     exit
   end
 
@@ -41,30 +41,30 @@ end.parse!
 
 if filename = ARGV.pop
   input_content = IO.read(filename)
-  ReverseAsciidoctor.config.sourcedir = File.dirname(File.expand_path(filename))
+  ReverseAdoc.config.sourcedir = File.dirname(File.expand_path(filename))
 else
-  if ReverseAsciidoctor.config.external_images
+  if ReverseAdoc.config.external_images
     raise "The -e | --external-images feature cannot be used with STDIN input. Exiting."
   end
 
   input_content = ARGF.read
 end
 
-if ReverseAsciidoctor.config.external_images && ReverseAsciidoctor.config.destination.nil?
+if ReverseAdoc.config.external_images && ReverseAdoc.config.destination.nil?
   raise "The -e | --external-images feature must be used with -o | --output. Exiting."
 end
 
 # Read from STDIN
-adoc_content = ReverseAsciidoctor.convert(input_content)
+adoc_content = ReverseAdoc.convert(input_content)
 
 # Print to STDOUT
-unless ReverseAsciidoctor.config.destination
+unless ReverseAdoc.config.destination
   puts adoc_content
   exit
 end
 
-# Write output to ReverseAsciidoctor.config.destination
-FileUtils.mkdir_p(File.dirname(ReverseAsciidoctor.config.destination))
-File.open(ReverseAsciidoctor.config.destination, "w") do |file|
+# Write output to ReverseAdoc.config.destination
+FileUtils.mkdir_p(File.dirname(ReverseAdoc.config.destination))
+File.open(ReverseAdoc.config.destination, "w") do |file|
   file.write(adoc_content)
 end

data/bin/w2a

@@ -1,31 +1,32 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler/setup'
 
 require 'word-to-markdown'
 require 'optparse'
-require 'reverse_asciidoctor'
+require 'reverse_adoc'
 
 ARGV.push('-h') if ARGV.empty?
 
 OptionParser.new do |opts|
   opts.banner = "Usage: w2a [options] <file>"
   opts.on('-m', '--mathml2asciimath', 'Convert MathML to AsciiMath') do |v|
-    ReverseAsciidoctor.config.mathml2asciimath = true
+    ReverseAdoc.config.mathml2asciimath = true
   end
 
   opts.on('-oFILENAME', '--output=FILENAME', 'Output file to write to') do |v|
-    ReverseAsciidoctor.config.destination = File.expand_path(v)
-    # puts "output goes to #{ReverseAsciidoctor.config.destination}"
+    ReverseAdoc.config.destination = File.expand_path(v)
+    # puts "output goes to #{ReverseAdoc.config.destination}"
   end
 
   opts.on('-e', '--external-images', 'Export images if data URI') do |v|
-    ReverseAsciidoctor.config.external_images = true
+    ReverseAdoc.config.external_images = true
   end
 
   opts.on('-v', '--version', 'Version information') do |v|
-    puts "reverse_adoc: v#{ReverseAsciidoctor::VERSION}"
+    puts "reverse_adoc: v#{ReverseAdoc::VERSION}"
     puts "[dependency] WordToMarkdown: v#{WordToMarkdown::VERSION}"
     unless Gem.win_platform?
       puts "[dependency] LibreOffice: v#{WordToMarkdown.soffice.version}"
@@ -45,29 +46,28 @@ end.parse!
 filename = ARGV.pop
 raise "Please provide an input file to process. Exiting." unless filename
 
-if ReverseAsciidoctor.config.external_images && ReverseAsciidoctor.config.destination.nil?
+if ReverseAdoc.config.external_images && ReverseAdoc.config.destination.nil?
   raise "The -e | --external-images feature must be used with -o | --output. Exiting."
 end
 
-ReverseAsciidoctor.config.sourcedir = Dir.mktmpdir
-# puts "ReverseAsciidoctor.config.sourcedir #{ReverseAsciidoctor.config.sourcedir}"
+ReverseAdoc.config.sourcedir = Dir.mktmpdir
 
-doc = WordToMarkdown.new(filename, ReverseAsciidoctor.config.sourcedir)
-File.open("test.html", "w:UTF-8") { |f| f.write doc.document.html }
-adoc_content = ReverseAsciidoctor.convert(
-  ReverseAsciidoctor.cleaner.preprocess_word_html(doc.document.html),
+doc = WordToMarkdown.new(filename, ReverseAdoc.config.sourcedir)
+#File.open("test.html", "w:UTF-8") { |f| f.write doc.document.html }
+adoc_content = ReverseAdoc.convert(
+  ReverseAdoc.cleaner.preprocess_word_html(doc.document.html),
   WordToMarkdown::REVERSE_MARKDOWN_OPTIONS
 )
 # puts scrub_whitespace(doc.document.html)
 
 # Print to STDOUT
-unless ReverseAsciidoctor.config.destination
+unless ReverseAdoc.config.destination
   puts adoc_content
   exit
 end
 
-# Write output to ReverseAsciidoctor.config.destination
-FileUtils.mkdir_p(File.dirname(ReverseAsciidoctor.config.destination))
-File.open(ReverseAsciidoctor.config.destination, "w") do |file|
+# Write output to ReverseAdoc.config.destination
+FileUtils.mkdir_p(File.dirname(ReverseAdoc.config.destination))
+File.open(ReverseAdoc.config.destination, "w") do |file|
   file.write(adoc_content)
 end

data/lib/reverse_adoc.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'digest'
+require 'nokogiri'
+require 'reverse_adoc/version'
+require 'reverse_adoc/errors'
+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 = {})
+    ReverseAdoc::HtmlConverter.convert(input, options)
+  end
+
+  def self.config
+    @config ||= Config.new
+    yield @config if block_given?
+    @config
+  end
+
+  def self.cleaner
+    @cleaner ||= Cleaner.new
+  end
+end

data/lib/{reverse_asciidoctor → reverse_adoc}/cleaner.rb

@@ -1,4 +1,4 @@
-module ReverseAsciidoctor
+module ReverseAdoc
   class Cleaner
 
     def tidy(string)
@@ -36,19 +36,19 @@ module ReverseAsciidoctor
     # Same for underscores and brackets.
     def clean_tag_borders(string)
       result = string.gsub(/\s?\*{2,}.*?\*{2,}\s?/) do |match|
-        preserve_border_whitespaces(match, default_border: ReverseAsciidoctor.config.tag_border) do
+        preserve_border_whitespaces(match, default_border: ReverseAdoc.config.tag_border) do
           match.strip.sub('** ', '**').sub(' **', '**')
         end
       end
 
       result = result.gsub(/\s?\_{2,}.*?\_{2,}\s?/) do |match|
-        preserve_border_whitespaces(match, default_border: ReverseAsciidoctor.config.tag_border) do
+        preserve_border_whitespaces(match, default_border: ReverseAdoc.config.tag_border) do
           match.strip.sub('__ ', '__').sub(' __', '__')
         end
       end
 
       result = result.gsub(/\s?~{2,}.*?~{2,}\s?/) do |match|
-        preserve_border_whitespaces(match, default_border: ReverseAsciidoctor.config.tag_border) do
+        preserve_border_whitespaces(match, default_border: ReverseAdoc.config.tag_border) do
           match.strip.sub('~~ ', '~~').sub(' ~~', '~~')
         end
       end

data/lib/{reverse_asciidoctor → reverse_adoc}/config.rb

@@ -1,12 +1,13 @@
 require 'tmpdir'
 
-module ReverseAsciidoctor
+module ReverseAdoc
   class Config
     attr_accessor :unknown_tags, :tag_border, :mathml2asciimath, :external_images,
-      :destination, :sourcedir, :image_counter, :image_counter_pattern
+      :destination, :sourcedir, :image_counter, :image_counter_pattern, :input_format
 
     def initialize
       @unknown_tags     = :pass_through
+      @input_format     = :html
       @mathml2asciimath = false
       @external_images  = false
 

data/lib/{reverse_asciidoctor → reverse_adoc}/converters.rb

@@ -1,4 +1,4 @@
-module ReverseAsciidoctor
+module ReverseAdoc
   module Converters
     def self.register(tag_name, converter)
       @@converters ||= {}
@@ -16,17 +16,17 @@ module ReverseAsciidoctor
     private
 
     def self.default_converter(tag_name)
-      case ReverseAsciidoctor.config.unknown_tags.to_sym
+      case ReverseAdoc.config.unknown_tags.to_sym
       when :pass_through
-        ReverseAsciidoctor::Converters::PassThrough.new
+        ReverseAdoc::Converters::PassThrough.new
       when :drop
-        ReverseAsciidoctor::Converters::Drop.new
+        ReverseAdoc::Converters::Drop.new
       when :bypass
-        ReverseAsciidoctor::Converters::Bypass.new
+        ReverseAdoc::Converters::Bypass.new
       when :raise
         raise UnknownTagError, "unknown tag: #{tag_name}"
       else
-        raise InvalidConfigurationError, "unknown value #{ReverseAsciidoctor.config.unknown_tags.inspect} for ReverseAsciidoctor.config.unknown_tags"
+        raise InvalidConfigurationError, "unknown value #{ReverseAdoc.config.unknown_tags.inspect} for ReverseAdoc.config.unknown_tags"
       end
     end
   end

data/lib/{reverse_asciidoctor → reverse_adoc}/converters/a.rb

@@ -1,6 +1,6 @@
 require "uri"
 
-module ReverseAsciidoctor
+module ReverseAdoc
   module Converters
     class A < Base
       def convert(node, state = {})

data/lib/{reverse_asciidoctor → reverse_adoc}/converters/aside.rb

@@ -1,4 +1,4 @@
-module ReverseAsciidoctor
+module ReverseAdoc
   module Converters
     class Aside < Base
       def convert(node, state = {})

data/lib/{reverse_asciidoctor → reverse_adoc}/converters/audio.rb

@@ -1,4 +1,4 @@
-module ReverseAsciidoctor
+module ReverseAdoc
   module Converters
     class Audio < Base
       def convert(node, state = {})

data/lib/{reverse_asciidoctor → reverse_adoc}/converters/base.rb

@@ -1,4 +1,4 @@
-module ReverseAsciidoctor
+module ReverseAdoc
   module Converters
     class Base
       def treat_children(node, state)
@@ -8,7 +8,7 @@ module ReverseAsciidoctor
       end
 
       def treat(node, state)
-        ReverseAsciidoctor::Converters.lookup(node.name).convert(node, state)
+        ReverseAdoc::Converters.lookup(node.name).convert(node, state)
       end
 
       def escape_keychars(string)