rbpdf 1.19.0 → 1.19.1

data/test/rbpdf_format_test.rb

@@ -1,3 +1,7 @@
+# Copyright (c) 2011-2017 NAITOH Jun
+# Released under the MIT license
+# http://www.opensource.org/licenses/MIT
+
 require 'test_helper'
 
 class RbpdfFormatTest < Test::Unit::TestCase
@@ -5,22 +9,22 @@ class RbpdfFormatTest < Test::Unit::TestCase
     pdf = RBPDF.new
 
     pagedim = pdf.set_page_orientation('')
-    assert_equal pagedim['or'], 'P'
-    assert_equal pagedim['pb'], true
-    assert_equal pagedim['olm'], nil
-    assert_equal pagedim['orm'], nil
-    assert_in_delta pagedim['bm'], 20, 0.1
+    assert_equal 'P',   pagedim['or']
+    assert_equal true,  pagedim['pb']
+    assert_equal nil,   pagedim['olm']
+    assert_equal nil,   pagedim['orm']
+    assert_in_delta 20, pagedim['bm'], 0.1
 
     pagedim = pdf.set_page_orientation('P')
-    assert_equal pagedim['or'], 'P'
+    assert_equal 'P',   pagedim['or']
 
     pagedim = pdf.set_page_orientation('L', false)
-    assert_equal pagedim['or'], 'L'
-    assert_equal pagedim['pb'], false
+    assert_equal 'L',   pagedim['or']
+    assert_equal false, pagedim['pb']
 
     pagedim = pdf.set_page_orientation('P', true, 5)
-    assert_equal pagedim['or'], 'P'
-    assert_equal pagedim['pb'], true
-    assert_equal pagedim['bm'], 5
+    assert_equal 'P',   pagedim['or']
+    assert_equal true,  pagedim['pb']
+    assert_equal 5,     pagedim['bm']
   end
 end

data/test/rbpdf_func_test.rb

@@ -1,3 +1,7 @@
+# Copyright (c) 2011-2017 NAITOH Jun
+# Released under the MIT license
+# http://www.opensource.org/licenses/MIT
+
 require 'test_helper'
 
 class RbpdfTest < Test::Unit::TestCase
@@ -10,71 +14,71 @@ class RbpdfTest < Test::Unit::TestCase
   test "get_html_unit_to_units test" do
     pdf = RBPDF.new
     unit = pdf.get_html_unit_to_units("100", 1)
-    assert_in_delta unit, 35.27, 0.01
+    assert_in_delta 35.27, unit, 0.01
 
     unit = pdf.get_html_unit_to_units("100px", 1, 'px', false)
-    assert_in_delta unit, 35.27, 0.01
+    assert_in_delta 35.27, unit, 0.01
 
     unit = pdf.get_html_unit_to_units(100, 1, 'pt', false)
-    assert_in_delta unit, 35.27, 0.01
+    assert_in_delta 35.27, unit, 0.01
 
     unit = pdf.get_html_unit_to_units(100.0, 1, 'pt', false)
-    assert_in_delta unit, 35.27, 0.01
+    assert_in_delta 35.27, unit, 0.01
 
     unit = pdf.get_html_unit_to_units("100.0", 1, 'pt', false)
-    assert_in_delta unit, 35.27, 0.01
+    assert_in_delta 35.27, unit, 0.01
 
     unit = pdf.get_html_unit_to_units("200", 1, '%', false)
-    assert_equal unit, 2.0
+    assert_equal 2.0, unit
 
     unit = pdf.get_html_unit_to_units("400%", 1, '%', false)
-    assert_equal unit, 4.0
+    assert_equal 4.0, unit
 
     unit = pdf.get_html_unit_to_units("10", 1, '%', false)
-    assert_equal unit, 0.1
+    assert_equal 0.1, unit
 
     unit = pdf.get_html_unit_to_units("10mm", 1, '%', false)
-    assert_in_delta unit, 10, 0.01
+    assert_in_delta 10, unit, 0.01
 
     unit = pdf.get_html_unit_to_units("10", 1, 'mm', false)
-    assert_in_delta unit, 10, 0.01
+    assert_in_delta 10, unit, 0.01
 
     unit = pdf.get_html_unit_to_units(10, 1, 'mm', false)
-    assert_in_delta unit, 10, 0.01
+    assert_in_delta 10, unit, 0.01
 
     unit = pdf.get_html_unit_to_units("1", 1, 'cm', false)
-    assert_in_delta unit, 10, 0.01
+    assert_in_delta 10, unit, 0.01
 
     unit = pdf.get_html_unit_to_units(10, 1, 'em', false)
-    assert_equal unit, 10
+    assert_equal 10, unit
 
     unit = pdf.get_html_unit_to_units(10, 2, 'em', false)
-    assert_equal unit, 20
+    assert_equal 20, unit
   end
 
   test "getSpaceString test" do
     pdf = MYPDF.new
     spacestr = pdf.getSpaceString()
-    assert_equal spacestr, 32.chr
+    assert_equal 32.chr, spacestr
 
     pdf.set_font('freesans', '', 18)
     spacestr = pdf.getSpaceString()
-    assert_equal spacestr, 0.chr + 32.chr
+    assert_equal 0.chr + 32.chr, spacestr
   end
 
   test "revstrpos test" do
     pdf = RBPDF.new
     pos = pdf.revstrpos('abcd efgh ', 'cd')
-    assert_equal pos, 2
+    assert_equal 2, pos
 
     pos = pdf.revstrpos('abcd efgh ', 'cd ')
-    assert_equal pos, 2
+    assert_equal 2, pos
 
     pos = pdf.revstrpos('abcd efgh abcd efg', 'cd')
-    assert_equal pos, 12
+    assert_equal 12, pos
 
     pos = pdf.revstrpos('abcd efgh abcd efg', 'zy')
-    assert_equal pos, nil
+    assert_equal nil, pos
   end
 
   test "revstrpos offset test 1" do
@@ -129,7 +133,7 @@ class RbpdfTest < Test::Unit::TestCase
 
     pdf = RBPDF.new
     str = 'test'.force_encoding('UTF-8')
-    width = pdf.get_string_width(str)
-    assert_equal str.encoding.to_s, 'UTF-8'
+    pdf.get_string_width(str)
+    assert_equal 'UTF-8', str.encoding.to_s
   end
 end

data/test/rbpdf_html_anchor_test.rb

@@ -1,12 +1,10 @@
+# Copyright (c) 2011-2017 NAITOH Jun
+# Released under the MIT license
+# http://www.opensource.org/licenses/MIT
+
 require 'test_helper'
 
 class RbpdfTest < Test::Unit::TestCase
-  class MYPDF < RBPDF
-    def getPageBuffer(page)
-      super
-    end
-  end
-
   test "anchor with text inside" do
     pdf = RBPDF.new
     pdf.add_page()
@@ -15,7 +13,7 @@ class RbpdfTest < Test::Unit::TestCase
     pdf.write_html(htmlcontent, true, 0, true, 0)
 
     position = pdf.get_html_anchor_position('foo')
-    assert_equal position, [1, 10.001249999999999]
+    assert_equal [1, 10.001249999999999], position
   end
 
   test "anchor with id" do
@@ -26,7 +24,7 @@ class RbpdfTest < Test::Unit::TestCase
     pdf.write_html(htmlcontent, true, 0, true, 0)
 
     position = pdf.get_html_anchor_position('foo')
-    assert_equal position, [1, 10.001249999999999]
+    assert_equal [1, 10.001249999999999], position
   end
 
   test "empty anchor" do
@@ -37,7 +35,7 @@ class RbpdfTest < Test::Unit::TestCase
     pdf.write_html(htmlcontent, true, 0, true, 0)
 
     position = pdf.get_html_anchor_position('foo')
-    assert_equal position, [1, 10.001249999999999]
+    assert_equal [1, 10.001249999999999], position
   end
 
 
@@ -49,7 +47,7 @@ class RbpdfTest < Test::Unit::TestCase
     pdf.write_html(htmlcontent, true, 0, true, 0)
 
     position = pdf.get_html_anchor_position('foo')
-    assert_equal position, [1, 57.626249999999985]
+    assert_equal [1, 57.626249999999985], position
   end
 
 
@@ -63,7 +61,7 @@ class RbpdfTest < Test::Unit::TestCase
     pdf.write_html(htmlcontent, true, 0, true, 0)
 
     position = pdf.get_html_anchor_position('foo')
-    assert_equal position, [3, 68.20958333333331]
+    assert_equal [3, 68.20958333333331], position
   end
 
 
@@ -82,7 +80,7 @@ class RbpdfTest < Test::Unit::TestCase
 
     pdf.send(:mapLinksToHtmlAnchors)
     link_position = pdf.instance_variable_get(:@links)[1]
-    assert_equal link_position,  [3, 73.50124999999998]
+    assert_equal [3, 73.50124999999998], link_position
   end
 
   test "maps when anchor before link" do
@@ -101,7 +99,7 @@ class RbpdfTest < Test::Unit::TestCase
     pdf.send(:mapLinksToHtmlAnchors)
 
     link_position = pdf.instance_variable_get(:@links)[1]
-    assert_equal link_position, [1, 10.001249999999999]
+    assert_equal [1, 10.001249999999999], link_position
   end
 
 end

data/test/rbpdf_html_func_test.rb

@@ -1,3 +1,7 @@
+# Copyright (c) 2011-2017 NAITOH Jun
+# Released under the MIT license
+# http://www.opensource.org/licenses/MIT
+
 require 'test_helper'
 
 class RbpdfTest < Test::Unit::TestCase
@@ -21,8 +25,8 @@ class RbpdfTest < Test::Unit::TestCase
     pdf.addHTMLVertSpace(1, 0, false, true)
     x2 = pdf.get_x
     y2 = pdf.get_y
-    assert_equal x2, x1
-    assert_equal y2, y1
+    assert_equal x1, x2
+    assert_equal y1, y2
 
     # same line, @c_margin position
     margins = pdf.get_margins
@@ -32,8 +36,8 @@ class RbpdfTest < Test::Unit::TestCase
     pdf.addHTMLVertSpace(1, 0, true, true)
     x2 = pdf.get_x
     y2 = pdf.get_y
-    assert_equal x2, x1 + margins['cell']
-    assert_equal y2, y1
+    assert_equal x1 + margins['cell'], x2
+    assert_equal y1,                   y2
   end
 
   test "html func addHTMLVertSpace add line test" do
@@ -47,8 +51,8 @@ class RbpdfTest < Test::Unit::TestCase
     pdf.addHTMLVertSpace(5, 0, false, false)
     x2 = pdf.get_x
     y2 = pdf.get_y
-    assert_equal x2, x1
-    assert_equal y2, y1 + 5
+    assert_equal x1,     x2
+    assert_equal y1 + 5, y2
 
     # next line, @c_margin position
     margins = pdf.get_margins
@@ -58,8 +62,8 @@ class RbpdfTest < Test::Unit::TestCase
     pdf.addHTMLVertSpace(5, 0, true, false)
     x2 = pdf.get_x
     y2 = pdf.get_y
-    assert_equal x2, x1 + margins['cell']
-    assert_equal y2, y1 + 5
+    assert_equal x1 + margins['cell'], x2
+    assert_equal y1 + 5,               y2
   end
 
   test "html func addHTMLVertSpace height of the break test 1" do
@@ -72,44 +76,44 @@ class RbpdfTest < Test::Unit::TestCase
     pdf.addHTMLVertSpace(0, 5, true, false) # height of the break : 5
     x2 = pdf.get_x
     y2 = pdf.get_y
-    assert_equal x2, x1 + margins['cell']
-    assert_equal y2, y1 + 5
+    assert_equal x1 + margins['cell'], x2
+    assert_equal y1 + 5,               y2
 
     pdf.addHTMLVertSpace(0, 5, true, false)  # height of the break : 5
     x3 = pdf.get_x
     y3 = pdf.get_y
-    assert_equal x3, x2
-    assert_equal y3, y2
+    assert_equal x2, x3
+    assert_equal y2, y3
 
     pdf.addHTMLVertSpace(0, 5 + 2, true, false)  # height of the break : 7
     x4 = pdf.get_x
     y4 = pdf.get_y
-    assert_equal x4, x3
-    assert_equal y4, y3 + 2
+    assert_equal x3,     x4
+    assert_equal y3 + 2, y4
 
     pdf.addHTMLVertSpace(0, 5, true, false)  # height of the break : 7
     x5 = pdf.get_x
     y5 = pdf.get_y
-    assert_equal x5, x4
-    assert_equal y5, y4
+    assert_equal x4, x5
+    assert_equal y4, y5
 
     pdf.addHTMLVertSpace(0, 5 + 2 + 1, true, false)  # height of the break : 8
     x6 = pdf.get_x
     y6 = pdf.get_y
-    assert_equal x6, x5
-    assert_equal y6, y5 + 1
+    assert_equal x5,     x6
+    assert_equal y5 + 1, y6
 
     pdf.addHTMLVertSpace(0, 10, true, true)  # height of the break : 0 (reset)
     x7 = pdf.get_x
     y7 = pdf.get_y
-    assert_equal x7, x6
-    assert_equal y7, y6
+    assert_equal x6, x7
+    assert_equal y6, y7
 
     pdf.addHTMLVertSpace(0, 2, true, false)  # height of the break : 2
     x8 = pdf.get_x
     y8 = pdf.get_y
-    assert_equal x8, x7
-    assert_equal y8, y7 + 2
+    assert_equal x7,     x8
+    assert_equal y7 + 2, y8
   end
 
   test "html func addHTMLVertSpace height of the break test 2" do
@@ -121,20 +125,20 @@ class RbpdfTest < Test::Unit::TestCase
     pdf.addHTMLVertSpace(10, 5, false, false) # height of the break : 5
     x2 = pdf.get_x
     y2 = pdf.get_y
-    assert_equal x2, x1
-    assert_equal y2, y1 + 10 + 5
+    assert_equal x1,          x2
+    assert_equal y1 + 10 + 5, y2
 
     pdf.addHTMLVertSpace(10, 5, false, false)  # height of the break : 5
     x3 = pdf.get_x
     y3 = pdf.get_y
-    assert_equal x3, x2
-    assert_equal y3, y2 + 10
+    assert_equal x2,      x3
+    assert_equal y2 + 10, y3
 
     pdf.addHTMLVertSpace(10, 5 + 2, false, false)  # height of the break : 7
     x4 = pdf.get_x
     y4 = pdf.get_y
-    assert_equal x4, x3
-    assert_equal y4, y3 + 10 + 2
+    assert_equal x3,          x4
+    assert_equal y3 + 10 + 2, y4
   end
 
   test "html func sanitize test 1" do
@@ -143,7 +147,7 @@ class RbpdfTest < Test::Unit::TestCase
     html = '<table border="1"><thead><tr><td>ABCD</td><td>EFGH</td><td>IJKL</td></tr></thead><tr><td>abcd</td><td>efgh</td><td>ijkl</td></tr><tr><td>' + 'ABC' + '</td></tr></table>'
     html = pdf.sanitize_html(html).gsub(/[\r\n]/,'')
 
-    assert_equal html, %{<table border="1"><thead><tr><td>ABCD</td><td>EFGH</td><td>IJKL</td></tr></thead><tr><td>abcd</td><td>efgh</td><td>ijkl</td></tr><tr><td>ABC</td></tr></table>}
+    assert_equal %{<table border="1"><thead><tr><td>ABCD</td><td>EFGH</td><td>IJKL</td></tr></thead><tr><td>abcd</td><td>efgh</td><td>ijkl</td></tr><tr><td>ABC</td></tr></table>}, html
   end
 
   test "html func sanitize test 2" do
@@ -153,7 +157,7 @@ class RbpdfTest < Test::Unit::TestCase
     htmlcontent = '1<br><br><br><br><br><br><br><br><br><br> 2<br><br><br><br><br><br><br><br><br><br> 3<br><br><br><br><br><br><br><br><br><br> 4<br><br><br><br><br><br><br><br><br><br> 5<br><br><br><br><br><br><br><br><br><br> 6<br><br><br><br><br><br><br><br><br><br> 7<br><br><br><br><br><br><br><br><br><br> 8<br><br><br><br><br><br><br><br><br><br> 9<br><br><br><br><br><br><br><br><br><br> 10<br><br><br><br><br><br><br><br><br><br> 11<br><br><br><br><br><br><br><br><br><br>'
     html = '<table cellpadding="1"><thead><tr><td>ABCD</td><td>EFGH</td><td>IJKL</td></tr></thead><tr><td>abcd</td><td>efgh</td><td>ijkl</td></tr><tr><td>' + htmlcontent + '</td></tr></table>'
     html = pdf.sanitize_html(html).gsub(/[\r\n]/,'')
-    assert_equal html, %{<table cellpadding="1"><thead><tr><td>ABCD</td><td>EFGH</td><td>IJKL</td></tr></thead><tr><td>abcd</td><td>efgh</td><td>ijkl</td></tr><tr><td>1<br><br><br><br><br><br><br><br><br><br> 2<br><br><br><br><br><br><br><br><br><br> 3<br><br><br><br><br><br><br><br><br><br> 4<br><br><br><br><br><br><br><br><br><br> 5<br><br><br><br><br><br><br><br><br><br> 6<br><br><br><br><br><br><br><br><br><br> 7<br><br><br><br><br><br><br><br><br><br> 8<br><br><br><br><br><br><br><br><br><br> 9<br><br><br><br><br><br><br><br><br><br> 10<br><br><br><br><br><br><br><br><br><br> 11<br><br><br><br><br><br><br><br><br><br></td></tr></table>}
+    assert_equal %{<table cellpadding="1"><thead><tr><td>ABCD</td><td>EFGH</td><td>IJKL</td></tr></thead><tr><td>abcd</td><td>efgh</td><td>ijkl</td></tr><tr><td>1<br><br><br><br><br><br><br><br><br><br> 2<br><br><br><br><br><br><br><br><br><br> 3<br><br><br><br><br><br><br><br><br><br> 4<br><br><br><br><br><br><br><br><br><br> 5<br><br><br><br><br><br><br><br><br><br> 6<br><br><br><br><br><br><br><br><br><br> 7<br><br><br><br><br><br><br><br><br><br> 8<br><br><br><br><br><br><br><br><br><br> 9<br><br><br><br><br><br><br><br><br><br> 10<br><br><br><br><br><br><br><br><br><br> 11<br><br><br><br><br><br><br><br><br><br></td></tr></table>}, html
   end
 
   test "html func sanitize open angled bracket '<' test" do

data/test/rbpdf_html_test.rb

@@ -1,4 +1,9 @@
 # coding: ASCII-8BIT
+#
+# Copyright (c) 2011-2017 NAITOH Jun
+# Released under the MIT license
+# http://www.opensource.org/licenses/MIT
+
 require 'test_helper'
 
 class RbpdfHtmlTest < Test::Unit::TestCase
@@ -74,7 +79,7 @@ class RbpdfHtmlTest < Test::Unit::TestCase
     pdf.write_html(htmlcontent, true, 0, true, 0)
 
     pno = pdf.get_page
-    assert_equal pno, 3
+    assert_equal 3, pno
   end
 
   test "write_html Table test 1" do
@@ -90,7 +95,7 @@ class RbpdfHtmlTest < Test::Unit::TestCase
     pdf.write_html(tablehtml, true, 0, true, 0)
 
     pno = pdf.get_page
-    assert_equal pno, 3
+    assert_equal 3, pno
   end
 
   test "write_html Table test 2" do
@@ -105,7 +110,7 @@ class RbpdfHtmlTest < Test::Unit::TestCase
     pdf.write_html(tablehtml, true, 0, true, 0)
 
     pno = pdf.get_page
-    assert_equal pno, 3
+    assert_equal 3, pno
 
     # Page 1
     count_line, count_text, xpos1 = pdf.get_html_text_position_x(1, /ABCD/) # Header
@@ -395,7 +400,7 @@ class RbpdfHtmlTest < Test::Unit::TestCase
     content.each do |line|
       count_text += 1 unless line.scan(text).empty?
     end
-    assert_equal count_text, 1
+    assert_equal 1, count_text
   end
 
   test "write_html Non ASCII text test" do
@@ -420,7 +425,7 @@ class RbpdfHtmlTest < Test::Unit::TestCase
       line.force_encoding('ASCII-8BIT') if line.respond_to?(:force_encoding)
       count_text += 1 unless line.scan(text).empty?
     end
-    assert_equal count_text, 1
+    assert_equal 1, count_text
   end
 
   test "works internal links out of page range" do
@@ -439,6 +444,28 @@ class RbpdfHtmlTest < Test::Unit::TestCase
     end
   end
 
+  test "write_html no tag text test" do
+    pdf = MYPDF.new
+    pdf.set_print_header(false)
+    pdf.add_page()
+
+    text = ' abc def '
+    pdf.write_html(text, true, 0, true, 0)
+    pdf_text = pdf.get_html_text(1)
+    assert_equal 'abc def', pdf_text
+  end
+
+  test "write_html no tag back slash test" do
+    pdf = MYPDF.new
+    pdf.set_print_header(false)
+    pdf.add_page()
+
+    text = " abc \\def "
+    pdf.write_html(text, true, 0, true, 0)  # use escape() method in getCellCode()
+    pdf_text = pdf.get_html_text(1)
+    assert_equal "abc \\\\def", pdf_text
+  end
+
   test "write_html <b> tag test" do
     pdf = MYPDF.new
     pdf.set_print_header(false)
@@ -504,6 +531,32 @@ class RbpdfHtmlTest < Test::Unit::TestCase
     assert_equal "\xa0" * 2 + 'A' * 70, pdf_text
   end
 
+  test "write_html <table> tag text test" do
+    pdf = MYPDF.new
+    pdf.set_print_header(false)
+    pdf.add_page()
+
+    text = "abc"
+    htmlcontent = '<table border="1"><tr><td>' + text + '</td></tr></table>'
+
+    pdf.write_html(htmlcontent, true, 0, true, 0)
+    pdf_text = pdf.get_html_text(1)
+    assert_equal 'abc', pdf_text
+  end
+
+  test "write_html <table> tag back slash test" do
+    pdf = MYPDF.new
+    pdf.set_print_header(false)
+    pdf.add_page()
+
+    text = "a\\bc"
+    htmlcontent = '<table border="1"><tr><td>' + text + '</td></tr></table>'
+
+    pdf.write_html(htmlcontent, true, 0, true, 0) # use escape() method in getCellCode()
+    pdf_text = pdf.get_html_text(1)
+    assert_equal 'a\\\\bc', pdf_text
+  end
+
   test "write_html Character Entities test" do
     pdf = MYPDF.new
     pdf.set_print_header(false)