prawn-layout 0.2.0.1 → 0.2.1

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 require "rake/rdoctask"
 require "rake/gempackagetask"  
 
-PRAWN_LAYOUT_VERSION = "0.2.0.1"
+PRAWN_LAYOUT_VERSION = "0.2.1"
 
 task :default => [:test]
        

data/examples/example_helper.rb

@@ -0,0 +1,6 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require "rubygems"
+require "prawn"   
+require "prawn/layout"
+
+Prawn.debug = true

data/examples/grid/simple_grid.rb

@@ -1,9 +1,6 @@
 # encoding: utf-8    
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-require "rubygems"
-require "prawn"   
-require "prawn/layout"
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
 
 Prawn::Document.generate('simple_grid.pdf') do |p|
   p.define_grid(:columns => 5, :rows => 8, :gutter => 10)

data/examples/page_layout/flowing_text_with_header_and_footer.rb

@@ -8,10 +8,7 @@
 #
 # Future versions of Prawn may make this more convenient somehow.
 #
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-require "rubygems"
-require "prawn"   
-require "prawn/layout"
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
 
 Prawn::Document.generate("flow_with_headers_and_footers.pdf")  do
 

data/examples/page_layout/lazy_bounding_boxes.rb

@@ -10,10 +10,7 @@
 # location each time it is redrawn, regardless of the bounds 
 # LazyBoundingBox#draw is in.
 # 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-require "rubygems"
-require "prawn"   
-require "prawn/layout"
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
 
 file = "lazy_bounding_boxes.pdf"
 Prawn::Document.generate(file, :skip_page_creation => true) do

data/examples/page_layout/padded_box.rb

@@ -7,10 +7,7 @@
 # Feature borrowed from Josh Knowle's pt at:
 # http://github.com/joshknowles/pt/tree/master
 #
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-require "rubygems"
-require "prawn"   
-require "prawn/layout"
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
 
 Prawn::Document.generate('padded_box.pdf') do
   stroke_bounds

data/examples/table/cell.rb

@@ -5,11 +5,7 @@
 # building your own table implementation from scratch or heavily modify
 # the existing table system.
 #
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-
-require "rubygems"
-require "prawn"
-require "prawn/layout"
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
 
 Prawn::Document.generate("cell.pdf") do 
   cell = Prawn::Table::Cell.new(

data/examples/table/fancy_table.rb

@@ -2,11 +2,7 @@
 #
 # Demonstrates various table and cell features.  
 #
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-
-require "rubygems"
-require "prawn"
-require "prawn/layout"
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
    
 headers, body = nil, nil  
 

data/examples/table/table.rb

@@ -4,11 +4,7 @@
 # Although this does not show all of the options available to table, the most
 # common are used here.  See fancy_table.rb for a more comprehensive example.
 #
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-
-require "rubygems"
-require "prawn"
-require "prawn/layout"
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
  
 Prawn::Document.generate("table.pdf") do 
   font "#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf"

data/examples/table/table_alignment.rb

@@ -3,15 +3,11 @@
 # Demonstrates the many controls over alignment and positioning in Prawn
 # tables.
 #
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-
-require "rubygems"
-require "prawn"
-require "prawn/layout"
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
 
 Prawn::Document.generate "table_header_align.pdf" do
   table [ ['01/01/2008', 'John Doe', '4.2', '125.00', '525.00'],
-	  ['01/12/2008', 'Jane Doe', '3.2', '75.50', '241.60'] ] * 20,
+	  ['01/12/2008', 'Jane Doe', '3.2', { :text => '75.5', :align => :center }, '241.60'] ] * 20,
   :position => :center,
   :headers => ['Date', 'Employee', 'Hours', 'Rate', 'Total'],
   :column_widths => { 0 => 75, 1 => 100, 2 => 50, 3 => 50, 4 => 50},

data/examples/table/table_border_color.rb

@@ -3,11 +3,7 @@
 # Demonstrates how to set the table border color with the :border_color
 # attribute.
 #
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-
-require "rubygems"
-require "prawn"
-require "prawn/layout"
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
 
 Prawn::Document.generate "table_border_color.pdf" do
   table [ ['01/01/2008', 'John Doe', '4.2', '125.00', '525.00'], 

data/examples/table/table_colspan.rb

@@ -2,17 +2,13 @@
 #
 # Demonstrates the use of the :col_span option when using Document#table
 #
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-
-require "rubygems"
-require "prawn"
-require "prawn/layout"
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
 
 Prawn::Document.generate "table_colspan.pdf" do
   data = [ ['01/01/2008', 'John Doe', '4.2', '125.00', '525.00'], 
            ['01/12/2008', 'Jane Doe', '3.2', '75.50', '241.60'] ] * 5
   
-  data << [{:text => 'Total', :colspan => 2}, '37.0', '1002.5', '3833']
+  data << [{:text => 'Total', :colspan => 2, :align => :center}, '37.0', '1002.5', '3833']
   
   table data,
   :position => :center,

data/examples/table/table_header_color.rb

@@ -3,11 +3,7 @@
 # Demonstrates explicitly setting the :header_color rather than inferring
 # it from :row_colors in Document#table
 #
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-
-require "rubygems"
-require "prawn"
-require "prawn/layout"
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
 
 Prawn::Document.generate "table_header_color.pdf" do
   table [ ['01/01/2008', 'John Doe', '4.2', '125.00', '525.00'], 

data/examples/table/table_header_underline.rb

@@ -2,11 +2,7 @@
 #
 # Demonstrates the :underline_header border style for Document#table.
 #
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-
-require "rubygems"
-require "prawn"
-require "prawn/layout"
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
 
 Prawn::Document.generate "table_header_underline.pdf" do
   table [ ['01/01/2008', 'John Doe', '4.2', '125.00', '525.00'], 

data/examples/table/table_widths.rb

@@ -4,11 +4,7 @@
 # Although this does not show all of the options available to table, the most
 # common are used here.  See fancy_table.rb for a more comprehensive example.
 #
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-
-require "rubygems"
-require "prawn"
-require "prawn/layout"
+require "#{File.dirname(__FILE__)}/../example_helper.rb"
 
 Prawn::Document.generate("table_widths.pdf") do 
 

data/lib/prawn/layout.rb

@@ -16,6 +16,6 @@ module Prawn
  end
 
  module Layout
-   VERSION = "0.2.0.1"
+   VERSION = "0.2.1"
  end
 end

data/lib/prawn/table.rb

@@ -283,16 +283,22 @@ module Prawn
                 @column_widths[col_index]
               end
               
-              cell_options = {:document => @document, 
+              cell_options = {
+                :document => @document, 
                 :text     => text,
                 :width    => width,
                 :horizontal_padding => C(:horizontal_padding),
                 :vertical_padding   => C(:vertical_padding),
                 :border_width       => C(:border_width),
                 :border_style       => :sides,
-                :align              => align}
-              cell_options[:font_style] = e[:font_style] if e.is_a?(Hash) && e.has_key?(:font_style)
-              cell_options[:font_size] = e[:font_size] if e.is_a?(Hash) && e.has_key?(:font_size)
+                :align              => align 
+              }
+
+              if e.is_a?(Hash) 
+                opts = e.dup
+                opts.delete(:colspan)
+                cell_options.update(opts)
+              end
 
               c << Prawn::Table::Cell.new(cell_options)
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: prawn-layout
 version: !ruby/object:Gem::Version 
-  version: 0.2.0.1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Gregory Brown
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-15 00:00:00 -04:00
+date: 2009-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- examples/example_helper.rb
 - examples/grid/simple_grid.rb
 - examples/page_layout/flowing_text_with_header_and_footer.rb
 - examples/page_layout/lazy_bounding_boxes.rb