pdf-wrapper 0.3.0 → 0.3.1

data/Rakefile

@@ -8,7 +8,7 @@ require 'spec/rake/spectask'
 require 'roodi'
 require 'roodi_task'
 
-PKG_VERSION = "0.3.0"
+PKG_VERSION = "0.3.1"
 PKG_NAME = "pdf-wrapper"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 

data/lib/pdf/core.rb

@@ -1,19 +1,41 @@
 # coding: utf-8
 
-class Hash
-  # raise an error if this hash has any keys that aren't in the supplied list
-  # - borrowed from activesupport
-  def assert_valid_keys(*valid_keys)
-    unknown_keys = keys - [valid_keys].flatten
-    raise(ArgumentError, "Unknown key(s): #{unknown_keys.join(", ")}") unless unknown_keys.empty?
+
+unless {}.respond_to?(:assert_valid_keys)
+  class Hash
+    # raise an error if this hash has any keys that aren't in the supplied list
+    # - borrowed from activesupport
+    def assert_valid_keys(*valid_keys)
+      unknown_keys = keys - [valid_keys].flatten
+      raise(ArgumentError, "Unknown key(s): #{unknown_keys.join(", ")}") unless unknown_keys.empty?
+    end
+  end
+end
+
+unless {}.respond_to?(:except)
+
+  class Hash
+    def except(*keys)
+      keys.flatten!
+      self.dup.reject { |k,v|
+        keys.include? k.to_sym
+      }
+    end
   end
 
-  def only(*keys)
-    keys.flatten!
-    self.dup.reject { |k,v|
-      !keys.include? k.to_sym
-    }
+end
+
+unless {}.respond_to?(:only)
+
+  class Hash
+    def only(*keys)
+      keys.flatten!
+      self.dup.reject { |k,v|
+        !keys.include? k.to_sym
+      }
+    end
   end
+
 end
 
 unless [].respond_to?(:sum)

data/lib/pdf/wrapper.rb

@@ -103,7 +103,8 @@ module PDF
     # <tt>output</tt>:: Where to render the PDF to. Can be a string containing a filename,
     #                   or an IO object (File, StringIO, etc)
     # Options:
-    # <tt>:paper</tt>::   The paper size to use (default :A4)
+    # <tt>:paper</tt>::   The paper size to use (default :A4). Can be a predefined paper size,
+    #                     or an array of [width, height]
     # <tt>:orientation</tt>::   :portrait (default) or :landscape
     # <tt>:background_color</tt>::   The background colour to use (default :white)
     # <tt>:margin_top</tt>::   The size of the default top margin (default 5% of page)
@@ -154,7 +155,7 @@ module PDF
       options.merge!(opts)
 
       # test for invalid options
-      options.assert_valid_keys(:paper, :orientation, :background_color, :margin_left, :margin_right, 
+      options.assert_valid_keys(:paper, :orientation, :background_color, :margin_left, :margin_right,
                                 :margin_top, :margin_bottom, :io, :template)
 
       set_dimensions(options[:orientation], options[:paper])
@@ -385,7 +386,7 @@ module PDF
       when StringIO then
         File.open(filename, "w") do |of|
           of.write(@output.string)
-        end 
+        end
       when File     then return FileUtils.cp(@output.path, filename)
       else
         return FileUtils.cp(@output, filename)
@@ -607,6 +608,25 @@ module PDF
     private
 
     def set_dimensions(orientation, paper)
+      return if orientation.nil? || paper.nil?
+
+      if paper.is_a?(Array)
+        set_manual_dimensions(*paper)
+      else
+        set_predefined_dimensions(orientation, paper)
+      end
+    end
+
+    def set_manual_dimensions(*args)
+      @page_width, @page_height = *args
+      if @page_width > @page_height
+        @orientation = :landscape
+      else
+        @orientation = :portrait
+      end
+    end
+
+    def set_predefined_dimensions(orientation, paper)
       # use the defaults if none were provided
       orientation ||= @orientation
       paper       ||= @paper

data/lib/pdf/wrapper/text_cell.rb

@@ -28,8 +28,8 @@ module PDF
         else
           str = self.data.dup
         end
-        @min_width  = wrapper.text_width(str.gsub(/\b|\B/,"\n"), text_options) + (padding * 4)
-        @natural_width = wrapper.text_width(str, text_options) + (padding * 4)
+        @min_width  = wrapper.text_width(str.gsub(/\b|\B/,"\n"), text_options_without_markup) + (padding * 4)
+        @natural_width = wrapper.text_width(str, text_options_without_markup) + (padding * 4)
       end
 
       def calculate_height(wrapper)
@@ -48,6 +48,10 @@ module PDF
       def text_options
         self.options.only(wrapper.default_text_options.keys)
       end
+
+      def text_options_without_markup
+        self.options.only(wrapper.default_text_options.keys).except(:markup)
+      end
     end
   end
 end

data/specs/tables_spec.rb

@@ -144,6 +144,22 @@ context PDF::Wrapper do
     x.to_i.should eql(100)
   end
 
+  specify "should be able to draw a table with escaped content markup on the canvas" do
+    table = PDF::Wrapper::Table.new(:markup => :pango) do |t|
+      t.data = [%w{data1 data2}, %w{data3 data4&5}]
+    end
+    @pdf.table(table)
+    @pdf.finish
+
+    receiver = PageTextReceiver.new
+    reader = PDF::Reader.string(@output.string, receiver)
+
+    receiver.content.first.include?("data1").should be_true
+    receiver.content.first.include?("data2").should be_true
+    receiver.content.first.include?("data3").should be_true
+    receiver.content.first.include?("data4&5").should be_true
+  end
+
 end
 
 context PDF::Wrapper, "data= method" do

data/specs/text_spec.rb

@@ -168,7 +168,7 @@ 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(1107)
+    @pdf.text_width(str2, opts).should eql(1106)
   end
 
   specify "should raise an exception if build_pango_layout is passed anything other than a string" do

data/specs/wrapper_spec.rb

@@ -18,6 +18,13 @@ context "The PDF::Wrapper class" do
     pdf.page_height.should eql(PDF::Wrapper::PAGE_SIZES[:A0].last)
   end
 
+  specify "should initilize with the correct manual paper size" do
+    output = StringIO.new
+    pdf = PDF::Wrapper.new(output, :paper => [100, 1000])
+    pdf.page_width.to_i.should eql(100)
+    pdf.page_height.to_i.should eql(1000)
+  end
+
   specify "should initilize with the correct custom orientation" do
     output = StringIO.new
     pdf = PDF::Wrapper.new(output, :paper => :A4, :orientation => :landscape)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pdf-wrapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - James Healy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 +11:00
+date: 2009-11-24 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,49 +33,49 @@ extra_rdoc_files:
 - CHANGELOG
 - TODO
 files: 
-- examples/cell.rb
-- examples/image.rb
-- examples/markup.rb
-- examples/repeating.rb
 - examples/utf8-long.rb
-- examples/shapes.rb
-- examples/table.rb
 - examples/scaled_image.rb
+- examples/table_simple.rb
+- examples/table.rb
+- examples/image.rb
+- examples/varied_page_size.rb
 - examples/translate.rb
 - examples/utf8.rb
-- examples/varied_page_size.rb
-- examples/table_fixed_col_width.rb
 - examples/table_images.rb
-- examples/table_simple.rb
-- lib/pdf/core.rb
-- lib/pdf/wrapper.rb
+- examples/markup.rb
+- examples/cell.rb
+- examples/table_fixed_col_width.rb
+- examples/repeating.rb
+- examples/shapes.rb
 - lib/pdf/errors.rb
 - lib/pdf/wrapper/graphics.rb
-- lib/pdf/wrapper/images.rb
-- lib/pdf/wrapper/loading.rb
-- lib/pdf/wrapper/page.rb
 - lib/pdf/wrapper/table.rb
+- lib/pdf/wrapper/loading.rb
+- lib/pdf/wrapper/text_image_cell.rb
+- lib/pdf/wrapper/images.rb
 - lib/pdf/wrapper/text.rb
+- lib/pdf/wrapper/page.rb
 - lib/pdf/wrapper/text_cell.rb
-- lib/pdf/wrapper/text_image_cell.rb
+- lib/pdf/core.rb
+- lib/pdf/wrapper.rb
+- specs/wrapper_spec.rb
+- specs/image_spec.rb
+- specs/graphics_spec.rb
 - specs/data/google.png
-- specs/data/iso-2022-jp.txt
-- specs/data/orc.svg
+- specs/data/zits.gif
+- specs/data/windmill.jpg
+- specs/data/utf8-long.txt
 - specs/data/shift_jis.txt
+- specs/data/orc.svg
 - specs/data/shipsail.jpg
 - specs/data/stef.jpg
-- specs/data/utf8-long.pdf
-- specs/data/utf8-long.txt
+- specs/data/iso-2022-jp.txt
 - specs/data/utf8.txt
-- specs/data/windmill.jpg
-- specs/data/zits.gif
+- specs/data/utf8-long.pdf
 - specs/spec_helper.rb
-- specs/image_spec.rb
-- specs/load_spec.rb
 - specs/tables_spec.rb
+- specs/load_spec.rb
 - specs/text_spec.rb
-- specs/wrapper_spec.rb
-- specs/graphics_spec.rb
 - Rakefile
 - README.rdoc
 - CHANGELOG