rbpdf 1.18.6 → 1.18.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da1bf9dca7775d7e0b454cccc03c92e8983e9075
-  data.tar.gz: 2aa1f90e5d0e58774ef811a25a845085370e044a
+  metadata.gz: 15432b181857328b6ed5f8c5bbfa2ffce4d69782
+  data.tar.gz: 3d8ef59f34b8bd101d6cbbd67ff30fb2fbdbfd04
 SHA512:
-  metadata.gz: 8d42d61a6222d2b8cfd520ad9a200c0dac5415ef029bc0a69522cbe1947ac4fda75b6e21b46f8b17a579fbba2e781b0f2109538092f857bf9f881b0fb56d8b55
-  data.tar.gz: 9cff8bf012066f9954963282d66c976b403e24aa3458aac9e931149ab7f60b63d7103c13ee40469018ff97c1dcdcf1216e775152cdd4e80a9076c784c7551133
+  metadata.gz: f3aae8a53859e23684be355730099acfd1770abf1de5f71d0e8adac27cb0862eef72585c9166affa8442c7f4c158e4a379ac32b9bdabfc57837a8006c329e767
+  data.tar.gz: 6d6e239b6aa135886d4499cedcd8d2df2c20c57aa5f58646112907acabc3d2ec3e427d5af48d84d295410880d2e6b336de7a08d57a4d4e904725775ebf674c48

data/CHANGELOG

@@ -1,3 +1,7 @@
+1.18.7 2015-10-18
+       - Fixed case of missing HTML <pre> tag texts with whitespace. (use htmlentities gem liblary.)
+       - Fixed HTML Image function y position problem with png alpha image.
+
 1.18.6 2015-06-20
        - Fixed page boxes problem for iOS.
        - The dependence to the Rails environment was reduced.

data/lib/rbpdf.rb

@@ -4930,7 +4930,7 @@ class RBPDF
         if info == 'pngalpha' and ismask == false and Object.const_defined?(:Magick)
           info = ImagePngAlpha(file, x, y, w, h, 'PNG', link, align, resize, dpi, palign)
           if false != info
-            return
+            return true
           end
         end
       end
@@ -5274,6 +5274,8 @@ class RBPDF
     # remove temp files
     tempfile_alpha.delete
     tempfile_plain.delete
+
+    return true
   end
   protected :ImagePngAlpha
 
@@ -10738,6 +10740,10 @@ protected
         # preserve newlines on <pre> tag
         html_b = html_b.gsub(/<xre([^\>]*)>(.*?)\n(.*?)<\/pre>/mi, "<xre\\1>\\2<br />\\3</pre>")
       end
+      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>")
+      end
       html = html_a + html_b + html[(pos + 6)..-1]
       offset = (html_a + html_b).length
     end

data/lib/rbpdf/version.rb

@@ -1,3 +1,3 @@
 module Rbpdf
-  VERSION = "1.18.6"
+  VERSION = "1.18.7"
 end

data/rbpdf.gemspec

@@ -30,6 +30,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "htmlentities", "= 4.3.1"
+
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 end

data/test/rbpdf_html_test.rb

@@ -1,3 +1,4 @@
+# coding: ASCII-8BIT
 require 'test_helper'
 
 class RbpdfTest < ActiveSupport::TestCase
@@ -5,6 +6,20 @@ class RbpdfTest < ActiveSupport::TestCase
     def getPageBuffer(page)
       super
     end
+
+    # get text from pdf page
+    def get_html_text(page)
+      content = []
+      contents = getPageBuffer(page)
+      contents.each_line {|line| content.push line.chomp }
+      pdf_text = ''
+      content.each do |line|
+        if line =~ /\[\((.*)\)\] TJ ET/
+          pdf_text << $1
+        end
+      end
+      return pdf_text
+    end
   end
 
   test "write_html Basic test" do
@@ -576,4 +591,143 @@ class RbpdfTest < ActiveSupport::TestCase
     end
     assert_equal count, 1
   end
+
+  test "write_html <b> tag test" do
+    pdf = MYPDF.new
+    pdf.set_print_header(false)
+    pdf.add_page()
+
+    text = ' ' + 'A' * 70
+    htmlcontent = '<b>' + text + '</b>'
+
+    pdf.write_html(htmlcontent, true, 0, true, 0)
+    pdf_text = pdf.get_html_text(1)
+    assert_equal 'A' * 70, pdf_text
+  end
+
+  test "write_html <i> tag test" do
+    pdf = MYPDF.new
+    pdf.set_print_header(false)
+    pdf.add_page()
+
+    text = ' ' + 'A' * 70
+    htmlcontent = '<i>' + text + '</i>'
+
+    pdf.write_html(htmlcontent, true, 0, true, 0)
+    pdf_text = pdf.get_html_text(1)
+    assert_equal 'A' * 70, pdf_text
+  end
+
+  test "write_html <u> tag test" do
+    pdf = MYPDF.new
+    pdf.set_print_header(false)
+    pdf.add_page()
+
+    text = ' ' + 'A' * 70
+    htmlcontent = '<u>' + text + '</u>'
+
+    pdf.write_html(htmlcontent, true, 0, true, 0)
+    pdf_text = pdf.get_html_text(1)
+    assert_equal 'A' * 70, pdf_text
+  end
+
+  test "write_html <pre> tag space 1 test" do
+    pdf = MYPDF.new
+    pdf.set_print_header(false)
+    pdf.add_page()
+
+    text = ' ' + 'A' * 70
+    htmlcontent = '<pre>' + text + '</pre>'
+
+    pdf.write_html(htmlcontent, true, 0, true, 0)
+    pdf_text = pdf.get_html_text(1)
+    assert_equal "\xa0" + 'A' * 70, pdf_text
+  end
+
+  test "write_html <pre> tag space 2 test" do
+    pdf = MYPDF.new
+    pdf.set_print_header(false)
+    pdf.add_page()
+
+    text = '  ' + 'A' * 70
+    htmlcontent = '<pre>' + text + '</pre>'
+
+    pdf.write_html(htmlcontent, true, 0, true, 0)
+    pdf_text = pdf.get_html_text(1)
+    assert_equal "\xa0" * 2 + 'A' * 70, pdf_text
+  end
+
+  test "write_html Character Entities test" do
+    pdf = MYPDF.new
+    pdf.set_print_header(false)
+
+    character_entities = {
+      '&lt;'    => '<',
+      '&gt;'    => '>',
+      '&amp;'   => '&',
+      '&quot;'  => '"',
+      '&nbsp;'  => "\xa0",
+      '&cent;'  => "\xa2",
+      '&pound;' => "\xa3",
+      '&yen;'   => "\xa5",
+      '&copy;'  => "\xa9",
+      '&reg;'   => "\xae",
+      '&euro;'  => "\x80",
+    }
+    character_entities.each {|ce, c|
+      pdf.add_page()
+      page = pdf.get_page
+      pdf.write_html(ce, true, 0, true, 0)
+      pdf_text = pdf.get_html_text(page)
+      assert_equal '[' + ce + ']:' + c, '[' + ce + ']:' + pdf_text
+    }
+  end
+
+  test "write_html Character Entities test pre mode" do
+    pdf = MYPDF.new
+    pdf.set_print_header(false)
+
+    character_entities = {
+      '&lt;'    => '<',
+      '&gt;'    => '>',
+      '&amp;'   => '&',
+      '&quot;'  => '"',
+      '&nbsp;'  => "\xa0",
+      '&cent;'  => "\xa2",
+      '&pound;' => "\xa3",
+      '&yen;'   => "\xa5",
+      '&copy;'  => "\xa9",
+      '&reg;'   => "\xae",
+      '&euro;'  => "\x80",
+    }
+    character_entities.each {|ce, c|
+      pdf.add_page()
+      page = pdf.get_page
+      pdf.write_html('<pre>' + ce + '</pre>', true, 0, true, 0)
+      pdf_text = pdf.get_html_text(page)
+      assert_equal '[' + ce + ']:' + c, '[' + ce + ']:' + pdf_text
+    }
+  end
+
+  test "unhtmlentities test" do
+    pdf = RBPDF.new
+    character_entities = {
+      '&lt;'    => '<',
+      '&gt;'    => '>',
+      '&amp;'   => '&',
+      '&quot;'  => '"',
+      '&nbsp;'  => "\xc2\xa0",
+      '&cent;'  => "\xc2\xa2",
+      '&pound;' => "\xc2\xa3",
+      '&yen;'   => "\xc2\xa5",
+      '&copy;'  => "\xc2\xa9",
+      '&reg;'   => "\xc2\xae",
+      '&euro;'  => "\xe2\x82\xac",
+    }
+    character_entities.each {|ce, c|
+      text = pdf.unhtmlentities(ce)
+      text.force_encoding('ASCII-8BIT') if text.respond_to?(:force_encoding)
+      assert_equal '[' + ce + ']:' + c, '[' + ce + ']:' + text
+    }
+  end
 end

data/test/rbpdf_image_rmagick_test.rb

@@ -225,7 +225,7 @@ class RbpdfTest < ActiveSupport::TestCase
     pdf.add_page
     img_file = File.join(File.dirname(__FILE__), 'png_test_alpha.png')
     info = pdf.image(img_file, 10, 10, 100, '', '', 'https://rubygems.org/gems/rbpdf', '', false, 300)
-    assert_equal info, nil
+    assert_equal info, true
   end
 
   test "Image GIF test" do
@@ -257,4 +257,39 @@ class RbpdfTest < ActiveSupport::TestCase
     info = pdf.image(img_file, 10, 10, 100, '', '', 'https://rubygems.org/gems/rbpdf', '', false, 300)
     assert_equal info, 1
   end
+
+  test "HTML Image test" do
+    return unless Object.const_defined?(:Magick)
+
+    images = {
+      'png_test_alpha.png'        => 40.11,
+      'png_test_msk_alpha.png'    => 40.11,
+      'png_test_non_alpha.png'    => 40.11,
+      'logo_rbpdf_8bit.png'       => 36.58,
+      'logo_rbpdf_8bit.gif'       => 36.58,
+      'logo_rbpdf_8bit_alpha.gif' => 36.58,
+      'logo_rbpdf_8bit.jpg'       => 36.58,
+      'logo_rbpdf_mono_gray.jpg'  => 36.58,
+      'logo_rbpdf_mono_gray.png'  => 36.58,
+      'logo_rbpdf_mono_rgb.jpg'   => 36.58,
+      'logo_rbpdf_mono_rgb.png'   => 36.58,
+      'ng.png'                    => 9.42
+    }
+
+    pdf = RBPDF.new
+    images.each {|image, h|
+      pdf.add_page
+      img_file = File.join(File.dirname(__FILE__), image)
+      htmlcontent = '<img src="'+ img_file + '"/>'
+
+      x_org = pdf.get_x
+      y_org = pdf.get_y
+      pdf.write_html(htmlcontent, true, 0, true, 0)
+      x = pdf.get_x
+      y = pdf.get_y
+
+      assert_equal '[' + image + ']:' + x_org.to_s, '[' + image + ']:' + x.to_s
+      assert_equal '[' + image + ']:' + (y_org + h).round(2).to_s, '[' + image + ']:' + y.round(2).to_s
+    }
+  end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rbpdf
 version: !ruby/object:Gem::Version
-  version: 1.18.6
+  version: 1.18.7
 platform: ruby
 authors:
 - NAITOH Jun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +190,6 @@ files:
 - test/rbpdf_viewerpreferences_test.rb
 - test/rbpdf_write_test.rb
 - test/test_helper.rb
-- test/test_helper.rb_
 - test_unicode.rbpdf
 - utf8test.txt
 homepage: ''
@@ -242,4 +255,3 @@ test_files:
 - test/rbpdf_viewerpreferences_test.rb
 - test/rbpdf_write_test.rb
 - test/test_helper.rb
-- test/test_helper.rb_

data/test/test_helper.rb_

@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-#require 'test/unit'
-#require 'active_support'
-require 'rbpdf'
-
-=begin
-if Rails::VERSION::MAJOR >= 4
-#  require 'active_support/testing/autorun' # Rails 4.2
-
-gem 'test-unit'
-require 'test/unit'
-#Test::Unit::AutoRunner.new(true).run
-Test::Unit::AutoRunner.new(false).run
-#(r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
-#  abort r.options.banner + " tests..."
-#exit r.run
-
-#  require 'active_support/testing/autorun' # Rails 4.2
-
-#gem 'minitest'
-#require 'minitest'
-#Minitest.autorun
-
-else
-=end
-#  require 'rails/all'
-require "rails"
-
-  class Application < Rails::Application
-  end
-#end