rbpdf 1.19.4 → 1.19.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ad5083c310d25cd904c1826bd2672b7bbb31a93
-  data.tar.gz: dcb1537363d38928044d3f55168381409c5f7b1b
+  metadata.gz: 2639ff84fd70b4fcf84386c2d2d4ec407cfe932e
+  data.tar.gz: 59a2e7fe5a678bec81f112744dae30d004ae9a00
 SHA512:
-  metadata.gz: 82119b8767536543d6e2cdd625bcdb48b0a7c75bc4ea92a3f2154f74731527eab42b7a1d605ee31f31b12a9bc3034599d4b5b1eeec2ce50036ea98cddeedea4d
-  data.tar.gz: 9c2428dbe401fb1425ee29096b09e50df64231ff9dcf8976c9bd0303dbd681bb95e8d3aecca5265ba73201647c5e39f92de4d64b83d9f1ee64570ce235b14a51
+  metadata.gz: 10d521aaf60b79a63a03d4a7e04830ee2cacee71f5d0a6f3f1acafb03a0d0973c48ce8fb77eec9f86747b72f4c52e5d0ccfcc59f55edca70e25804e0fb65302c
+  data.tar.gz: de13ae61679876a96365899664338a1a54134805eeec6e1d93cf2355c0b2b89c7266ad314a6b9066f306cc210712659914578cafab8f3907729f9d1c24c50692

data/CHANGELOG

@@ -1,3 +1,9 @@
+1.19.5 2018-06-24
+       - Fixed that the handling of Tempfile was wrong.
+       - Fixed compatibility problem with Magick::RGBColorspace and Magick::SRGBColorspace.
+         image_alpha_mask function has been fixed to use Magick :: ExtractAlphaChannel.
+       - Deleted exception handling of ImagePngAlpha function.
+
 1.19.4 2018-06-16
        - Ruby 2.5 supported.
        - Rails 5.2 supported.

data/lib/rbpdf.rb

@@ -4836,6 +4836,9 @@ class RBPDF
     # set bottomcoordinates
     @img_rb_y = y + h
     Error('Image filename is empty.') if file.nil? or file.length == 0
+    unless File.exist?(file)
+      Error('Image file is not found. : ' + file)
+    end
 
     # get image dimensions
     imsize = getimagesize(file)
@@ -4845,14 +4848,14 @@ class RBPDF
       imsize = getimagesize(file)
 
       if imsize.nil?
-        Error('Missing image file: ' + file)
+        Error("Can't get image dimension. : " + file)
       elsif imsize == false
         if (w > 0) and (h > 0)
           pw = getHTMLUnitToUnits(w, 0, @pdfunit, true) * @img_scale * @k
           ph = getHTMLUnitToUnits(h, 0, @pdfunit, true) * @img_scale * @k
           imsize = [pw, ph]
         else
-          Error('[Image] Unable to get image width and height: ' + file)
+          Error('Unable to get image width and height: ' + file)
         end
       end
     end
@@ -4963,7 +4966,7 @@ class RBPDF
           tmpFile = imageToPNG(file)
           if tmpFile != false
             info=parsepng(tmpFile.path)
-            tmpFile.delete
+            tmpFile.close(true)
           end
         else
           #Allow for additional formats
@@ -4997,10 +5000,10 @@ class RBPDF
           tmpname.binmode
           jpeg_quality = @jpeg_quality
           tmpname.print img.to_blob { self.quality = jpeg_quality }
-          tmpname.close
+          tmpname.fsync
 
           info = parsejpeg(tmpname.path)
-          tmpname.delete
+          tmpname.close(true)
         else
           return false
         end
@@ -5137,9 +5140,8 @@ class RBPDF
     tmpFile = Tempfile.new(['', '_' + File::basename(file) + '.png'], @@k_path_cache);
     tmpFile.binmode
     tmpFile.print img.to_blob
+    tmpFile.fsync
     tmpFile
-  ensure
-    tmpFile.close unless tmpFile.nil?
   end
   protected :imageToPNG
 
@@ -5247,17 +5249,18 @@ class RBPDF
 
   def image_alpha_mask(file)
     img = Magick::ImageList.new(file)
-
-    img2 = img.separate(Magick::OpacityChannel)
-    img = img2.negate(true)
+    if img.alpha?
+      img.alpha = Magick::ExtractAlphaChannel   # PNG alpha channel Mask
+    else
+      return false
+    end
 
     #use a temporary file....
     tmpFile = Tempfile.new(['msk_', '.png'], @@k_path_cache)
     tmpFile.binmode
     tmpFile.print img.to_blob
+    tmpFile.fsync
     tmpFile
-  ensure
-    tmpFile.close  unless tmpFile.nil?
   end
   protected :image_alpha_mask
 
@@ -5294,22 +5297,19 @@ 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)
+    if tempfile_alpha == false
+      return false
+    end
 
     # embed mask image
     imgmask = Image(tempfile_alpha.path, x, y, w, h, 'PNG', '', '', resize, dpi, '', true, false)
+    tempfile_alpha.close(true)
 
     # embed image, masked with previously embedded mask
     Image(tempfile_plain.path, x, y, w, h, type, link, align, resize, dpi, palign, false, imgmask)
-    # remove temp files
-    tempfile_alpha.delete
-    tempfile_plain.delete
+    tempfile_plain.close(true)
 
     return true
   end
@@ -11775,9 +11775,8 @@ protected
       res = http.get(uri.path)
       tmpFile.print res.body
     end
+    tmpFile.fsync
     tmpFile
-  ensure
-    tmpFile.close  unless tmpFile.nil?
   end
 
   #
@@ -13266,7 +13265,7 @@ public
           result_img = false
         ensure
           # remove temp files
-          tmpFile.delete unless tmpFile.nil?
+          tmpFile.close(true) unless tmpFile.nil?
         end
 
         if result_img or ih != 0
@@ -14149,8 +14148,6 @@ protected
     tmpFile = Tempfile.new(name + '_', @@k_path_cache)
     tmpFile.binmode
     tmpFile
-  ensure
-    tmpFile.close
   end
 
   #

data/lib/rbpdf/version.rb

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

data/test/rbpdf_http_test.rb

@@ -24,9 +24,11 @@ class RbpdfHttpTest < Test::Unit::TestCase
     utf8_japanese_aiueo_str  = "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a"
 
     images = [
-      'logo_rbpdf_8bit.png',
-      'logo_rbpdf_8bit .png',
-      'logo_rbpdf_8bit+ .png',
+      # file_name,                    error_message
+      ['logo_rbpdf_8bit.png',         nil],
+      ['logo_rbpdf_8bit .png',        nil],
+      ['logo_rbpdf_8bit+ .png',       nil],
+      ['logo_rbpdf_8bit_no_file.png', /^RBPDF error: Unable to get image width and height: /],
     ]
     # no use
     #if RUBY_VERSION >= '2.0' # Ruby 1.9.2/1.9.3
@@ -36,19 +38,26 @@ class RbpdfHttpTest < Test::Unit::TestCase
     pdf = MYPDF.new
     images.each_with_index {|image, i|
       pdf.add_page
-      #tmpFile = pdf.get_image_file('http://127.0.0.1:' + @port.to_s + '/logo_rbpdf_8bit.png')
-      #tmpFile = pdf.get_image_file('http://127.0.0.1:' + @port.to_s + '/logo_rbpdf_8bit .png')
-      #tmpFile = pdf.get_image_file('http://127.0.0.1:' + @port.to_s + '/' + image)
-      #image.force_encoding('ASCII-8BIT') if image.respond_to?(:force_encoding)
-      tmpFile = pdf.get_image_file('http://127.0.0.1:' + @port.to_s + '/' + image)
+      #image[0].force_encoding('ASCII-8BIT') if image[0].respond_to?(:force_encoding)
+      tmpFile = pdf.get_image_file('http://127.0.0.1:' + @port.to_s + '/' + image[0])
+
       img_file = tmpFile.path
       assert_not_equal "", img_file
       unless File.exist?(img_file)
         assert false, "file not found. :" + img_file
       end
 
-      result_img = pdf.image(img_file, 50, 0, 0, '', '', '', '', false, 300, '', true)
-      assert_equal i+1, result_img
+      if image[1].nil?
+        result_img = pdf.image(img_file, 50, 0, 0, '', '', '', '', false, 300, '', true)
+        assert_equal i+1, result_img
+      else
+        err = assert_raise(RBPDFError) { 
+          result_img = pdf.image(img_file, 50, 0, 0, '', '', '', '', false, 300, '', true)
+        }
+        assert_match image[1], err.message
+        assert_equal nil, result_img
+      end
+
       no = pdf.get_num_pages
       assert_equal i+1, no
 

data/test/rbpdf_image_rmagick_test.rb

@@ -31,8 +31,8 @@ class RbpdfTest < Test::Unit::TestCase
     assert_equal data[:type],               info[2] # Image Type
     assert_equal 'height="89" width="240"', info[3]
     assert_equal data[:mime],               info['mime']
-    assert_equal data[:channels],           info['channels'] if @channels # RGB
-    assert_equal data[:bits],               info['bits']     if @bits     # depth
+    assert_equal data[:channels],           info['channels'] if data[:channels] # RGB
+    assert_equal data[:bits],               info['bits']     if data[:bits]     # depth
   end
 
   images = {
@@ -95,7 +95,7 @@ class RbpdfTest < Test::Unit::TestCase
 
   images = {
     'PNG alpha'          => {:file => 'png_test_alpha.png',        :info => true},
-    'PNG alpha Error'    => {:file => 'png_test_alpha.png',        :info => false, :png_alpha_error => true},
+    #'PNG alpha Error'    => {:file => 'png_test_alpha.png',        :info => false, :png_alpha_error => true}, # no use
   }
 
   data(images)
@@ -105,7 +105,7 @@ class RbpdfTest < Test::Unit::TestCase
     pdf = RBPDF.new
     pdf.add_page
     img_file = File.join(File.dirname(__FILE__), data[:file])
-    pdf.singleton_class.send(:define_method, :parsepng){|*args| {:cs => 'Indexed'}} if data[:png_alpha_error]
+    #pdf.singleton_class.send(:define_method, :parsepng){|*args| {:cs => 'Indexed'}} if data[:png_alpha_error] # no use
     info = pdf.send(:ImagePngAlpha, img_file, 10, 10, 100, '', 'PNG', 'https://rubygems.org/gems/rbpdf')
     assert_equal data[:info], info
   end
@@ -113,7 +113,7 @@ class RbpdfTest < Test::Unit::TestCase
   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},
+    #'PNG alpha Error'    => {:file => 'png_test_alpha.png',        :info => 1,    :use_magick => true, :png_alpha_error => true}, # no use
     '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},
@@ -128,7 +128,7 @@ class RbpdfTest < Test::Unit::TestCase
     pdf = RBPDF.new
     pdf.add_page
     img_file = File.join(File.dirname(__FILE__), data[:file])
-    pdf.singleton_class.send(:define_method, :parsepng){|*args| {:cs => 'Indexed'}} if data[:png_alpha_error]
+    #pdf.singleton_class.send(:define_method, :parsepng){|*args| {:cs => 'Indexed'}} if data[:png_alpha_error] # no use
     info = pdf.image(img_file, 10, 10, 100, '', '', 'https://rubygems.org/gems/rbpdf', '', false, 300)
     assert_equal data[:info], info
   end

data/test/rbpdf_image_test.rb

@@ -96,7 +96,7 @@ class RbpdfTest < Test::Unit::TestCase
     err = assert_raises(RBPDFError) { 
       pdf.image('foo.png')
     }
-    assert_equal 'RBPDF error: Missing image file: foo.png', err.message
+    assert_equal 'RBPDF error: Image file is not found. : foo.png', err.message
   end
 
   test "Image basic test" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbpdf
 version: !ruby/object:Gem::Version
-  version: 1.19.4
+  version: 1.19.5
 platform: ruby
 authors:
 - NAITOH Jun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-16 00:00:00.000000000 Z
+date: 2018-06-24 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.2.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: RBPDF via TCPDF.
@@ -211,4 +211,3 @@ test_files:
 - test/rbpdf_viewerpreferences_test.rb
 - test/rbpdf_write_test.rb
 - test/test_helper.rb
-has_rdoc: