rbpdf 1.19.2 → 1.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 745cf6037c3efe5f56d6c13c24010ff889393050
-  data.tar.gz: 7fe45fc428b9921af7506b1b0bb775d97b5d8faf
+  metadata.gz: fe56fed150bb05fc1e613f87058b5403787068cb
+  data.tar.gz: 7e0de6186f06514075d03c9499dc2ff72a11c52a
 SHA512:
-  metadata.gz: 9c2b97f1520facee2e23895c030cbc600f84191c67497fb9fd286762beedf10f19b8e38e4c998b9015667552e001310b0c5856d0a209638df0e423ebdab3f458
-  data.tar.gz: 1787ec42fa71bba0a1524024f29a9acc17c447ac9a9bd9fab25be2ddb1c3e5c15c8aa3c7055de56b6f38e5c770f71038a1790d5279da447bb6b8dc75b93fd2b5
+  metadata.gz: b526e43f73722bcf9cd6d4b76fb0f800ebf58462ed0331181c05e80ad062d733b9472c45e41b73a27e9a6c64ac6ce6f4ed691f33131ecac500b7c798bc735532
+  data.tar.gz: a6d704fd9fc1c53950933c64bd37021161d2ee77affa6a41effcb38786e3226d42aa7fc080e7b671f05343e8e8569dd839dac94ac067197df694f842a40ae003

data/CHANGELOG

@@ -1,3 +1,7 @@
+1.19.3 2017-09-10
+       - Rails 5.1 supported.
+       - nil link bug fixed. (by jkraemer)
+
 1.19.2 2017-04-08
        - Ruby 1.9/2.0 on Windows install problem fixed.
 

data/lib/rbpdf.rb

@@ -95,6 +95,9 @@ PDF_PRODUCER = 'RBPDF 5.2.000'
 # @license:: http://www.gnu.org/copyleft/lesser.html LGPL 2.1
 #
 
+class RBPDFError < StandardError
+end
+
 class RBPDF
   include ActionView::Helpers
   include Rbpdf
@@ -367,7 +370,7 @@ class RBPDF
     @numfonts ||= 0
     @fontkeys ||= []
     @font_obj_ids ||= {}
-    @pageopen ||= []
+    @pageopen ||= [] # Store the fage status (true when opened, false when closed).
     @default_monospaced_font = 'courier'
 
 
@@ -442,7 +445,7 @@ class RBPDF
     @font_files ||= {}
     @diffs ||= []
     @images ||= {}
-    @links ||= []
+    @links ||= [] # array of internal links
     @html_anchor ||= nil
     @html_anchors ||= {}
     @html_anchor_links ||= {}
@@ -1507,13 +1510,21 @@ class RBPDF
   # This method is automatically called in case of fatal error; it simply outputs the message and halts the execution. An inherited class may override it to customize the error handling but should always halt the script, or the resulting document would probably be invalid.
   # * 2004-06-11 :: Nicola Asuni : changed bold tag with strong
   # [@param string :msg] The error message
+  # [@param string :err] Exception object
   # [@access public]
   # [@since 1.0]
   #
-  def Error(msg)
-    #destroy(true)
-    #Fatal error
-    raise "RBPDF error: #{msg}"
+  def Error(msg, err = nil)
+    if /^.+?:\d+(?::in `(.*)')?/ =~ caller(2).first
+      method = $1
+    end
+    if err and err.class != RBPDFError
+      logger.error "pdf: #{method}: #{err.message}"
+      err.backtrace.each{|trace|
+        logger.error trace
+      }
+    end
+    raise RBPDFError, "RBPDF error: #{msg}"
   end
   alias_method :error, :Error
 
@@ -2983,7 +2994,7 @@ class RBPDF
   #
   def AddLink()
     #Create a new internal link
-    n=@links.length+1;
+    n = @links.length
     @links[n]=[0,0];
     return n;
   end
@@ -3385,6 +3396,8 @@ class RBPDF
     end
     checkPageBreak(h)
     out(getCellCode(w, h, txt, border, ln, align, fill, link, stretch, ignore_min_height, calign, valign))
+  rescue => err
+    Error('Cell Error.', err)
   end
   alias_method :cell, :Cell
 
@@ -3744,7 +3757,7 @@ class RBPDF
       if (@color_flag)
         s<<' Q';
       end
-      if link && ((link.is_a?(String) and !link.empty?) or (link.is_a?(Integer) and link != 0)) # Integer is PDF file Page No.
+      if link && ((link.is_a?(String) and !link.empty?) or (link.is_a?(Integer) and link >= 0)) # Integer is @links array index
         Link(xdx, y + ((h - @font_size) / 2.0), width, @font_size, link, ns)
       end
     end
@@ -3843,6 +3856,9 @@ class RBPDF
   #   SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), Cell(), Write(), SetAutoPageBreak()
   #
   def MultiCell(w, h, txt, border=0, align='J', fill=0, ln=1, x='', y='', reseth=true, stretch=0, ishtml=false, autopadding=true, maxh=0)
+
+    @x ||= 0
+
     w = 0 unless w.is_a?(Numeric)
     h = 0 unless h.is_a?(Numeric)
 
@@ -4033,6 +4049,8 @@ class RBPDF
 
     setContentMark()
     return nl
+  rescue => err
+    Error('MultiCell Error.', err)
   end
   alias_method :multi_cell, :MultiCell
 
@@ -4624,6 +4642,8 @@ class RBPDF
       return ''
     end
     return nl
+  rescue => err
+    Error('Write Error.', err)
   end
   alias_method :write, :Write
 
@@ -5107,7 +5127,7 @@ class RBPDF
     img = Magick::ImageList.new(file)
     img.format = 'PNG'       # convert to PNG from gif
     if img.alpha?
-      img.opacity = 0          # PNG alpha channel delete
+      img.alpha = Magick::DeactivateAlphaChannel   # PNG alpha channel delete
       if img.alpha?
         return false
       end
@@ -11824,6 +11844,8 @@ public
   def writeHTMLCell(w, h, x, y, html='', border=0, ln=0, fill=0, reseth=true, align='', autopadding=true)
     rtn = MultiCell(w, h, html, border, align, fill, ln, x, y, reseth, 0, true, autopadding, 0)
     return rtn
+  rescue => err
+    Error('writeHTMLCell Error.', err)
   end
   alias_method :write_html_cell, :writeHTMLCell
 
@@ -13004,6 +13026,8 @@ public
     @listcount = prev_listcount
     @lispacer = prev_lispacer
     dom = nil
+  rescue => err
+    Error('writeHTML Error.', err)
   end
   alias_method :write_html, :writeHTML
 
@@ -13465,7 +13489,7 @@ public
           Ln(0, cell)
           @x = parent['startx']
           # account for booklet mode
-          if @page > parent['startpage']
+          if parent['startpage'] and @page > parent['startpage']
             if @rtl and (@pagedim[@page]['orm'] != @pagedim[parent['startpage']]['orm'])
               @x -= @pagedim[@page]['orm'] - @pagedim[parent['startpage']]['orm']
             elsif !@rtl and (@pagedim[@page]['olm'] != @pagedim[parent['startpage']]['olm'])
@@ -13535,6 +13559,7 @@ public
               startpage = parent['startpage']
               end_page = parent['endpage']
             end
+            cellpos['startx'] ||= 0
             if end_page > startpage
               # design borders around HTML cells.
               startpage.upto(end_page) do |page|
@@ -14637,6 +14662,7 @@ public
     # adjust links
     tmplinks = @links
     tmplinks.each_with_index do |link, key|
+      next if link.nil?
       if link[0] > page
         @links[key][0] = link[0] - 1
       elsif link[0] == page
@@ -14815,6 +14841,8 @@ public
         movePage(page_last, page)
       end
     end
+  rescue => err
+    Error('addTOC Error.', err)
   end
   alias_method :add_toc, :addTOC
 
@@ -14919,6 +14947,8 @@ public
         movePage(page_last, page)
       end
     end
+  rescue => err
+    Error('addHTMLTOC Error.', err)
   end
   alias_method :add_html_toc, :addHTMLTOC
 

data/lib/rbpdf/version.rb

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

data/test/rbpdf_font_test.rb

@@ -286,17 +286,17 @@ class RbpdfFontTest < Test::Unit::TestCase
     pdf = RBPDF.new
     RBPDF.k_path_fonts = File.join File.dirname(__FILE__)
 
-    err = assert_raises(RuntimeError) { 
+    err = assert_raises(RBPDFError) { 
       pdf.set_font('err_font', '', 18)
     }
     assert_equal 'RBPDF error: Could not include font definition file: err_font', err.message
 
-    err = assert_raises(RuntimeError) { 
+    err = assert_raises(RBPDFError) { 
       pdf.set_font('err_font1', '', 18)
     }
     assert_match(/RBPDF error: The font definition file has a bad format: .*err_font1.rb/, err.message)
 
-    err = assert_raises(RuntimeError) { 
+    err = assert_raises(RBPDFError) { 
       pdf.set_font('err_font2', '', 18)
     }
     assert_equal 'RBPDF error: Unknow font type: Type0', err.message

data/test/rbpdf_html_anchor_test.rb

@@ -79,7 +79,7 @@ class RbpdfTest < Test::Unit::TestCase
     pdf.write_html(htmlcontent, true, 0, true, 0)
 
     pdf.send(:mapLinksToHtmlAnchors)
-    link_position = pdf.instance_variable_get(:@links)[1]
+    link_position = pdf.instance_variable_get(:@links)[0]
     assert_equal [3, 73.50124999999998], link_position
   end
 
@@ -98,7 +98,7 @@ class RbpdfTest < Test::Unit::TestCase
 
     pdf.send(:mapLinksToHtmlAnchors)
 
-    link_position = pdf.instance_variable_get(:@links)[1]
+    link_position = pdf.instance_variable_get(:@links)[0]
     assert_equal [1, 10.001249999999999], link_position
   end
 

data/test/rbpdf_image_rmagick_test.rb

@@ -5,15 +5,6 @@
 require 'test_helper'
 
 class RbpdfTest < Test::Unit::TestCase
-  class MYPDF < RBPDF
-    def imageToPNG(file)
-      super
-    end
-    def parsepng(file)
-      super
-    end
-  end
-
   test "image getimagesize PNG test" do
     pdf = RBPDF.new
     pdf.add_page
@@ -126,70 +117,95 @@ class RbpdfTest < Test::Unit::TestCase
   end
 
   test "imageToPNG delete GIF test" do
-    pdf = MYPDF.new
+    return unless Object.const_defined?(:Magick)
+    pdf = RBPDF.new
     pdf.add_page
     img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.gif')
 
-    if Object.const_defined?(:Magick)
-      tempfile = pdf.imageToPNG(img_file)
-      assert_not_equal false,      tempfile
+    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 "Magick::ImageList 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')
 
-      info = pdf.parsepng(tempfile.path)
+    img = Magick::ImageList.new(img_file)
+    img.format = 'PNG'       # convert to PNG from gif
+    assert_equal true,   img.alpha?
 
-      assert_not_equal 'pngalpha', info
-      assert_equal     8,          info['bpc']
-      assert_equal     'Indexed',  info['cs']
-    end
+    img.alpha = Magick::DeactivateAlphaChannel   # PNG alpha channel delete
+    assert_equal false,   img.alpha?
   end
 
   test "imageToPNG delete GIF alpha channel test" do
-    pdf = MYPDF.new
+    return unless Object.const_defined?(:Magick)
+    pdf = RBPDF.new
     pdf.add_page
     img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit_alpha.gif')
 
-    if Object.const_defined?(:Magick)
-      tempfile = pdf.imageToPNG(img_file)
-      assert_not_equal false,      tempfile
+    tempfile = pdf.send(:imageToPNG, img_file)
+    assert_not_equal false,      tempfile
 
-      info = pdf.parsepng(tempfile.path)
+    info = pdf.send(:parsepng, tempfile.path)
 
-      assert_not_equal 'pngalpha', info
-      assert_equal     8,          info['bpc']
-      assert_equal     'Indexed',  info['cs']
-    end
+    assert_not_equal 'pngalpha', info
+    assert_equal     8,          info['bpc']
+    assert_equal     'Indexed',  info['cs']
   end
 
   test "imageToPNG delete PNG alpha channel test" do
-    pdf = MYPDF.new
+    return unless Object.const_defined?(:Magick)
+    pdf = RBPDF.new
     pdf.add_page
     img_file = File.join(File.dirname(__FILE__), 'png_test_alpha.png')
 
-    if Object.const_defined?(:Magick)
-      tempfile = pdf.imageToPNG(img_file)
-      assert_not_equal  false,       tempfile
+    tempfile = pdf.send(:imageToPNG, img_file)
+    assert_not_equal  false,       tempfile
 
-      info = pdf.parsepng(tempfile.path)
+    info = pdf.send(:parsepng, tempfile.path)
 
-      assert_not_equal 'pngalpha',   info
-      assert_equal      8,           info['bpc']
-      assert_equal      'DeviceRGB', info['cs']
-    end
+    assert_not_equal 'pngalpha',  info
+    assert_equal      8,          info['bpc']
+    assert_equal     'DeviceRGB', info['cs']
   end
 
   test "image_alpha_mask DeviceGray test" do
-    pdf = MYPDF.new
+    return unless Object.const_defined?(:Magick)
+
+    pdf = RBPDF.new
     pdf.add_page
     img_file = File.join(File.dirname(__FILE__), 'png_test_alpha.png')
 
-    if Object.const_defined?(:Magick)
-      tempfile = pdf.send(:image_alpha_mask, img_file)
+    tempfile = pdf.send(:image_alpha_mask, img_file)
+
+    info = pdf.send(:parsepng, tempfile.path)
+
+    assert_not_equal 'pngalpha',   info
+    assert_equal      8,           info['bpc']
+    assert_equal     'DeviceGray', info['cs']
 
-      info = pdf.parsepng(tempfile.path)
+    # embed mask image test
+    imgmask = pdf.image(tempfile.path, 10, 10, 100, '', 'PNG', '', '', false, 300, '', true, false)
+    assert_equal 1, imgmask
+  end
+
+  test "ImagePngAlpha test" do
+    return unless Object.const_defined?(:Magick)
 
-      assert_not_equal 'pngalpha',    info
-      assert_equal      8,            info['bpc']
-      assert_equal      'DeviceGray', info['cs']
-    end
+    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
 
   test "Image PNG test" do

data/test/rbpdf_image_test.rb

@@ -59,12 +59,12 @@ class RbpdfTest < Test::Unit::TestCase
     pdf = RBPDF.new
     pdf.add_page
     img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.png')
-    assert_nothing_raised(RuntimeError) { 
+    assert_nothing_raised(RBPDFError) { 
       pdf.image(img_file)
     }
 
     img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit .png')
-    assert_nothing_raised(RuntimeError) { 
+    assert_nothing_raised(RBPDFError) { 
       pdf.image(img_file)
     }
   end
@@ -76,24 +76,24 @@ class RbpdfTest < Test::Unit::TestCase
 
   #  utf8_japanese_aiueo_str  = "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a"
   #  img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit_' + utf8_japanese_aiueo_str + '.png')
-  #  assert_nothing_raised(RuntimeError) { 
+  #  assert_nothing_raised(RBPDFError) { 
   #    pdf.image(img_file)
   #  }
   #end
 
   test "Image basic filename error test" do
     pdf = RBPDF.new
-    err = assert_raise(RuntimeError) { 
+    err = assert_raise(RBPDFError) { 
       pdf.image(nil)
     }
     assert_equal 'RBPDF error: Image filename is empty.', err.message
 
-    err = assert_raises(RuntimeError) { 
+    err = assert_raises(RBPDFError) { 
       pdf.image('')
     }
     assert_equal 'RBPDF error: Image filename is empty.', err.message
 
-    err = assert_raises(RuntimeError) { 
+    err = assert_raises(RBPDFError) { 
       pdf.image('foo.png')
     }
     assert_equal 'RBPDF error: Missing image file: foo.png', err.message

data/test/rbpdf_test.rb

@@ -174,7 +174,7 @@ class RbpdfTest < Test::Unit::TestCase
     pages = pdf.get_num_pages
     assert_equal 1, pages
 
-    assert_raise(RuntimeError) {pdf.set_page(0)} # Page under size
+    assert_raise(RBPDFError) {pdf.set_page(0)} # Page under size
   end
 
   test "add_page set_page Over Error" do
@@ -201,7 +201,7 @@ class RbpdfTest < Test::Unit::TestCase
     page = pdf.get_page
     assert_equal 1, page
 
-    assert_raise(RuntimeError) {pdf.set_page(3)} # Page over size
+    assert_raise(RBPDFError) {pdf.set_page(3)} # Page over size
   end
 
   test "deletePage test" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbpdf
 version: !ruby/object:Gem::Version
-  version: 1.19.2
+  version: 1.19.3
 platform: ruby
 authors:
 - NAITOH Jun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-08 00:00:00.000000000 Z
+date: 2017-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -98,12 +98,9 @@ files:
 - lib/htmlcolors.rb
 - lib/rbpdf.rb
 - lib/rbpdf/version.rb
-- lib/rbpdf_encode_ok.rb
-- lib/rbpdf_encode_ok2.rb
 - lib/unicode_data.rb
 - logo_example.png
 - rbpdf.gemspec
-- test/_rbpdf_image_test.rb_
 - test/err_font1.rb
 - test/err_font2.rb
 - test/logo_rbpdf_8bit .png
@@ -171,12 +168,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: RBPDF via TCPDF.
 test_files:
-- test/_rbpdf_image_test.rb_
 - test/err_font1.rb
 - test/err_font2.rb
 - test/logo_rbpdf_8bit .png