rbpdf 1.19.0 → 1.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6206e410a85c6ea47f3464985c9a4a8c6673974
-  data.tar.gz: 43b4d2ce869cdab5244ed41582fcdcaaf269aa15
+  metadata.gz: 931120b760803ab55df75a98a64f8e44815f079a
+  data.tar.gz: 7b6137a01c62c40bf73d4801605afa6a053b050f
 SHA512:
-  metadata.gz: 65e07e6d1a6a72cf760a6bf5492db77b08cd0ffa9dd32de92b65bb8ec5fff85b457c1c20ec28b4bce91a1b0216efa4f49292889995242cebf7bb6be16cbdeda6
-  data.tar.gz: c77b80be9193f445da757904c8937f01714aea5be51f82156af113c1e521128cbb413b8533e9a52027b0b16444e59ebec473ec7d73c01d5f6f22da1fe2bad54b
+  metadata.gz: 2554dc1102b75b1b5f55f6fd1d348e55d059fb4338610d7dcdab5503f96ee3098d3eb91ab9225d63f240f4d5c400a22236f0c514df60d13c709862a1efab56f4
+  data.tar.gz: a20170d14ae2e0eaf8f34f974819c6fbae9a246395f4ceb5ccc9a8dff79b1734741718941880610f130c98c5065554cca57c39ec7594427511e62b9c1cc19d65

data/CHANGELOG

@@ -1,3 +1,13 @@
+1.19.1 2017-03-30
+       - Ruby 2.4 supported.
+       - Fixed get image file from remote URL
+       - Fixed get image file with Non-ASCII file name.
+       - Fixed function of SetFont bold/italic/bold and italic problem for CID-0 fonts.
+       - Fixed issue where backslash is duplicated in table tag. (by t-gergely)
+       - Fixed strict htmlentities dependency.
+       - Added the ability to specify abs-path font files. (by Artemiy Solopov)
+       - Use correct brackets to get second character in a string. (by vrobert)
+
 1.19.0 2015-11-20
        - Update base version to TCPDF 5.2.000.
        - IMPORTANT: Support for font subsetting was added by default to reduce the size of documents using large unicode font files.

data/Gemfile

@@ -1,3 +1,7 @@
+# Copyright (c) 2011-2017 NAITOH Jun
+# Released under the MIT license
+# http://www.opensource.org/licenses/MIT
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rbpdf.gemspec

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2006 4ssoM LLC <www.4ssoM.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOa AND
+NONINFRINGEMENT. IN NO EVENT SaALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -62,3 +62,19 @@ utf8test.txt
 logo_example.png
 
 ENJOY!
+
+License
+
+  The project RBPDF doesn't use same license for all code. There are
+  code with:
+
+   * LGPLv2.1+ (GNU Lesser General Public License v2.1 or any later version)
+
+   * MIT (MIT-LICENSE)
+
+  Please, check source code for more details. A license is usually at the start
+  of each source file.
+
+  The MIT-LICENSE file (MIT) is the default license for code without an explicitly
+  defined license.
+

data/Rakefile

@@ -1,3 +1,7 @@
+# Copyright (c) 2011-2017 NAITOH Jun
+# Released under the MIT license
+# http://www.opensource.org/licenses/MIT
+
 require "bundler/gem_tasks"
 require 'rake/testtask'
 

data/lib/core/rmagick.rb

@@ -25,7 +25,7 @@ module Rbpdf
 
   # http://uk2.php.net/getimagesize
   def getimagesize(filename)
-    return nil unless File.exists?(filename)
+    return nil unless File.exist?(filename)
 
     out = Hash.new
     type = File::extname(filename)

data/lib/rbpdf.rb

@@ -50,6 +50,7 @@ require "rbpdf/version"
 
 require 'htmlentities'
 require 'rbpdf-font' 
+require 'erb'
 
 begin
   # RMagick 2.14.0
@@ -73,6 +74,7 @@ require 'rubygems' if RUBY_VERSION < '1.9' # Ruby 1.8.7
 require 'action_view'
 require 'tempfile'
 require 'uri'
+require 'net/http'
 
 #
 # RBPDF Class.
@@ -256,7 +258,7 @@ class RBPDF
     #   mb_internal_encoding("ASCII");
     # }
 
-   if defined? Rails.root
+    if defined? Rails.root
       @@k_path_cache = Rails.root.join('tmp').to_s
       @@k_path_main = Rails.root.join('tmp').to_s
       @@k_path_url = Rails.root.join('tmp').to_s
@@ -289,6 +291,11 @@ class RBPDF
     @img_scale ||= 1
     @r_margin ||= 0
     @l_margin ||= 0
+    @original_r_margin ||= nil
+    @original_l_margin ||= nil
+    @t_margin ||= nil
+    @b_margin ||= nil
+    @auto_page_break ||= nil
     @page_annots ||= []
 
     @header_font ||= ['', '', 10]
@@ -308,6 +315,7 @@ class RBPDF
     @header_string ||= ""
     @listordered ||= []
     @listcount ||= []
+    @listnum ||= 0
     @listindent ||= 0
     @listindentlevel ||= 0
     @lispacer ||= ""
@@ -322,6 +330,7 @@ class RBPDF
     @dpi = 72.0
     @newpagegroup ||= []
     @pagegroups ||= {}
+    @currpagegroup ||= nil
     @visibility ||= 'all'
     @cell_height_ratio = @@k_cell_height_ratio
     @viewer_preferences ||= {}
@@ -387,6 +396,7 @@ class RBPDF
     @num_columns ||= 0
     @current_column ||= 0
     @column_start_page ||= 0
+    @cur_orientation ||= nil
 
     # Text rendering mode:
     # 0 = Fill text;
@@ -433,6 +443,7 @@ class RBPDF
     @diffs ||= []
     @images ||= {}
     @links ||= []
+    @html_anchor ||= nil
     @html_anchors ||= {}
     @html_anchor_links ||= {}
     @gradients ||= []
@@ -449,6 +460,11 @@ class RBPDF
     @fill_color ||= '0 g'
     @text_color ||= '0 g'
     @color_flag ||= false
+    @title ||= nil
+    @author ||= nil
+    @subject ||= nil
+    @keywords ||= nil
+    @creator ||= nil
 
     # encryption values
     @encrypted ||= false
@@ -532,6 +548,7 @@ class RBPDF
     @annot_obj_id ||= @annots_start_obj_id
     @curr_annot_obj_id ||= @annots_start_obj_id
     @apxo_obj_id ||= @apxo_start_obj_id
+    @objcopy ||= nil
   end
 
   #
@@ -1494,9 +1511,9 @@ class RBPDF
   # [@since 1.0]
   #
   def Error(msg)
-    destroy(true)
+    #destroy(true)
     #Fatal error
-    raise ("RBPDF error: #{msg}")
+    raise "RBPDF error: #{msg}"
   end
   alias_method :error, :Error
 
@@ -2674,21 +2691,23 @@ class RBPDF
       end
     end
 
+    fontname = family.gsub(' ', '') + style.downcase
+
     # search and include font file
     if empty_string(fontfile)
       # build a standard filenames for specified font
-      fontfile1 = family.gsub(' ', '') + style.downcase + '.rb'
+      fontfile1 = fontname + '.rb'
       fontfile2 = family.gsub(' ', '') + '.rb'
       # search files on various directories
-      if (fontdir != false) and File.exists?(fontdir + fontfile1)
+      if (fontdir != false) and File.exist?(fontdir + fontfile1)
         fontfile = fontdir + fontfile1
         fontname = fontfile1
       elsif fontfile = getfontpath(fontfile1)
         fontname = fontfile1
-      elsif File.exists?(fontfile1)
+      elsif File.exist?(fontfile1)
         fontfile = fontfile1
         fontname = fontfile1
-      elsif (fontdir != false) and File.exists?(fontdir + fontfile2)
+      elsif (fontdir != false) and File.exist?(fontdir + fontfile2)
         fontfile = fontdir + fontfile2
         fontname = fontfile2
       elsif fontfile = getfontpath(fontfile2)
@@ -2700,13 +2719,13 @@ class RBPDF
     end
 
     # include font file
-    if File.exists?(fontfile)
+    if File.exist?(fontfile)
       require(fontfile)
     else
       Error('Could not include font definition file: ' + family + '')
     end
 
-    font_desc = RBPDFFontDescriptor.font(fontname)
+    font_desc = RBPDFFontDescriptor.font(fontname).dup
     if font_desc[:desc].nil?
       desc = {}
     else
@@ -2745,7 +2764,7 @@ class RBPDF
     if font_desc[:type] == 'cidfont0'
       #  register CID font (all styles at once)
       styles = {'' => '', 'B' => ',Bold', 'I' => ',Italic', 'BI' => ',BoldItalic'}
-      sname = font_desc[:name] + styles[bistyle]
+      font_desc[:name] = font_desc[:name] + styles[bistyle]
       # artificial bold
       if bistyle.index('B') != nil
         if desc['StemV']
@@ -3725,7 +3744,7 @@ class RBPDF
       if (@color_flag)
         s<<' Q';
       end
-      if link && ((link.is_a?(String) and !link.empty?) or (link.is_a?(Fixnum) and link != 0)) # Fixnum is PDF file Page No.
+      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
@@ -5017,7 +5036,7 @@ class RBPDF
       return info['i']
     end
     xkimg = ximg * @k
-    out(sprintf('q %.2f 0 0 %.2f %.2f %.2f cm /I%d Do Q', w * @k, h * @k, xkimg, (@h -(y + h)) * @k, info['i']))
+    out(sprintf('q %.2f 0 0 %.2f %.2f %.2f cm /I%d Do Q', w * @k, h * @k, xkimg, (@h - (y + h)) * @k, info['i']))
 
     if border != 0
       bx = x
@@ -5104,22 +5123,6 @@ class RBPDF
   end
   protected :imageToPNG
 
-  def image_alpha_mask(file)
-    img = Magick::ImageList.new(file)
-
-    img2 = img.separate(Magick::OpacityChannel)
-    img = img2.negate(true)
-
-    #use a temporary file....
-    tmpFile = Tempfile.new(['msk_', '.png'], @@k_path_cache)
-    tmpFile.binmode
-    tmpFile.print img.to_blob
-    tmpFile
-  ensure
-    tmpFile.close unless tmpFile.nil?
-  end
-  protected :image_alpha_mask
-
   #
   # Extract info from a PNG file
   # [@access protected]
@@ -5236,6 +5239,7 @@ class RBPDF
   ensure
     tmpFile.close  unless tmpFile.nil?
   end
+  protected :image_alpha_mask
 
   #
   # Extract info from a PNG image with alpha channel using the GD library.
@@ -5586,7 +5590,7 @@ class RBPDF
     end
     self.instance_variables.each { |val|
       if destroyall or ((val != '@internal_encoding') and (val != '@state') and (val != '@bufferlen') and (val != '@buffer') and (val != '@diskcache') and (val != '@sign') and (val != '@signature_data') and (val != '@signature_max_length') and (val != '@byterange_string'))
-        if (!preserve_objcopy or (val.to_s != '@objcopy')) and @val
+        if (!preserve_objcopy or (val.to_s != '@objcopy')) and !val.nil?
           eval("#{val} = nil")
         end
       end
@@ -5620,13 +5624,13 @@ protected
     # Is it in the @@k_path_fonts?
     if @@k_path_fonts
       fpath = File.join @@k_path_fonts, file
-      if File.exists?(fpath)
+      if File.exist?(fpath)
         return fpath
       end
     end
     # Is it in this plugin's font folder?
     fpath = File.join File.dirname(__FILE__), 'fonts', file
-    if File.exists?(fpath)
+    if File.exist?(fpath)
       return fpath
     end
     # Could not find it.
@@ -5831,7 +5835,7 @@ protected
       #Page content
       p=(@compress) ? Zlib::Deflate.deflate(temppage) : temppage
       newobj();
-      out('<<' + filter +' /Length ' + p.length.to_s  + '>> ' + getstream(p) + ' endobj')
+      out('<<' + filter + ' /Length ' + p.length.to_s  + '>> ' + getstream(p) + ' endobj')
       if @diskcache
         # remove temporary files
         File.delete(@pages[n].path)
@@ -6819,7 +6823,7 @@ protected
     font << [numTables].pack('n') # numTables
     entrySelector = (Math.log(numTables) / Math.log(2.0)).floor
 
-    searchRange = 2 **entrySelector * 16
+    searchRange = 2 ** entrySelector * 16
     rangeShift = numTables * 16 - searchRange
     font << [searchRange].pack('n') # searchRange
     font << [entrySelector].pack('n') # entrySelector
@@ -7201,10 +7205,10 @@ protected
       # search and get ctg font file to embedd
       fontfile = ''
       # search files on various directories
-      if (fontdir != false) and File.exists?(fontdir + ctgfile)
+      if (fontdir != false) and File.exist?(fontdir + ctgfile)
         fontfile = fontdir + ctgfile
       elsif fontfile = getfontpath(ctgfile)
-      elsif File.exists?(ctgfile)
+      elsif File.exist?(ctgfile)
         fontfile = ctgfile
       end
 
@@ -9280,7 +9284,7 @@ public
       Circle(x0, y0, r, 0, 360, circle_style, circle_outLine_style, circle_fill_color)
     end
     p = []
-    0.upto(ns -1) do |i|
+    0.upto(ns - 1) do |i|
       a = angle + i * 360 / ns
       a_rad = a * ::Math::PI / 180 # deg2rad
       p.push x0 + (r * ::Math.sin(a_rad))
@@ -9328,7 +9332,7 @@ public
     end
     p2 = []
     visited = []
-    0.upto(nv -1) do |i|
+    0.upto(nv - 1) do |i|
       a = angle + i * 360 / nv
       a_rad = a * ::Math::PI / 180 # deg2rad
       p2.push x0 + r * ::Math.sin(a_rad)
@@ -11030,7 +11034,7 @@ protected
               end
             end
           when ':'  # pseudo-class or pseudo-element
-            if attrib{1} == ':'  # pseudo-element
+            if attrib[1] == ':'  # pseudo-element
               # pseudo-elements are not supported!
               # (::first-line, ::first-letter, ::before, ::after)
             else # pseudo-class
@@ -11161,7 +11165,7 @@ protected
               uri_path = uri_path.join(path)
             }
             cssdata = ''
-            next unless File.exists?(uri_path)
+            next unless File.exist?(uri_path)
 
             open(uri_path) do |f|
               cssdata << f.read
@@ -11207,7 +11211,6 @@ protected
     html.gsub!(/<(table|tr|td|th|blockquote|dd|div|dt|h1|h2|h3|h4|h5|h6|br|hr|li|ol|ul|p)([^\>]*)>[\n\r\t]+/, '<\\1\\2>')
     html.gsub!(/@(\r\n|\r)@/, "\n")
     html.gsub!(/[\t\0\x0B]/, " ")
-    html.gsub!(/\\/, "\\\\\\")
 
     offset = 0
     while (offset < html.length) and ((pos = html.index('</pre>', offset)) != nil)
@@ -11710,7 +11713,7 @@ protected
         # text
         dom[key]['tag'] = false
         dom[key]['block'] = false
-        dom[key]['value'] = unhtmlentities(element).gsub(/\\\\/, "\\")
+        dom[key]['value'] = unhtmlentities(element)
         dom[key]['parent'] = level[-1]
       end
       elkey += 1
@@ -11724,13 +11727,35 @@ protected
   # [@param string :attrname] image file name
   #
   def get_image_filename( attrname )
-    testscrtype = URI.parse(attrname)
+    attrname_escape = File.join(File.dirname(attrname),  ERB::Util.url_encode(File.basename(attrname)))
+    testscrtype = URI.parse(attrname_escape)
     if testscrtype.query.nil? or testscrtype.query.empty?
       # convert URL to server path
       attrname = attrname.gsub(@@k_path_url, @@k_path_main)
     end
   end
 
+  #
+  # Get image file from remote URL
+  # [@param string :image_uri] image URI path
+  #
+  def get_image_file(image_uri)
+    image_uri = File.join(File.dirname(image_uri),  ERB::Util.url_encode(File.basename(image_uri)))
+    uri = URI.parse(image_uri)
+    extname = File.extname(uri.path)
+
+    #use a temporary file....
+    tmpFile = Tempfile.new(['tmp_', extname], @@k_path_cache)
+    tmpFile.binmode
+    Net::HTTP.start(uri.host, uri.port) do |http|
+      res = http.get(uri.path)
+      tmpFile.print res.body
+    end
+    tmpFile
+  ensure
+    tmpFile.close  unless tmpFile.nil?
+  end
+
   #
   # Convert to accessible url path
   # [@param string :url] url path
@@ -13117,9 +13142,10 @@ public
         #    tag['attribute']['src'] = Rails.root.join('public') + tag['attribute']['src']
         #  end
         #end
-        img_name = tag['attribute']['src']
         ### T.B.D ### TCPDF 5.0.000 ###
-        # tag['attribute']['src'] = CGI.escape(tag['attribute']['src'])
+        tag['attribute']['src'].gsub!(/%([0-9a-fA-F]{2})/){$1.hex.chr}
+
+        img_name = tag['attribute']['src']
         type = getImageFileType(tag['attribute']['src'])
         tag['attribute']['src'] = get_image_filename(tag['attribute']['src'])
         if tag['width'].nil?
@@ -13194,16 +13220,25 @@ public
         SetRightMargin(@r_margin + @c_margin)
 
         begin
+          if tag['attribute']['src'] =~ /^http/
+            tmpFile = get_image_file(tag['attribute']['src'])
+            img_file = tmpFile.path
+          else
+            img_file = tag['attribute']['src']
+          end
 #        if (type == 'eps') or (type == 'ai')
-#          ImageEps(tag['attribute']['src'], xpos, @y, iw, ih, imglink, true, align, '', border, true)
+#          ImageEps(img_file, xpos, @y, iw, ih, imglink, true, align, '', border, true)
 #        elsif type == 'svg'
-#          ImageSVG(tag['attribute']['src'], xpos, @y, iw, ih, imglink, align, '', border, true)
+#          ImageSVG(img_file, xpos, @y, iw, ih, imglink, align, '', border, true)
 #        else
-          result_img = Image(tag['attribute']['src'], xpos, @y, iw, ih, '', imglink, align, false, 300, '', false, false, border, false, false, true)
+          result_img = Image(img_file, xpos, @y, iw, ih, '', imglink, align, false, 300, '', false, false, border, false, false, true)
 #        end
         rescue => err
           logger.error "pdf: Image: error: #{err.message}"
           result_img = false
+        ensure
+          # remove temp files
+          tmpFile.delete unless tmpFile.nil?
         end
 
         if result_img or ih != 0