pdf-wrapper 0.3.1 → 0.3.2

data/CHANGELOG

@@ -1,3 +1,14 @@
+v0.3.2 (6th September 2010)
+- fix importing of PDF files as images
+  - always imports the first page, currently no support for importing the
+    second or subsequent pages
+- PDF::Wrapper#cell() - allow font size to be specified as a range. The
+                        largest size that fits all the cell text will be used
+
+v0.3.1 (24th November 2009)
+- avoid errors being printed to stderr when rendering tables
+- allow manual page sizes to be specified
+
 v0.3.0 (15th October 2009)
 - remove some deprecated functions from Table
 - added support for table cells with text and images
@@ -50,11 +61,11 @@ v0.1.1 (Unreleased)
 
 v0.1.0 (28th May 2008)
 - added PDF::Wrapper#translate and PDF::Wrapper#scale
-- fixed a bug that caused some text to be rendered off the page when wrapping onto 3rd and 
+- fixed a bug that caused some text to be rendered off the page when wrapping onto 3rd and
   subsequent pages
 - Improved table support using a new class PDF::Wrapper::Table
 - Added a :center option to Wrapper#image
-- Added a :markup option to text related functions. Pango markup can be used to tweak 
+- Added a :markup option to text related functions. Pango markup can be used to tweak
   text style (bold, italics, super script, etc)
 - Replaced PDF::Wrapper#rounded_rectangle with the :radius option to PDF::Wrapper#rectangle
 - Allow cells to have a border with rounded corners

data/Rakefile

@@ -8,7 +8,7 @@ require 'spec/rake/spectask'
 require 'roodi'
 require 'roodi_task'
 
-PKG_VERSION = "0.3.1"
+PKG_VERSION = "0.3.2"
 PKG_NAME = "pdf-wrapper"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
@@ -72,12 +72,16 @@ spec = Gem::Specification.new do |spec|
   spec.has_rdoc = true
   spec.extra_rdoc_files = %w{README.rdoc CHANGELOG TODO}
   spec.rdoc_options << '--title' << 'PDF::Wrapper Documentation' << '--main'  << 'README.rdoc' << '-q'
-  spec.add_dependency 'cairo', '>=1.5.0'
   spec.author = "James Healy"
   spec.homepage = "http://pdf-wrapper.rubyforge.org/"
   spec.email = "jimmy@deefa.com"
   spec.rubyforge_project = "pdf-wrapper"
   spec.description = "A unicode aware PDF writing library that uses the ruby bindings to various c libraries ( like cairo, pango, poppler and rsvg ) to do the heavy lifting."
+  spec.add_dependency("cairo", "~>1.8")
+  #spec.add_dependency("pango")
+  #spec.add_dependency("poppler")
+  #spec.add_dependency("gdkpixbuf")
+  # TODO - add rsvg2
 end
 
 # package the library into a gem

data/lib/pdf/wrapper/images.rb

@@ -117,7 +117,7 @@ module PDF
       # based on a similar function in rabbit. Thanks Kou.
       load_libpoppler
       x, y = current_point
-      page = Poppler::Document.new(filename).get_page(1)
+      page = Poppler::Document.new(filename).get_page(0)
       w, h = page.size
       width, height = calc_image_dimensions(opts[:width], opts[:height], w, h, opts[:proportional])
       x, y = calc_image_coords(opts[:left] || x, opts[:top] || y, opts[:width] || w, opts[:height] || h, width, height,  opts[:center])
@@ -191,7 +191,7 @@ module PDF
       case detect_image_type(filename)
       when :pdf   then
         load_libpoppler
-        page = Poppler::Document.new(filename).get_page(1)
+        page = Poppler::Document.new(filename).get_page(0)
         return page.size
       when :png   then
         img_surface = Cairo::ImageSurface.from_png(filename)

data/lib/pdf/wrapper/text.rb

@@ -1,6 +1,8 @@
 module PDF
   class Wrapper
 
+    DEFAULT_CELL_PADDING = 3
+
     # Change the default font size
     #
     # If no block is provided, the change is permanent. If a block
@@ -52,16 +54,24 @@ module PDF
     # <tt>:border_color</tt>::  What color should the border be?
     # <tt>:fill_color</tt>::  A background color for the cell. Defaults to none.
     # <tt>:radius</tt>:: Give the border around the cell rounded corners. Implies :border => "tblr"
+    #
+    # Unlike with the text() method, the :font_size argument can be a range. The
+    # largest size in the range that will fit all the text in the cell will be used.
+    #
     def cell(str, x, y, w, h, opts={})
       # TODO: add a wrap option so wrapping can be disabled
       # TODO: add an option for vertical alignment
       # TODO: allow cell contents to be defined as a block, like link_to in EDGE rails
 
       options = default_text_options
-      options.merge!({:border => "tblr", :border_width => @default_line_width, :border_color => :black,  :fill_color => nil, :padding => 3, :radius => nil})
+      options.merge!({:border => "tblr", :border_width => @default_line_width, :border_color => :black,  :fill_color => nil, :padding => DEFAULT_CELL_PADDING, :radius => nil})
       options.merge!(opts)
       options.assert_valid_keys(default_text_options.keys + [:width, :border, :border_width, :border_color, :fill_color, :padding, :radius])
 
+      if options[:font_size] && options[:font_size].is_a?(Range)
+        options[:font_size] = best_font_size(str, w, h, options[:font_size], options)
+      end
+
       # apply padding
       textw = w - (options[:padding] * 2)
       texth = h - (options[:padding] * 2)
@@ -214,6 +224,22 @@ module PDF
 
     private
 
+    # calculate the largest font size within range that will fit str in
+    # a box with dimensions of height by width.
+    #
+    #    best_font_size("Hello There", 50, 50, 5..9)
+    #    => 9
+    #
+    def best_font_size(str, width, height, sizes, options = {})
+      cellpadding = DEFAULT_CELL_PADDING * 2
+      sizes.map { |size|
+        opts = options.only(:markup).merge(:font_size => size)
+        h = text_height( str, width, opts )
+        h <= height - cellpadding ? size : nil
+      }.compact[-1] || sizes.first
+    end
+
+
     # takes a string and a range of options and creates a pango layout for us. Pango
     # does all the hard work of calculating text layout, wrapping, fonts, sizes,
     # direction and more. Thank $diety.

data/lib/pdf/wrapper.rb

@@ -6,17 +6,15 @@ require 'pdf/errors'
 require 'tempfile'
 require 'fileutils'
 
-require File.dirname(__FILE__) + "/wrapper/graphics"
-require File.dirname(__FILE__) + "/wrapper/images"
-require File.dirname(__FILE__) + "/wrapper/loading"
-require File.dirname(__FILE__) + "/wrapper/text_cell"
-require File.dirname(__FILE__) + "/wrapper/text_image_cell"
-require File.dirname(__FILE__) + "/wrapper/table"
-require File.dirname(__FILE__) + "/wrapper/text"
-require File.dirname(__FILE__) + "/wrapper/page"
-
-require 'rubygems'
-gem 'cairo', '>=1.5'
+require "pdf/wrapper/graphics"
+require "pdf/wrapper/images"
+require "pdf/wrapper/loading"
+require "pdf/wrapper/text_cell"
+require "pdf/wrapper/text_image_cell"
+require "pdf/wrapper/table"
+require "pdf/wrapper/text"
+require "pdf/wrapper/page"
+
 require 'cairo'
 
 module PDF

data/specs/text_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper'
 
-context "The PDF::Wrapper class" do
+describe PDF::Wrapper do
 
   before(:each) { create_pdf }
 
@@ -168,7 +168,8 @@ context "The PDF::Wrapper class" do
     opts = {:font_size => 16, :font => "Sans Serif"}
     @pdf.text(str, opts)
     @pdf.text_width(str, opts).should eql(131)
-    @pdf.text_width(str2, opts).should eql(1106)
+    (@pdf.text_width(str2, opts) >= 1106).should be_true
+    (@pdf.text_width(str2, opts) <= 1107).should be_true
   end
 
   specify "should raise an exception if build_pango_layout is passed anything other than a string" do
@@ -246,4 +247,10 @@ context "The PDF::Wrapper class" do
     lambda { @pdf.text msg, :wrap => :ponies }.should raise_error(ArgumentError)
   end
 
+  specify "should determine the largest font size possible that will fit some text in a cell" do
+    @pdf.__send__(:best_font_size, "Hello There", 34, 50, 5..9).should eql(9)
+    @pdf.__send__(:best_font_size, "<b>Hello There</b>", 34, 50, 5..9, :markup => :pango).should eql(8)
+    @pdf.__send__(:best_font_size, "Hello There", 5, 50, 5..9).should eql(5)
+  end
+
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pdf-wrapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - James Healy
@@ -9,19 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 +11:00
+date: 2010-09-06 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cairo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.0
-    version: 
+        hash: 31
+        segments: 
+        - 1
+        - 8
+        version: "1.8"
+  type: :runtime
+  version_requirements: *id001
 description: A unicode aware PDF writing library that uses the ruby bindings to various c libraries ( like cairo, pango, poppler and rsvg ) to do the heavy lifting.
 email: jimmy@deefa.com
 executables: []
@@ -94,21 +105,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: pdf-wrapper
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A PDF generating library built on top of cairo