rbpdf 1.19.5 → 1.19.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2639ff84fd70b4fcf84386c2d2d4ec407cfe932e
-  data.tar.gz: 59a2e7fe5a678bec81f112744dae30d004ae9a00
+  metadata.gz: eb07b943fb93bd28c583e7d1725cb594fd38e37e
+  data.tar.gz: bc4e241e6d61bf6ff850080c598fe468a0c524a7
 SHA512:
-  metadata.gz: 10d521aaf60b79a63a03d4a7e04830ee2cacee71f5d0a6f3f1acafb03a0d0973c48ce8fb77eec9f86747b72f4c52e5d0ccfcc59f55edca70e25804e0fb65302c
-  data.tar.gz: de13ae61679876a96365899664338a1a54134805eeec6e1d93cf2355c0b2b89c7266ad314a6b9066f306cc210712659914578cafab8f3907729f9d1c24c50692
+  metadata.gz: 01bf0690ab57b3248123090f7832826d60247d6361e276187a9efa98855a95733a869a48edd3d85f3b938f78c4ca424f7a830c6c203146830a350e2ee4bf8b9d
+  data.tar.gz: 65cc6adaff4ee5271c0f9d006e4dc600d93766c0d807fb90fd6120399ed73316258aee785bff8f963bee85a920705cb4414ef21fbe964785ea6543399e78995f

data/CHANGELOG

@@ -1,3 +1,15 @@
+1.19.6 2018-10-06
+       - The problem of the line feed position of Ln() function has been fixed.
+       - Fixed a problem of line feed position occurring in the following <pre> tag of HTML in the following cases.
+         When a <br> tag is included immediately after the start of the <pre> tag.
+         When a <br> tag is included immediately before the end of the <pre> tag.
+         When a line feed is included immediately after the start of the tag.
+         When a line feed is included immediately before the end of the tag.
+       - Fixed a problem of line feed position occurring in the following </pre> and <p> tags of HTML in the following cases.
+         When a space is included between the </pre> tag and the <p> tag.
+       - Cell link bug fixed.
+       - Examples test added.
+
 1.19.5 2018-06-24
        - Fixed that the handling of Tempfile was wrong.
        - Fixed compatibility problem with Magick::RGBColorspace and Magick::SRGBColorspace.

data/Gemfile

@@ -7,5 +7,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in rbpdf.gemspec
 gemspec
 
-gem "actionpack"
-
+gem "actionpack", "~> 5.2.0"

data/lib/rbpdf.rb

@@ -2994,7 +2994,7 @@ class RBPDF
   #
   def AddLink()
     #Create a new internal link
-    n = @links.length
+    n = @links.length + 1
     @links[n]=[0,0];
     return n;
   end
@@ -3757,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 @links array index
+      if link && ((link.is_a?(String) and !link.empty?) or (link.is_a?(Integer) and link != 0)) # Integer is PDF file Page No.
         Link(xdx, y + ((h - @font_size) / 2.0), width, @font_size, link, ns)
       end
     end
@@ -3993,7 +3993,11 @@ class RBPDF
           end
         end
         SetX(nx)
+
+        prevLastH = @lasth
         ccode = getCellCode(w, h, '', cborder, 1, '', fill, '', 0, false)
+        @lasth = prevLastH
+
         if (cborder != 0) or (fill == 1)
           pagebuff = getPageBuffer(@page)
           pstart = pagebuff[0, @intmrk[@page]]
@@ -4007,8 +4011,12 @@ class RBPDF
       # put cursor at the beginning of text
       SetY(y)
       SetX(x)
+
+      prevLastH = @lasth
       # design a cell around the text
       ccode = getCellCode(w, h, '', border, 1, '', fill, '', 0, true)
+      @lasth = prevLastH
+
       if (border != 0) or (fill == 1)
         if !@transfmrk[@page].nil?
           pagemark = @transfmrk[@page]
@@ -11242,8 +11250,24 @@ protected
       html_b = html[offset, pos - offset + 6]
       while html_b =~ /<xre([^\>]*)>(.*?)\n(.*?)<\/pre>/mi
         # preserve newlines on <pre> tag
-        html_b = html_b.gsub(/<xre([^\>]*)>(.*?)\n(.*?)<\/pre>/mi, "<xre\\1>\\2<br />\\3</pre>")
+        html_b = html_b.gsub(/<xre([^\>]*)>(.*?)\n(.*?)<\/pre>/mi) do
+          if ($2 != '') and ($3 != '') 
+            "<xre#{$1}>#{$2}<br />#{$3}</pre>"
+          elsif ($2 == '') and ($3 != '') 
+            "<xre#{$1}>#{$3}</pre>"
+          elsif ($2 != '') and ($3 == '') 
+            "<xre#{$1}>#{$2}</pre>"
+          else
+            "<xre#{$1}></pre>"
+          end
+        end
       end
+
+      # Delete the <br />(<br>) tag located immediately after the <pre> tag.
+      html_b = html_b.gsub(/<xre([^\>]*)>((?:<[^\>]+>)*)<br *\/*>/, "<xre\\1>\\2")
+      # Delete the <br />(<br>) tag located immediately before the </pre> tag.
+      html_b = html_b.gsub(/<br *\/*>((?:<\/[^\>]+>)*)<\/pre>/, "\\1</pre>")
+
       while html_b =~ /<xre([^\>]*)>(.*?)[\s](.*?)<\/pre>/mi
         # preserve whitespace on <pre> tag
         html_b = html_b.gsub(/<xre([^\>]*)>(.*?)[\s](.*?)<\/pre>/mi, "<xre\\1>\\2&nbsp;\\3</pre>")
@@ -12794,7 +12818,7 @@ public
             startlinepage = @page
           end
         end
-      elsif dom[key]['value'].length > 0
+      elsif dom[key]['value'].strip.length > 0
         # print list-item
         if !empty_string(@lispacer)
           SetFont(pfontname, pfontstyle, pfontsize)
@@ -13596,8 +13620,12 @@ public
                     @x += @pagedim[page]['olm'] - @pagedim[startpage]['olm']
                   end
                 end
+
+                prevLastH = @lasth
                 # design a cell around the text
                 ccode = @fill_color + "\n" + getCellCode(cw, ch, '', cborder, 1, '', fill, '', 0, true)
+                @lasth = prevLastH
+
                 if (cborder != 0) or (fill == 1)
                   pagebuff = getPageBuffer(@page)
                   pstart = pagebuff[0, @intmrk[@page]]
@@ -13618,8 +13646,12 @@ public
               @y = parent['starty']
               cw = (cellpos['endx'] - cellpos['startx']).abs
               ch = endy - parent['starty']
+
+              prevLastH = @lasth
               # design a cell around the text
               ccode = @fill_color + "\n" + getCellCode(cw, ch, '', border, 1, '', fill, '', 0, true)
+              @lasth = prevLastH
+
               if (border != 0) or (fill == 1)
                 if !@transfmrk[@page].nil?
                   pagemark = @transfmrk[@page]

data/lib/rbpdf/version.rb

@@ -1,7 +1,7 @@
-# Copyright (c) 2011-2017 NAITOH Jun
+# Copyright (c) 2011-2018 NAITOH Jun
 # Released under the MIT license
 # http://www.opensource.org/licenses/MIT
 
 module Rbpdf
-  VERSION = "1.19.5"
+  VERSION = "1.19.6"
 end

data/test/rbpdf_cell_test.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2017 NAITOH Jun
+# Copyright (c) 2011-2018 NAITOH Jun
 # Released under the MIT license
 # http://www.opensource.org/licenses/MIT
 
@@ -18,6 +18,9 @@ class RbpdfTest < Test::Unit::TestCase
     pdf.add_page()
     content = []
     contents = pdf.send(:getCellCode, 10, 10, 'abc')
+    #pdf.send(:getCellCode, 10, 10, 'abc')
+    #contents = pdf.output()
+
     contents.each_line {|line| content.push line.chomp }
 
     assert_equal 2, content.length
@@ -131,203 +134,85 @@ class RbpdfTest < Test::Unit::TestCase
     assert_equal " /Annots [ 200001 0 R ]", annots
   end
 
-  test "getStringHeight Basic test" do
-    pdf = RBPDF.new('P', 'mm', 'A4', true, "UTF-8", true)
-    pdf.add_page
-
-    txt = 'abcdefg'
-
-    w = 50
-    y1 = pdf.get_y
-    pdf.multi_cell(w, 0, txt)
-    pno = pdf.get_page
-    assert_equal 1, pno
-    y2 = pdf.get_y
-    h1 = y2 - y1
-
-    h2 = pdf.getStringHeight(w, txt)
-    assert_in_delta h1, h2, 0.01
-
-    line = pdf.get_num_lines(txt, w)
-    assert_equal 1, line
-
-    w = 20
-    y1 = pdf.get_y
-    pdf.multi_cell(w, 0, txt)
-    pno = pdf.get_page
-    assert_equal 1, pno
-    y2 = pdf.get_y
-    h1 = y2 - y1
-
-    h2 = pdf.getStringHeight(w, txt)
-    assert_in_delta h1, h2, 0.01
-
-    line = pdf.get_num_lines(txt, w)
-    assert_equal 1, line
-  end
-
-  test "getStringHeight Line Break test" do
-    pdf = RBPDF.new('P', 'mm', 'A4', true, "UTF-8", true)
-    pdf.add_page
-
-    txt = 'abcdefg'
-
-    w = 10
-    y1 = pdf.get_y
-    pdf.multi_cell(w, 0, txt)
-    pno = pdf.get_page
-    assert_equal 1, pno
-    y2 = pdf.get_y
-    h1 = y2 - y1
-
-    h2 = pdf.getStringHeight(w, txt)
-    assert_in_delta h1, h2, 0.01
-
-    line = pdf.get_num_lines(txt, w)
-    assert_equal 3, line
-
-
-    w = 5
-    y1 = pdf.get_y
-    pdf.multi_cell(w, 0, txt)
-    pno = pdf.get_page
-    assert_equal 1, pno
-    y2 = pdf.get_y
-    h1 = y2 - y1
-
-    h2 = pdf.getStringHeight(w, txt)
-    assert_in_delta h1, h2, 0.01
-
-    line = pdf.get_num_lines(txt, w)
-    assert_equal 7, line
-  end
-
-  test "getStringHeight Multi Line test" do
-    pdf = RBPDF.new('P', 'mm', 'A4', true, "UTF-8", true)
-    pdf.add_page
-
-    txt = "abc\ndif\nhij"
-
-    w = 100
-    y1 = pdf.get_y
-    pdf.multi_cell(w, 0, txt)
-    pno = pdf.get_page
-    assert_equal 1, pno
-    y2 = pdf.get_y
-    h1 = y2 - y1
-
-    h2 = pdf.getStringHeight(w, txt)
-    assert_in_delta h1, h2, 0.01
-
-    line = pdf.get_num_lines(txt, w)
-    assert_equal 3, line
-  end
-
-  test "getStringHeight Minimum Width test 1" do
-    pdf = RBPDF.new('P', 'mm', 'A4', true, "UTF-8", true)
-    pdf.add_page
-
-    w = pdf.get_string_width('OO')
+  test "Cell link with Close and output PDF document test" do
+    pdf = RBPDF.new
 
-    txt = "Export to PDF: align is Good."
-
-    y1 = pdf.get_y
-    pdf.multi_cell(w, 0, txt)
-    pno = pdf.get_page
-    assert_equal 1, pno
-    y2 = pdf.get_y
-    h1 = y2 - y1
+    # add a page
+    pdf.add_page()
 
-    h2 = pdf.getStringHeight(w, txt)
-    assert_in_delta h1, h2, 0.01
+    text="DUMMY"
+    pdf.cell(0, 0, text, 1, 1, 'L', 1, 0)
 
-    line = pdf.get_num_lines(txt, w)
-    assert_equal 16, line
+    # Close and output PDF document
+    content = []
+    contents = pdf.output()
+    contents.each_line {|line| content.push line.chomp }
+    assert_match(/3 0 obj/, content[1])
   end
 
- test "getStringHeight Minimum Width test 2" do
-    pdf = RBPDF.new('L', 'mm', 'A4', true, "UTF-8", true)
-    pdf.set_font('kozminproregular', '', 8)
-    pdf.add_page
-
-    margins = pdf.get_margins
-    w = pdf.get_string_width('20') + margins['cell'] * 2
-
-    txt = "20"
-
-    y1 = pdf.get_y
-    pdf.multi_cell(w, 0, txt)
-    pno = pdf.get_page
-    assert_equal 1, pno
-    y2 = pdf.get_y
-    h1 = y2 - y1
+  texts = {
+    'Basic'                   => {:params => [{:txt => "abcdefg", :w => 50, :pno => 1, :line => 1},
+                                              {:txt => "abcdefg", :w => 20, :pno => 1, :line => 1}]},
+    'Line Break'              => {:params => [{:txt => "abcdefg", :w => 10, :pno => 1, :line => 3},
+                                              {:txt => "abcdefg", :w => 5, :pno => 1, :line => 7}]},
+    'Multi Line'              => {:params => [{:txt => "abc\ndif\nhij", :w => 100, :pno => 1, :line => 3}]},
+    'Minimum Width'           => {:params => [{:txt => "Export to PDF: align is Good.", :w => 'OO', :pno => 1, :line => 16}]},
+    'Minimum Width with font' => {:font => "kozminproregular", :orientation => 'L',
+                                  :params => [{:txt => "20", :w => '20', :pno => 1, :line => 2}]},
+    'Minimum Bidi'            => {:params => [{:txt => "\xd7\xa2\xd7\x91\xd7\xa8\xd7\x99\xd7\xaa", :w => 'OO', :pno => 1, :line => 5},
+                                              {:txt => "? \xd7\x93\xd7\x92 \xd7\xa1\xd7\xa7\xd7\xa8\xd7\x9f \xd7\xa9\xd7\x98 \xd7\x91\xd7\x99\xd7\x9d \xd7\x9e\xd7\x90\xd7\x95\xd7\x9b\xd7\x96\xd7\x91 \xd7\x95\xd7\x9c\xd7\xa4\xd7\xaa\xd7\xa2 \xd7\x9e\xd7\xa6\xd7\x90 \xd7\x9c\xd7\x95 \xd7\x97\xd7\x91\xd7\xa8\xd7\x94 \xd7\x90\xd7\x99\xd7\x9a \xd7\x94\xd7\xa7\xd7\x9c\xd7\x99\xd7\x98\xd7\x94", :w => 'OO', :pno => 1, :line => 41}]},
+    'Minimum Bidi with font'  => {:font => "freesans", :rtl => true,
+                                  :params => [{:txt => "\xd7\x9c 000", :w => 'OO', :pno => 1, :line => 3}]},
+  }
+
+  data(texts)
+  test "getStringHeight test" do |data|
+    orientation = data[:orientation] ? data[:orientation] : 'P'
+    pdf = RBPDF.new(orientation, 'mm', 'A4', true, "UTF-8", true)
+    pdf.set_font(data[:font], '', 8) if data[:font]
+
+    if data[:rtl]
+      pdf.set_rtl(true)
+      pdf.set_temp_rtl('R')
+    end
 
-    h2 = pdf.getStringHeight(w, txt)
-    assert_in_delta h1, h2, 0.01
-
-    line = pdf.get_num_lines(txt, w)
-    assert_equal 2, line
-  end
-
-  test "getStringHeight Minimum Bidi test 1" do
-    pdf = RBPDF.new('P', 'mm', 'A4', true, "UTF-8", true)
     pdf.add_page
 
-    w = pdf.get_string_width('OO')
-
-    txt  = "\xd7\xa2\xd7\x91\xd7\xa8\xd7\x99\xd7\xaa"
-    y1 = pdf.get_y
-    pdf.multi_cell(w, 0, txt)
-    pno = pdf.get_page
-    assert_equal 1, pno
-    y2 = pdf.get_y
-    h1 = y2 - y1
-    h2 = pdf.getStringHeight(w, txt)
-    assert_in_delta h1, h2, 0.01
-
-    line = pdf.get_num_lines(txt, w)
-    assert_equal 5, line
-
-    txt = "? \xd7\x93\xd7\x92 \xd7\xa1\xd7\xa7\xd7\xa8\xd7\x9f \xd7\xa9\xd7\x98 \xd7\x91\xd7\x99\xd7\x9d \xd7\x9e\xd7\x90\xd7\x95\xd7\x9b\xd7\x96\xd7\x91 \xd7\x95\xd7\x9c\xd7\xa4\xd7\xaa\xd7\xa2 \xd7\x9e\xd7\xa6\xd7\x90 \xd7\x9c\xd7\x95 \xd7\x97\xd7\x91\xd7\xa8\xd7\x94 \xd7\x90\xd7\x99\xd7\x9a \xd7\x94\xd7\xa7\xd7\x9c\xd7\x99\xd7\x98\xd7\x94"
-
-    y1 = pdf.get_y
-    pdf.multi_cell(w, 0, txt)
-    pno = pdf.get_page
-    assert_equal 1, pno
-    y2 = pdf.get_y
-    h1 = y2 - y1
-
-    h2 = pdf.getStringHeight(w, txt)
-    assert_in_delta h1, h2, 0.01
-
-    line = pdf.get_num_lines(txt, w)
-    assert_equal 41, line
-  end
-
-  test "getStringHeight Minimum Bidi test 2" do
-    pdf = RBPDF.new('P', 'mm', 'A4', true, "UTF-8", true)
-    pdf.set_font('freesans', '')
-    pdf.set_rtl(true)
-    pdf.set_temp_rtl('R')
-    pdf.add_page
-
-    margins = pdf.get_margins
-    w = pdf.get_string_width('OO') + margins['cell'] * 2
-
-    txt =  "\xd7\x9c 000"
-
-    y1 = pdf.get_y
-    pdf.multi_cell(w, 0, txt)
-    pno = pdf.get_page
-    assert_equal 1, pno
-    y2 = pdf.get_y
-    h1 = y2 - y1
-
-    h2 = pdf.getStringHeight(w, txt)
-    assert_in_delta h1, h2, 0.01
-
-    line = pdf.get_num_lines(txt, w)
-    assert_equal 3, line
+    data[:params].each_with_index {|param, i|
+      txt = param[:txt]
+      if param[:w].is_a? String
+        if data[:font]
+          margins = pdf.get_margins
+          w = pdf.get_string_width(param[:w]) + margins['cell'] * 2
+        else
+          w = pdf.get_string_width(param[:w])
+        end
+      else
+        w = param[:w]
+      end
+
+      lasth_0 = pdf.get_last_h
+      y1 = pdf.get_y
+      pdf.multi_cell(w, 0, txt)
+      lasth_1 = pdf.get_last_h
+      pno = pdf.get_page
+      assert_equal param[:pno], pno
+
+      if i == 0
+        assert_not_equal 0, lasth_1
+      else
+        assert_equal lasth_0, lasth_1
+      end
+
+      y2 = pdf.get_y
+      h1 = y2 - y1
+
+      h2 = pdf.getStringHeight(w, txt)
+      assert_in_delta h1, h2, 0.01
+
+      line = pdf.get_num_lines(txt, w)
+      assert_equal param[:line], line
+    }
   end
 
   test "removeSHY encoding test" do

data/test/rbpdf_dom_test.rb

@@ -6,343 +6,267 @@ require 'test_helper'
 
 class RbpdfTest < Test::Unit::TestCase
   class MYPDF < RBPDF
-    def getHtmlDomArray(html)
-      super
-    end
-    def openHTMLTagHandler(dom, key, cell)
-      super
-    end
     def get_temp_rtl
       @tmprtl
     end
   end
 
-  test "Dom Basic" do
-    pdf = MYPDF.new
+  htmls = {
+    'Simple Text'     => {:html => 'abc', :length => 2,
+                          :params => [{:parent => 0, :tag => false}, # parent -> Root
+                                      {:parent => 0, :tag => false, :value => 'abc',   :elkey => 0, :block => false}]},
+    'Back Slash Text' => {:html => 'a\\bc', :length => 2,
+                          :params => [{:parent => 0, :tag => false}, # parent -> Root
+                                      {:parent => 0, :tag => false, :value => 'a\\bc', :elkey => 0, :block => false}]},
+    'Simple Tag'      => {:html => '<b>abc</b>', :length => 4,
+                          :params => [{:parent => 0, :tag => false, :attribute => {}}, # parent -> Root
+                                      {:parent => 0, :tag => true,  :value => 'b',     :elkey => 0, :opening => true, :attribute => {}},
+                                      {:parent => 1, :tag => false, :value => 'abc',   :elkey => 1, :block => false},     # parent -> open tag key
+                                      {:parent => 1, :tag => true,  :value => 'b',     :elkey => 2, :opening => false}]}, # parent -> open tag key
+    'pre Tag'         => {:html => "<pre>abc</pre>", :length => 4,  # See. 'Dom pre tag test'
+                          :params => [{:parent => 0, :tag => false, :attribute => {}}, # parent -> Root
+                                      {:parent => 0, :tag => true,  :value => 'pre',   :elkey => 0, :opening => true, :attribute => {}},
+                                      {:parent => 1, :tag => false, :value => 'abc',   :elkey => 1, :block => false},     # parent -> open tag key
+                                      {:parent => 1, :tag => true,  :value => 'pre',   :elkey => 2, :opening => false}]}, # parent -> open tag key
+    'pre code Tag'    => {:html => '<pre><code class="ruby">abc</code></pre>', :length => 4,  # See. 'Dom pre tag test (code)'
+                          :params => [{:parent => 0, :tag => false, :attribute => {}}, # parent -> Root
+                                      {:parent => 0, :tag => true,  :value => 'pre',   :elkey => 0, :opening => true, :attribute => {}},
+                                      {:parent => 1, :tag => false, :value => 'abc',   :elkey => 1, :block => false},     # parent -> open tag key
+                                      {:parent => 1, :tag => true,  :value => 'pre',   :elkey => 2, :opening => false}]}, # parent -> open tag key
+    'pre code span Tag' => {:html => '<pre><code class="ruby syntaxhl"><span class="CodeRay">abc</span></code></pre>', :length => 6,  # See. 'Dom pre tag test (code span)'
+                          :params => [{:parent => 0, :tag => false, :attribute => {}}, # parent -> Root
+                                      {:parent => 0, :tag => true,  :value => 'pre',   :elkey => 0, :opening => true, :attribute => {}},
+                                      {:parent => 1, :tag => true,  :value => 'span',  :elkey => 1, :opening => true},
+                                      {:parent => 2, :tag => false, :value => 'abc',   :elkey => 2, :block => false},     # parent -> open tag key
+                                      {:parent => 2, :tag => true,  :value => 'span',  :elkey => 3, :opening => false}, # parent -> open tag key
+                                      {:parent => 1, :tag => true,  :value => 'pre',   :elkey => 4, :opening => false}]}, # parent -> open tag key
+    'Error Tag (doble colse tag)' => {:html => '</ul></div>',
+                                      :validated_length => 1, # for Rails 4.2 later (no use Rails 3.x/4.0/4.1)
+                          :params => [{:parent => 0, :tag => false, :attribute => {}}, # parent -> Root
+                                      {:parent => 0, :tag => true,  :value => 'ul',    :elkey => 0, :opening => false},   # parent -> Root key
+                                      {:parent => 0, :tag => true,  :value => 'div',   :elkey => 1, :opening => false}]}, # parent -> Root key
+    'Attribute'       => {:html => '<p style="text-align:justify">abc</p>', :length => 4,
+                          :params => [{:parent => 0, :tag => false, :attribute => {}}, # parent -> Root
+                                      {:parent => 0, :tag => true,  :value => 'p',     :elkey => 0, :opening => true, :align => 'J', :attribute => {:style => 'text-align:justify;'}}]},
+    'Table border'    => {:html => '<table border="1"><tr><td>abc</td></tr></table>', :length => 9,
+                              # -> '<table border="1"><tr><td>abc<marker style="font-size:0"/></td></tr></table>' ## added marker tag (by getHtmlDomArray()) ##
+                          :params => [{:parent => 0, :tag => false, :attribute => {}}, # parent -> Root
+                                      {:parent => 0, :tag => true,  :value => 'table', :elkey => 0, :opening => true, :attribute => {:border => 1}},
+                                      {},
+                                      {},
+                                      {},
+                                      # marker tag (by getHtmlDomArray())
+                                      {:parent => 3, :tag => true,  :value => 'marker', :elkey => 4, :opening => true, :attribute => {:style => 'font-size:0'}}]},
+    'Table td Width'  => {:html => '<table><tr><td width="10">abc</td></tr></table>', :length => 9,
+                              # -> '<table><tr><td width="10">abc<marker style="font-size:0"/></td></tr></table>' ## added marker tag (by getHtmlDomArray()) ##
+                          :params => [{},
+                                      {},
+                                      {},
+                                      {:parent => 2, :tag => true,  :value => 'td',    :elkey => 2, :opening => true, :width => '10'}]},
+    'Dom open angled bracket "<"' => {:html => "<p>AAA '<'-BBB << <<< '</' '<//' '<///' CCC.</p>", :length => 4,
+                          :params => [{:parent => 0, :tag => false, :attribute => {}}, # parent -> Root
+                                      {:parent => 0, :tag => true,  :value => 'p',    :elkey => 0, :opening => true, :attribute => {}},
+                                      {:parent => 1, :tag => false, :value => "AAA '<'-BBB << <<< '</' '<//' '<///' CCC.",   :elkey => 1},
+                                      {:parent => 1, :tag => true,  :value => 'p',    :elkey => 2, :opening => false}]},
+    'Dom self close tag' => {:html => '<b>ab<br>c</b>', :length => 6, # See. 'Dom self close tag test (Simple Tag)'
+                          :params => [{:parent => 0, :tag => false, :attribute => {}}, # parent -> Root
+                                      {:parent => 0, :tag => true,  :value => 'b',    :elkey => 0, :opening => true, :attribute => {}}, # <b>
+                                      {:parent => 1, :tag => false, :value => 'ab',   :elkey => 1, :block => false},                    # ab
+                                      {:parent => 1, :tag => true,  :value => 'br',   :elkey => 2, :opening => true, :attribute => {}}, # <br>
+                                      {:parent => 1, :tag => false, :value => 'c',    :elkey => 3, :block => false},                    # c
+                                      {:parent => 1, :tag => true,  :value => 'b',    :elkey => 4, :opening => false}]},                # </b>
+  }
+
+  data(htmls)
+  test "Dom Basic test" do |data|
+    pdf = RBPDF.new
+    dom = pdf.send(:getHtmlDomArray, data[:html])
+    assert_equal data[:length], dom.length if data[:length]
+    data[:params].each_with_index {|param, i|
+      # validated length check (for Rails 4.2 later)
+      if dom[i].nil? and i >= data[:validated_length]
+        break
+      end
+
+      param.each {|key, val|
+        if (key == :attribute) and !val.empty?
+          val.each {|k, v|
+            if (k == :style) and !v.empty?
+              assert_equal("dom[#{i}][attribute]: #{k} => #{v}", "dom[#{i}][attribute]: #{k} => #{dom[i][key.to_s][k.to_s].gsub(' ', '')}")
+            else
+              assert_equal("dom[#{i}][attribute]: #{k} => #{v}", "dom[#{i}][attribute]: #{k} => #{dom[i][key.to_s][k.to_s]}")
+            end
+          }
+        else
+          assert_equal("dom[#{i}]: #{key} => #{val}", "dom[#{i}]: #{key} => #{dom[i][key.to_s]}")
+        end
+      }
+    }
+  end
 
-    # Simple Text
-    dom = pdf.getHtmlDomArray('abc')
-    assert_equal 0,     dom[0]['parent'] # Root
-    assert_equal false, dom[0]['tag']
-    assert_equal({'tag'=>false, 'value'=>'abc', 'elkey'=>0, 'parent'=>0, 'block'=>false}, dom[1])
+  test "Dom pre tag test" do
+    pdf = RBPDF.new
 
-    # Back Slash Text
-    dom = pdf.getHtmlDomArray("a\\bc")
-    assert_equal 0,     dom[0]['parent'] # Root
-    assert_equal false, dom[0]['tag']
-    assert_equal({'tag'=>false, 'value'=>"a\\bc", 'elkey'=>0, 'parent'=>0, 'block'=>false}, dom[1])
+    # No Text
+    dom = pdf.send(:getHtmlDomArray, "<pre></pre>")
+    dom2 = pdf.send(:getHtmlDomArray, "<pre>\n</pre>")
+    assert_equal dom, dom2
 
     # Simple Tag
-    dom = pdf.getHtmlDomArray('<b>abc</b>')
-    assert_equal 4,     dom.length
-
-    assert_equal 0,     dom[0]['parent']  # Root
-    assert_equal false, dom[0]['tag']
-    assert_equal({},    dom[0]['attribute'])
-
-    assert_equal 0,     dom[1]['parent'] # parent -> parent tag key
-    assert_equal 0,     dom[1]['elkey']
-    assert_equal true,  dom[1]['tag']
-    assert_equal true,  dom[1]['opening']
-    assert_equal 'b',   dom[1]['value']
-    assert_equal({},    dom[1]['attribute'])
-
-    assert_equal({'tag' => false, 'value'=>'abc', 'elkey'=>1, 'parent'=>1, 'block'=>false}, dom[2])  # parent -> open tag key
-
-    assert_equal 1,     dom[3]['parent'] # parent -> open tag key
-    assert_equal 2,     dom[3]['elkey']
-    assert_equal true,  dom[3]['tag']
-    assert_equal false, dom[3]['opening']
-    assert_equal 'b',   dom[3]['value']
-
-    # Error Tag (doble colse tag)
-    dom = pdf.getHtmlDomArray('</ul></div>')
-
-    assert_equal 0,     dom[0]['parent']  # Root
-    assert_equal false, dom[0]['tag']
-    assert_equal({},    dom[0]['attribute'])
-
-    if dom.length == 3 # for Rails 3.x/4.0/4.1 (no use Rails 4.2 later)
-      assert_equal 0,     dom[1]['parent'] # parent -> Root key
-      assert_equal 0,     dom[1]['elkey']
-      assert_equal true,  dom[1]['tag']
-      assert_equal false, dom[1]['opening']
-      assert_equal 'ul',  dom[1]['value']
-
-      assert_equal 0,     dom[2]['parent'] # parent -> Root key
-      assert_equal 1,     dom[2]['elkey']
-      assert_equal true,  dom[2]['tag']
-      assert_equal false, dom[2]['opening']
-      assert_equal 'div', dom[2]['value']
-    end
-
-    # Attribute
-    dom = pdf.getHtmlDomArray('<p style="text-align:justify">abc</p>')
-    assert_equal 4,     dom.length
-
-    assert_equal 0,     dom[0]['parent'] # Root
-    assert_equal false, dom[0]['tag']
-    assert_equal({},    dom[0]['attribute'])
-
-    assert_equal 0,     dom[1]['parent'] # parent -> parent tag key
-    assert_equal 0,     dom[1]['elkey']
-    assert_equal true,  dom[1]['tag']
-    assert_equal true,  dom[1]['opening']
-    assert_equal 'p',   dom[1]['value']
-    assert_not_nil dom[1]['attribute']
-    assert_equal 'text-align:justify;', dom[1]['attribute']['style'].gsub(' ', '')
-    assert_equal 'J',   dom[1]['align']
-
-    # Table border
-    dom = pdf.getHtmlDomArray('<table border="1"><tr><td>abc</td></tr></table>')
-    ## added marker tag (by getHtmlDomArray()) ##
-    # '<table border="1"><tr><td>abc<marker style="font-size:0"/></td></tr></table>'
-    assert_equal 9,             dom.length
-
-    assert_equal 0,             dom[1]['parent'] # parent -> parent tag key
-    assert_equal 0,             dom[1]['elkey']
-    assert_equal true,          dom[1]['tag']
-    assert_equal true,          dom[1]['opening']
-    assert_equal 'table',       dom[1]['value']
-    assert_equal '1',           dom[1]['attribute']['border']
+    dom = pdf.send(:getHtmlDomArray, "<pre>abc</pre>")
+    dom2 = pdf.send(:getHtmlDomArray, "<pre>\nabc\n</pre>")
+    assert_equal dom, dom2
+    dom2 = pdf.send(:getHtmlDomArray, "<pre>\nabc</pre>")
+    assert_equal dom, dom2
+    dom2 = pdf.send(:getHtmlDomArray, "<pre>abc\n</pre>")
+    assert_equal dom, dom2
+    dom2 = pdf.send(:getHtmlDomArray, "<pre>abc<br /></pre>")
+    assert_equal dom, dom2
 
-    ## marker tag (by getHtmlDomArray())
-    assert_equal 3,             dom[5]['parent'] # parent -> parent tag key
-    assert_equal 4,             dom[5]['elkey']
-    assert_equal true,          dom[5]['tag']
-    assert_equal true,          dom[5]['opening']
-    assert_equal 'marker',      dom[5]['value']
-    assert_equal 'font-size:0', dom[5]['attribute']['style']
+    # with line feed
+    dom = pdf.send(:getHtmlDomArray, "<pre>abc\ndef</pre>")
+    dom2 = pdf.send(:getHtmlDomArray, "<pre>\nabc\ndef\n</pre>")
+    assert_equal dom, dom2
+    dom2 = pdf.send(:getHtmlDomArray, "<pre>\nabc\ndef</pre>")
+    assert_equal dom, dom2
+    dom2 = pdf.send(:getHtmlDomArray, "<pre>abc\ndef\n</pre>")
+    assert_equal dom, dom2
 
-    # Table td Width
-    dom = pdf.getHtmlDomArray('<table><tr><td width="10">abc</td></tr></table>')
-    ## added marker tag (by getHtmlDomArray()) ##
-    # '<table><tr><td width="10">abc<marker style="font-size:0"/></td></tr></table>'
-    assert_equal 9,    dom.length
+    # code Tag
+    dom = pdf.send(:getHtmlDomArray, '<pre><code class="ruby">abc</code></pre>')
+    dom2 = pdf.send(:getHtmlDomArray, "<pre><code class=\"ruby\">\nabc\n</code></pre>")
+    assert_equal dom, dom2
+    dom2 = pdf.send(:getHtmlDomArray, "<pre><code class=\"ruby\">\nabc</code></pre>")
+    assert_equal dom, dom2
+    dom2 = pdf.send(:getHtmlDomArray, "<pre><code class=\"ruby\">abc\n</code></pre>")
+    assert_equal dom, dom2
 
-    assert_equal 2,     dom[3]['parent'] # parent -> parent tag key
-    assert_equal 2,     dom[3]['elkey']
-    assert_equal true,  dom[3]['tag']
-    assert_equal true,  dom[3]['opening']
-    assert_equal 'td',  dom[3]['value']
-    assert_equal '10',  dom[3]['width']
+    # code span Tag
+    dom = pdf.send(:getHtmlDomArray, '<pre><code class="ruby syntaxhl"><span class="CodeRay">abc</span></code></pre>')
+    dom2 = pdf.send(:getHtmlDomArray, "<pre><code class=\"ruby syntaxhl\"><span class=\"CodeRay\">\nabc\n</span></code></pre>")
+    assert_equal dom, dom2
+    dom2 = pdf.send(:getHtmlDomArray, "<pre><code class=\"ruby syntaxhl\"><span class=\"CodeRay\">\nabc</span></code></pre>")
+    assert_equal dom, dom2
+    dom2 = pdf.send(:getHtmlDomArray, "<pre><code class=\"ruby syntaxhl\"><span class=\"CodeRay\">abc\n</span></code></pre>")
+    assert_equal dom, dom2
+    dom2 = pdf.send(:getHtmlDomArray, "<pre><code class=\"ruby syntaxhl\"><span class=\"CodeRay\">abc</span>\n</code></pre>")
+    assert_equal dom, dom2
+    dom2 = pdf.send(:getHtmlDomArray, "<pre><code class=\"ruby syntaxhl\">\n<span class=\"CodeRay\">\nabc\n</span>\n</code></pre>")
+    assert_equal dom, dom2
   end
 
   test "Dom self close tag test" do
-    pdf = MYPDF.new
+    pdf = RBPDF.new
 
     # Simple Tag
-    dom = pdf.getHtmlDomArray('<b>ab<br>c</b>')
-    assert_equal 6,     dom.length
-
-    assert_equal 0,     dom[0]['parent'] # Root
-    assert_equal false, dom[0]['tag']
-    assert_equal({},    dom[0]['attribute'])
-
-    # <b>
-    assert_equal 0,     dom[1]['parent'] # parent -> parent tag key
-    assert_equal 0,     dom[1]['elkey']
-    assert_equal true,  dom[1]['tag']
-    assert_equal true,  dom[1]['opening']
-    assert_equal 'b',   dom[1]['value']
-    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 1,     dom[3]['parent'] # parent -> open tag key
-    assert_equal 2,     dom[3]['elkey']
-    assert_equal true,  dom[3]['tag']
-    assert_equal true,  dom[3]['opening']
-    assert_equal 'br',  dom[3]['value']
-    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 1,     dom[5]['parent'] # parent -> open tag key
-    assert_equal 4,     dom[5]['elkey']
-    assert_equal true,  dom[5]['tag']
-    assert_equal false, dom[5]['opening']
-    assert_equal 'b',   dom[5]['value']
-
-    dom2 = pdf.getHtmlDomArray('<b>ab<br/>c</b>')
+    dom = pdf.send(:getHtmlDomArray, '<b>ab<br>c</b>')
+    dom2 = pdf.send(:getHtmlDomArray, '<b>ab<br/>c</b>')
     assert_equal dom, dom2
 
     htmlcontent = '<b><img src="/public/ng.png" alt="test alt attribute" width="30" height="30" border="0"/></b>'
-    dom1 = pdf.getHtmlDomArray(htmlcontent)
+    dom1 = pdf.send(:getHtmlDomArray, htmlcontent)
     htmlcontent = '<b><img src="/public/ng.png" alt="test alt attribute" width="30" height="30" border="0"></b>'
-    dom2 = pdf.getHtmlDomArray(htmlcontent)
+    dom2 = pdf.send(:getHtmlDomArray, htmlcontent)
     assert_equal dom1, dom2
 
-    dom1 = pdf.getHtmlDomArray('<b>ab<hr/>c</b>')
-    dom2 = pdf.getHtmlDomArray('<b>ab<hr>c</b>')
+    dom1 = pdf.send(:getHtmlDomArray, '<b>ab<hr/>c</b>')
+    dom2 = pdf.send(:getHtmlDomArray, '<b>ab<hr>c</b>')
     assert_equal dom1, dom2
   end
 
   test "Dom HTMLTagHandler Basic test" do
-    pdf = MYPDF.new
+    pdf = RBPDF.new
     pdf.add_page
 
     # Simple HTML
     htmlcontent = '<h1>HTML Example</h1>'
-    dom1 = pdf.getHtmlDomArray(htmlcontent)
-    dom2 = pdf.openHTMLTagHandler(dom1, 1, false)
+    dom1 = pdf.send(:getHtmlDomArray, htmlcontent)
+    dom2 = pdf.send(:openHTMLTagHandler, dom1, 1, false)
     assert_equal dom1, dom2
   end
 
-  test "Dom HTMLTagHandler DIR RTL test" do
+  htmls = {
+    'LTR' => {:lines => [{:html => '<p dir="ltr">HTML Example</p>', :length => 4,
+                          :params => [{}, {:tag => true,  :value => 'p',     :opening => true, :attribute => {:dir => 'ltr'}, :temprtl => false}]},
+                         {:html => '<p dir="rtl">HTML Example</p>', :length => 4,
+                          :params => [{}, {:tag => true,  :value => 'p',     :opening => true, :attribute => {:dir => 'rtl'}, :temprtl => 'R'}]},
+                         {:html => '<p dir="ltr">HTML Example</p>', :length => 4,
+                          :params => [{}, {:tag => true,  :value => 'p',     :opening => true, :attribute => {:dir => 'ltr'}, :temprtl => false}]}
+                        ]},
+    'RTL' => {:rtl => true, 
+              :lines => [{:html => '<p dir="ltr">HTML Example</p>', :length => 4,
+                          :params => [{}, {:tag => true,  :value => 'p',     :opening => true, :attribute => {:dir => 'ltr'}, :temprtl => 'L'}]},
+                         {:html => '<p dir="rtl">HTML Example</p>', :length => 4,
+                          :params => [{}, {:tag => true,  :value => 'p',     :opening => true, :attribute => {:dir => 'rtl'}, :temprtl => false}]}
+                        ]},
+  }
+
+  data(htmls)
+  test "Dom HTMLTagHandler DIR test" do |data|
     pdf = MYPDF.new
     pdf.add_page
     temprtl = pdf.get_temp_rtl
     assert_equal false, temprtl
-
-    # LTR, ltr
-    htmlcontent = '<p dir="ltr">HTML Example</p>'
-    dom = pdf.getHtmlDomArray(htmlcontent)
-    dom = pdf.openHTMLTagHandler(dom, 1, false)
-
-    assert_equal true,  dom[1]['tag']
-    assert_equal true,  dom[1]['opening']
-    assert_equal 'p',   dom[1]['value']
-    assert_equal 'ltr', dom[1]['attribute']['dir']
-
-    temprtl = pdf.get_temp_rtl
-    assert_equal false, temprtl
-
-    # LTR, rtl
-    htmlcontent = '<p dir="rtl">HTML Example</p>'
-    dom = pdf.getHtmlDomArray(htmlcontent)
-    dom = pdf.openHTMLTagHandler(dom, 1, false)
-    assert_equal 4,     dom.length
-
-    assert_equal true,  dom[1]['tag']
-    assert_equal true,  dom[1]['opening']
-    assert_equal 'p',   dom[1]['value']
-    assert_equal 'rtl', dom[1]['attribute']['dir']
-
-    temprtl = pdf.get_temp_rtl
-    assert_equal 'R',   temprtl
-
-    # LTR, ltr
-    htmlcontent = '<p dir="ltr">HTML Example</p>'
-    dom = pdf.getHtmlDomArray(htmlcontent)
-    dom = pdf.openHTMLTagHandler(dom, 1, false)
-
-    assert_equal true,  dom[1]['tag']
-    assert_equal true,  dom[1]['opening']
-    assert_equal 'p',   dom[1]['value']
-    assert_equal 'ltr', dom[1]['attribute']['dir']
-
-    temprtl = pdf.get_temp_rtl
-    assert_equal false, temprtl
-  end
-
-  test "Dom HTMLTagHandler DIR LTR test" do
-    pdf = MYPDF.new
-    pdf.add_page
-    temprtl = pdf.get_temp_rtl
-    assert_equal false, temprtl
-    pdf.set_rtl(true)
-
-    # RTL, ltr
-    htmlcontent = '<p dir="ltr">HTML Example</p>'
-    dom = pdf.getHtmlDomArray(htmlcontent)
-    dom = pdf.openHTMLTagHandler(dom, 1, false)
-    assert_equal 4,     dom.length
-
-    assert_equal true,  dom[1]['tag']
-    assert_equal true,  dom[1]['opening']
-    assert_equal 'p',   dom[1]['value']
-    assert_equal 'ltr', dom[1]['attribute']['dir']
-
-    temprtl = pdf.get_temp_rtl
-    assert_equal 'L',   temprtl
-
-    # RTL, rtl
-    htmlcontent = '<p dir="rtl">HTML Example</p>'
-    dom = pdf.getHtmlDomArray(htmlcontent)
-    dom = pdf.openHTMLTagHandler(dom, 1, false)
-    assert_equal 4,     dom.length
-
-    assert_equal true,  dom[1]['tag']
-    assert_equal true,  dom[1]['opening']
-    assert_equal 'p',   dom[1]['value']
-    assert_equal 'rtl', dom[1]['attribute']['dir']
-
-    temprtl = pdf.get_temp_rtl
-    assert_equal false, temprtl
+    pdf.set_rtl(true) if data[:rtl]
+
+    data[:lines].each_with_index {|line, l|
+      dom = pdf.send(:getHtmlDomArray, line[:html])
+      dom = pdf.send(:openHTMLTagHandler, dom, 1, false)
+
+      assert_equal line[:length], dom.length if line[:length]
+      line[:params].each_with_index {|param, i|
+        param.each {|key, val|
+          if (key == :attribute) and !val.empty?
+            val.each {|k, v|
+              assert_equal("#{l}: dom[#{i}][attribute]: #{k} => #{v}", "#{l}: dom[#{i}][attribute]: #{k} => #{dom[i][key.to_s][k.to_s]}")
+            }
+          elsif (key == :temprtl)
+            temprtl = pdf.get_temp_rtl
+            assert_equal("#{l}: dom[#{i}]: temprtl => #{val}", "#{l}: dom[#{i}]: temprtl => #{temprtl.to_s}")
+          else
+            assert_equal("#{l}: dom[#{i}]: #{key} => #{val}", "#{l}: dom[#{i}]: #{key} => #{dom[i][key.to_s]}")
+          end
+        }
+      }
+    }
   end
 
   test "Dom HTMLTagHandler img y position with height attribute test" do
-    pdf = MYPDF.new
+    pdf = RBPDF.new
     pdf.add_page
 
     # Image Error HTML
     htmlcontent = '<img src="/public/ng.png" alt="test alt attribute" width="30" height="30" border="0"/>'
-    dom1 = pdf.getHtmlDomArray(htmlcontent)
+    dom1 = pdf.send(:getHtmlDomArray, htmlcontent)
     #y1 = pdf.get_y
 
-    dom2 = pdf.openHTMLTagHandler(dom1, 1, false)
+    dom2 = pdf.send(:openHTMLTagHandler, dom1, 1, false)
     y2 = pdf.get_y
     assert_equal dom1, dom2
     assert_equal pdf.get_image_rby - (12 / pdf.get_scale_factor) , y2
   end
 
   test "Dom HTMLTagHandler img y position without height attribute test" do
-    pdf = MYPDF.new
+    pdf = RBPDF.new
     pdf.add_page
 
     # Image Error HTML
     htmlcontent = '<img src="/public/ng.png" alt="test alt attribute" border="0"/>'
-    dom1 = pdf.getHtmlDomArray(htmlcontent)
+    dom1 = pdf.send(:getHtmlDomArray, htmlcontent)
     y1 = pdf.get_y
 
-    dom2 = pdf.openHTMLTagHandler(dom1, 1, false)
+    dom2 = pdf.send(:openHTMLTagHandler, dom1, 1, false)
     y2 = pdf.get_y
     assert_equal dom1, dom2
     assert_equal y1, y2
   end
 
-  test "Dom open angled bracket '<' test" do
-    pdf = MYPDF.new
-    pdf.add_page
-
-    htmlcontent = "<p>AAA '<'-BBB << <<< '</' '<//' '<///' CCC.</p>"
-    dom = pdf.getHtmlDomArray(htmlcontent)
-    assert_equal 4,     dom.length
-
-    assert_equal 0,     dom[0]['parent']  # Root
-    assert_equal false, dom[0]['tag']
-    assert_equal({},    dom[0]['attribute'])
-
-    assert_equal 0,     dom[1]['parent']   # parent -> parent tag key
-    assert_equal 0,     dom[1]['elkey']
-    assert_equal true,  dom[1]['tag']
-    assert_equal true,  dom[1]['opening']
-    assert_equal 'p',   dom[1]['value']
-    assert_equal({},    dom[1]['attribute'])
-
-    assert_equal 1,     dom[2]['parent']   # parent -> open tag key
-    assert_equal 1,     dom[2]['elkey']
-    assert_equal false, dom[2]['tag']
-    assert_equal "AAA '<'-BBB << <<< '</' '<//' '<///' CCC.", dom[2]['value']
-
-    assert_equal 1,     dom[3]['parent']   # parent -> open tag key
-    assert_equal 2,     dom[3]['elkey']
-    assert_equal true,  dom[3]['tag']
-    assert_equal false, dom[3]['opening']
-    assert_equal 'p',   dom[3]['value']
-  end
-
   test "getHtmlDomArray encoding test" do
     return unless 'test'.respond_to?(:force_encoding)
 
-    pdf = MYPDF.new('P', 'mm', 'A4', true, "UTF-8", true)
+    pdf = RBPDF.new('P', 'mm', 'A4', true, "UTF-8", true)
     htmlcontent = 'test'.force_encoding('ASCII-8BIT')
-    pdf.getHtmlDomArray(htmlcontent)
+    pdf.send(:getHtmlDomArray, htmlcontent)
     assert_equal 'ASCII-8BIT', htmlcontent.encoding.to_s
   end
 end

data/test/rbpdf_examples_test.rb

@@ -0,0 +1,83 @@
+# Copyright (c) 2011-2018 NAITOH Jun
+# Released under the MIT license
+# http://www.opensource.org/licenses/MIT
+
+require 'test_helper'
+
+def logger
+  require 'logger'
+  return Logger.new(STDOUT)
+end
+
+if !defined? ApplicationController
+  class ApplicationController
+  end
+end
+
+class RbpdfTest < Test::Unit::TestCase
+  htmls = {
+    '001 : Default Header and Footer'                       => '001',
+    '002 : Removing Header and Footer'                      => '002',
+    '003 : Custom Header and Footer'                        => '003',
+    '004 : Cell stretching'                                 => '004',
+    '005 : Multicell'                                       => '005',
+    '006 : write_html and RTL support'                      => '006',
+    '007 : Two independent columns with write_htmlcell()'   => '007',
+    '008 : Include external UTF-8 text file'                => '008',
+    '009 : Test Image'                                      => '009',
+    '011 : Colored Table'                                   => '011',
+    '012 : Graphic Functions'                               => '012',
+    '015 : Bookmarks (Table of Content)'                    => '015',
+    '017 : Two independent columns with MultiCell'          => '017',
+    '018 : RTL document with Persian language'              => '018',
+    '020 : Two columns composed by MultiCell of different'  => '020',
+    '021 : write_html text flow'                            => '021',
+    '022 : CMYK colors'                                     => '022',
+    '023 : Page Groups'                                     => '023',
+    '024 : Object Visibility'                               => '024',
+    '025 : Object Transparency'                             => '025',
+    '026 : Text Rendering Modes and Text Clipping'          => '026',
+    '028 : Changing page formats'                           => '028',
+    '029 : Set PDF viewer display preferences.'             => '029',
+    '031 : Pie Chart'                                       => '031',
+    '033 : Mixed font types'                                => '033',
+    '034 : Clipping'                                        => '034',
+    '035 : Line styles with cells and multicells'           => '035',
+    '036 : Annotations'                                     => '036',
+    '038 : CID-0 CJK unembedded font'                       => '038',
+    '039 : HTML justification'                              => '039',
+    '040 : Booklet mode (double-sided pages)'               => '040',
+    '041 : Annotation - FileAttachment'                     => '041',
+    '042 : Test Image with alpha channel'                   => '042',
+    '043 : Disk caching'                                    => '043',
+    '044 : Move, copy and delete pages'                     => '044',
+    '045 : Bookmarks and Table of Content'                  => '045',
+    '047 : Transactions'                                    => '047',
+    '048 : HTML tables and table headers'                   => '048',
+#    '051 : Full page background'                            => '051',
+    '055 : Display all characters available on core fonts.' => '055',
+    '057 : Cell vertical alignments'                        => '057',
+    '059 : Table Of Content using HTML templates.'          => '059',
+    '060 : Advanced page settings.'                         => '060',
+    '061 : XHTML + CSS'                                     => '061',
+  }
+
+  data(htmls)
+  test "Examples test" do |data|
+    $LOAD_PATH << File.join(File.dirname(File.expand_path(__FILE__)), '../example/rails/app/controllers/')
+
+    require "example#{data}_controller"
+
+    content = []
+    test = Object.const_get("Example#{data}Controller").new
+
+    contents = test.index
+#    contents = assert_nothing_raised do
+#      test.index
+#    end
+    contents.each_line {|line| content.push line.chomp }
+
+    assert_not_equal 0, content.length
+    assert_equal '%PDF-1.7', content[0]
+  end
+end

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)[0]
+    link_position = pdf.instance_variable_get(:@links)[1]
     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)[0]
+    link_position = pdf.instance_variable_get(:@links)[1]
     assert_equal [1, 10.001249999999999], link_position
   end
 

data/test/rbpdf_htmlcell_test.rb

@@ -1,68 +1,60 @@
-# Copyright (c) 2011-2017 NAITOH Jun
+# Copyright (c) 2011-2018 NAITOH Jun
 # Released under the MIT license
 # http://www.opensource.org/licenses/MIT
 
 require 'test_helper'
 
 class RbpdfTest < Test::Unit::TestCase
-  test "write_html_cell Basic test" do
+  htmls = {
+    'Basic'                     => {:html => '<p>foo</p>', :line => 1,
+                                    :border => 0,      :pno => 1, :no => 1},
+    'Page Break no border'      => {:html => '<p>foo</p>', :margin => 30,
+                                    :border => 0,      :pno => 2, :no => 2},
+    'Page Break border'         => {:html => '<p>foo</p>', :margin => 30,
+                                    :border => 'LRBT', :pno => 2, :no => 2},
+    'pre tag y position'        => {:html => "<p>test 0</p>\n <pre>test 1\ntest 2\ntest 3</pre>\n <p>test 10</p>", :line => 7,
+                                    :border => 0,      :pno => 1, :no => 1},
+  }
+
+  data(htmls)
+  test "write_html_cell test" do |data|
     pdf = RBPDF.new
     pdf.add_page()
+    t_margin = pdf.instance_variable_get('@t_margin')
+    y0 = pdf.get_y
+    assert_equal t_margin, y0
 
-    htmlcontent = '<p>foo</p>'
-    pdf.write_html_cell(0, 5, 10, '', htmlcontent, 0, 1)
+    if data[:margin]
+      pdf.set_top_margin(data[:margin])
+      y0 = pdf.get_y
+      assert_equal data[:margin], y0
 
-    pno = pdf.get_page
-    assert_equal 1, pno
-
-    y = pdf.get_y
-    assert_in_delta 17.3, y, 0.1
-
-    no = pdf.get_num_pages
-    assert_equal 1, no
-  end
-
-  test "write_html_cell Page Break test 1" do
-    pdf = RBPDF.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 2, pno
-
-    y = pdf.get_y
-    assert_in_delta 40.0, y, 0.1
-
-    no = pdf.get_num_pages
-    assert_equal 2, no
-  end
-
-  test "write_html_cell Page Break test 2" do
-    pdf = RBPDF.new
-    pdf.add_page()
+      h = pdf.get_page_height
+      pdf.set_y(h - 15)
+      y0 = pdf.get_y
+    end
 
-    pdf.set_top_margin(30)
+    font_size = pdf.get_font_size
+    cell_height_ratio = pdf.get_cell_height_ratio
+    min_cell_height = font_size * cell_height_ratio
+    h = 5
 
-    h = pdf.get_page_height
-    pdf.set_y(h - 15)
+    min_cell_height = h > min_cell_height ? h : min_cell_height
 
-    htmlcontent = '<p>foo</p>'
-    pdf.write_html_cell(0, 5, 10, '', htmlcontent, "LRBT", 1)
+    pdf.write_html_cell(0, h, 10, '', data[:html], data[:border], 1, 0, true, '', false)
 
     pno = pdf.get_page
-    assert_equal 2, pno
+    assert_equal data[:pno], pno
 
-    y = pdf.get_y
-    assert_in_delta 40.0, y, 0.1
+    y1 = pdf.get_y
+    if pno == 1
+      assert_in_delta(y0 + min_cell_height * data[:line], y1, 0.1)
+    else # pno 2, 1 line case only
+      page_break_trigger = pdf.instance_variable_get('@page_break_trigger')
+      assert_in_delta(data[:margin] + y0 + h - page_break_trigger, y1, 0.1)
+    end
 
     no = pdf.get_num_pages
-    assert_equal 2, no
+    assert_equal data[:no], no
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbpdf
 version: !ruby/object:Gem::Version
-  version: 1.19.5
+  version: 1.19.6
 platform: ruby
 authors:
 - NAITOH Jun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-24 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -122,6 +122,7 @@ files:
 - test/rbpdf_content_test.rb
 - test/rbpdf_css_test.rb
 - test/rbpdf_dom_test.rb
+- test/rbpdf_examples_test.rb
 - test/rbpdf_font_func_test.rb
 - test/rbpdf_font_style_test.rb
 - test/rbpdf_font_test.rb
@@ -194,6 +195,7 @@ test_files:
 - test/rbpdf_content_test.rb
 - test/rbpdf_css_test.rb
 - test/rbpdf_dom_test.rb
+- test/rbpdf_examples_test.rb
 - test/rbpdf_font_func_test.rb
 - test/rbpdf_font_style_test.rb
 - test/rbpdf_font_test.rb