reverse_adoc 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22407f5a4ca3839adba7a35be1c31492f2c051a2a9862b84ecb44f7992b1ece1
-  data.tar.gz: 55bbbb5169f22a48ed4cac0d5653a30ddf92163827d8e2cc7ba0699098ac0d70
+  metadata.gz: c47e4d9eb1123a3b243cbb8f525eb3a4e5292d3cb721d09b1a0dc5a308521c24
+  data.tar.gz: 15602c27effe49fd669aa0114c655b30879d71fefe1019a5333962860e88375d
 SHA512:
-  metadata.gz: e3860543e71ec3c4c372cdf9b96a51128bf1579e53e0d110879e39ccab90b4b08754f13fa28edfa96a24b4cbb2974a7aa65e23c8d6326e42e85fa7ff55b05063
-  data.tar.gz: 0e043787955792419c2bd521a1c2a96cf2c3a0f022ad00c2ff8e74107d5e89d3c745774c55857f5a857f394ef05c6c82123402e1d18320670f4c4cc38e6fe376
+  metadata.gz: ce264bc1decfc19683b4fc5c5f72d96a71be82bfb5ffbbe7f6c1e2428ca78eae48f6df66d473e712c925f04afa8fca887c858549dddf2fe0568dd953b2fe6a01
+  data.tar.gz: 460f744b26878bf13783393f8a0776dd74c15450072cc9b7654221da3b122c28457353aec3560a8f3bb5c88db70cf8568e84cafae63b29154539ba789f0d1045

data/.github/workflows/rake.yml

@@ -16,19 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '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
 

data/.github/workflows/release.yml

@@ -0,0 +1,45 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
+  push:
+    tags: [ v* ]
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '2.6'
+          bundler-cache: true
+
+      - run: gem install gem-release
+
+      - if: ${{ github.event_name == 'workflow_dispatch' }} && ${{ github.event.inputs.next_version != 'skip' }}
+        run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          gem bump --version ${{ github.event.inputs.next_version }} --tag --push
+
+      - name: publish to rubygems.org
+        env:
+          RUBYGEMS_API_KEY: ${{secrets.METANORMA_CI_RUBYGEMS_API_KEY}}
+        run: |
+          gem install gem-release
+          envsubst << 'EOF' > ~/.gem/credentials
+          ---
+          :rubygems_api_key: ${RUBYGEMS_API_KEY}
+          EOF
+          chmod 0600 ~/.gem/credentials
+          gem release

data/.hound.yml

@@ -1,3 +1,5 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 ruby:
-  Enabled: true
+  enabled: true
   config_file: .rubocop.yml

data/.rubocop.yml

@@ -1,20 +1,10 @@
-# This project follows the Ribose OSS style guide.
-# https://github.com/riboseinc/oss-guides
-# All project-specific additions and overrides should be specified in this file.
-
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
-AllCops:
-  TargetRubyVersion: 2.4
-Rails:
-  Enabled: false
 
-# Dependencies are ordered for purpose.
-Gemspec/OrderedDependencies:
-  Enabled: false
+# local repo-specific modifications
+# ...
 
-# TODO Rather than disabling, change severity to "info" in Rubocop 1.9+.
-Layout:
-  Enabled: false
-Style/StringLiterals:
-  Enabled: false
+AllCops:
+  TargetRubyVersion: 2.4

data/lib/reverse_adoc/cleaner.rb

@@ -1,6 +1,5 @@
 module ReverseAdoc
   class Cleaner
-
     def tidy(string)
       result = remove_inner_whitespaces(string)
       result = remove_newlines(result)
@@ -14,7 +13,7 @@ module ReverseAdoc
     end
 
     def remove_leading_newlines(string)
-      string.gsub(/\A\n+/, '')
+      string.gsub(/\A\n+/, "")
     end
 
     def remove_inner_whitespaces(string)
@@ -25,7 +24,7 @@ module ReverseAdoc
       end
       string.each_line.inject("") do |memo, line|
         memo + preserve_border_whitespaces(line) do
-          line.strip.gsub(/[ \t]{2,}/, ' ')
+          line.strip.gsub(/[ \t]{2,}/, " ")
         end
       end
     end
@@ -37,64 +36,67 @@ module ReverseAdoc
     def clean_tag_borders(string)
       result = string.gsub(/\s?\*{2,}.*?\*{2,}\s?/) do |match|
         preserve_border_whitespaces(match, default_border: ReverseAdoc.config.tag_border) do
-          match.strip.sub('** ', '**').sub(' **', '**')
+          match.strip.sub("** ", "**").sub(" **", "**")
         end
       end
 
-      result = result.gsub(/\s?\_{2,}.*?\_{2,}\s?/) do |match|
+      result = result.gsub(/\s?_{2,}.*?_{2,}\s?/) do |match|
         preserve_border_whitespaces(match, default_border: ReverseAdoc.config.tag_border) do
-          match.strip.sub('__ ', '__').sub(' __', '__')
+          match.strip.sub("__ ", "__").sub(" __", "__")
         end
       end
 
       result = result.gsub(/\s?~{2,}.*?~{2,}\s?/) do |match|
         preserve_border_whitespaces(match, default_border: ReverseAdoc.config.tag_border) do
-          match.strip.sub('~~ ', '~~').sub(' ~~', '~~')
+          match.strip.sub("~~ ", "~~").sub(" ~~", "~~")
         end
       end
 
       result.gsub(/\s?\[.*?\]\s?/) do |match|
         preserve_border_whitespaces(match) do
-          match.strip.sub('[ ', '[').sub(' ]', ']')
+          match.strip.sub("[ ", "[").sub(" ]", "]")
         end
       end
     end
 
     def clean_punctuation_characters(string)
-      string.gsub(/(\*\*|~~|__)\s([\.!\?'"])/, "\\1".strip + "\\2")
+      string.gsub(/(\*\*|~~|__)\s([.!?'"])/, "\\1".strip + "\\2")
     end
 
-     # preprocesses HTML, rather than postprocessing it
+    # preprocesses HTML, rather than postprocessing it
     def preprocess_word_html(string)
       clean_headings(scrub_whitespace(string.dup))
     end
 
     def scrub_whitespace(string)
-      string.gsub!(/ |\ |\u00a0/i, ' ')       # HTML encoded spaces
-      string.sub!(/^\A[[:space:]]+/m, '') # document leading whitespace
-      string.sub!(/[[:space:]]+\z$/m, '') # document trailing whitespace
-      string.gsub!(/([ ]+)$/, ' ')       # line trailing whitespace
-      string.gsub!(/\n\n\n\n/, "\n\n")  # Quadruple line breaks
-      #string.delete!('?| ')               # Unicode non-breaking spaces, injected as tabs
+      string.gsub!(/ | |\u00a0/i, " ") # HTML encoded spaces
+      string.sub!(/^\A[[:space:]]+/m, "") # document leading whitespace
+      string.sub!(/[[:space:]]+\z$/m, "") # document trailing whitespace
+      string.gsub!(/( +)$/, " ") # line trailing whitespace
+      string.gsub!(/\n\n\n\n/, "\n\n") # Quadruple line breaks
+      # string.delete!('?| ')               # Unicode non-breaking spaces, injected as tabs
       string
     end
 
     # following added by me
     def clean_headings(string)
-      string.gsub!(%r{<h([1-9])[^>]*></h\1>}, " ") # I don't know why Libre Office is inserting them, but they need to go
+      string.gsub!(%r{<h([1-9])[^>]*></h\1>}, " ")
+      # I don't know why Libre Office is inserting them, but they need to go
       string.gsub!(%r{<h([1-9])[^>]* style="vertical-align: super;[^>]*>(.+?)</h\1>},
-                   "<sup>\\2</sup>")         # I absolutely don't know why Libre Office is rendering superscripts as h1
+                   "<sup>\\2</sup>")
+      # I absolutely don't know why Libre Office is rendering superscripts as h1
       string
     end
 
     private
 
-    def preserve_border_whitespaces(string, options = {}, &block)
-      return string if string =~ /\A\s*\Z/
-      default_border = options.fetch(:default_border, '')
+    def preserve_border_whitespaces(string, options = {})
+      return string if /\A\s*\Z/.match?(string)
+
+      default_border = options.fetch(:default_border, "")
       # If the string contains part of a link so the characters [,],(,)
       # then don't add any extra spaces
-      default_border = '' if string =~ /[\[\(\]\)]/
+      default_border = "" if /[\[(\])]/.match?(string)
       string_start   = present_or_default(string[/\A\s*/], default_border)
       string_end     = present_or_default(string[/\s*\Z/], default_border)
       result         = yield
@@ -108,6 +110,5 @@ module ReverseAdoc
         string
       end
     end
-
   end
 end

data/lib/reverse_adoc/html_converter.rb

@@ -1,51 +1,51 @@
 # 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'
+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)
+             elsif input.is_a?(Nokogiri::XML::Document)
               then input.root
-            elsif input.is_a?(Nokogiri::XML::Node)
+             elsif input.is_a?(Nokogiri::XML::Node)
               then input
-            end
+             end
 
-      root || (return '')
+      root || (return "")
 
       ReverseAdoc.config.with(options) do
         result = ReverseAdoc::Converters.lookup(root.name).convert(root)

data/lib/reverse_adoc/version.rb

@@ -1,3 +1,3 @@
 module ReverseAdoc
-  VERSION = '0.3.1'
+  VERSION = "0.3.3".freeze
 end

data/reverse_adoc.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+
+$:.push File.expand_path("lib", __dir__)
 require "reverse_adoc/version"
 
 Gem::Specification.new do |s|
@@ -9,30 +10,30 @@ Gem::Specification.new do |s|
   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 -- exe/*`.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 'marcel', "~> 1.0.0"
-  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 "premailer", "~> 1.11.0"
+  s.add_dependency "word-to-markdown"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: reverse_adoc
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
   requirement: !ruby/object:Gem::Requirement
@@ -39,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: marcel
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,33 +123,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: word-to-markdown
+  name: premailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
-  name: premailer
+  name: word-to-markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '0'
 description: Generate AsciiDoc from HTML and Microsoft Word via CLI or library.
 email:
 - open.source@ribose.com
@@ -161,6 +161,7 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -281,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Generate AsciiDoc from HTML and Microsoft Word via CLI or library.