asciidoctor-fb2 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fefb6e896cf8679642198ac1ffe5222916781f71cbb775130bf32eeb00b375b4
-  data.tar.gz: 5100ec044994316213786b065115f6214ca4dd29c4f8655fc3a9ffc42726d258
+  metadata.gz: 2c92fc77a9c3146a344b615e53430b2a1c33c04688a60a6dd175df173ec5e173
+  data.tar.gz: 991a87e1cede4126726357252f2bb19e30380912153f1a81a511ee81873124b2
 SHA512:
-  metadata.gz: '099b2149b1dacc1a1239725ce386afdc48ff7429a6aa7e0108af80db0c84630c176ec6adf96090f671c7a51bd1140590d920133ba4de76788e239fe490951317'
-  data.tar.gz: 7418059f5dd43b7f77087acac3af70764e80af4dc676be995c9d421edd01dd89008b11926c36151b6832b1c137684236cad3b00a12b6798a5747d23690089c7c
+  metadata.gz: 7da4ab8d23af356a2d321b9894d2747cfdf9913931566ace0b3945fb43e9dda32c76b1257e6555607cc3a47940c0e6e480213e395b60f5089120f5d6c2ad9db3
+  data.tar.gz: 49422fe74cb1ac22574d602a572abc5d79ae66883e20758ed721e7efc579771acf8359aa3acc67d8ad45400d344c8dd6421dab9cda46f04ab25ec358e2f26a0a

data/.github/dependabot.yml

@@ -6,3 +6,8 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/ci.yml

@@ -9,17 +9,16 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
-      - name: Build
-        run: bundle install --jobs 4 --retry 3
+          ruby-version: '3.0'
+          bundler-cache: true
       - name: Lint
         run: bundle exec rake lint
   test:
     strategy:
       matrix:
-        ruby: [jruby, 2.4, 2.5, 2.6, 2.7]
-        platform: [ubuntu-latest, macos-latest, windows-latest]
-    runs-on: ${{ matrix.platform }}
+        ruby: ['jruby', '2.4', '2.5', '2.6', '2.7', '3.0']
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -27,7 +26,6 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: Build
-        run: bundle install --jobs 4 --retry 3
+          bundler-cache: true
       - name: Test
         run: bundle exec rake spec

data/.github/workflows/release.yml

@@ -11,14 +11,9 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: '3.0'
     - name: Publish to RubyGems.org
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:rubygems_api_key: ${RUBYGEMS_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push *.gem
-      env:
-        RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+      uses: dawidd6/action-publish-gem@v1
+      with:
+        api_key: ${{ secrets.RUBYGEMS_API_KEY }}
+

data/CHANGELOG.adoc

@@ -7,6 +7,11 @@
 This document provides a high-level view of the changes to the {project-name} by release.
 For a detailed view of what has changed, refer to the {uri-project}/commits/master[commit history] on GitHub.
 
+== 0.4.0 (2021-02-14) - @slonopotamus
+
+* fix table cells markup
+* bump fb2rb to 0.6.0
+
 == 0.3.1 (2020-11-29) - @slonopotamus
 
 * fix crash on `+toc::[]+` macro

data/asciidoctor-fb2.gemspec

@@ -19,12 +19,13 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'asciidoctor', '~> 2.0'
-  s.add_runtime_dependency 'fb2rb', '~> 0.4.0'
+  s.add_runtime_dependency 'fb2rb', '~> 0.6.0'
   s.add_runtime_dependency 'mime-types', '~> 3.0'
 
   s.add_development_dependency 'asciidoctor-diagram', '~> 2.0'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.10.0'
-  s.add_development_dependency 'rubocop', '~> 1.4.0'
-  s.add_development_dependency 'rubocop-rspec', '~> 2.0.0'
+  s.add_development_dependency 'rubocop', '~> 1.9.0'
+  s.add_development_dependency 'rubocop-rake', '~> 0.5.0'
+  s.add_development_dependency 'rubocop-rspec', '~> 2.2.0'
 end

data/lib/asciidoctor_fb2.rb

@@ -44,30 +44,28 @@ module Asciidoctor
         end
         node.authors.each do |author|
           title_info.authors << FB2rb::Author.new(
-            author.firstname,
-            author.middlename,
-            author.lastname,
-            nil,
-            [],
-            author.email.nil? ? [] : [author.email]
+            first_name: author.firstname,
+            middle_name: author.middlename,
+            last_name: author.lastname,
+            emails: author.email.nil? ? [] : [author.email]
           )
         end
 
         if node.attr? 'series-name'
           series_name = node.attr 'series-name'
           series_volume = node.attr 'series-volume', 1
-          title_info.sequences << FB2rb::Sequence.new(series_name, series_volume)
+          title_info.sequences << FB2rb::Sequence.new(name: series_name, number: series_volume)
         end
 
         date = node.attr('revdate') || node.attr('docdate')
-        fb2date = FB2rb::FB2Date.new(date, Date.parse(date))
+        fb2date = FB2rb::FB2Date.new(display_value: date, value: Date.parse(date))
         title_info.date = document_info.date = fb2date
 
         unless (cover_image = node.attr('front-cover-image')).nil?
           cover_image = Regexp.last_match(1) if cover_image =~ IMAGE_ATTRIBUTE_VALUE_RX
           cover_image_path = node.image_uri(cover_image)
           register_binary(node, cover_image_path, 'image')
-          title_info.coverpage = FB2rb::Coverpage.new([%(##{cover_image_path})])
+          title_info.coverpage = FB2rb::Coverpage.new(images: [%(##{cover_image_path})])
         end
 
         document_info.id = node.attr('uuid', '')
@@ -81,7 +79,7 @@ module Asciidoctor
 <title><p>#{node.doctitle}</p></title>
 #{node.content}
 </section>)
-        @book.bodies << FB2rb::Body.new(nil, body)
+        @book.bodies << FB2rb::Body.new(content: body)
         unless node.document.footnotes.empty?
           notes = []
           node.document.footnotes.each do |footnote|
@@ -90,7 +88,7 @@ module Asciidoctor
 <p>#{footnote.text}</p>
 </section>)
           end
-          @book.bodies << FB2rb::Body.new('notes', notes * "\n")
+          @book.bodies << FB2rb::Body.new(name: 'notes', content: notes * "\n")
         end
         @book
       end
@@ -382,30 +380,36 @@ module Asciidoctor
         lines * "\n"
       end
 
+      # @param cell [Asciidoctor::Table::Cell]
+      def get_cell_content(cell) # rubocop:disable Metrics/MethodLength
+        case cell.style
+        when :asciidoc
+          cell.content
+        when :emphasis
+          %(<emphasis>#{cell.text}</emphasis>)
+        when :literal
+          %(<code>#{cell.text}</code>)
+        when :monospaced
+          %(<code>#{cell.text}</code>)
+        when :strong
+          %(<strong>#{cell.text}</strong>)
+        else
+          cell.text
+        end
+      end
+
       # @param node [Asciidoctor::Table]
       def convert_table(node) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         lines = []
         lines << %(<subtitle>#{node.captioned_title}</subtitle>) if node.title?
         lines << '<table>'
-        node.rows.to_h.each do |tsec, rows| # rubocop:disable Metrics/BlockLength
+        node.rows.to_h.each do |tsec, rows|
           next if rows.empty?
 
           rows.each do |row|
             lines << '<tr>'
             row.each do |cell|
-              cell_content = if tsec == :head
-                               cell.text
-                             else
-                               case cell.style
-                               when :asciidoc
-                                 cell.content
-                               when :literal
-                                 %(<p><pre>#{cell.text}</pre></p>)
-                               else
-                                 (cell_content = cell.content).empty? ? '' : %(<p>#{cell_content * "</p>\n<p>"}</p>)
-                               end
-                             end
-
+              cell_content = get_cell_content(cell)
               cell_tag_name = (tsec == :head || cell.style == :header ? 'th' : 'td')
               cell_attrs = [
                 %(halign="#{cell.attr 'halign'}"),

data/lib/asciidoctor_fb2/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module FB2
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-fb2
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Marat Radchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-29 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.9.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
 description: 
 email:
 - marat@slonopotamus.org
@@ -170,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to FB2 e-book formats