rbpdf 1.21.0 → 1.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5ff3f6272253912bfd08cadee35bda912f4deae8c663fbadd6187f46e5e5710
-  data.tar.gz: 4339767a774386b3c18358965c101fcbcb2ba78ae67c05228292843b61a1a504
+  metadata.gz: 7fe46482c5272d1a1e3c050c4c421648ba584ddf21225655fbce7f86309050e8
+  data.tar.gz: 504808a1ddc2e1b0720bd8d1b0ce2960ef598ae808ce1af6173502e537a0ce4a
 SHA512:
-  metadata.gz: 45293dc5fac4368ed11ce0d9cb71b0326ce0823d84bde3d0f1a811cd9de000a73c4b147266b9ab0130c62a329c76aa4e10ba5428d007d6d88f6a1eb62abadd9b
-  data.tar.gz: 06a6c03c0f2a8bc45615c14a5c163dc2e5c88a2c76b970098dc7505c424aec7bfe15745ec6894443840d45d209a63e76a718ce13ab35f9ee8be79512362d8034
+  metadata.gz: 34cb1673c7bb205ff539e8f8f9bf7b2b90ef2e0dc0bf0cd5cbea47dff4d4cb6ac0287f74001fe5418506b53d8dac93aaa5438018ab015a308991b31916f19dbe
+  data.tar.gz: 667285f30d8d889877a63bf23e897ebd2f2e7929392eb48b135994ff678c331cfb90adae6682aaedbd2b798ef64e187ce4931d34182b32235cb3acf6101c21d8

data/CHANGELOG

@@ -1,16 +1,24 @@
+1.21.1 2023-03-20
+       - Changed version description of PDF PRODUCER. (#83)
+       - fix isValidCSSSelectorForTag method. (#82)
+       - Improved compatibility with ImageMagick 7.1.1-0 and later when using mini_magick. (#81)
+       - Fixed parsepng method to support transparent GIF and PNG tRNS transparency. (#80)
+       - ImageMagick7 support in RMagick 5.2.0. (#79)
+       - Add support WebP image. (#77)
+
 1.21.0 2023-02-13
-       - Support for Ruby 3.0.0, 3.1.0, 3.2.0. (Drop support for Ruby 2.2 and earlier.) #66
-       - Support Rails 6 and Rails 7. (Drop support for Rails 3.x, 4.x) #66, #72
-       - Fix RMagick 5.0 compatible. #66
-       - Infinite loop has been resolved. #68, #74
-       - Fixed a bug that caused the x position to shift when an <img> tag was behind a <li> tag in HTML. #74
-       - fix: Incorrect characters when copying out of a generated PDF with Unicode fonts. #71
-       - Suppresses output for Circle(), Ellipse(), PieSector(), and PieSectorXY() when the radius is 0. #67
-       - Don't change an object while iterating over it #59 (by thegcat)
-       - fix : bidi bug #56 (by ahorek)
-       - Avoid rdoc stack level too deep (SystemStackError) in gem install. #76
-       - PDF example output option OUTPUT=true added #70
-       - Make the image file path acquisition process extensible #58 (by yui-har)
+       - Support for Ruby 3.0.0, 3.1.0, 3.2.0. (Drop support for Ruby 2.2 and earlier.) (#66)
+       - Support Rails 6 and Rails 7. (Drop support for Rails 3.x, 4.x) (#66, #72)
+       - Fix RMagick 5.0 compatible. (#66)
+       - Infinite loop has been resolved. (#68, #74)
+       - Fixed a bug that caused the x position to shift when an <img> tag was behind a <li> tag in HTML. (#74)
+       - fix: Incorrect characters when copying out of a generated PDF with Unicode fonts. (#71)
+       - Suppresses output for Circle(), Ellipse(), PieSector(), and PieSectorXY() when the radius is 0. (#67)
+       - Don't change an object while iterating over it (#59) (by thegcat)
+       - fix : bidi bug (#56) (by ahorek)
+       - Avoid rdoc stack level too deep (SystemStackError) in gem install. (#76)
+       - PDF example output option OUTPUT=true added (#70)
+       - Make the image file path acquisition process extensible (#58) (by yui-har)
 
 1.20.1 2019-08-21
        - fix license warning. (by pavel)

data/README.md

@@ -16,7 +16,7 @@ A template plugin allowing the inclusion of ERB-enabled RBPDF template files.
 * CSS minimum support.
 * Image
  - 8bit PNG image support without MiniMagick/RMagick library.
- - PNG(with alpha channel)/JPEG/GIF image support. (use MiniMagick or RMagick library)
+ - PNG(with alpha channel)/JPEG/GIF/WebP image support. (use MiniMagick or RMagick library)
 
 
 ##

data/lib/core/mini_magick.rb

@@ -1,3 +1,4 @@
+# coding: ASCII-8BIT
 # The MIT License
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -55,6 +56,7 @@ module Rbpdf
     width = image.width
     height = image.height
 
+    out['mime'] = image.mime_type
     out[0] = width
     out[1] = height
     
@@ -67,17 +69,19 @@ module Rbpdf
       out[2] = "JPEG"
     when "image/png"
       out[2] = "PNG"
-    when " 	image/vnd.wap.wbmp"
+    when "image/webp", "image/x-webp"
+      out[2] = "WEBP"
+      out['mime'] = "image/webp"
+    when "image/vnd.wap.wbmp"
       out[2] = "WBMP"
     when "image/x-xpixmap"
       out[2] = "XPM"
     end
     out[3] = "height=\"#{height}\" width=\"#{width}\""
-    out['mime'] = image.mime_type
     
     # This needs work to cover more situations
     # I can't see how to just list the number of channels with ImageMagick / mini_magick
-    case image["%[channels]"].downcase
+    case image["%[channels]"].downcase.split.first
     when 'cmyk'
       out['channels'] = 4
     when 'rgb', 'rgba', 'srgb', 'srgba'  # Mac OS X : sRGB

data/lib/core/rmagick.rb

@@ -1,3 +1,4 @@
+# coding: ASCII-8BIT
 # The MIT License
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -55,6 +56,7 @@ module Rbpdf
     
     width = image.columns
     height = image.rows
+    out['mime'] = image.mime_type
     out[0] = width
     out[1] = height
     
@@ -67,13 +69,15 @@ module Rbpdf
       out[2] = "JPEG"
     when "image/png"
       out[2] = "PNG"
-    when " 	image/vnd.wap.wbmp"
+    when "image/webp", "image/x-webp"
+      out[2] = "WEBP"
+      out['mime'] = "image/webp"
+    when "image/vnd.wap.wbmp"
       out[2] = "WBMP"
     when "image/x-xpixmap"
       out[2] = "XPM"
     end
     out[3] = "height=\"#{height}\" width=\"#{width}\""
-    out['mime'] = image.mime_type
     
     # This needs work to cover more situations
     # I can't see how to just list the number of channels with ImageMagick / rmagick

data/lib/rbpdf/version.rb

@@ -3,5 +3,5 @@
 # http://www.opensource.org/licenses/MIT
 
 module Rbpdf
-  VERSION = "1.21.0"
+  VERSION = "1.21.1"
 end

data/lib/rbpdf.rb

@@ -89,7 +89,7 @@ require 'net/http'
 #
 
 
-PDF_PRODUCER = 'RBPDF 5.2.000'
+PDF_PRODUCER = "RBPDF #{Rbpdf::VERSION}"
 
 # == This is a Ruby class for generating PDF files on-the-fly without requiring external extensions.
 # * This class is a Ruby port of the TCPDF class by Nicola Asuni (http://www.tcpdf.org).
@@ -4790,7 +4790,7 @@ class RBPDF
   # * explicit width and height (expressed in user unit)
   # * one explicit dimension, the other being calculated automatically in order to keep the original proportions
   # * no explicit dimension, in which case the image is put at 72 dpi
-  # Supported formats are PNG images whitout RMagick/MiniMagick library and JPEG and GIF images supported by RMagick/MiniMagick.
+  # Supported formats are PNG images whitout RMagick/MiniMagick library and JPEG and GIF and WebP images supported by RMagick/MiniMagick.
   # For JPEG, all flavors are allowed:
   # * gray scales
   # * true colors (24 bits)
@@ -4808,7 +4808,7 @@ class RBPDF
   # [@param float :y] Ordinate of the upper-left corner.
   # [@param float :w] Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
   # [@param float :h] Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-  # [@param string :type] Image format. Possible values are (case insensitive): JPG, JPEG, PNG. If not specified, the type is inferred from the file extension.
+  # [@param string :type] Image format. Possible values are (case insensitive): JPG, JPEG, PNG, GIF, WebP. If not specified, the type is inferred from the file extension.
   # [@param mixed :link] URL or identifier returned by AddLink().
   # [@param string :align]
   #   Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:
@@ -4974,12 +4974,19 @@ class RBPDF
 
       info = false
       if !resize
-        if (type == 'jpeg')
+        case type
+        when 'jpeg'
           info=parsejpeg(file)
-        elsif (type == 'png')
-          info=parsepng(file);
-        elsif (type == 'gif')
-          tmpFile = imageToPNG(file)
+        when 'png'
+          info=parsepng(file)
+        when 'webp'
+          tmpFile = imageToPNG(file, false)
+          if tmpFile != false
+            info=parsepng(tmpFile.path)
+            tmpFile.close(true)
+          end
+        when 'gif'
+          tmpFile = imageToPNG(file, false)
           if tmpFile != false
             info=parsepng(tmpFile.path)
             tmpFile.close(true)
@@ -4992,6 +4999,7 @@ class RBPDF
           end
           info=send(mtd, file);
         end
+
         if info == 'pngalpha' and ismask == false and (Object.const_defined?(:MiniMagick) or Object.const_defined?(:Magick))
           info = ImagePngAlpha(file, x, y, w, h, 'PNG', link, align, resize, dpi, palign)
           if false != info
@@ -5156,29 +5164,38 @@ class RBPDF
   end
   protected :parsejpeg
 
-  def imageToPNG(file)
+  def imageToPNG(file, delete_alpha=true)
     if Object.const_defined?(:MiniMagick)
       # MiniMagick library
 
       img = MiniMagick::Image.open(file)
-      img.format 'png' # convert to PNG from gif
-      if ['rgba', 'srgba', 'graya'].include?(img["%[channels]"].downcase)
-        img.combine_options do |mogrify|
-            mogrify.alpha 'off'
-        end
-        if ['rgba', 'srgba', 'graya'].include?(img["%[channels]"].downcase)
-          return false
+      img.format 'png'
+      if delete_alpha
+        if ['rgba', 'srgba', 'graya'].include?(img["%[channels]"].downcase.split.first)
+          img.combine_options do |mogrify|
+              mogrify.alpha 'off'
+          end
+          if ['rgba', 'srgba', 'graya'].include?(img["%[channels]"].downcase.split.first)
+            return false
+          end
         end
       end
     elsif Object.const_defined?(:Magick)
       # RMagick library
 
       img = Magick::ImageList.new(file)
-      img.format = 'PNG'       # convert to PNG from gif
-      if img.alpha?
-        img.alpha Magick::DeactivateAlphaChannel   # PNG alpha channel delete
+      img.format = 'png'
+      if delete_alpha
         if img.alpha?
-          return false
+          # PNG alpha channel delete
+          if Magick.const_defined?(:OffAlphaChannel) # RMagick 5.2.0 and later
+            img.alpha Magick::OffAlphaChannel
+          else # RMagick 5.1.0 and before for ImageMagick 6.x
+            img.alpha Magick::DeactivateAlphaChannel
+          end
+          if img.alpha?
+            return false
+          end
         end
       end
     else
@@ -5199,45 +5216,45 @@ class RBPDF
   # [@access protected]
   #
   def parsepng(file)
-    f=open(file,'rb');
-    #Check signature
-    if (f.read(8)!=137.chr + 'PNG' + 13.chr + 10.chr + 26.chr + 10.chr)
-      Error('Not a PNG file: ' + file);
-    end
-    #Read header chunk
-    f.read(4);
-    if (f.read(4)!='IHDR')
-      Error('Incorrect PNG file: ' + file);
-    end
-    w=freadint(f);
-    h=freadint(f);
-    bpc=f.read(1).unpack('C')[0]
-
-    ct=f.read(1).unpack('C')[0]
-    if (ct==0)
-      colspace='DeviceGray';
-    elsif (ct==2)
-      colspace='DeviceRGB';
-    elsif (ct==3)
-      colspace='Indexed';
+    f = open(file,'rb')
+    # Check signature
+    if f.read(8) != 137.chr + 'PNG' + 13.chr + 10.chr + 26.chr + 10.chr
+      Error('Not a PNG file: ' + file)
+    end
+    # Read header chunk
+    f.read(4)
+    if f.read(4) != 'IHDR'
+      Error('Incorrect PNG file: ' + file)
+    end
+    w = freadint(f)
+    h = freadint(f)
+    bpc = f.read(1).unpack('C')[0]
+    ct = f.read(1).unpack('C')[0]
+    case ct
+    when 0
+      colspace = 'DeviceGray'
+    when 2
+      colspace = 'DeviceRGB'
+    when 3
+      colspace = 'Indexed'
     else
       if Object.const_defined?(:MiniMagick) or Object.const_defined?(:Magick)
         # alpha channel
         return 'pngalpha'
       else
-        Error('No RMagick/MiniMagick : Alpha channel not supported: ' + file);
+        Error('No RMagick/MiniMagick : Alpha channel not supported: ' + file)
       end
     end
-    if (f.read(1).unpack('C')[0] != 0)
+    if f.read(1).unpack('C')[0] != 0
       # Error('Unknown compression method: ' + file)
       return false
     end
-    if (f.read(1).unpack('C')[0]!=0)
+    if f.read(1).unpack('C')[0] != 0
       # Error('Unknown filter method: ' + file)
       return false
     end
 
-    if (bpc>8)
+    if bpc > 8
       if Object.const_defined?(:MiniMagick) or Object.const_defined?(:Magick)
         return false
       else
@@ -5245,48 +5262,50 @@ class RBPDF
       end
     end
 
-    if (f.read(1).unpack('C')[0]!=0)
+    if f.read(1).unpack('C')[0] != 0
       # Error('Interlacing not supported: ' + file)
       return false
     end
-    f.read(4);
-    parms='/DecodeParms <</Predictor 15 /Colors ' + (ct==2 ? 3 : 1).to_s + ' /BitsPerComponent ' + bpc.to_s + ' /Columns ' + w.to_s + '>>';
-    #Scan chunks looking for palette, transparency and image data
-    pal='';
-    trns='';
-    data='';
+    f.read(4)
+    parms='/DecodeParms <</Predictor 15 /Colors ' + (ct == 2 ? 3 : 1).to_s + ' /BitsPerComponent ' + bpc.to_s + ' /Columns ' + w.to_s + '>>'
+    # Scan chunks looking for palette, transparency and image data
+    pal = ''
+    trns = ''
+    data = ''
     begin
-      n=freadint(f);
-      type=f.read(4);
-      if (type=='PLTE')
-        #Read palette
-        pal=f.read( n);
-        f.read(4);
-      elsif (type=='tRNS')
-        #Read transparency info
-        t=f.read( n);
-        if (ct==0)
-          trns = t[1].unpack('C')[0]
-        elsif (ct==2)
-          trns = t[[1].unpack('C')[0], t[3].unpack('C')[0], t[5].unpack('C')[0]]
-        else
-          pos=t.include?(0.chr);
-          if (pos!=false)
-            trns = ['1']
-          end
-        end
-        f.read(4);
-      elsif (type=='IDAT')
-        #Read image data block
-        data<<f.read( n);
-        f.read(4);
-      elsif (type=='IEND')
-        break;
+      n = freadint(f)
+      type = f.read(4)
+      case type
+      when 'PLTE'
+        # Read palette
+        pal = f.read(n)
+        f.read(4)
+      when 'tRNS'
+        # Read transparency info
+        t = f.read(n)
+        case ct
+        when 0 # DeviceGray
+          trns = [t[1].unpack('C')[0]]
+        when 2 # DeviceRGB
+          trns = [t[1].unpack('C')[0], t[3].unpack('C')[0], t[5].unpack('C')[0]]
+        else # Indexed
+          trns = []
+          n.times do |i|
+            trns << t[i].unpack('C')[0]
+          end
+        end
+        f.read(4)
+      when 'IDAT'
+        # Read image data block
+        data << f.read(n)
+        f.read(4)
+      when 'IEND'
+        break
       else
-        f.read( n+4);
+        f.read(n + 4)
       end
     end while(n)
-    if (colspace=='Indexed' and pal.empty?)
+    if (colspace == 'Indexed' and pal.empty?)
       # Error('Missing palette in ' + file)
       return false
     end
@@ -5302,7 +5321,7 @@ class RBPDF
 
       img = MiniMagick::Image.open(file)
       img.format('png')
-      if ['rgba', 'srgba', 'graya'].include?(img["%[channels]"].downcase)
+      if ['rgba', 'srgba', 'graya'].include?(img["%[channels]"].downcase.split.first)
         img.combine_options do |mogrify|
           mogrify.channel 'matte'
           mogrify.separate '+matte'
@@ -5314,6 +5333,7 @@ class RBPDF
       # RMagick library
 
       img = Magick::ImageList.new(file)
+      img.format = 'png'
       if img.alpha?
         img.alpha Magick::ExtractAlphaChannel   # PNG alpha channel Mask
       else
@@ -5333,13 +5353,13 @@ class RBPDF
   protected :image_alpha_mask
 
   #
-  # Extract info from a PNG image with alpha channel using the GD library.
+  # Extract info from a PNG image with alpha channel using the RMagick/MiniMagick library.
   # [@param string :file] Name of the file containing the image.
   # [@param float :x] Abscissa of the upper-left corner.
   # [@param float :y] Ordinate of the upper-left corner.
   # [@param float :w] Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
   # [@param float :h] Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-  # [@param string :type] Image format. Possible values are (case insensitive): JPEG and PNG (whitout GD library) and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;. If not specified, the type is inferred from the file extension.
+  # [@param string :type] Possible values are (case insensitive): JPEG and PNG (without RMagick/MiniMagick library) and PNG(with alpha channel) and JPEG and GIF and WebP supported by RMagick/MiniMagick. If not specified, the type is inferred from the file extension.
   # [@param mixed :link] URL or identifier returned by AddLink().
   # [@param string :align]
   #   Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:
@@ -5347,7 +5367,7 @@ class RBPDF
   #   * M: middle-right for LTR or middle-left for RTL
   #   * B: bottom-right for LTR or bottom-left for RTL
   #   * N: next line
-  # [@param boolean :resize] If true resize (reduce) the image to fit :w and :h (requires GD library).
+  # [@param boolean :resize] If true resize (reduce) the image to fit :w and :h (requires RMagick/MiniMagick library).
   # [@param int :dpi] dot-per-inch resolution used on resize
   # [@param string :palign]
   #   Allows to center or align the image on the current line. Possible values are:
@@ -7446,7 +7466,7 @@ protected
         trns='';
         count_info = info['trns'].length
         count_info.times do |i|
-          trns << info['trns'][i] + ' ' + info['trns'][i] + ' ';
+          trns << info['trns'][i].to_s + ' ' + info['trns'][i].to_s + ' '
         end
         out << ' /Mask [' + trns + ']'
       end
@@ -11102,7 +11122,7 @@ protected
     operator = ''
     lasttag = ''
     attrib = ''
-    while selector_offset = selector.index(/([\>\+\~\s]{1})([a-zA-Z0-9\*]+)([^\>\+\~\s]*)/mi, selector_offset)
+    while selector_offset = selector.index(/([\>\+\~\s]{1})([a-zA-Z0-9\*]+)([^\>\+\s]*)/mi, selector_offset)
       offset = selector_offset
       selector_offset += $&.length
       operator = $1
@@ -11122,18 +11142,19 @@ protected
           when '['  # attribute
             attrmatch = attrib.scan(/\[([a-zA-Z0-9]*)[\s]*([\~\^\$\*\|\=]*)[\s]*["]?([^"\]]*)["]?\]/i)
             if !attrmatch.empty?
-              att = attrmatch[0].downcase
-              val = attrmatch[2]
+              att = attrmatch[0][0].downcase
+              val = attrmatch[0][2]
+
               if dom[key]['attribute'][att]
-                case attrmatch[1]
+                case attrmatch[0][1]
                 when '='
                   valid = true  if dom[key]['attribute'][att] == val
                 when '~='
                   valid = true  if dom[key]['attribute'][att].split(' ').include?(val)
                 when '^='
-                  valid = true  if val == substr(dom[key]['attribute'][att], 0, val.length)
+                  valid = true  if val == dom[key]['attribute'][att][0, val.length]
                 when '$='
-                  valid = true  if val == substr(dom[key]['attribute'][att], -val.length)
+                  valid = true  if val == dom[key]['attribute'][att][-val.length..-1]
                 when '*='
                   valid = true  if dom[key]['attribute'][att].index(val) != nil
                 when '|='

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbpdf
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.21.1
 platform: ruby
 authors:
 - NAITOH Jun
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities