rbpdf 1.19.3 → 1.19.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe56fed150bb05fc1e613f87058b5403787068cb
-  data.tar.gz: 7e0de6186f06514075d03c9499dc2ff72a11c52a
+  metadata.gz: 9ad5083c310d25cd904c1826bd2672b7bbb31a93
+  data.tar.gz: dcb1537363d38928044d3f55168381409c5f7b1b
 SHA512:
-  metadata.gz: b526e43f73722bcf9cd6d4b76fb0f800ebf58462ed0331181c05e80ad062d733b9472c45e41b73a27e9a6c64ac6ce6f4ed691f33131ecac500b7c798bc735532
-  data.tar.gz: a6d704fd9fc1c53950933c64bd37021161d2ee77affa6a41effcb38786e3226d42aa7fc080e7b671f05343e8e8569dd839dac94ac067197df694f842a40ae003
+  metadata.gz: 82119b8767536543d6e2cdd625bcdb48b0a7c75bc4ea92a3f2154f74731527eab42b7a1d605ee31f31b12a9bc3034599d4b5b1eeec2ce50036ea98cddeedea4d
+  data.tar.gz: 9c2428dbe401fb1425ee29096b09e50df64231ff9dcf8976c9bd0303dbd681bb95e8d3aecca5265ba73201647c5e39f92de4d64b83d9f1ee64570ce235b14a51

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.19.4 2018-06-16
+       - Ruby 2.5 supported.
+       - Rails 5.2 supported.
+       - Fixed exception handling of ImagePngAlpha function.
+
 1.19.3 2017-09-10
        - Rails 5.1 supported.
        - nil link bug fixed. (by jkraemer)

data/lib/core/rmagick.rb

@@ -46,7 +46,10 @@ module Rbpdf
       return out
     end
 
-    return false unless Object.const_defined?(:Magick)
+    unless Object.const_defined?(:Magick)
+      Error('No RMagick: Non-PNG file is not supported.: ' + filename);
+      return false
+    end
 
     image = Magick::ImageList.new(filename)
     

data/lib/rbpdf.rb

@@ -5294,6 +5294,11 @@ class RBPDF
     if tempfile_plain == false
       return false
     end
+    info=parsepng(tempfile_plain.path)
+    if info['cs'] != 'DeviceRGB'
+      tempfile_plain.delete
+      return false
+    end
 
     tempfile_alpha = image_alpha_mask(file)
 
@@ -7168,7 +7173,6 @@ protected
     out << ' /BaseFont /' + fontname + ''
     out << ' /Name /F' + font['i'].to_s
     out << ' /Encoding /' + font['enc']
-    out << ' /ToUnicode /Identity-H'
     out << ' /DescendantFonts [' + (@n + 1).to_s + ' 0 R]'
     out << ' >>'
     out << ' endobj'

data/lib/rbpdf/version.rb

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

data/test/rbpdf_content_test.rb

@@ -110,7 +110,7 @@ class RbpdfPageTest < Test::Unit::TestCase
     assert_equal '370.62 391.58 340.88 408.76 308.08 414.54 c', content[6]  # 2/9 circle
     assert_equal '275.27 420.32 241.45 414.36 212.60 397.70 c', content[7]  # 3/9 circle
     assert_equal '183.75 381.05 161.67 354.74 150.28 323.44 c', content[8]  # 4/9 circle
-    assert_equal '138.89 292.13 138.89 257.79 150.28 226.49 c', content[9]  # 5/9 circle
+    assert_match(/138.8[89] 292.13 138.8[89] 257.79 150.28 226.4[89] c/, content[9]) # 5/9 circle
     assert_equal '161.67 195.18 183.75 168.87 212.60 152.22 c', content[10] # 6/9 circle
     assert_equal '241.45 135.56 275.27 129.60 308.08 135.38 c', content[11] # 7/9 circle
     assert_equal '340.88 141.17 370.62 158.34 392.04 183.86 c', content[12] # 8/9 circle

data/test/rbpdf_image_rmagick_test.rb

@@ -5,122 +5,48 @@
 require 'test_helper'
 
 class RbpdfTest < Test::Unit::TestCase
-  test "image getimagesize PNG test" do
-    pdf = RBPDF.new
-    pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.png')
-
-    info = pdf.getimagesize(img_file)
-    assert_equal 240,                       info[0] # width
-    assert_equal 89,                        info[1] # height
-    assert_equal 'PNG',                     info[2] # Image Type
-    assert_equal 'height="89" width="240"', info[3]
-    assert_equal 'image/png',               info['mime']
-  end
-
-  test "image getimagesize GIF test" do
-    return unless Object.const_defined?(:Magick)
-
-    pdf = RBPDF.new
-    pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.gif')
-
-    info = pdf.getimagesize(img_file)
-    assert_equal 240,                       info[0] # width
-    assert_equal 89,                        info[1] # height
-    assert_equal 'GIF',                     info[2] # Image Type
-    assert_equal 'height="89" width="240"', info[3]
-    assert_equal 'image/gif',               info['mime']
-    assert_equal 3,                         info['channels'] # RGB
-    assert_equal 8,                         info['bits']     # depth
-  end
-
-  test "image getimagesize GIF alpha test" do
-    return unless Object.const_defined?(:Magick)
-
-    pdf = RBPDF.new
-    pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit_alpha.gif')
-
-    info = pdf.getimagesize(img_file)
-    assert_equal 240,                       info[0] # width
-    assert_equal 89,                        info[1] # height
-    assert_equal 'GIF',                     info[2] # Image Type
-    assert_equal 'height="89" width="240"', info[3]
-    assert_equal 'image/gif',               info['mime']
-    assert_equal 3,                         info['channels'] # RGB
-    assert_equal 8,                         info['bits']     # depth
-  end
+  images = {
+    'PNG'                => {:file => 'logo_rbpdf_8bit.png',       :type => 'PNG',  :mime => 'image/png',  :use_magick => false},
+    'PNG monotone'       => {:file => 'logo_rbpdf_mono_rgb.png',   :type => 'PNG',  :mime => 'image/png',  :use_magick => false},
+    'GIF'                => {:file => 'logo_rbpdf_8bit.gif',       :type => 'GIF',  :mime => 'image/gif',  :use_magick => true, :channels => 3, :bits => 8},
+    'GIF alpha'          => {:file => 'logo_rbpdf_8bit_alpha.gif', :type => 'GIF',  :mime => 'image/gif',  :use_magick => true, :channels => 3, :bits => 8},
+    'JPEG RGB'           => {:file => 'logo_rbpdf_8bit.jpg',       :type => 'JPEG', :mime => 'image/jpeg', :use_magick => true, :channels => 3, :bits => 8},
+    'JPEG monotone RGB'  => {:file => 'logo_rbpdf_mono_rgb.jpg',   :type => 'JPEG', :mime => 'image/jpeg', :use_magick => true, :channels => 3, :bits => 8},
+    'JPEG monotone Gray' => {:file => 'logo_rbpdf_mono_gray.jpg',  :type => 'JPEG', :mime => 'image/jpeg', :use_magick => true, :channels => 0, :bits => 8},
+  }
 
-  test "image getimagesize JPEG RGB test" do
-    return unless Object.const_defined?(:Magick)
+  data(images)
+  test "image getimagesize test" do |data|
+    if data[:use_magick] and !Object.const_defined?(:Magick)
+      return
+    end
 
     pdf = RBPDF.new
     pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.jpg')
+    img_file = File.join(File.dirname(__FILE__), data[:file])
 
     info = pdf.getimagesize(img_file)
     assert_equal 240,                       info[0] # width
     assert_equal 89,                        info[1] # height
-    assert_equal 'JPEG',                    info[2] # Image Type
+    assert_equal data[:type],               info[2] # Image Type
     assert_equal 'height="89" width="240"', info[3]
-    assert_equal 'image/jpeg',              info['mime']
-    assert_equal 3,                         info['channels'] # RGB
-    assert_equal 8,                         info['bits']     # depth
+    assert_equal data[:mime],               info['mime']
+    assert_equal data[:channels],           info['channels'] if @channels # RGB
+    assert_equal data[:bits],               info['bits']     if @bits     # depth
   end
 
-  test "image getimagesize JPEG monotone RGB test" do
-    return unless Object.const_defined?(:Magick)
-
-    pdf = RBPDF.new
-    pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_mono_rgb.jpg')
-
-    info = pdf.getimagesize(img_file)
-    assert_equal 240,                       info[0] # width
-    assert_equal 89,                        info[1] # height
-    assert_equal 'JPEG',                    info[2] # Image Type
-    assert_equal 'height="89" width="240"', info[3]
-    assert_equal 'image/jpeg',              info['mime']
-    assert_equal 3,                         info['channels'] # RGB
-    assert_equal 8,                         info['bits']     # depth
-  end
-
-  test "image getimagesize JPEG monotone Gray test" do
-    return unless Object.const_defined?(:Magick)
-
-    pdf = RBPDF.new
-    pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_mono_gray.jpg')
-
-    info = pdf.getimagesize(img_file)
-    assert_equal 240,                       info[0] # width
-    assert_equal 89,                        info[1] # height
-    assert_equal 'JPEG',                    info[2] # Image Type
-    assert_equal 'height="89" width="240"', info[3]
-    assert_equal 'image/jpeg',              info['mime']
-    assert_equal 0,                         info['channels'] # Gray
-    assert_equal 8,                         info['bits']     # depth
-  end
-
-  test "image getimagesize PNG monotone test" do
-    pdf = RBPDF.new
-    pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_mono_rgb.png')
-
-    info = pdf.getimagesize(img_file)
-    assert_equal 240,                       info[0] # width
-    assert_equal 89,                        info[1] # height
-    assert_equal 'PNG',                     info[2] # Image Type
-    assert_equal 'height="89" width="240"', info[3]
-    assert_equal 'image/png',               info['mime']
-  end
+  images = {
+    'PNG alpha'          => {:file => 'png_test_alpha.png',        :cs => 'DeviceRGB'},
+    'GIF'                => {:file => 'logo_rbpdf_8bit.gif',       :cs => 'Indexed'},
+    'GIF alpha'          => {:file => 'logo_rbpdf_8bit_alpha.gif', :cs => 'Indexed'},
+  }
 
-  test "imageToPNG delete GIF test" do
+  data(images)
+  test "imageToPNG delete test" do |data|
     return unless Object.const_defined?(:Magick)
     pdf = RBPDF.new
     pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.gif')
+    img_file = File.join(File.dirname(__FILE__), data[:file])
 
     tempfile = pdf.send(:imageToPNG, img_file)
     assert_not_equal false,      tempfile
@@ -129,7 +55,7 @@ class RbpdfTest < Test::Unit::TestCase
 
     assert_not_equal 'pngalpha', info
     assert_equal     8,          info['bpc']
-    assert_equal     'Indexed',  info['cs']
+    assert_equal     data[:cs],  info['cs']
   end
 
   test "Magick::ImageList delete GIF alpha channel test" do
@@ -146,38 +72,6 @@ class RbpdfTest < Test::Unit::TestCase
     assert_equal false,   img.alpha?
   end
 
-  test "imageToPNG delete GIF alpha channel test" do
-    return unless Object.const_defined?(:Magick)
-    pdf = RBPDF.new
-    pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit_alpha.gif')
-
-    tempfile = pdf.send(:imageToPNG, img_file)
-    assert_not_equal false,      tempfile
-
-    info = pdf.send(:parsepng, tempfile.path)
-
-    assert_not_equal 'pngalpha', info
-    assert_equal     8,          info['bpc']
-    assert_equal     'Indexed',  info['cs']
-  end
-
-  test "imageToPNG delete PNG alpha channel test" do
-    return unless Object.const_defined?(:Magick)
-    pdf = RBPDF.new
-    pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'png_test_alpha.png')
-
-    tempfile = pdf.send(:imageToPNG, img_file)
-    assert_not_equal  false,       tempfile
-
-    info = pdf.send(:parsepng, tempfile.path)
-
-    assert_not_equal 'pngalpha',  info
-    assert_equal      8,          info['bpc']
-    assert_equal     'DeviceRGB', info['cs']
-  end
-
   test "image_alpha_mask DeviceGray test" do
     return unless Object.const_defined?(:Magick)
 
@@ -198,62 +92,45 @@ class RbpdfTest < Test::Unit::TestCase
     assert_equal 1, imgmask
   end
 
-  test "ImagePngAlpha test" do
-    return unless Object.const_defined?(:Magick)
 
-    pdf = RBPDF.new
-    pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'png_test_alpha.png')
-    info = pdf.send(:ImagePngAlpha, img_file, 10, 10, 100, '', 'PNG', 'https://rubygems.org/gems/rbpdf')
-    assert_equal true, info
-  end
+  images = {
+    'PNG alpha'          => {:file => 'png_test_alpha.png',        :info => true},
+    'PNG alpha Error'    => {:file => 'png_test_alpha.png',        :info => false, :png_alpha_error => true},
+  }
 
-  test "Image PNG test" do
-    pdf = RBPDF.new
-    pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.png')
-    info = pdf.image(img_file, 10, 10, 100, '', '', 'https://rubygems.org/gems/rbpdf', '', false, 300)
-    assert_equal 1, info
-  end
-
-  test "Image PNG alpha test" do
+  data(images)
+  test "ImagePngAlpha test" do |data|
     return unless Object.const_defined?(:Magick)
 
     pdf = RBPDF.new
     pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'png_test_alpha.png')
-    info = pdf.image(img_file, 10, 10, 100, '', '', 'https://rubygems.org/gems/rbpdf', '', false, 300)
-    assert_equal true, info
-  end
-
-  test "Image GIF test" do
-    return unless Object.const_defined?(:Magick)
-
-    pdf = RBPDF.new
-    pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.gif')
-    info = pdf.image(img_file, 10, 10, 100, '', '', 'https://rubygems.org/gems/rbpdf', '', false, 300)
-    assert_equal 1, info
+    img_file = File.join(File.dirname(__FILE__), data[:file])
+    pdf.singleton_class.send(:define_method, :parsepng){|*args| {:cs => 'Indexed'}} if data[:png_alpha_error]
+    info = pdf.send(:ImagePngAlpha, img_file, 10, 10, 100, '', 'PNG', 'https://rubygems.org/gems/rbpdf')
+    assert_equal data[:info], info
   end
 
-  test "Image GIF alpha test" do
-    return unless Object.const_defined?(:Magick)
-
-    pdf = RBPDF.new
-    pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit_alpha.gif')
-    info = pdf.image(img_file, 10, 10, 100, '', '', 'https://rubygems.org/gems/rbpdf', '', false, 300)
-    assert_equal 1, info
-  end
+  images = {
+    'PNG'                => {:file => 'logo_rbpdf_8bit.png',       :info => 1,    :use_magick => false},
+    'PNG alpha'          => {:file => 'png_test_alpha.png',        :info => true, :use_magick => true},
+    'PNG alpha Error'    => {:file => 'png_test_alpha.png',        :info => 1,    :use_magick => true, :png_alpha_error => true},
+    'GIF'                => {:file => 'logo_rbpdf_8bit.gif',       :info => 1,    :use_magick => true},
+    'GIF alpha'          => {:file => 'logo_rbpdf_8bit_alpha.gif', :info => 1,    :use_magick => true},
+    'JPEG'               => {:file => 'logo_rbpdf_8bit.jpg',       :info => 1,    :use_magick => true},
+  }
 
-  test "Image JPEG test" do
-    return unless Object.const_defined?(:Magick)
+  data(images)
+  test "Image test" do |data|
+    if data[:use_magick] and !Object.const_defined?(:Magick)
+      return
+    end
 
     pdf = RBPDF.new
     pdf.add_page
-    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.jpg')
+    img_file = File.join(File.dirname(__FILE__), data[:file])
+    pdf.singleton_class.send(:define_method, :parsepng){|*args| {:cs => 'Indexed'}} if data[:png_alpha_error]
     info = pdf.image(img_file, 10, 10, 100, '', '', 'https://rubygems.org/gems/rbpdf', '', false, 300)
-    assert_equal 1, info
+    assert_equal data[:info], info
   end
 
   test "HTML Image test" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbpdf
 version: !ruby/object:Gem::Version
-  version: 1.19.3
+  version: 1.19.4
 platform: ruby
 authors:
 - NAITOH Jun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-09 00:00:00.000000000 Z
+date: 2018-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RBPDF via TCPDF.
@@ -211,3 +211,4 @@ test_files:
 - test/rbpdf_viewerpreferences_test.rb
 - test/rbpdf_write_test.rb
 - test/test_helper.rb
+has_rdoc: