rbpdf 1.18.1 → 1.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1933519745cfcf8ecb037bbb90abd2756ce438c
-  data.tar.gz: 23af83ebf1ab6d77a7f64e62f5225cda74d418ed
+  metadata.gz: 58e305378e0bcb076298f1c3deb700869cbec74e
+  data.tar.gz: cbd734a213aa85690bd1d0b04359376e517221c7
 SHA512:
-  metadata.gz: f4da9bb136d4fb89cecd8bb9ac0d3c9c617ffe0dc2110e3883b09fb43b36121cae886f2c1a14826042afb5d0997b09fdbce90a6bc06f8c73602de8b8587417a9
-  data.tar.gz: ffaf67be7f514e66fdce7ac8ac7730627709296c00624747c27b0f0141776029faeadc581a50216779efe8ea798894370e991c17ededbd90ba43556921db52af
+  metadata.gz: ddc12d9fce5eb9172b307b12ecda5ee2e3a7c00fd2142673618352396507c8e2fcb3d9dc36431de48c02fa06edbbd482d25617fe0eba323ca29043c1561a4b4b
+  data.tar.gz: d37493ecfc88a6450d7a201ff1e9f6cec53ca7f397062ba62981177753078c362fb07fd3e0bbf8b6abd5f72c50b3de122e4eb0c58b06e41ba3c3ae8e30a0d415

data/CHANGELOG

@@ -1,3 +1,7 @@
+1.18.2 2014-10-25 
+       - getNumLines and a getStringHeight function fixed the problem which is wrong by the case of two or more lines.
+       - fix case of missing image file.
+
 1.18.1 2014-09-15 
        - ImagePngAlpha function fixed for the error case where an alpha channel cannot be deleted.
        - getimagesize function fixed for MAC OS rmagick.

data/lib/rbpdf/version.rb

@@ -1,3 +1,3 @@
 module Rbpdf
-  VERSION = "1.18.1"
+  VERSION = "1.18.2"
 end

data/lib/rbpdf.rb

@@ -3918,14 +3918,15 @@ class RBPDF
           @transfmrk[@page] += (ccode + "\n").length
         elsif @in_footer
           pagemark = @footerpos[@page]
+          @footerpos[@page] += (ccode + "\n").length
         else
           pagemark = @intmrk[@page]
+          @intmrk[@page] += (ccode + "\n").length
         end
         pagebuff = getPageBuffer(@page)
         pstart = pagebuff[0, pagemark]
         pend = pagebuff[pagemark..-1].to_s
         setPageBuffer(@page, pstart + ccode + "\n" + pend)
-        pagemark += (ccode + "\n").length
       end
     end
     
@@ -4090,7 +4091,7 @@ class RBPDF
       if unichr(chars[i]) =~ /\s/
         lastSeparator = i
       end
-      if sum + charWidth >= wmax 
+      if (sum + charWidth >= wmax) or (chars[i] == 10) # 10 = "\n" = new line
         lines += 1
         if lastSeparator != -1
           i = lastSeparator
@@ -12141,12 +12142,12 @@ public
                 opentagpos = @footerpos[@page]
               end
             end
-            openHTMLTagHandler(dom, key, cell)
+            dom = openHTMLTagHandler(dom, key, cell)
           end
         else
           # closing tag
           prev_numpages = @numpages
-          closeHTMLTagHandler(dom, key, cell, maxbottomliney)
+          dom = closeHTMLTagHandler(dom, key, cell, maxbottomliney)
           if prev_numpages > @numpages
             startlinepage = @page
           end
@@ -12580,18 +12581,17 @@ 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) unless img_name.nil?
@@ -12706,6 +12706,7 @@ public
         checkPageBreak(@page_break_trigger + 1)
       end
     end
+    dom
   end
   protected :openHTMLTagHandler
   
@@ -12932,14 +12933,15 @@ public
                   @transfmrk[@page] += (ccode + "\n").length
                 elsif @in_footer
                   pagemark = @footerpos[@page]
+                  @footerpos[@page] += (ccode + "\n").length
                 else
                   pagemark = @intmrk[@page]
+                  @intmrk[@page] += (ccode + "\n").length
                 end
                 pagebuff = getPageBuffer(@page)
                 pstart = pagebuff[0, pagemark]
                 pend = pagebuff[pagemark..-1]
                 setPageBuffer(@page, pstart + ccode + "\n" + pend)
-                pagemark += (ccode + "\n").length
               end
             end
           }                                       
@@ -13055,6 +13057,7 @@ public
       end
     end
     @tmprtl = false
+    dom
   end
   protected :closeHTMLTagHandler
   

data/test/rbpdf_cell_test.rb

@@ -123,6 +123,27 @@ class RbpdfTest < ActiveSupport::TestCase
     assert_equal line, 7
   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 pno, 1
+    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 line, 3
+  end
+
   test "getStringHeight Minimum Width test 1" do
     pdf = RBPDF.new('P', 'mm', 'A4', true, "UTF-8", true)
     pdf.add_page

data/test/rbpdf_dom_test.rb

@@ -5,6 +5,9 @@ class RbpdfTest < ActiveSupport::TestCase
     def getHtmlDomArray(html)
       super
     end
+    def openHTMLTagHandler(dom, key, cell)
+      super
+    end
   end
 
   test "Dom Basic" do
@@ -110,4 +113,30 @@ class RbpdfTest < ActiveSupport::TestCase
     assert_equal dom[3]['value'], 'td'
     assert_equal dom[3]['width'], '10'
   end
+
+  test "Dom HTMLTagHandler Basic test" do
+    pdf = MYPDF.new
+    pdf.add_page
+
+    # Simple HTML
+    htmlcontent = '<h1>HTML Example</h1>'
+    dom1 = pdf.getHtmlDomArray(htmlcontent)
+    dom2 = pdf.openHTMLTagHandler(dom1, 1, false)
+    assert_equal dom1, dom2
+  end
+
+  test "Dom HTMLTagHandler img test" do
+    pdf = MYPDF.new
+    pdf.add_page
+
+    # Image Error HTML
+    htmlcontent = '<img src="' + Rails.root.to_s + '/public/ng.png" alt="test alt attribute" width="30" height="30" border="0"/>'
+    dom1 = pdf.getHtmlDomArray(htmlcontent)
+    y1 = pdf.get_y
+
+    dom2 = pdf.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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbpdf
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.18.2
 platform: ruby
 authors:
 - NAITOH Jun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler