reverse_adoc 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7499c144d3114121db528db188b0602d9a5200b0f5e7a96053fb88f4d72cb27a
-  data.tar.gz: 83af0602458355d71d013bc5736d5bd22bc65006b6e89e8f984cf078680fe190
+  metadata.gz: f270330f82dbb25f80910714935e876e97d426537c4a5abd463e7bc9640e6467
+  data.tar.gz: 75b1f4e34156d28e64f93b8cdebd938b4286e3570154bc51f52386d3d14b69ba
 SHA512:
-  metadata.gz: 2c0fe6bf549ac2836d812985501efef76710340e4ed9d86ae62ae28fe995a5e54152a50bda148e0c3bd14e97aa86cea243cdb30af675d17a7b2070a9d33e2b04
-  data.tar.gz: b2b3cd453b1229add0a86fbc6f492be261241778a46fa2c70727362fb9465b9d839f94d10089ae36848575fd719babe0ecb867a65565d95f96b5d20ed6ce8510
+  metadata.gz: 682c02207ff5b6f9d403c3ddfbbb6733e71efcf4d0fd20b4c48aebaf48e42e241b4195753cddcffc8216870ec17338964fcc24c35aeb201fa0867e678cec3bff
+  data.tar.gz: 710296feb3d170223920b46184ebb7b80216db873376ff38e742cfc1b7c1935ad867e0b3bb0435d5bb5a557c46be0c3da0aeaccc1169c2363aa2eda2d95dfbde

data/.github/workflows/rake.yml

@@ -10,23 +10,6 @@ on:
 
 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: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    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
+    uses: metanorma/ci/.github/workflows/libreoffice-rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -15,31 +15,10 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
+    uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
+    with:
+      next_version: ${{ github.event.inputs.next_version }}
+    secrets:
+      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
 
-      - 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/lib/reverse_adoc/converters/pre.rb

@@ -16,7 +16,11 @@ module ReverseAdoc
       private
 
       def treat(node, state)
-        node.to_s
+        return "\n" if node.name == "br"
+
+        prefix = postfix = "\n\n" if node.name == "p"
+
+        "#{prefix}#{node.text}#{postfix}"
       end
 
       def language(node)

data/lib/reverse_adoc/converters/text.rb

@@ -32,17 +32,15 @@ module ReverseAdoc
         text = escape_keychars(text)
 
         text = preserve_keychars_within_backticks(text)
-        text = preserve_tags(text)
-
-        text
+        escape_links(text)
       end
 
       def preserve_nbsp(text)
         text.gsub(/\u00A0/, " ")
       end
 
-      def preserve_tags(text)
-        text.gsub(/[<>]/, '>' => '\>', '<' => '\<')
+      def escape_links(text)
+        text.gsub(/<<([^>]*)>>/, "\\<<\\1>>")
       end
 
       def remove_border_newlines(text)

data/lib/reverse_adoc/version.rb

@@ -1,3 +1,3 @@
 module ReverseAdoc
-  VERSION = "0.3.5".freeze
+  VERSION = "0.3.7".freeze
 end

data/reverse_adoc.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   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.5.0")
+  s.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   # specify any dependencies here; for example:
   s.add_dependency "marcel", "~> 1.0.0"
   s.add_dependency "mathml2asciimath"
-  s.add_dependency "nokogiri", "~> 1.12"
+  s.add_dependency "nokogiri", "~> 1.13"
   s.add_development_dependency "codeclimate-test-reporter"
   s.add_development_dependency "rake"
   s.add_development_dependency "redcarpet"

data/spec/components/code_spec.rb

@@ -7,19 +7,19 @@ describe ReverseAdoc do
   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 /\nvar this;\nthis\.is/ }
   it { is_expected.to match /block"\)\nconsole/ }
 
   context "with github style code blocks" do
     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\.\.\.\./ }
+    it { is_expected.to match /\n\.\.\.\.\nvar this;\nthis/ }
+    it { is_expected.to match /it is"\) ?\n	\n\.\.\.\./ }
   end
 
   context "code with indentation" do
     subject { ReverseAdoc.convert(input) }
-    it { is_expected.to match(/^<code>tell application "Foo"\n/) }
+    it { is_expected.to match(/^tell application "Foo"\n/) }
     it { is_expected.to match(/^    beep\n/) }
     it { is_expected.to match(/^end tell\n/) }
   end

data/spec/components/escapables_spec.rb

@@ -25,7 +25,8 @@ describe ReverseAdoc do
   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" }
+    let(:expected_output) { "....\nvar theoretical_max_infin = 1.0;\n....\n" }
+    it { is_expected.to include expected_output }
   end
 
 end

data/spec/components/paragraphs_spec.rb

@@ -8,7 +8,7 @@ describe ReverseAdoc do
 
   it { is_expected.not_to start_with "\n\n" }
   it { is_expected.to start_with "First content\n\nSecond content\n\n" }
-  it { is_expected.to include "\n\n_Complex_\n\n\.\.\.\.\n\n        <code>Content</code>\n" }
+  it { is_expected.to include "\n\n_Complex_\n\n\.\.\.\.\n\n        Content\n" }
   it { is_expected.to include "*Trailing whitespace:*" }
   it { is_expected.to include "*Trailing non-breaking space:&nbsp;*" }
   it { is_expected.to include "*_Combination:&nbsp;_*" }

data/spec/components/quotation_spec.rb

@@ -6,7 +6,7 @@ describe ReverseAdoc do
   let(:document) { Nokogiri::HTML(input) }
   subject { ReverseAdoc.convert(input) }
 
-  it { is_expected.to match /\n      <code>Block of code<\/code>$/ }
+  it { is_expected.to match /\n      Block of code$/ }
   it { is_expected.to include "\n____\nFirst quoted paragraph\n\nSecond quoted paragraph\n____\n" }
 
 end

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

@@ -21,7 +21,7 @@ describe ReverseAdoc::Converters::Pre do
 
   it 'preserves xml' do
     node = node_for("<pre><code>x</code><br/><p>hello</p></pre>")
-    expect(converter.convert(node)).to include "....\n<code>x</code><br><p>hello</p>\n....\n"
+    expect(converter.convert(node)).to include "....\nx\n\n\nhello\n\n\n....\n"
   end
 
   context 'syntax highlighting' do

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

@@ -28,10 +28,16 @@ describe ReverseAdoc::Converters::Text do
     expect(result).to eq "foo bar  "
   end
 
-  it 'keeps escaped HTML-ish characters' do
+  it "keeps HTML characters" do
     input = node_for("<p>&lt;foo&gt;</p>")
     result = converter.convert(input)
-    expect(result).to eq '\<foo\>'
+    expect(result).to eq "<foo>"
+  end
+
+  it "escapes Link like characters in text" do
+    input = node_for("<p>&lt;&lt;foo&gt;&gt;</p>")
+    result = converter.convert(input)
+    expect(result).to eq '\<<foo>>'
   end
 
   context 'within backticks' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reverse_adoc
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: marcel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -267,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
@@ -275,65 +275,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: Generate AsciiDoc from HTML and Microsoft Word via CLI or library.
-test_files:
-- spec/assets/anchors.html
-- spec/assets/basic.html
-- spec/assets/code.html
-- spec/assets/escapables.html
-- spec/assets/external_images.docx
-- spec/assets/external_images.html
-- spec/assets/from_the_wild.html
-- spec/assets/full_example.html
-- spec/assets/html_fragment.html
-- spec/assets/lists.html
-- spec/assets/minimum.html
-- spec/assets/paragraphs.html
-- spec/assets/quotation.html
-- spec/assets/tables.html
-- spec/assets/unknown_tags.html
-- spec/bin/reverse_adoc_spec.rb
-- spec/bin/w2a_spec.rb
-- spec/components/anchors_spec.rb
-- spec/components/basic_spec.rb
-- spec/components/code_spec.rb
-- spec/components/escapables_spec.rb
-- spec/components/from_the_wild_spec.rb
-- spec/components/html_fragment_spec.rb
-- spec/components/lists_spec.rb
-- spec/components/paragraphs_spec.rb
-- spec/components/quotation_spec.rb
-- spec/components/tables_spec.rb
-- spec/components/unknown_tags_spec.rb
-- spec/lib/reverse_adoc.rb
-- spec/lib/reverse_adoc/cleaner_spec.rb
-- spec/lib/reverse_adoc/config_spec.rb
-- spec/lib/reverse_adoc/converters/aside_spec.rb
-- spec/lib/reverse_adoc/converters/audio_spec.rb
-- spec/lib/reverse_adoc/converters/blockquote_spec.rb
-- 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/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/p_spec.rb
-- spec/lib/reverse_adoc/converters/pre_spec.rb
-- spec/lib/reverse_adoc/converters/q_spec.rb
-- spec/lib/reverse_adoc/converters/strong_spec.rb
-- spec/lib/reverse_adoc/converters/text_spec.rb
-- spec/lib/reverse_adoc/converters/video_spec.rb
-- spec/lib/reverse_adoc/converters_spec.rb
-- spec/spec_helper.rb
-- spec/support/shell_helpers.rb
+test_files: []