asciidoctor-pdf 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65bb6f189bb4f178cc3c92701488d3a8ffed51c607a9dca2d80821e7431c2083
-  data.tar.gz: 51ab7401ed17a659a0537237bc7a840b261d0218bb3bc18963a33ff346683e13
+  metadata.gz: e90846d73d8139ce9e156f4010b8cd4220d9aa318897ec94dcac52ca2b027c61
+  data.tar.gz: b519c77487cb7c7b317244342dcb06b40241d511016f6289e3a31b8305798225
 SHA512:
-  metadata.gz: 3f486c6c9a9825b87126d910089ba47a2956449e8868e42dfcbca1c29a93f15973f2619e51e911d898855ea80385aceb9bb7b01342d4fd389235a265c02a464e
-  data.tar.gz: c452eb12b67a7a2daf1575961d7cb23723944a448aa4fb797a300db4e0a72125968e6a54f54adfc0ee9ed3f7e3f77d7c24bc4a09fd192eb02df7c7fe4ad29da5
+  metadata.gz: 836351139245d4460ea72c91889276e86484b1f587681ada048ccfa8d0716b7bfb595f28de0862e24556faec53a1b412a5d5f65cf2236b7579523dfd785dd1a6
+  data.tar.gz: ae3ca4fbc60ab2f8b0eefab691c8c08dfc2e39f20a2950516a8f2c4d6f9a09420f3b702b063d160592d389d390834148ef14ad173b4b31a8432995b926c27b14

data/CHANGELOG.adoc

@@ -5,13 +5,21 @@
 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-repo}/commits/master[commit history] on GitHub.
 
+== 1.5.2 (2020-02-21) - @mojavelinux
+
+Bug Fixes::
+
+* fix crash if btn or kbd macro is used in section title (#1563)
+* ensure background and admonition icon image files are closed after being read (#1566)
+* ensure temporary images generated by running content are cleaned up (#1566)
+
 == 1.5.1 (2020-02-16) - @mojavelinux
 
 Enhancements::
 
 * allow theme to control font color of first line of abstract
 
-Fixes::
+Bug Fixes::
 
 * fix spacing after first line of indented paragraph (#1557)
 

data/README.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor PDF: A native PDF converter for AsciiDoc
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v1.5.1, 2020-02-16
+v1.5.2, 2020-02-21
 // Settings:
 :experimental:
 :idprefix:
@@ -23,7 +23,7 @@ endif::[]
 :project-name: Asciidoctor PDF
 :project-handle: asciidoctor-pdf
 // Variables:
-:release-version: 1.5.1
+:release-version: 1.5.2
 // URIs:
 :url-asciidoctor: http://asciidoctor.org
 :url-gem: http://rubygems.org/gems/asciidoctor-pdf

data/lib/asciidoctor/pdf/converter.rb

@@ -299,7 +299,7 @@ module Asciidoctor
 
         stamp_foreground_image doc, has_front_cover
         layout_cover_page doc, :back
-        clean_up_tmp_files
+        remove_tmp_files
         nil
       end
 
@@ -836,7 +836,7 @@ module Asciidoctor
                       end
                     else
                       begin
-                        image_obj, image_info = build_image_object icon_path
+                        image_obj, image_info = ::File.open(icon_path, 'rb') {|fd| build_image_object fd }
                         icon_aspect_ratio = image_info.width.fdiv image_info.height
                         # NOTE: don't scale image up if smaller than label_width
                         icon_width = [(to_pt image_info.width, :px), label_width].min
@@ -2406,7 +2406,7 @@ module Asciidoctor
       end
 
       def convert_inline_button node
-        %(<button>#{(@theme.button_content || '%s').sub '%s', node.text}</button>)
+        %(<button>#{((load_theme node.document).button_content || '%s').sub '%s', node.text}</button>)
       end
 
       def convert_inline_callout node
@@ -2538,7 +2538,7 @@ module Asciidoctor
         if (keys = node.attr 'keys').size == 1
           %(<key>#{keys[0]}</key>)
         else
-          keys.map {|key| %(<key>#{key}</key>) }.join @theme.key_separator || '+'
+          keys.map {|key| %(<key>#{key}</key>) }.join (load_theme node.document).key_separator || '+'
         end
       end
 
@@ -3237,9 +3237,13 @@ module Asciidoctor
           folio_basis, invert_folio = :virtual, false
         end
         periphery_layout_cache = {}
+        # NOTE: this block is invoked during PDF generation, after convert_document has returned
         repeat (content_start_page..num_pages), dynamic: true do
-          # NOTE don't write on pages which are imported / inserts (otherwise we can get a corrupt PDF)
-          next if page.imported_page?
+          # NOTE: don't write on pages which are imported / inserts (otherwise we can get a corrupt PDF)
+          if page.imported_page?
+            remove_tmp_files if page_number == num_pages
+            next
+          end
           virtual_pgnum = (pgnum = page_number) - skip_pagenums
           pgnum_label = (virtual_pgnum < 1 ? (RomanNumeral.new pgnum, :lower) : virtual_pgnum).to_s
           side = page_side((folio_basis == :physical ? pgnum : virtual_pgnum), invert_folio)
@@ -3339,6 +3343,7 @@ module Asciidoctor
               end
             end
           end
+          remove_tmp_files if pgnum == num_pages
         end
 
         go_to_page prev_page_number
@@ -4063,17 +4068,17 @@ module Asciidoctor
         image_format ||= ::Asciidoctor::Image.format image_path, (::Asciidoctor::Image === node ? node.attributes : nil)
         # NOTE base64 logic currently used for inline images
         if ::Base64 === image_path
-          return (tmp_file = @tmp_files[image_path]) && tmp_file.path if @tmp_files.key? image_path
-          @tmp_files[image_path] = tmp_image = ::Tempfile.create ['image-', image_format && %(.#{image_format})]
+          return @tmp_files[image_path] if @tmp_files.key? image_path
+          tmp_image = ::Tempfile.create ['image-', image_format && %(.#{image_format})]
           tmp_image.binmode unless image_format == 'svg'
           begin
             tmp_image.write ::Base64.decode64 image_path
             tmp_image.close
-            tmp_image.path
+            @tmp_files[image_path] = tmp_image.path
           rescue
             @tmp_files[image_path] = nil
             tmp_image.close
-            unlink_tmp_file tmp_image
+            unlink_tmp_file tmp_image.path
             nil
           end
         # handle case when image is a URI
@@ -4084,23 +4089,23 @@ module Asciidoctor
             return
           end
           if @tmp_files.key? image_path
-            return (tmp_file = @tmp_files[image_path]) && tmp_file.path
+            return @tmp_files[image_path]
           elsif cache_uri
             Helpers.require_library 'open-uri/cached', 'open-uri-cached' unless defined? ::OpenURI::Cache
           else
             ::OpenURI
           end
-          @tmp_files[image_path] = tmp_image = ::Tempfile.create ['image-', image_format && %(.#{image_format})]
+          tmp_image = ::Tempfile.create ['image-', image_format && %(.#{image_format})]
           tmp_image.binmode if (binary = image_format != 'svg')
           begin
             ::OpenURI.open_uri(image_path, (binary ? 'rb' : 'r')) {|fd| tmp_image.write fd.read }
             tmp_image.close
-            tmp_image.path
+            @tmp_files[image_path] = tmp_image.path
           rescue
-            logger.warn %(could not retrieve remote image: #{image_path}; #{$!.message}) unless scratch?
             @tmp_files[image_path] = nil
+            logger.warn %(could not retrieve remote image: #{image_path}; #{$!.message}) unless scratch?
             tmp_image.close
-            unlink_tmp_file tmp_image
+            unlink_tmp_file tmp_image.path
             nil
           end
         # handle case when image is a local file
@@ -4343,16 +4348,16 @@ module Asciidoctor
         link_annotation [image_x, (image_y - image_height), (image_x + image_width), image_y], Border: [0, 0, 0], A: { Type: :Action, S: :URI, URI: uri.as_pdf }
       end
 
-      def clean_up_tmp_files
-        @tmp_files.values.each {|tmp_file| unlink_tmp_file tmp_file if tmp_file }
-        @tmp_files.clear
+      def remove_tmp_files
+        @tmp_files.reject! {|_, path| path ? (unlink_tmp_file path) : true }
       end
 
-      def unlink_tmp_file file
-        path = file.path
+      def unlink_tmp_file path
         ::File.unlink path if ::File.exist? path
+        true
       rescue
         logger.warn %(could not delete temporary file: #{path}; #{$!.message}) unless scratch?
+        false
       end
 
       def apply_subs_discretely doc, value, opts = {}
@@ -4461,14 +4466,11 @@ module Asciidoctor
       def init_scratch_prototype
         @save_state = nil
         @scratch_depth = 0
-        # NOTE can't marshall tmp_files, so clear them before creating prototype
-        saved_tmp_files, @tmp_files = @tmp_files, {}
         # IMPORTANT don't set font before using Marshal, it causes serialization to fail
         @prototype = ::Marshal.load ::Marshal.dump self
         @prototype.state.store.info.data[:Scratch] = @prototype.text_formatter.scratch = true
         # NOTE we're now starting a new page each time, so no need to do it here
         #@prototype.start_new_page if @prototype.page_number == 0
-        @tmp_files = saved_tmp_files
       end
 
       def push_scratch doc

data/lib/asciidoctor/pdf/ext/prawn/images.rb

@@ -12,19 +12,23 @@ module Asciidoctor
       # Dispatch to suitable image method in Prawn based on file extension.
       def image file, opts = {}
         # FIXME: handle case when SVG is an IO object
-        if ::String === file && (((opts = opts.dup).delete :format) == 'svg' || (file.downcase.end_with? '.svg'))
-          #opts[:enable_file_requests_with_root] = (::File.dirname file) unless opts.key? :enable_file_requests_with_root
-          #opts[:enable_web_requests] = allow_uri_read if !(opts.key? :enable_web_requests) && (respond_to? :allow_uri_read)
-          #opts[:cache_images] = cache_uri if !(opts.key? :cache_images) && (respond_to? :cache_uri)
-          #opts[:fallback_font_name] = fallback_svg_font_name if !(opts.key? :fallback_font_name) && (respond_to? :fallback_svg_font_name)
-          if (opts.key? :fit) && (fit = opts.delete :fit) && !opts[:width] && !opts[:height]
-            svg (::File.read file, mode: 'r:UTF-8'), opts do |svg_doc|
-              max_width, max_height = fit
-              svg_doc.calculate_sizing requested_width: max_width if max_width && svg_doc.sizing.output_width != max_width
-              svg_doc.calculate_sizing requested_height: max_height if max_height && svg_doc.sizing.output_height > max_height
+        if ::String === file
+          if ((opts = opts.dup).delete :format) == 'svg' || (file.downcase.end_with? '.svg')
+            #opts[:enable_file_requests_with_root] = (::File.dirname file) unless opts.key? :enable_file_requests_with_root
+            #opts[:enable_web_requests] = allow_uri_read if !(opts.key? :enable_web_requests) && (respond_to? :allow_uri_read)
+            #opts[:cache_images] = cache_uri if !(opts.key? :cache_images) && (respond_to? :cache_uri)
+            #opts[:fallback_font_name] = fallback_svg_font_name if !(opts.key? :fallback_font_name) && (respond_to? :fallback_svg_font_name)
+            if (opts.key? :fit) && (fit = opts.delete :fit) && !opts[:width] && !opts[:height]
+              svg (::File.read file, mode: 'r:UTF-8'), opts do |svg_doc|
+                max_width, max_height = fit
+                svg_doc.calculate_sizing requested_width: max_width if max_width && svg_doc.sizing.output_width != max_width
+                svg_doc.calculate_sizing requested_height: max_height if max_height && svg_doc.sizing.output_height > max_height
+              end
+            else
+              svg (::File.read file, mode: 'r:UTF-8'), opts
             end
           else
-            svg (::File.read file, mode: 'r:UTF-8'), opts
+            ::File.open(file, 'rb') {|fd| _initial_image fd, opts }
           end
         else
           _initial_image file, opts

data/lib/asciidoctor/pdf/version.rb

@@ -2,7 +2,7 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '1.5.1'
+    VERSION = '1.5.2'
   end
   Pdf = PDF unless const_defined? :Pdf, false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2020-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor