reverse_adoc 0.2.8 → 0.3.3

data/reverse_adoc.gemspec

@@ -1,36 +1,39 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "reverse_asciidoctor/version"
+
+$:.push File.expand_path("lib", __dir__)
+require "reverse_adoc/version"
 
 Gem::Specification.new do |s|
   s.name        = "reverse_adoc"
-  s.version     = ReverseAsciidoctor::VERSION
+  s.version     = ReverseAdoc::VERSION
   s.authors       = ["Ribose Inc."]
   s.email         = ["open.source@ribose.com"]
 
   s.homepage    = "http://github.com/metanorma/reverse_adoc"
-  s.summary     = %q{Generate AsciiDoc from HTML and Microsoft Word via CLI or library.}
-  s.description = %q{Generate AsciiDoc from HTML and Microsoft Word via CLI or library.}
+  s.summary     = "Generate AsciiDoc from HTML and Microsoft Word via CLI or library."
+  s.description = "Generate AsciiDoc from HTML and Microsoft Word via CLI or library."
   s.license       = "BSD-2-Clause"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- exe/*`.split("\n").map { |f| File.basename(f) }
+  s.bindir        = "exe"
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   # specify any dependencies here; for example:
-  s.add_dependency 'nokogiri', ">= 1.10.4"
-  s.add_dependency 'mathml2asciimath'
-  s.add_dependency 'mimemagic'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'redcarpet'
-  s.add_development_dependency 'codeclimate-test-reporter'
+  s.add_dependency "marcel", "~> 1.0.0"
+  s.add_dependency "mathml2asciimath"
+  s.add_dependency "nokogiri", "~> 1.11"
+  s.add_development_dependency "codeclimate-test-reporter"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "redcarpet"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "simplecov"
 
   # spec.add_runtime_dependency "thor"
 
   # All the following are for bin/w2m
-  s.add_dependency 'word-to-markdown'
+  s.add_dependency "premailer", "~> 1.11.0"
+  s.add_dependency "word-to-markdown"
 end

data/spec/assets/escapables.html

@@ -4,8 +4,10 @@
 
     **two asterisks**
     ***three asterisks***
+    ***three *and*the* asterisc*word and asterisc**multword asterisks***
     __two underscores__
     ___three underscores___
+    ___three__underscores___ and another_undersocre
 
     some text...
 

data/spec/bin/reverse_adoc_spec.rb

@@ -2,9 +2,9 @@
 
 require 'spec_helper'
 
-describe 'bin/revrse_adoc' do
+describe 'exe/revrse_adoc' do
   subject(:convert) do
-    ShellUtils.execute!("./bin/reverse_adoc -e -o test1 #{input_file_path}")
+    ShellUtils.execute!("./exe/reverse_adoc -e -o test1 #{input_file_path}")
   end
   unless Gem.win_platform?
     context 'when external images present' do

data/spec/bin/w2a_spec.rb

@@ -2,9 +2,9 @@
 
 require 'spec_helper'
 
-describe 'bin/w2a' do
+describe 'exe/w2a' do
   subject(:convert) do
-    ShellUtils.execute!("./bin/w2a -e -o test1 #{input_file_path}")
+    ShellUtils.execute!("./exe/w2a -e -o test1 #{input_file_path}")
   end
   # TODO: fix github actions integration with libreoffice, currently it hangs
   # when trying to use soffice binary
@@ -22,13 +22,13 @@ describe 'bin/w2a' do
         expect { convert }.to_not raise_error
       end
 
-      it 'exatracts images from source html' do
+      it 'extracts images from source html' do
         expect { convert }
           .to(change do
-            Dir["#{images_folder}/*gif"]
-              .map { |entry| File.basename(entry) }
-              .sort
-          end.from([]).to(['001.gif', '002.gif']))
+          Dir["#{images_folder}/*gif"]
+            .map { |entry| File.basename(entry) }
+            .size > 0
+        end.from(false).to(true))
       end
     end
   end

data/spec/components/anchors_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe ReverseAsciidoctor do
+describe ReverseAdoc do
 
   let(:input)    { File.read('spec/assets/anchors.html') }
   let(:document) { Nokogiri::HTML(input) }
-  subject { ReverseAsciidoctor.convert(input) }
+  subject { ReverseAdoc.convert(input) }
 
   it { is_expected.to include 'http://foobar.com[Foobar]' }
   it { is_expected.to include 'http://foobar.com[Fubar]' }

data/spec/components/basic_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe ReverseAsciidoctor do
+describe ReverseAdoc do
 
   let(:input)    { File.read('spec/assets/basic.html') }
   let(:document) { Nokogiri::HTML(input) }
-  subject { ReverseAsciidoctor.convert(input) }
+  subject { ReverseAdoc.convert(input) }
 
   it { is_expected.to match /plain text ?\n/ }
   it { is_expected.to match /\n== h1\n/ }
-  it { is_expected.to match /\n\[\[A]\]\n== h1 with anchor\n/ }
+  it { is_expected.to match /\n\[\[A\]\]\n== h1 with anchor\n/ }
   it { is_expected.to match /\n=== h2\n/ }
   it { is_expected.to match /\n==== h3\n/ }
   it { is_expected.to match /\n===== h4\n/ }

data/spec/components/code_spec.rb

@@ -1,28 +1,27 @@
 require 'spec_helper'
 
-describe ReverseAsciidoctor do
+describe ReverseAdoc do
 
   let(:input)    { File.read('spec/assets/code.html') }
   let(:document) { Nokogiri::HTML(input) }
-  subject { ReverseAsciidoctor.convert(input) }
+  subject { ReverseAdoc.convert(input) }
 
   it { is_expected.to match /inline `code` block/ }
   it { is_expected.to match /\n<code>var this\;\nthis\.is/ }
   it { is_expected.to match /block"\)\nconsole/ }
 
   context "with github style code blocks" do
-    subject { ReverseAsciidoctor.convert(input) }
+    subject { ReverseAdoc.convert(input) }
     it { is_expected.to match /inline `code` block/ }
     it { is_expected.to match /\n\.\.\.\.\n<code>var this\;\nthis/ }
     it { is_expected.to match /it is"\) ?\n	<\/code>\n\.\.\.\./ }
   end
 
   context "code with indentation" do
-    subject { ReverseAsciidoctor.convert(input) }
+    subject { ReverseAdoc.convert(input) }
     it { is_expected.to match(/^<code>tell application "Foo"\n/) }
     it { is_expected.to match(/^    beep\n/) }
     it { is_expected.to match(/^end tell\n/) }
   end
 
 end
-

data/spec/components/escapables_spec.rb

@@ -1,14 +1,17 @@
 require 'spec_helper'
 
-describe ReverseAsciidoctor do
+describe ReverseAdoc do
 
   let(:input)    { File.read('spec/assets/escapables.html') }
   let(:document) { Nokogiri::HTML(input) }
-  subject { ReverseAsciidoctor.convert(input) }
+  subject { ReverseAdoc.convert(input) }
 
   context "multiple asterisks" do
     it { is_expected.to include ' \*\*two asterisks\*\* ' }
     it { is_expected.to include ' \*\*\*three asterisks\*\*\* ' }
+    it { is_expected.to include ' \*and*the\* ' }
+    it { is_expected.to include ' asterisc*word ' }
+    it { is_expected.to include ' asterisc**multword asterisks\*\*\* ' }
   end
 
   context "multiple underscores" do
@@ -16,6 +19,11 @@ describe ReverseAsciidoctor do
     it { is_expected.to include ' \_\_\_three underscores\_\_\_ ' }
   end
 
+  context "multiple underscores with undersocre inside words and new lines" do
+    it { is_expected.to include 'another_undersocre' }
+    it { is_expected.to include ' \_\_\_three__underscores\_\_\_ ' }
+  end
+
   context "underscores within words in code blocks" do
     it { is_expected.to include "....\n<code>var theoretical_max_infin = 1.0;</code>\n....\n" }
   end

data/spec/components/from_the_wild_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe ReverseAsciidoctor do
+describe ReverseAdoc do
 
   let(:input)    { File.read('spec/assets/from_the_wild.html') }
   let(:document) { Nokogiri::HTML(input) }
-  subject { ReverseAsciidoctor.convert(input) }
+  subject { ReverseAdoc.convert(input) }
 
   it "should make sense of strong-crazy markup (as seen in the wild)" do
     expect(subject).to include "*. +\n \\*\\*\\* intentcast* : logo design *+*\n"

data/spec/components/html_fragment_spec.rb

@@ -1,11 +1,10 @@
 require 'spec_helper'
 
-describe ReverseAsciidoctor do
+describe ReverseAdoc do
 
   let(:input)    { File.read('spec/assets/html_fragment.html') }
   let(:document) { Nokogiri::HTML(input) }
-  subject { ReverseAsciidoctor.convert(input) }
+  subject { ReverseAdoc.convert(input) }
 
   it { is_expected.to eq("naked text 1\n\nparagraph text\n\nnaked text 2") }
 end
-

data/spec/components/lists_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe ReverseAsciidoctor do
+describe ReverseAdoc do
 
   let(:input)    { File.read('spec/assets/lists.html') }
   let(:document) { Nokogiri::HTML(input) }
-  subject { ReverseAsciidoctor.convert(input) }
+  subject { ReverseAdoc.convert(input) }
 
   it { is_expected.to match /\n\* unordered list entry\n/ }
   it { is_expected.to match /\n\* unordered list entry 2\n/ }

data/spec/components/paragraphs_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe ReverseAsciidoctor do
+describe ReverseAdoc do
 
   let(:input)    { File.read('spec/assets/paragraphs.html') }
   let(:document) { Nokogiri::HTML(input) }
-  subject { ReverseAsciidoctor.convert(input) }
+  subject { ReverseAdoc.convert(input) }
 
   it { is_expected.not_to start_with "\n\n" }
   it { is_expected.to start_with "First content\n\nSecond content\n\n" }

data/spec/components/quotation_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe ReverseAsciidoctor do
+describe ReverseAdoc do
 
   let(:input)    { File.read('spec/assets/quotation.html') }
   let(:document) { Nokogiri::HTML(input) }
-  subject { ReverseAsciidoctor.convert(input) }
+  subject { ReverseAdoc.convert(input) }
 
   it { is_expected.to match /\n      <code>Block of code<\/code>$/ }
   it { is_expected.to include "\n____\nFirst quoted paragraph\n\nSecond quoted paragraph\n____\n" }

data/spec/components/tables_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe ReverseAsciidoctor do
+describe ReverseAdoc do
 
   let(:input)    { File.read('spec/assets/tables.html') }
   let(:document) { Nokogiri::HTML(input) }
-  subject { ReverseAsciidoctor.convert(input) }
+  subject { ReverseAdoc.convert(input) }
 
   it { is_expected.to match /\[\[A\]\]\n\|===\n\| \[\[C\]\]header 1 \| header 2 \| header 3\n\n/ }
   it { is_expected.to match /\nh\| \[\[D\]\]data 1-1 \| data 2-1 \| data 3-1\n/ }

data/spec/components/unknown_tags_spec.rb

@@ -1,39 +1,38 @@
 require 'spec_helper'
 
-describe ReverseAsciidoctor do
+describe ReverseAdoc do
 
   let(:input)    { File.read('spec/assets/unknown_tags.html') }
   let(:document) { Nokogiri::HTML(input) }
-  let(:result)   { ReverseAsciidoctor.convert(input) }
+  let(:result)   { ReverseAdoc.convert(input) }
 
   context 'with unknown_tags = :pass_through' do
-    before { ReverseAsciidoctor.config.unknown_tags = :pass_through }
+    before { ReverseAdoc.config.unknown_tags = :pass_through }
 
     it { expect(result).to include "<bar>Foo with bar</bar>" }
   end
 
   context 'with unknown_tags = :raise' do
-    before { ReverseAsciidoctor.config.unknown_tags = :raise }
+    before { ReverseAdoc.config.unknown_tags = :raise }
 
-    it { expect { result }.to raise_error(ReverseAsciidoctor::UnknownTagError) }
+    it { expect { result }.to raise_error(ReverseAdoc::UnknownTagError) }
   end
 
   context 'with unknown_tags = :drop' do
-    before { ReverseAsciidoctor.config.unknown_tags = :drop }
+    before { ReverseAdoc.config.unknown_tags = :drop }
 
     it { expect(result).to eq '' }
   end
 
   context 'with unknown_tags = :bypass' do
-    before { ReverseAsciidoctor.config.unknown_tags = :bypass }
+    before { ReverseAdoc.config.unknown_tags = :bypass }
 
     it { expect(result).to eq "Foo with bar\n\n" }
   end
 
   context 'with unknown_tags = :something_wrong' do
-    before { ReverseAsciidoctor.config.unknown_tags = :something_wrong }
+    before { ReverseAdoc.config.unknown_tags = :something_wrong }
 
-    it { expect { result }.to raise_error(ReverseAsciidoctor::InvalidConfigurationError) }
+    it { expect { result }.to raise_error(ReverseAdoc::InvalidConfigurationError) }
   end
 end
-

data/spec/lib/{reverse_asciidoctor_spec.rb → reverse_adoc.rb}

@@ -1,51 +1,51 @@
 require 'spec_helper'
 
-describe ReverseAsciidoctor do
+describe ReverseAdoc do
   let(:input)    { File.read('spec/assets/minimum.html') }
   let(:document) { Nokogiri::HTML(input) }
 
   it 'parses nokogiri documents' do
-    expect { ReverseAsciidoctor.convert(document) }.not_to raise_error
+    expect { ReverseAdoc.convert(document) }.not_to raise_error
   end
 
   it 'parses nokogiri elements' do
-    expect { ReverseAsciidoctor.convert(document.root) }.not_to raise_error
+    expect { ReverseAdoc.convert(document.root) }.not_to raise_error
   end
 
   it 'parses string input' do
-    expect { ReverseAsciidoctor.convert(input) }.not_to raise_error
+    expect { ReverseAdoc.convert(input) }.not_to raise_error
   end
 
   it 'behaves in a sane way when root element is nil' do
-    expect(ReverseAsciidoctor.convert(nil)).to eq ''
+    expect(ReverseAdoc.convert(nil)).to eq ''
   end
 
   describe '#config' do
     it 'stores a given configuration option' do
-      ReverseAsciidoctor.config.tag_border = true
-      expect(ReverseAsciidoctor.config.tag_border).to eq true
+      ReverseAdoc.config.tag_border = true
+      expect(ReverseAdoc.config.tag_border).to eq true
     end
 
     it 'can be used as a block configurator as well' do
-      ReverseAsciidoctor.config do |config|
+      ReverseAdoc.config do |config|
         expect(config.tag_border).to eq ' '
         config.tag_border = true
       end
-      expect(ReverseAsciidoctor.config.tag_border).to eq true
+      expect(ReverseAdoc.config.tag_border).to eq true
     end
   end
 
   shared_examples 'converting source with external images included' do |result|
     let(:temp_dir) do
-      Pathname.new(ReverseAsciidoctor.config.destination).dirname
+      Pathname.new(ReverseAdoc.config.destination).dirname
     end
     let(:images_folder) { File.join(temp_dir, 'images') }
 
     before do
-      ReverseAsciidoctor.config.destination = File.join(Dir.mktmpdir,
+      ReverseAdoc.config.destination = File.join(Dir.mktmpdir,
                                                         'output.html')
-      ReverseAsciidoctor.config.sourcedir = Dir.mktmpdir
-      ReverseAsciidoctor.config.external_images = true
+      ReverseAdoc.config.sourcedir = Dir.mktmpdir
+      ReverseAdoc.config.external_images = true
     end
 
     after do
@@ -67,14 +67,14 @@ describe ReverseAsciidoctor do
   unless Gem::Platform.local.os == 'darwin' && !ENV['GITHUB_ACTION'].nil?
     context 'when docx file input' do
       subject(:convert) do
-        ReverseAsciidoctor.convert(
-          ReverseAsciidoctor.cleaner.preprocess_word_html(input.document.html),
+        ReverseAdoc.convert(
+          ReverseAdoc.cleaner.preprocess_word_html(input.document.html),
           WordToMarkdown::REVERSE_MARKDOWN_OPTIONS
         )
       end
       let(:input) do
         WordToMarkdown.new('spec/assets/external_images.docx',
-                           ReverseAsciidoctor.config.sourcedir)
+                           ReverseAdoc.config.sourcedir)
       end
       it_behaves_like 'converting source with external images included',
                       ['001.gif', '002.gif']
@@ -82,7 +82,7 @@ describe ReverseAsciidoctor do
   end
 
   context 'when html file input' do
-    subject(:convert) { ReverseAsciidoctor.convert(input) }
+    subject(:convert) { ReverseAdoc.convert(input) }
     let(:input) { File.read('spec/assets/external_images.html') }
     it_behaves_like 'converting source with external images included',
                     ['001.gif']

data/spec/lib/{reverse_asciidoctor → reverse_adoc}/cleaner_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe ReverseAsciidoctor::Cleaner do
-  let(:cleaner) { ReverseAsciidoctor::Cleaner.new }
+describe ReverseAdoc::Cleaner do
+  let(:cleaner) { ReverseAdoc::Cleaner.new }
 
   describe '#scrub_whitespace' do
     it "makes consistent nonbreaking spaces" do
@@ -86,7 +86,7 @@ describe ReverseAsciidoctor::Cleaner do
 
   describe '#clean_tag_borders' do
     context 'with default_border is set to space' do
-      before { ReverseAsciidoctor.config.tag_border = ' ' }
+      before { ReverseAdoc.config.tag_border = ' ' }
 
       it 'removes not needed whitespaces from strong tags' do
         input = "foo ** foobar ** bar"
@@ -132,7 +132,7 @@ describe ReverseAsciidoctor::Cleaner do
     end
 
     context 'with default_border set to no space' do
-      before { ReverseAsciidoctor.config.tag_border = '' }
+      before { ReverseAdoc.config.tag_border = '' }
 
       it 'removes not needed whitespaces from strong tags' do
         input = "foo ** foobar ** bar"