asciidoctor-fb2 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 191e9008da2371aa05c0f179901db6e452a1a15306cf9672243461dd60843279
-  data.tar.gz: 2e553897787cd096962a72a448a1763ad9584a73987ddb660735e354fa38f1f8
+  metadata.gz: c86e38af133de5a0b984e4ba98639333a483284a205f7fd118334248e48adfd5
+  data.tar.gz: 6192121701d79223d0c44cb032c87b8be375b0177ce540394a1ef81ddc4a87e5
 SHA512:
-  metadata.gz: 3ce011a8f7b12cf2a2fc1c82882fc746b8e22905606afa78d6dec730617c06abb9f9925f4d2ead4dcf9d8a96e843ae7786af66ff65cfe4d12e2fb47f5592c7ed
-  data.tar.gz: ef5fc4eb0738e197709aefb45b4385ef7af908c9a5435092ec0119864389130364e306a3044dc50072f37602c8fd6cfbb9e72879b5445ae23241ea481518db2b
+  metadata.gz: 10f7f74ccaf1289f9a6cccfcf6c10938949bd959b22af0fd53a0a60b52a80f010dc0bb9b4bbbb6b3256a1a2f320f78f273e10d0a5339e47f6ddf397e2b726a88
+  data.tar.gz: 500756c54b05993d00fa197079a59f19a11824121bfcfae61a1e1fea64b9ba2b7603717a53c6e4bfafefe44300779d264d7a73046a0909414991e369e26899f6

data/.github/workflows/ci.yml

@@ -5,23 +5,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Lint
         run: bundle exec rake lint
   test:
     strategy:
       matrix:
-        ruby: ['jruby', '2.4', '2.5', '2.6', '2.7', '3.0']
+        # Test oldest and newest supported versions
+        ruby: ['jruby-9.2', 'jruby-9.4', '2.5', '3.1']
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/release.yml

@@ -7,13 +7,26 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
+        ruby-version: '3.1'
     - name: Publish to RubyGems.org
       uses: dawidd6/action-publish-gem@v1
       with:
         api_key: ${{ secrets.RUBYGEMS_API_KEY }}
-
+    - name: Set release version
+      run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+    - name: Announcement
+      uses: zulip/github-actions-zulip/send-message@v1
+      with:
+        email: ${{ secrets.ZULIP_USERNAME }}
+        api-key: ${{ secrets.ZULIP_API_KEY }}
+        organization-url: 'https://asciidoctor.zulipchat.com'
+        to: '279652'
+        type: 'stream'
+        topic: 'releases'
+        content: |
+          Asciidoctor-FB2 ${{ env.RELEASE_VERSION }} is out!
+          https://github.com/asciidoctor/asciidoctor-fb2/releases/tag/${{ env.RELEASE_VERSION }}

data/CHANGELOG.adoc

@@ -7,6 +7,17 @@
 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.7.0 (2022-12-18) - @slonopotamus
+
+* fix handling of image paths with path separators
+* add support for image alignment. https://github.com/asciidoctor/asciidoctor-fb2/issues/16[#16]
+* add support for floating images
+* add naive admonition icons support. https://github.com/asciidoctor/asciidoctor-fb2/issues/18[#18]
+
+== 0.6.0 (2022-10-30) - @slonopotamus
+
+* bump fb2rb to 0.7.0
+
 == 0.5.1 (2021-04-01) - @slonopotamus
 
 * add basic support for stem blocks

data/README.adoc

@@ -3,13 +3,14 @@ Marat Radchenko <marat@slonopotamus.org>
 :project-name: Asciidoctor FB2
 :project-handle: asciidoctor-fb2
 :slug: asciidoctor/{project-handle}
+:source-highlighter: rouge
 :uri-project: https://github.com/{slug}
 :uri-ci: {uri-project}/actions?query=branch%3Amaster
 :uri-gem: https://rubygems.org/gems/{project-handle}
 
 image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[project chat,link=https://asciidoctor.zulipchat.com/]
 image:https://img.shields.io/gem/v/{project-handle}.svg[Latest Release,link={uri-gem}]
-image:{uri-project}/workflows/CI/badge.svg?branch=master[Build Status,link={uri-ci}]
+image:{uri-project}/workflows/CI/badge.svg?branch=main[Build Status,link={uri-ci}]
 
 {project-name} is an Asciidoctor extension for converting AsciiDoc documents directly to the FB2 e-book format.
 
@@ -39,7 +40,7 @@ This command should be available on your PATH if you installed the `{project-han
 Otherwise, you can find the command in the [path]_bin_ folder of the project.
 We also recommend specifying an output directory using the `-D` option flag.
 
-[source,shell script]
+[source,shell]
 ----
 $ asciidoctor-fb2 -D output path/to/book.adoc
 ----

data/asciidoctor-fb2.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.summary = 'Converts AsciiDoc documents to FB2 e-book formats'
   s.homepage = 'https://github.com/asciidoctor/asciidoctor-fb2'
   s.license = 'MIT'
-  s.required_ruby_version = '>= 2.4.0'
+  s.required_ruby_version = '>= 2.5.0'
 
   s.files = `git ls-files`.split("\n").reject { |f| f.match(%r{^spec/}) }
   s.executables = `git ls-files -- bin/*`.split("\n").map do |f|
@@ -19,13 +19,13 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'asciidoctor', '~> 2.0'
-  s.add_runtime_dependency 'fb2rb', '~> 0.6.0'
+  s.add_runtime_dependency 'fb2rb', '>= 0.6', '< 0.8'
   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.12.0'
-  s.add_development_dependency 'rubocop-rake', '~> 0.5.0'
-  s.add_development_dependency 'rubocop-rspec', '~> 2.2.0'
+  s.add_development_dependency 'rspec', '~> 3.12.0'
+  s.add_development_dependency 'rubocop', '~> 1.28.2'
+  s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
+  s.add_development_dependency 'rubocop-rspec', '~> 2.10.0'
 end

data/lib/asciidoctor_fb2/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module FB2
-    VERSION = '0.5.1'
+    VERSION = '0.7.0'
   end
 end

data/lib/asciidoctor_fb2.rb

@@ -282,7 +282,7 @@ module Asciidoctor
       # @param node [Asciidoctor::Inline]
       def convert_inline_image(node)
         image_attrs = register_binary(node, node.image_uri(node.target), 'image')
-        %(<image #{image_attrs * ' '}/>)
+        %(<image #{image_attrs.sort! * ' '}/>)
       end
 
       # @param node [Asciidoctor::Inline]
@@ -301,11 +301,18 @@ module Asciidoctor
       end
 
       # @param node [Asciidoctor::Block]
-      def convert_image(node)
+      def convert_image(node) # rubocop:disable Metrics/AbcSize
         image_attrs = register_binary(node, node.image_uri(node.attr('target')), 'image')
         image_attrs << %(title="#{node.captioned_title}") if node.title?
         image_attrs << %(id="#{node.id}") if node.id
-        %(<p><image #{image_attrs * ' '}/></p>)
+
+        p_style = []
+        p_style << %(float: #{node.attr 'float'}) if node.attr? 'float'
+        p_style << %(text-align: #{node.attr 'align'}) if node.attr? 'align'
+
+        p_attrs = []
+        p_attrs << %(style="#{p_style.sort! * '; '}") unless p_style.empty?
+        %(<p #{p_attrs.sort! * ' '}><image #{image_attrs.sort! * ' '}/></p>)
       end
 
       # @param node [Asciidoctor::Block]
@@ -339,8 +346,8 @@ module Asciidoctor
 
           if File.readable?(fs_path)
             # Calibre fails to load images if they contain path separators
-            target.sub!('/', '_')
-            target.sub!('\\', '_')
+            target.gsub!('/', '_')
+            target.gsub!('\\', '_')
 
             mime_type = determine_mime_type(target, media_type)
             @book.add_binary(target, fs_path, mime_type)
@@ -352,11 +359,26 @@ module Asciidoctor
         image_attrs << %(alt="#{node.attr('alt')}") if node.attr? 'alt'
       end
 
+      ADMONITION_ICONS = {
+        'caution' => '🔥',
+        'important' => '❗',
+        'note' => 'ℹ️',
+        'tip' => '💡',
+        'warning' => '⚠️'
+      }.freeze
+
       # @param node [Asciidoctor::Block]
       def convert_admonition(node)
-        lines = [%(<p><strong>#{node.title || node.caption}:</strong>
-#{node.content}
-</p>)]
+        lines = ['<p>']
+
+        lines << if node.document.attr?('icons', 'font') && (icon = ADMONITION_ICONS[node.attr 'name'])
+                   %(#{icon} )
+                 else
+                   %(<strong>#{node.title || node.caption}:</strong>)
+                 end
+
+        lines << node.content
+        lines << '</p>'
         lines << '<empty-line/>' unless node.has_role?('last')
         lines * "\n"
       end
@@ -465,7 +487,7 @@ module Asciidoctor
               ]
               cell_attrs << %(colspan="#{cell.colspan}") if cell.colspan
               cell_attrs << %(rowspan="#{cell.rowspan}") if cell.rowspan
-              lines << %(<#{cell_tag_name} #{cell_attrs * ' '}>#{cell_content}</#{cell_tag_name}>)
+              lines << %(<#{cell_tag_name} #{cell_attrs.sort! * ' '}>#{cell_content}</#{cell_tag_name}>)
             end
             lines << '</tr>'
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-fb2
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Marat Radchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2022-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -28,16 +28,22 @@ dependencies:
   name: fb2rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -86,56 +92,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.28.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.10.0
 description: 
 email:
 - marat@slonopotamus.org
@@ -177,14 +183,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to FB2 e-book formats