reverse_adoc 0.2.7 → 0.3.1

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,11 +8,13 @@ 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)
-        string.gsub(/(?<!\\)[*_]/, '*' => '\*', '_' => '\_')
+        subs = { '*' => '\*', '_' => '\_' }
+        string
+          .gsub(/((?<=\s)[\*_]+)|[\*_]+(?=\s)/) { |n| n.chars.map { |char| subs[char] }.join }
       end
 
       def extract_title(node)

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

@@ -1,4 +1,4 @@
-module ReverseAsciidoctor
+module ReverseAdoc
   module Converters
     class Blockquote < Base
       def convert(node, state = {})
@@ -7,7 +7,7 @@ module ReverseAsciidoctor
         cite = node['cite']
         attrs = cite ? "[quote, #{cite}]\n" : ""
         content = treat_children(node, state).strip
-        content = ReverseAsciidoctor.cleaner.remove_newlines(content)
+        content = ReverseAdoc.cleaner.remove_newlines(content)
         #"\n\n> " << content.lines.to_a.join('> ') << "\n\n"
         "\n\n#{attrs}____\n" << content.lines.to_a.join('') << "\n____\n\n"
       end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,31 +2,31 @@ require "fileutils"
 require "pathname"
 require "tempfile"
 require "base64"
-require "mimemagic"
+require "marcel"
 
-module ReverseAsciidoctor
+module ReverseAdoc
   module Converters
     class Img < Base
 
       def image_number
         sprintf(
-          ReverseAsciidoctor.config.image_counter_pattern,
-          ReverseAsciidoctor.config.image_counter
+          ReverseAdoc.config.image_counter_pattern,
+          ReverseAdoc.config.image_counter
         )
       end
 
       def image_number_increment
-        ReverseAsciidoctor.config.image_counter += 1
+        ReverseAdoc.config.image_counter += 1
       end
 
       def datauri2file(src)
         %r{^data:image/(?<imgtype>[^;]+);base64,(?<imgdata>.+)$} =~ src
 
-        dest_dir = Pathname.new(ReverseAsciidoctor.config.destination).dirname
+        dest_dir = Pathname.new(ReverseAdoc.config.destination).dirname
         images_dir = dest_dir + 'images'
         FileUtils.mkdir_p(images_dir)
 
-        ext, image_src_path = determine_image_src_path(imgdata, src)
+        ext, image_src_path = determine_image_src_path(src, imgdata)
         image_dest_path = images_dir + "#{image_number}.#{ext}"
 
         # puts "image_dest_path: #{image_dest_path.to_s}"
@@ -38,11 +38,11 @@ module ReverseAsciidoctor
         image_dest_path.relative_path_from(dest_dir)
       end
 
-      def determine_image_src_path(imgdata, src)
+      def determine_image_src_path(src, imgdata)
         return copy_temp_file(imgdata) if imgdata
 
         ext = File.extname(src).strip.downcase[1..-1]
-        [ext, Pathname.new(ReverseAsciidoctor.config.sourcedir) + src]
+        [ext, Pathname.new(ReverseAdoc.config.sourcedir) + src]
       end
 
       def copy_temp_file(imgdata)
@@ -50,7 +50,7 @@ module ReverseAsciidoctor
           f.binmode
           f.write(Base64.strict_decode64(imgdata))
           f.rewind
-          ext = MimeMagic.by_magic(f).subtype
+          ext = Marcel::MimeType.for(f).sub(%r{^[^/]+/}, "")
           [ext, f.path]
         end
       end
@@ -64,7 +64,7 @@ module ReverseAsciidoctor
         anchor = id ? "[[#{id}]]\n" : ""
         title = extract_title(node)
 
-        if ReverseAsciidoctor.config.external_images
+        if ReverseAdoc.config.external_images
           # puts "external image conversion #{id}, #{src}"
           src = datauri2file(src)
         end

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

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

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

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

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

@@ -1,15 +1,15 @@
-# Unless run with ReverseAsciidoctor.config.mathml2asciimath,
+# Unless run with ReverseAdoc.config.mathml2asciimath,
 # this is cheating: we're injecting MathML into Asciidoctor, but
 # Asciidoctor only understands AsciiMath or LaTeX
 
 require "mathml2asciimath"
 
-module ReverseAsciidoctor
+module ReverseAdoc
   module Converters
     class Math < Base
       def convert(node, state = {})
         stem = node.to_s.gsub(/\n/, " ")
-        stem = MathML2AsciiMath.m2a(stem) if ReverseAsciidoctor.config.mathml2asciimath
+        stem = MathML2AsciiMath.m2a(stem) if ReverseAdoc.config.mathml2asciimath
         stem = stem.gsub(/\[/, "\\[").gsub(/\]/, "\\]").gsub(/\(\(([^\)]+)\)\)/, "(\\1)") unless stem.nil?
         " stem:[" << stem << "] "
       end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-module ReverseAsciidoctor
+module ReverseAdoc
   module Converters
     class Th < Td
       def cellstyle(node)

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

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

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

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

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

@@ -1,4 +1,4 @@
-module ReverseAsciidoctor
+module ReverseAdoc
   class Error < StandardError
   end
 

data/lib/reverse_adoc/html_converter.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'reverse_adoc/converters/a'
+require 'reverse_adoc/converters/aside'
+require 'reverse_adoc/converters/audio'
+require 'reverse_adoc/converters/blockquote'
+require 'reverse_adoc/converters/br'
+require 'reverse_adoc/converters/bypass'
+require 'reverse_adoc/converters/code'
+require 'reverse_adoc/converters/div'
+require 'reverse_adoc/converters/drop'
+require 'reverse_adoc/converters/em'
+require 'reverse_adoc/converters/figure'
+require 'reverse_adoc/converters/h'
+require 'reverse_adoc/converters/head'
+require 'reverse_adoc/converters/hr'
+require 'reverse_adoc/converters/ignore'
+require 'reverse_adoc/converters/img'
+require 'reverse_adoc/converters/mark'
+require 'reverse_adoc/converters/li'
+require 'reverse_adoc/converters/ol'
+require 'reverse_adoc/converters/p'
+require 'reverse_adoc/converters/pass_through'
+require 'reverse_adoc/converters/pre'
+require 'reverse_adoc/converters/q'
+require 'reverse_adoc/converters/strong'
+require 'reverse_adoc/converters/sup'
+require 'reverse_adoc/converters/sub'
+require 'reverse_adoc/converters/table'
+require 'reverse_adoc/converters/td'
+require 'reverse_adoc/converters/th'
+require 'reverse_adoc/converters/text'
+require 'reverse_adoc/converters/tr'
+require 'reverse_adoc/converters/video'
+require 'reverse_adoc/converters/math'
+
+module ReverseAdoc
+  class HtmlConverter
+    def self.convert(input, options = {})
+      root = if input.is_a?(String)
+              then Nokogiri::HTML(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/lib/reverse_adoc/version.rb

@@ -0,0 +1,3 @@
+module ReverseAdoc
+  VERSION = '0.3.1'
+end

data/reverse_adoc.gemspec

@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "reverse_asciidoctor/version"
+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"]
 
@@ -15,14 +15,15 @@ Gem::Specification.new do |s|
 
   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 'nokogiri', "~> 1.10.4"
   s.add_dependency 'mathml2asciimath'
-  s.add_dependency 'mimemagic'
+  s.add_dependency 'marcel', "~> 1.0.0"
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rake'
@@ -33,4 +34,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