rbpdf 1.19.8 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66699792092231cda5c7ad0b1cfdd9f446425ae4
-  data.tar.gz: e53cb1abb783881253c801aab591dcf84ad74442
+  metadata.gz: 3b80cab6ce3fb2d7d57010d42f7b82963ad0c467
+  data.tar.gz: 26efc4e45882f2a043d848e730f2f754209c7ae2
 SHA512:
-  metadata.gz: 7a90e8b5bb735b8bff2f390537965013ba33b57c7a086749ed00383b1715437c6ee78b9833a783ee56c3f9f9d58c347a8193ea8f6f403eed6b847e8e2fc395c0
-  data.tar.gz: 46eb59da195f4f177b6ec7f3a33158543ae92d1e1f7e1d99e17d7c668e705ae8a93acaf174d4c3fb42b858267dfde6961dd30c7bd21afc25b2ae8866ef087dce
+  metadata.gz: 43c758cd4cb263758ee0177d8fe1548d4afeb5acf8956702f5c87d4b1bb041e142342150c86050713205c06be2e8754fd68857a90256dc621c26db14456382a4
+  data.tar.gz: 59cca68008ee2c668f8fe04ed905bcb0cd22e95dd08439ca5ba26e2e45f1020aca89e5632533e882525b01b1521cf0679b3e839939129290d44e5872bfed058f

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.20.0 2019-08-11
+       - Added support for MiniMagick.
+       - Fix RMagick 4.0 compatible.
+       - freeze unicode tables. (by pavel)
+
 1.19.8 2019-01-30
        - Fixed a bug that escaping parentheses when <div style = "text-align: justify;"> is specified in write_html method.
 

data/README.md

@@ -15,8 +15,8 @@ A template plugin allowing the inclusion of ERB-enabled RBPDF template files.
 * HTML tag support.
 * CSS minimum support.
 * Image
- - 8bit PNG image support without RMagick library.
- - PNG(with alpha channel)/JPEG/GIF image support. (use RMagick library)
+ - 8bit PNG image support without MiniMagick/RMagick library.
+ - PNG(with alpha channel)/JPEG/GIF image support. (use MiniMagick or RMagick library)
 
 
 ##
@@ -29,6 +29,10 @@ RBPDF is distributed via RubyGems, and can be installed the usual way that you i
 
 If you are using image file, it is recommended you install:
 ```
+gem install mini_magick
+```
+or
+```
 gem install rmagick
 ```
 

data/lib/core/mini_magick.rb

@@ -0,0 +1,101 @@
+# The MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# This implements native php methods used by tcpdf, which have had to be
+# reimplemented within Ruby.
+
+module Rbpdf
+
+  def getimagesize(filename)
+    return nil unless File.exist?(filename)
+
+    out = Hash.new
+    type = File::extname(filename)
+    if type == '.png'
+      open(filename,'rb') do |f|
+        # Check signature
+        return false if (f.read(8)!=137.chr + 'PNG' + 13.chr + 10.chr + 26.chr + 10.chr)
+        # Read header chunk
+        f.read(4)
+        return false if (f.read(4)!='IHDR')
+        out[0] = freadint(f)
+        out[1] = freadint(f)
+        out[2] = 'PNG'
+        out[3] = "height=\"#{out[1]}\" width=\"#{out[0]}\""
+        out['mime'] = 'image/png'
+      end
+
+      return out
+    end
+
+    unless Object.const_defined?(:MiniMagick)
+      Error('No Mini Magick: Non-PNG file is not supported.: ' + filename);
+      return false
+    end
+
+    image = MiniMagick::Image.open(filename)
+    
+    width = image.width
+    height = image.height
+
+    out[0] = width
+    out[1] = height
+    
+    # These are actually meant to return integer values But I couldn't seem to find anything saying what those values are.
+    # So for now they return strings. The only place that uses this at the moment is the parsejpeg method, so I've changed that too.
+    case image.mime_type
+    when "image/gif"
+      out[2] = "GIF"
+    when "image/jpeg"
+      out[2] = "JPEG"
+    when "image/png"
+      out[2] = "PNG"
+    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
+    when 'cmyk'
+      out['channels'] = 4
+    when 'rgb', 'rgba', 'srgb', 'srgba'  # Mac OS X : sRGB
+      out['channels'] = 3
+      if image.colorspace.downcase == 'pseudoclassgray'  # PseudoClassGray
+        out['channels'] = 0
+      else
+        out['channels'] = 3
+      end
+    when 'gray', 'graya'
+        out['channels'] = 0
+    else
+        out['channels'] = 0
+    end
+
+    out['bits'] = image["%[depth]"].to_i
+    
+    out
+  end
+  
+end

data/lib/core/rmagick.rb

@@ -53,8 +53,10 @@ module Rbpdf
 
     image = Magick::ImageList.new(filename)
     
-    out[0] = image.columns
-    out[1] = image.rows
+    width = image.columns
+    height = image.rows
+    out[0] = width
+    out[1] = height
     
     # These are actually meant to return integer values But I couldn't seem to find anything saying what those values are.
     # So for now they return strings. The only place that uses this at the moment is the parsejpeg method, so I've changed that too.
@@ -70,7 +72,7 @@ module Rbpdf
     when "image/x-xpixmap"
       out[2] = "XPM"
     end
-    out[3] = "height=\"#{image.rows}\" width=\"#{image.columns}\""
+    out[3] = "height=\"#{height}\" width=\"#{width}\""
     out['mime'] = image.mime_type
     
     # This needs work to cover more situations

data/lib/rbpdf.rb

@@ -53,21 +53,29 @@ require 'rbpdf-font'
 require 'erb'
 
 begin
-  # RMagick 2.14.0
-  # [DEPRECATION] requiring "RMagick" is deprecated. Use "rmagick" instead
-  # https://github.com/gemhome/rmagick/pull/141
-  require 'rmagick' unless Object.const_defined?(:Magick)
+  require 'mini_magick' unless Object.const_defined?(:MiniMagick)
+  require 'core/mini_magick'
 rescue LoadError
-  # RMagick is not available
+  # MiniMagick is not available
 end
 
-begin
-  require 'RMagick' unless Object.const_defined?(:Magick)
-rescue LoadError
-  # RMagick is not available
-end
+unless Object.const_defined?(:MiniMagick)
+  begin
+    # RMagick 2.14.0
+    # [DEPRECATION] requiring "RMagick" is deprecated. Use "rmagick" instead
+    # https://github.com/gemhome/rmagick/pull/141
+    require 'rmagick' unless Object.const_defined?(:Magick)
+  rescue LoadError
+    # RMagick is not available
+  end
 
-require 'core/rmagick'
+  begin
+    require 'RMagick' unless Object.const_defined?(:Magick)
+  rescue LoadError
+    # RMagick is not available
+  end
+  require 'core/rmagick'
+end
 
 # Needed to run the test suite outside of a Rails environment.
 require 'rubygems' if RUBY_VERSION < '1.9' # Ruby 1.8.7
@@ -4782,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 library and JPEG and GIF images supported by RMagick.
+  # Supported formats are PNG images whitout RMagick/MiniMagick library and JPEG and GIF images supported by RMagick/MiniMagick.
   # For JPEG, all flavors are allowed:
   # * gray scales
   # * true colors (24 bits)
@@ -4808,7 +4816,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 mixed :resize] If true resize (reduce) the image to fit :w and :h (requires RMagick library); if false do not resize; if 2 force resize in all cases (upscaling and downscaling).
+  # [@param mixed :resize] If true resize (reduce) the image to fit :w and :h (requires RMagick/MiniMagick library); if false do not resize; if 2 force resize in all cases (upscaling and downscaling).
   # [@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:
@@ -4984,7 +4992,7 @@ class RBPDF
           end
           info=send(mtd, file);
         end
-        if info == 'pngalpha' and ismask == false and Object.const_defined?(:Magick)
+        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
             return true
@@ -4992,7 +5000,22 @@ class RBPDF
         end
       end
       if !info
-        if Object.const_defined?(:Magick)
+        if Object.const_defined?(:MiniMagick)
+          # MiniMagick library
+
+          ### T.B.D ### TCPDF 5.0.000 ###
+          # if type == 'SVG'
+          # else
+            img = MiniMagick::Image.open(file)
+          # end
+          if resize
+            img.resize("#{neww}x#{newh}")
+          end
+          img.format 'jpeg'
+          tmpname = Tempfile.new(File::basename(file), @@k_path_cache)
+          tmpname.binmode
+          tmpname.print img.to_blob
+        elsif Object.const_defined?(:Magick)
           # RMagick library
 
           ### T.B.D ### TCPDF 5.0.000 ###
@@ -5008,13 +5031,12 @@ class RBPDF
           tmpname.binmode
           jpeg_quality = @jpeg_quality
           tmpname.print img.to_blob { self.quality = jpeg_quality }
-          tmpname.fsync
-
-          info = parsejpeg(tmpname.path)
-          tmpname.close(true)
         else
           return false
         end
+        tmpname.fsync
+        info = parsejpeg(tmpname.path)
+        tmpname.close(true)
       end
 
       if info == false
@@ -5135,13 +5157,32 @@ class RBPDF
   protected :parsejpeg
 
   def imageToPNG(file)
-    img = Magick::ImageList.new(file)
-    img.format = 'PNG'       # convert to PNG from gif
-    if img.alpha?
-      img.alpha = Magick::DeactivateAlphaChannel   # PNG alpha channel delete
+    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
+        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?
-        return false
+        img.alpha Magick::DeactivateAlphaChannel   # PNG alpha channel delete
+        if img.alpha?
+          return false
+        end
       end
+    else
+      return false
     end
 
     #use a temporary file....
@@ -5180,11 +5221,11 @@ class RBPDF
     elsif (ct==3)
       colspace='Indexed';
     else
-      if Object.const_defined?(:Magick)
+      if Object.const_defined?(:MiniMagick) or Object.const_defined?(:Magick)
         # alpha channel
         return 'pngalpha'
       else
-        Error('No RMagick: Alpha channel not supported: ' + file);
+        Error('No RMagick/MiniMagick : Alpha channel not supported: ' + file);
       end
     end
     if (f.read(1).unpack('C')[0] != 0)
@@ -5197,10 +5238,10 @@ class RBPDF
     end
 
     if (bpc>8)
-      if Object.const_defined?(:Magick)
+      if Object.const_defined?(:MiniMagick) or Object.const_defined?(:Magick)
         return false
       else
-        Error('No RMagick: 16-bit depth not supported: ' + file)
+        Error('No RMagick/MiniMagick : 16-bit depth not supported: ' + file)
       end
     end
 
@@ -5256,9 +5297,28 @@ class RBPDF
   protected :parsepng
 
   def image_alpha_mask(file)
-    img = Magick::ImageList.new(file)
-    if img.alpha?
-      img.alpha = Magick::ExtractAlphaChannel   # PNG alpha channel Mask
+    if Object.const_defined?(:MiniMagick)
+      # MiniMagick library
+
+      img = MiniMagick::Image.open(file)
+      img.format('png')
+      if ['rgba', 'srgba', 'graya'].include?(img["%[channels]"].downcase)
+        img.combine_options do |mogrify|
+          mogrify.channel 'matte'
+          mogrify.separate '+matte'
+        end
+      else
+        return false
+      end
+    elsif  Object.const_defined?(:Magick)
+      # RMagick library
+
+      img = Magick::ImageList.new(file)
+      if img.alpha?
+        img.alpha Magick::ExtractAlphaChannel   # PNG alpha channel Mask
+      else
+        return false
+      end
     else
       return false
     end

data/lib/rbpdf/version.rb

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

data/lib/unicode_data.rb

@@ -1,4 +1,5 @@
 # coding: ASCII-8BIT
+# frozen_string_literal: true
 #============================================================+
 # File name   : unicode_data.rb
 # Begin       : 2008-01-01

data/rbpdf.gemspec

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (c) 2011-2017 NAITOH Jun
+# Copyright (c) 2011-2019 NAITOH Jun
 # Released under the MIT license
 # http://www.opensource.org/licenses/MIT
 
@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.glob("lib/rbpdf/version.rb") +
                        Dir.glob("lib/*.rb") +
                        Dir.glob("lib/core/rmagick.rb") +
+                       Dir.glob("lib/core/mini_magick.rb") +
                        Dir.glob("test/*") +
                        ["Rakefile", "rbpdf.gemspec", "Gemfile",
                         "CHANGELOG", "test_unicode.rbpdf", "README.md", "LICENSE.TXT", "MIT-LICENSE",

data/test/rbpdf_cell_test.rb

@@ -221,11 +221,11 @@ class RbpdfTest < Test::Unit::TestCase
     pdf = RBPDF.new('P', 'mm', 'A4', true, "UTF-8", true)
 
     str = 'test'.force_encoding('UTF-8')
-    txt = pdf.removeSHY(str)
+    pdf.removeSHY(str)
     assert_equal 'UTF-8', str.encoding.to_s
 
     str = 'test'.force_encoding('ASCII-8BIT')
-    txt = pdf.removeSHY(str)
+    pdf.removeSHY(str)
     assert_equal 'ASCII-8BIT', str.encoding.to_s
   end
 end

data/test/rbpdf_html_test.rb

@@ -14,13 +14,13 @@ class RbpdfHtmlTest < Test::Unit::TestCase
 
     # get text count and x_pos from pdf page
     def get_html_text_position_x(page, regrep_text, x_pos_exp=nil)
-      count_line, count_text, x_pos, y_pos = get_html_text_position(page, regrep_text, x_pos_exp)
+      count_line, count_text, x_pos, _y_pos = get_html_text_position(page, regrep_text, x_pos_exp)
       return count_line, count_text, x_pos
     end
 
     # get text count and y_pos from pdf page
     def get_html_text_position_y(page, regrep_text)
-      count_line, count_text, x_pos, y_pos = get_html_text_position(page, regrep_text)
+      count_line, count_text, _x_pos, y_pos = get_html_text_position(page, regrep_text)
       return count_line, count_text, y_pos
     end
 
@@ -143,7 +143,7 @@ class RbpdfHtmlTest < Test::Unit::TestCase
     page = pdf.get_page
     assert_equal 1, page
 
-    count_line, count_text, xpos = pdf.get_html_text_position_x(1, /ABCD/) # Header
+    _count_line, count_text, _xpos = pdf.get_html_text_position_x(1, /ABCD/) # Header
     assert_equal 1, count_text
   end
 

data/test/rbpdf_http_test.rb

@@ -21,8 +21,6 @@ class RbpdfHttpTest < Test::Unit::TestCase
   end
 
   test "Image get image file test" do
-    utf8_japanese_aiueo_str  = "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a"
-
     images = [
       # file_name,                    error_message
       ['logo_rbpdf_8bit.png',         nil],
@@ -32,6 +30,7 @@ class RbpdfHttpTest < Test::Unit::TestCase
     ]
     # no use
     #if RUBY_VERSION >= '2.0' # Ruby 1.9.2/1.9.3
+    #  utf8_japanese_aiueo_str  = "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a"
     #  images << 'logo_rbpdf_8bit_' + utf8_japanese_aiueo_str + '.png'
     #end
 

data/test/rbpdf_image_rmagick_test.rb

@@ -17,7 +17,7 @@ class RbpdfTest < Test::Unit::TestCase
 
   data(images)
   test "image getimagesize test" do |data|
-    if data[:use_magick] and !Object.const_defined?(:Magick)
+    if data[:use_magick] and (!Object.const_defined?(:Magick) and !Object.const_defined?(:MiniMagick))
       return
     end
 
@@ -68,7 +68,7 @@ class RbpdfTest < Test::Unit::TestCase
     img.format = 'PNG'       # convert to PNG from gif
     assert_equal true,   img.alpha?
 
-    img.alpha = Magick::DeactivateAlphaChannel   # PNG alpha channel delete
+    img.alpha Magick::DeactivateAlphaChannel   # PNG alpha channel delete
     assert_equal false,   img.alpha?
   end
 

data/test/test.rb

@@ -0,0 +1,22 @@
+require 'mini_magick'
+
+#  => {"red"=>"8-bit", "green"=>"8-bit", "blue"=>"8-bit", "alpha"=>"8-bit"} 
+# `mogrify -alpha on -red off -green off -blue off /tmp/mini_magick20190806-29273-5pt5pu.png` 
+# convert drawn.png -channel matte -separate +matte matte.png
+#img = MiniMagick::Image.open('input.jpg')
+img = MiniMagick::Image.open('png_test_alpha.png')
+#img.format('png')
+img.combine_options do |mogrify|
+#    mogrify.alpha 'on'
+#    mogrify.red 'off'
+#    mogrify.green 'off'
+#    mogrify.blue 'off'
+    mogrify.channel 'matte'
+    mogrify.separate '+matte'
+#    convert.channel 'matte'
+#    convert.separate '+matte'
+#    mogrify.alpha 'on'
+#    mogrify.channel 'a'
+#    mogrify.evaluate 'set', '25%'
+end
+img.write('output.png')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbpdf
 version: !ruby/object:Gem::Version
-  version: 1.19.8
+  version: 1.20.0
 platform: ruby
 authors:
 - NAITOH Jun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -94,6 +94,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- lib/core/mini_magick.rb
 - lib/core/rmagick.rb
 - lib/htmlcolors.rb
 - lib/rbpdf.rb
@@ -103,6 +104,8 @@ files:
 - rbpdf.gemspec
 - test/err_font1.rb
 - test/err_font2.rb
+- test/input.jpg
+- 'test/json:'
 - test/logo_rbpdf_8bit .png
 - test/logo_rbpdf_8bit+ .png
 - test/logo_rbpdf_8bit.gif
@@ -113,6 +116,7 @@ files:
 - test/logo_rbpdf_mono_gray.png
 - test/logo_rbpdf_mono_rgb.jpg
 - test/logo_rbpdf_mono_rgb.png
+- test/output.png
 - test/png_test_alpha.png
 - test/png_test_msk_alpha.png
 - test/png_test_non_alpha.png
@@ -139,6 +143,7 @@ files:
 - test/rbpdf_transaction_test.rb
 - test/rbpdf_viewerpreferences_test.rb
 - test/rbpdf_write_test.rb
+- test/test.rb
 - test/test_helper.rb
 - test_unicode.rbpdf
 - utf8test.txt
@@ -169,13 +174,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: RBPDF via TCPDF.
 test_files:
 - test/err_font1.rb
 - test/err_font2.rb
+- test/input.jpg
+- 'test/json:'
 - test/logo_rbpdf_8bit .png
 - test/logo_rbpdf_8bit+ .png
 - test/logo_rbpdf_8bit.gif
@@ -186,6 +193,7 @@ test_files:
 - test/logo_rbpdf_mono_gray.png
 - test/logo_rbpdf_mono_rgb.jpg
 - test/logo_rbpdf_mono_rgb.png
+- test/output.png
 - test/png_test_alpha.png
 - test/png_test_msk_alpha.png
 - test/png_test_non_alpha.png
@@ -212,5 +220,5 @@ test_files:
 - test/rbpdf_transaction_test.rb
 - test/rbpdf_viewerpreferences_test.rb
 - test/rbpdf_write_test.rb
+- test/test.rb
 - test/test_helper.rb
-has_rdoc: