rbpdf 1.18.2 → 1.18.3

data/test/rbpdf_dom_test.rb

@@ -114,6 +114,60 @@ class RbpdfTest < ActiveSupport::TestCase
     assert_equal dom[3]['width'], '10'
   end
 
+  test "Dom self close tag test" do
+    pdf = MYPDF.new
+
+    # Simple Tag
+    dom = pdf.getHtmlDomArray('<b>ab<br>c</b>')
+    assert_equal dom.length, 6
+
+    assert_equal 0, dom[0]['parent']  # Root
+    assert_equal false, dom[0]['tag']
+    assert_equal({}, dom[0]['attribute'])
+
+    # <b>
+    assert_equal dom[1]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[1]['elkey'], 0
+    assert_equal dom[1]['tag'], true
+    assert_equal dom[1]['opening'], true
+    assert_equal dom[1]['value'], 'b'
+    assert_equal dom[1]['attribute'], {}
+
+    # ab
+    assert_equal({'tag' => false, 'value'=>'ab', 'elkey'=>1, 'parent'=>1, 'block'=>false}, dom[2])  # parent -> open tag key
+
+    # <br>
+    assert_equal dom[3]['parent'], 1   # parent -> open tag key
+    assert_equal dom[3]['elkey'], 2
+    assert_equal dom[3]['tag'], true
+    assert_equal dom[3]['opening'], true
+    assert_equal dom[3]['value'], 'br'
+    assert_equal dom[3]['attribute'], {}
+
+    # c
+    assert_equal({'tag' => false, 'value'=>'c', 'elkey'=>3, 'parent'=>1, 'block'=>false}, dom[4])  # parent -> open tag key
+
+    # </b>
+    assert_equal dom[5]['parent'], 1   # parent -> open tag key
+    assert_equal dom[5]['elkey'], 4
+    assert_equal dom[5]['tag'], true
+    assert_equal dom[5]['opening'], false
+    assert_equal dom[5]['value'], 'b'
+
+    dom2 = pdf.getHtmlDomArray('<b>ab<br/>c</b>')
+    assert_equal dom, dom2
+
+    htmlcontent = '<b><img src="' + Rails.root.to_s + '/public/ng.png" alt="test alt attribute" width="30" height="30" border="0"/></b>'
+    dom1 = pdf.getHtmlDomArray(htmlcontent)
+    htmlcontent = '<b><img src="' + Rails.root.to_s + '/public/ng.png" alt="test alt attribute" width="30" height="30" border="0"></b>'
+    dom2 = pdf.getHtmlDomArray(htmlcontent)
+    assert_equal dom1, dom2
+
+    dom1 = pdf.getHtmlDomArray('<b>ab<hr/>c</b>')
+    dom2 = pdf.getHtmlDomArray('<b>ab<hr>c</b>')
+    assert_equal dom1, dom2
+  end
+
   test "Dom HTMLTagHandler Basic test" do
     pdf = MYPDF.new
     pdf.add_page
@@ -139,4 +193,13 @@ class RbpdfTest < ActiveSupport::TestCase
     assert_equal dom1, dom2
     assert_equal pdf.get_image_rby - (12 / pdf.get_scale_factor) , y2
   end
+
+  test "getHtmlDomArray encoding test" do
+    return unless 'test'.respond_to?(:force_encoding)
+
+    pdf = MYPDF.new('P', 'mm', 'A4', true, "UTF-8", true)
+    htmlcontent = 'test'.force_encoding('ASCII-8BIT')
+    dom = pdf.getHtmlDomArray(htmlcontent)
+    assert_equal htmlcontent.encoding.to_s, 'ASCII-8BIT'
+  end
 end

data/test/rbpdf_font_func_test.rb

@@ -1,6 +1,11 @@
 require 'test_helper'
 
 class RbpdfFontFuncTest < ActiveSupport::TestCase
+  class MYPDF < RBPDF
+    def putAPXObject(w=0, h=0, stream='')
+      super
+    end
+  end
   test "Font get_font_descent function test 1" do
     pdf = RBPDF.new
     fontdescent = pdf.get_font_descent('times', '', 18)
@@ -24,4 +29,13 @@ class RbpdfFontFuncTest < ActiveSupport::TestCase
     fontascent = pdf.get_font_ascent('freesans', '', 18)
     assert_in_delta 6.35, fontascent, 0.01
   end
+
+  test "putAPXObject test" do
+    pdf = MYPDF.new
+
+    apxo_obj_id = pdf.putAPXObject
+    assert_equal apxo_obj_id, 400001
+    apxo_obj_id = pdf.putAPXObject
+    assert_equal apxo_obj_id, 400002
+  end
 end

data/test/rbpdf_func_test.rb

@@ -123,4 +123,13 @@ class RbpdfTest < ActiveSupport::TestCase
     pdf.set_line_style({'width' => 0.1, 'cap' => 'butt', 'join' => 'miter', 'dash' => '1,2,3,4', 'phase' => 0, 'color' => [255, 0, 0]})
     pdf.set_line_style({'width' => 0.1, 'cap' => 'butt', 'join' => 'miter', 'dash' => 'a', 'phase' => 0, 'color' => [255, 0, 0]}) # Invalid
   end
+
+  test "get_string_width encoding test" do
+    return unless 'test'.respond_to?(:force_encoding)
+
+    pdf = RBPDF.new
+    str = 'test'.force_encoding('UTF-8')
+    width = pdf.get_string_width(str)
+    assert_equal str.encoding.to_s, 'UTF-8'
+  end
 end

data/test/rbpdf_html_func_test.rb

@@ -0,0 +1,136 @@
+require 'test_helper'
+
+class RbpdfTest < ActiveSupport::TestCase
+  class MYPDF < RBPDF
+    def addHTMLVertSpace(hbz, hb, cell, firstorlast)
+      super
+    end
+  end
+
+  test "html func addHTMLVertSpace empty lines test" do
+    pdf = MYPDF.new
+    pdf.add_page()
+
+    # same line, start position
+    x1 = pdf.get_x
+    pdf.set_x(x1 + 10)
+    y1 = pdf.get_y
+    pdf.addHTMLVertSpace(1, 0, false, true)
+    x2 = pdf.get_x
+    y2 = pdf.get_y
+    assert_equal x2, x1
+    assert_equal y2, y1
+
+    # same line, @c_margin position
+    margins = pdf.get_margins
+    
+    x1 = pdf.get_x
+    y1 = pdf.get_y
+    pdf.addHTMLVertSpace(1, 0, true, true)
+    x2 = pdf.get_x
+    y2 = pdf.get_y
+    assert_equal x2, x1 + margins['cell']
+    assert_equal y2, y1
+  end
+
+  test "html func addHTMLVertSpace add line test" do
+    pdf = MYPDF.new
+    pdf.add_page()
+
+    # next line, start position
+    x1 = pdf.get_x
+    pdf.set_x(x1 + 10)
+    y1 = pdf.get_y
+    pdf.addHTMLVertSpace(5, 0, false, false)
+    x2 = pdf.get_x
+    y2 = pdf.get_y
+    assert_equal x2, x1
+    assert_equal y2, y1 + 5
+
+    # next line, @c_margin position
+    margins = pdf.get_margins
+
+    x1 = pdf.get_x
+    y1 = pdf.get_y
+    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
+  end
+
+  test "html func addHTMLVertSpace height of the break test 1" do
+    pdf = MYPDF.new
+    pdf.add_page()
+
+    margins = pdf.get_margins
+    x1 = pdf.get_x
+    y1 = pdf.get_y
+    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
+
+    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
+
+    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
+
+    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
+
+    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
+
+    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
+
+    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
+  end
+
+  test "html func addHTMLVertSpace height of the break test 2" do
+    pdf = MYPDF.new
+    pdf.add_page()
+
+    x1 = pdf.get_x
+    y1 = pdf.get_y
+    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
+
+    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
+
+    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
+  end
+end

data/test/rbpdf_test.rb

@@ -242,4 +242,41 @@ class RbpdfTest < ActiveSupport::TestCase
     contents4 = pdf.getPageBuffer(2)
     assert_equal contents4, false
   end
+
+  test "start_page_group test" do
+    pdf = RBPDF.new
+    pdf.add_page
+    pdf.start_page_group
+    pdf.start_page_group(1)
+    pdf.start_page_group(nil)
+    pdf.start_page_group('')
+  end
+
+  test "get_page_dimensions test" do
+    pdf = RBPDF.new
+    pdf.add_page
+
+    pagedim = pdf.get_page_dimensions
+    assert_equal pagedim['CropBox']['llx'], 0.0
+    pagedim = pdf.get_page_dimensions(1)
+    assert_equal pagedim['CropBox']['llx'], 0.0
+    pagedim = pdf.get_page_dimensions(nil)
+    assert_equal pagedim['CropBox']['llx'], 0.0
+    pagedim = pdf.get_page_dimensions('')
+    assert_equal pagedim['CropBox']['llx'], 0.0
+  end
+
+  test "get_break_margin test" do
+    pdf = RBPDF.new
+    pdf.add_page
+
+    b_margin = pdf.get_break_margin
+    assert_in_delta b_margin, 20.0, 0.1
+    b_margin = pdf.get_break_margin(1)
+    assert_in_delta b_margin, 20.0, 0.1
+    b_margin = pdf.get_break_margin(nil)
+    assert_in_delta b_margin, 20.0, 0.1
+    b_margin = pdf.get_break_margin('')
+    assert_in_delta b_margin, 20.0, 0.1
+  end
 end

data/test/rbpdf_write_test.rb

@@ -170,4 +170,57 @@ class RbpdfTest < ActiveSupport::TestCase
     endlinex = pdf.endlinex()
     assert_not_equal endlinex, x
   end
+
+  test "write encoding test" do
+    return unless 'test'.respond_to?(:force_encoding)
+
+    pdf = RBPDF.new('P', 'mm', 'A4', true, "UTF-8", true)
+    str = 'test'.force_encoding('UTF-8')
+    width = pdf.write(0, str)
+    assert_equal str.encoding.to_s, 'UTF-8'
+  end
+
+  test "write Bidi arabic test" do
+    pdf = RBPDF.new
+    pdf.set_font('dejavusans', '', 18)
+    pdf.add_page
+
+    ascii_str   = "role"
+    utf8_arabic_str_1  = "\xd8\xaf\xd9\x88\xd8\xb1"
+
+    line = pdf.write(0, ascii_str)
+    assert_equal line,  1
+    line = pdf.write(0, utf8_arabic_str_1)
+    assert_equal line,  1
+  end
+
+  test "write Bidi arabic set_rtl test" do
+    pdf = RBPDF.new
+    pdf.set_font('dejavusans', '', 18)
+    pdf.set_rtl(true)
+    pdf.add_page
+
+    ascii_str   = "role"
+    utf8_arabic_str_1  = "\xd8\xaf\xd9\x88\xd8\xb1"
+
+    line = pdf.write(0, ascii_str)
+    assert_equal line,  1
+    line = pdf.write(0, utf8_arabic_str_1)
+    assert_equal line,  1
+  end
+
+  test "write Bidi arabic set_temp_rtl test" do
+    pdf = RBPDF.new
+    pdf.set_font('dejavusans', '', 18)
+    pdf.set_temp_rtl('rtl')
+    pdf.add_page
+
+    ascii_str   = "role"
+    utf8_arabic_str_1  = "\xd8\xaf\xd9\x88\xd8\xb1"
+
+    line = pdf.write(0, ascii_str)
+    assert_equal line,  1
+    line = pdf.write(0, utf8_arabic_str_1)
+    assert_equal line,  1
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbpdf
 version: !ruby/object:Gem::Version
-  version: 1.18.2
+  version: 1.18.3
 platform: ruby
 authors:
 - NAITOH Jun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-25 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -48,6 +48,7 @@ extra_rdoc_files: []
 files:
 - CHANGELOG
 - Gemfile
+- LICENSE.TXT
 - README.md
 - Rakefile
 - lib/core/rmagick.rb
@@ -165,6 +166,7 @@ files:
 - test/rbpdf_font_test.rb
 - test/rbpdf_format_test.rb
 - test/rbpdf_func_test.rb
+- test/rbpdf_html_func_test.rb
 - test/rbpdf_html_test.rb
 - test/rbpdf_htmlcell_test.rb
 - test/rbpdf_image_rmagick_test.rb
@@ -229,6 +231,7 @@ test_files:
 - test/rbpdf_font_test.rb
 - test/rbpdf_format_test.rb
 - test/rbpdf_func_test.rb
+- test/rbpdf_html_func_test.rb
 - test/rbpdf_html_test.rb
 - test/rbpdf_htmlcell_test.rb
 - test/rbpdf_image_rmagick_test.rb