reverse_adoc 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36f817d275ce6148cc1013a3b50e313b481d44121babe05d13fc07d49e221c2d
-  data.tar.gz: 6885e6d6810fb0c0113ff2108c50e7326eb74479501607b4825fe9581ab7b03f
+  metadata.gz: 5ada0c5000d417b1fa73962833f53144ae8ef29d4089ec49cd5aa8cfe87f0a99
+  data.tar.gz: d56d80b96a0c52b7ad1d1c0e0133821ba9711f277388f59727fc6c904a2cad12
 SHA512:
-  metadata.gz: a38b5a9afc809ff511606abfd62a2cd3bf75e3c632bd60319be2477e8879626ba20151ba1dd31b9114adc28492ebf864f9dc189e175bfb47b91b551ed0f8e701
-  data.tar.gz: b9ce3a1c1123166c2ecf2f5bdde273ecb003505071b8863196fe99e3d7a4d6225ea1d362c010ec034f8f60df8cf920ca7ef63ed0bc1f05b7ec3f51a7b66f687e
+  metadata.gz: 2cde0734e47f95bb24664dade9a3a11266bf4d109b15211b45e3385d71b6cc5748d7faa238aca2861d31f01045c09975f5e516a251b7c555ad31d48199fc8a90
+  data.tar.gz: 3f318a46c99954e5d69b12b03aaaca6e75b0238740fbdded85ae8dc2c1d147bdb1b5c2e4e9207f34406664150359a92bb6237cfe38622996cd24f89899af8323

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/Gemfile

@@ -4,5 +4,3 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in reverse_adoc.gemspec
 gemspec
-
-gem "byebug"

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/version.rb

@@ -1,3 +1,3 @@
 module ReverseAdoc
-  VERSION = "0.3.4".freeze
+  VERSION = "0.3.6".freeze
 end

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/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'simplecov'
-# require 'byebug'
 
 SimpleCov.profiles.define 'gem' do
   add_filter '/spec/'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reverse_adoc
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: marcel
@@ -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
@@ -282,58 +282,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.1.6
+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: []