rfpdf 1.17.2 → 1.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1977fa6dbcfe119efa5a039e7e109cb6544cfb99
-  data.tar.gz: b51ccf3d16c303592b596f151fb75f5a945dda65
+  metadata.gz: 63d0b7d1a6a69589d3929d473835804e9c373bcb
+  data.tar.gz: de62737227cba9fecdd59544b451ad61001c9b2c
 SHA512:
-  metadata.gz: ec76cd70718ea7e36b61686178df99ceeb929e9755f1bb141a11d6f8b7fd62b29dc743701592a2fb24ee4916bf1475cad39bc44403308212f0cb06068b7703eb
-  data.tar.gz: 89acfe639c5138a1c7a289dd12333f5117095222e3bb048a8bd161b579c0fb7196075b5684e1245ae4851f2814b77c574bde6cfc94712614428366b35d835b8c
+  metadata.gz: ff4b63ed0ac855ac2d8c712222f4bb954086e398a0940156e6e678717fb408b4704d0e82a9f9de59249bd288e19ed34bf5b349895ea87de2d9a1333e1a6b8446
+  data.tar.gz: 2bf37c098e1240e968f83244fdcada9c04b054b8da175f7f2b2ece1a8ae3a9269f1411c339e04bdda6f491e66342cf1b3bd5f0272654f50cbd501292b1a1d0ff

data/CHANGELOG

@@ -14,6 +14,7 @@ put your assignment in a before_filter (perhaps overriding :filename, etc in you
 1.15 2009-11-20 Rails 2.* support - Thanks to Prawnto plugin for showing the way to the new TemplateHandler
 1.16 2012-09-08 Rails 3.* and Ruby 1.9.* support, and fix FPDF severral bug.
      Jun NAITOH took over development of RFPDF from Edwin Moss.
-1.17 2014-05-18 Update base version to TCPDF 5.1.002. Ruby 2.0/2.1 support. FPDF is deprecated.
-1.17.2 2014-06-30 FreeSerif font added from GNU FreeFont(20080912).
+1.17   2014-05-18 Update base version to TCPDF 5.1.002. Ruby 2.0/2.1 support. FPDF is deprecated.
+1.17.2 2014-07-09 FreeSerif font added from GNU FreeFont(20080912).
+1.17.3 2014-07-16 Several bug fixed.
 

data/lib/rfpdf/version.rb

@@ -1,3 +1,3 @@
 module Rfpdf
-  VERSION = "1.17.2"
+  VERSION = "1.17.3"
 end

data/lib/tcpdf.rb

@@ -3182,6 +3182,7 @@ class TCPDF
           end
         end
       end
+      @newline = true
       return true
     end
     if current_page != @page
@@ -3836,7 +3837,7 @@ class TCPDF
     # get latest page number
     end_page = @page
     if resth > 0
-      skip = endpage - startpage
+      skip = end_page - startpage
       tmpresth = resth
       while tmpresth > 0
         if skip <= 0
@@ -3847,7 +3848,7 @@ class TCPDF
         skip -= 1
       end
       currentY = @y
-      endpage = @page
+      end_page = @page
     end
 
     # check if a new page has been created
@@ -4575,6 +4576,7 @@ class TCPDF
 
     # set bottomcoordinates
     @img_rb_y = y + h
+    Error('Image filename is empty.') if file.nil? or file.length == 0
 
     # get image dimensions
     imsize = getimagesize(file)
@@ -11611,10 +11613,10 @@ public
           minstartliney = startliney
           maxbottomliney = startliney + @font_size * @cell_height_ratio
         end
-        startlinepage = @page
-        if !endlinepos.nil? and !pbrk
+        if startlinepage == @page and !endlinepos.nil? and !pbrk # fix startlinepos at page break case.
           startlinepos = endlinepos
         else
+          startlinepage = @page
           if !@in_footer
             if !@footerlen[@page].nil?
               @footerpos[@page] = @pagelen[@page] - @footerlen[@page]
@@ -12279,20 +12281,21 @@ public
 #        else
           result_img = Image(tag['attribute']['src'], xpos, @y, iw, ih, '', imglink, align, false, 300, '', false, false, border, false, false, true)
 #        end
+          case align
+          when 'T'
+            @y = prevy
+          when 'M'
+            @y = (@img_rb_y + prevy - (tag['fontsize'] / @k)) / 2
+          when 'B'
+            @y = @img_rb_y - (tag['fontsize'] / @k)
+          end
         rescue => err
           logger.error "pdf: Image: error: #{err.message}"
           result_img = false
-        end
-        case align
-        when 'T'
           @y = prevy
-        when 'M'
-          @y = (@img_rb_y + prevy - (tag['fontsize'] / @k)) / 2
-        when 'B'
-          @y = @img_rb_y - (tag['fontsize'] / @k)
         end
         if result_img == false
-          Write(@lasth, File::basename(img_name), '', false, '', false, 0, false)
+          Write(@lasth, File::basename(img_name) + ' ', '', false, '', false, 0, false) unless img_name.nil?
         end
       end
     when 'dl'

data/test/tcpdf_htmlcell_test.rb

@@ -0,0 +1,64 @@
+require 'test_helper'
+
+class TcpdfTest < ActiveSupport::TestCase
+  test "write_html_cell Basic test" do
+    pdf = TCPDF.new
+    pdf.add_page()
+
+    htmlcontent = '<p>foo</p>'
+    pdf.write_html_cell(0, 5, 10, '', htmlcontent, 0, 1)
+
+    pno = pdf.get_page
+    assert_equal pno, 1
+
+    y = pdf.get_y
+    assert_in_delta 17.3, y, 0.1
+
+    no = pdf.get_num_pages
+    assert_equal no, 1
+  end
+
+  test "write_html_cell Page Break test 1" do
+    pdf = TCPDF.new
+    pdf.add_page()
+
+    pdf.set_top_margin(30)
+
+    h = pdf.get_page_height
+    pdf.set_y(h - 15)
+
+    htmlcontent = '<p>foo</p>'
+    pdf.write_html_cell(0, 5, 10, '', htmlcontent, 0, 1)
+
+    pno = pdf.get_page
+    assert_equal pno, 2
+
+    y = pdf.get_y
+    assert_in_delta 40.0, y, 0.1
+
+    no = pdf.get_num_pages
+    assert_equal no, 2
+  end
+
+  test "write_html_cell Page Break test 2" do
+    pdf = TCPDF.new
+    pdf.add_page()
+
+    pdf.set_top_margin(30)
+
+    h = pdf.get_page_height
+    pdf.set_y(h - 15)
+
+    htmlcontent = '<p>foo</p>'
+    pdf.write_html_cell(0, 5, 10, '', htmlcontent, "LRBT", 1)
+
+    pno = pdf.get_page
+    assert_equal pno, 2
+
+    y = pdf.get_y
+    assert_in_delta 40.0, y, 0.1
+
+    no = pdf.get_num_pages
+    assert_equal no, 2
+  end
+end

data/test/tcpdf_image_test.rb

@@ -51,4 +51,22 @@ class TcpdfTest < ActiveSupport::TestCase
     type = pdf.get_image_file_type(nil, [])
     assert_equal type, ''
   end
+
+  test "Image basic filename test" do
+    pdf = TCPDF.new
+    err = assert_raises(RuntimeError) { 
+      pdf.image(nil)
+    }
+    assert_equal( err.message, 'TCPDF error: Image filename is empty.')
+
+    err = assert_raises(RuntimeError) { 
+      pdf.image('')
+    }
+    assert_equal( err.message, 'TCPDF error: Image filename is empty.')
+
+    err = assert_raises(RuntimeError) { 
+      pdf.image('foo.png')
+    }
+    assert_equal( err.message, 'TCPDF error: Missing image file: foo.png')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfpdf
 version: !ruby/object:Gem::Version
-  version: 1.17.2
+  version: 1.17.3
 platform: ruby
 authors:
 - NAITOH Jun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,6 +155,7 @@ files:
 - test/tcpdf_format_test.rb
 - test/tcpdf_func_test.rb
 - test/tcpdf_html_test.rb
+- test/tcpdf_htmlcell_test.rb
 - test/tcpdf_image_test.rb
 - test/tcpdf_test.rb
 - test/tcpdf_transaction_test.rb
@@ -206,6 +207,7 @@ test_files:
 - test/tcpdf_format_test.rb
 - test/tcpdf_func_test.rb
 - test/tcpdf_html_test.rb
+- test/tcpdf_htmlcell_test.rb
 - test/tcpdf_image_test.rb
 - test/tcpdf_test.rb
 - test/tcpdf_transaction_test.rb