prawn 1.0.0 → 1.1.0

data/manual/text/rendering_and_color.rb

@@ -16,10 +16,10 @@ require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
-Prawn::Example.generate(filename) do
+Prawn::ManualBuilder::Example.generate(filename) do
   fill_color   "00ff00"
   stroke_color "0000ff"
-  
+
   font_size(40) do
     # normal rendering mode: fill
     text "This text is filled with green."

data/manual/text/right_to_left_text.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# 
+#
 # Prawn can be used with right-to-left text. The direction can be set
 # document-wide, on particular text, or on a text-box. Setting the direction to
 # <code>:rtl</code> automatically changes the default alignment to
@@ -13,7 +13,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
-Prawn::Example.generate(filename) do
+Prawn::ManualBuilder::Example.generate(filename) do
   # set the direction document-wide
   self.text_direction = :rtl
 

data/manual/text/rotation.rb

@@ -12,7 +12,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
-Prawn::Example.generate(filename) do
+Prawn::ManualBuilder::Example.generate(filename) do
   width  = 100
   height = 60
   angle  = 30
@@ -22,15 +22,15 @@ Prawn::Example.generate(filename) do
   stroke_rectangle [0, y], width, height
   text_box("This text was not rotated",
            :at => [0, y], :width => width, :height => height)
-  
+
   stroke_rectangle [0, y - 100], width, height
   text_box("This text was rotated around the center",
            :at => [0, y - 100], :width => width, :height => height,
            :rotate => angle, :rotate_around => :center)
-  
+
   [:lower_left, :upper_left,
    :lower_right, :upper_right].each_with_index do |corner, index|
-    
+
     y = y - 100 if index == 2
     stroke_rectangle [x + (index % 2) * 200, y], width, height
     text_box("This text was rotated around the #{corner} corner.",

data/manual/text/single_usage.rb

@@ -17,16 +17,16 @@ require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
-Prawn::Example.generate(filename) do
+Prawn::ManualBuilder::Example.generate(filename) do
   # Using a TTF font file
   font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf") do
     text "Written with the DejaVu Sans TTF font."
   end
   move_down 20
-  
+
   text "Written with the default font."
   move_down 20
-  
+
   # Using an DFONT font file
   font("#{Prawn::DATADIR}/fonts/Panic+Sans.dfont") do
     text "Written with the Panic Sans DFONT font"

data/manual/text/text.rb

@@ -5,10 +5,10 @@
 require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))
 
-Prawn::Example.generate("text.pdf", :page_size => "FOLIO") do
-  
+Prawn::ManualBuilder::Example.generate("text.pdf", :page_size => "FOLIO") do
+
   package "text" do |p|
-    
+
     p.section "Basics" do |s|
       s.example "free_flowing_text"
       s.example "positioned_text"
@@ -16,7 +16,7 @@ Prawn::Example.generate("text.pdf", :page_size => "FOLIO") do
       s.example "text_box_excess"
       s.example "column_box"
     end
-    
+
     p.section "Styling" do |s|
       s.example "font"
       s.example "font_size"
@@ -28,7 +28,7 @@ Prawn::Example.generate("text.pdf", :page_size => "FOLIO") do
       s.example "paragraph_indentation"
       s.example "rotation"
     end
-    
+
     p.section "Advanced Styling" do |s|
       s.example "inline"
       s.example "formatted_text"
@@ -36,12 +36,12 @@ Prawn::Example.generate("text.pdf", :page_size => "FOLIO") do
       s.example "rendering_and_color"
       s.example "text_box_extensions"
     end
-    
+
     p.section "External Fonts" do |s|
       s.example "single_usage"
       s.example "registering_families"
     end
-    
+
     p.section "M17n" do |s|
       s.example "utf8"
       s.example "line_wrapping"
@@ -49,7 +49,7 @@ Prawn::Example.generate("text.pdf", :page_size => "FOLIO") do
       s.example "fallback_fonts"
       s.example "win_ansi_charset"
     end
-    
+
     p.intro do
       prose("This is probably the feature people will use the most. There is no shortage of options when it comes to text. You'll be hard pressed to find a use case that is not covered by one of the text methods and configurable options.
 
@@ -68,6 +68,6 @@ Prawn::Example.generate("text.pdf", :page_size => "FOLIO") do
             "What happens when rendering text in different languages"
           )
     end
-    
+
   end
 end

data/manual/text/text_box_excess.rb

@@ -13,7 +13,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
-Prawn::Example.generate(filename) do
+Prawn::ManualBuilder::Example.generate(filename) do
   string = "This is the beginning of the text. It will be cut somewhere and " +
            "the rest of the text will procede to be rendered this time by " +
            "calling another method." + " . " * 50
@@ -25,7 +25,7 @@ Prawn::Example.generate(filename) do
                          :overflow => :truncate,
                          :at       => [100, y_position],
                          :size     => 18
-  
+
   text_box excess_text,
            :width    => 300,
            :at       => [100, y_position - 100]

data/manual/text/text_box_extensions.rb

@@ -14,7 +14,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
-Prawn::Example.generate(filename) do
+Prawn::ManualBuilder::Example.generate(filename) do
   module TriangleBox
     def available_width
       height + 25
@@ -24,14 +24,14 @@ Prawn::Example.generate(filename) do
   y_position = cursor - 10
   width      = 100
   height     = 100
-  
+
   Prawn::Text::Box.extensions << TriangleBox
   stroke_rectangle([0, y_position], width, height)
   text_box("A" * 100,
            :at => [0, y_position],
            :width => width,
            :height => height)
-  
+
   Prawn::Text::Formatted::Box.extensions << TriangleBox
   stroke_rectangle([200, y_position], width, height)
   formatted_text_box([:text => "A" * 100, :color => "009900"],

data/manual/text/text_box_overflow.rb

@@ -16,22 +16,22 @@ require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
-Prawn::Example.generate(filename) do
+Prawn::ManualBuilder::Example.generate(filename) do
   string = "This is the sample text used for the text boxes. See how it " +
            "behave with the various overflow options used."
 
   text string
-  
+
   y_position = cursor - 20
   [:truncate, :expand, :shrink_to_fit].each_with_index do |mode, i|
     text_box string, :at => [i * 150, y_position],
              :width => 100, :height => 50,
              :overflow => mode
   end
-  
+
   string = "If the box is too small for the text, :shrink_to_fit " +
            "can render the text in a really small font size."
-  
+
   move_down 120
   text string
   y_position = cursor - 20

data/manual/text/utf8.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# 
+#
 # Multilingualization isn't much of a problem on Prawn as its default encoding
 # is UTF-8. The only thing you need to worry about is if the font support the
 # glyphs of your language.
@@ -8,19 +8,19 @@ require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
-Prawn::Example.generate(filename) do
+Prawn::ManualBuilder::Example.generate(filename) do
   text "Take this example, a simple Euro sign:"
   text "€", :size => 32
   move_down 20
-  
+
   text "Seems ok. Now let's try something more complex:"
   text "ὕαλον ϕαγεῖν δύναμαι· τοῦτο οὔ με βλάπτει."
   move_down 20
-  
+
   text "Looks like the current font (#{font.inspect}) doesn't support those."
   text "Let's try them with another font."
   move_down 20
-  
+
   font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf") do
     text "ὕαλον ϕαγεῖν δύναμαι· τοῦτο οὔ με βλάπτει."
     text "There you go."

data/manual/text/win_ansi_charset.rb

@@ -8,7 +8,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
-Prawn::Example.generate(filename) do
+Prawn::ManualBuilder::Example.generate(filename) do
   FONT_SIZE = 9.5
 
   x = 0

data/prawn.gemspec

@@ -20,17 +20,19 @@ Gem::Specification.new do |spec|
   spec.rubyforge_project = "prawn"
   spec.licenses = ['RUBY', 'GPL-2', 'GPL-3']
 
-  spec.add_dependency('ttfunk', '~> 1.1.1')
-  spec.add_dependency('pdf-core', "~> 0.2.2")
+  spec.add_dependency('ttfunk', '~> 1.2.0')
+  spec.add_dependency('pdf-core', "~> 0.2.5")
 
   spec.add_development_dependency('pdf-inspector', '~> 1.1.0')
   spec.add_development_dependency('coderay', '~> 1.0.7')
   spec.add_development_dependency('yard')
-  spec.add_development_dependency('rspec')
+  spec.add_development_dependency('rspec', '2.14.1')
   spec.add_development_dependency('mocha')
   spec.add_development_dependency('rake')
   spec.add_development_dependency('simplecov')
+  spec.add_development_dependency('prawn-manual_builder', ">= 0.1.1")
   spec.add_development_dependency('pdf-reader', '~>1.2')
+  spec.add_development_dependency('rubocop', '0.20.1')
 
   spec.homepage = "http://prawn.majesticseacreature.com"
   spec.description = <<END_DESC

data/spec/acceptance/png.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require_relative "../../lib/prawn"
 
 images = [
@@ -15,9 +17,9 @@ Prawn::Document.generate("png_types.pdf", :page_size => "A5") do
     fill_color "FF0000"
 
     fill_rectangle bounds.top_left, bounds.width, bounds.height
-    text header 
-    
+    text header
+
     image file, :at => [50,450]
-  end 
+  end
 end
 

data/spec/cell_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
+require_relative "../lib/prawn/table"
 
 module CellHelpers
 

data/spec/column_box_spec.rb

@@ -58,7 +58,7 @@ describe "A column box" do
         @pdf.bounds.move_past_bottom
         @pdf.bounds.move_past_bottom
 
-        @pdf.bounds.absolute_top.should == page_top 
+        @pdf.bounds.absolute_top.should == page_top
         @pdf.bounds.absolute_top.should_not == init_column_top
       end
   end

data/spec/extensions/encoding_helpers.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module EncodingHelpers
   def win1252_string(str)
     str.force_encoding(Encoding::Windows_1252)

data/spec/extensions/mocha.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Allow speccing things when an expectation matcher runs. Similar to #with, but
 # always succeeds.
 #

data/spec/font_spec.rb

@@ -159,6 +159,21 @@ describe "font style support" do
     name = name.sub(/\w+\+/, "subset+")
     name.should == "subset+DejaVuSans"
   end
+
+  it "should accept IO objects for font files" do
+    io = File.open "#{Prawn::DATADIR}/fonts/DejaVuSans.ttf"
+    @pdf.font_families["DejaVu Sans"] = {
+      normal: Prawn::Font.load(@pdf, io)
+    }
+
+    @pdf.font "DejaVu Sans"
+    @pdf.text "In DejaVu Sans"
+
+    text = PDF::Inspector::Text.analyze(@pdf.render)
+    name = text.font_settings.map { |e| e[:name] }.first.to_s
+    name = name.sub(/\w+\+/, "subset+")
+    name.should == "subset+DejaVuSans"
+  end
 end
 
 describe "Transactional font handling" do

data/spec/measurement_units_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 require "prawn/measurement_extensions"
 

data/spec/repeater_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
 describe "Repeaters" do

data/spec/soft_mask_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
 module SoftMaskHelper

data/spec/stamp_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
 describe "create_stamp before any page is added" do

data/spec/table_spec.rb

@@ -1,6 +1,12 @@
 # encoding: utf-8
 
+# run rspec -t issue:XYZ  to run tests for a specific github issue
+# or  rspec -t unresolved to run tests for all unresolved issues
+
+
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
+
+require_relative "../lib/prawn/table"
 require 'set'
 
 describe "Prawn::Table" do
@@ -45,6 +51,48 @@ describe "Prawn::Table" do
     end
   end
 
+  describe "headers should allow for rowspan" do
+    it "should remember rowspans accross multiple pages", :issue => 721 do
+      pdf = Prawn::Document.new({:page_size => "A4", :page_layout => :portrait})
+      rows = [ [{:content=>"The\nNumber", :rowspan=>2}, {:content=>"Prefixed", :colspan=>2} ],
+           ["A's", "B's"] ]
+
+      (1..50).each do |n|
+        rows.push( ["#{n}", "A#{n}", "B#{n}"] )
+      end
+
+      pdf.table( rows, :header=>2 ) do
+         row(0..1).style :background_color=>"FFFFCC"
+      end
+
+      #ensure that the header on page 1 is identical to the header on page 0
+      output = PDF::Inspector::Page.analyze(pdf.render)
+      output.pages[0][:strings][0..4].should == output.pages[1][:strings][0..4]
+    end
+  end
+
+  describe "Text may be longer than the available space in a row on a single page" do
+    it "should not glitch the layout if there is too much text to fit onto a single row on a single page", :unresolved, :issue => 562 do
+      pdf = Prawn::Document.new({:page_size => "A4", :page_layout => :portrait})
+
+      table_data = Array.new
+      text = 'This will be a very long text. ' * 5
+      table_data.push([{:content => text, :rowspan => 2}, 'b', 'c'])
+      table_data.push(['b','c'])
+
+      column_widths = [50, 60, 400]
+
+      table = Prawn::Table.new table_data, pdf,:column_widths => column_widths
+
+      #render the table onto the pdf
+      table.draw
+
+      #expected behavior would be for the long text to be cut off or an exception to be raised
+      #thus we only expect a single page
+      pdf.page_count.should == 1
+    end
+  end
+
   describe "You can explicitly set the column widths and use a colspan > 1" do
 
     it "should tolerate floating point rounding errors < 0.000000001" do
@@ -53,9 +101,9 @@ describe "Prawn::Table" do
           ]
       #we need values with lots of decimals so that arithmetic errors will occur
       #the values are not arbitrary but where found converting mm to pdf pt
-      column_widths=[137, 40, 40, 54.69291338582678, 54.69291338582678, 
-                     54.69291338582678, 54.69291338582678, 54.69291338582678, 
-                     54.69291338582678, 54.69291338582678, 54.69291338582678, 
+      column_widths=[137, 40, 40, 54.69291338582678, 54.69291338582678,
+                     54.69291338582678, 54.69291338582678, 54.69291338582678,
+                     54.69291338582678, 54.69291338582678, 54.69291338582678,
                      54.69291338582678]
 
       pdf = Prawn::Document.new({:page_size => 'A4', :page_layout => :landscape})
@@ -63,10 +111,10 @@ describe "Prawn::Table" do
       table.column_widths.should == column_widths
     end
 
-    it "should work with two different given colspans", :issue => 628 do 
+    it "should work with two different given colspans", :issue => 628 do
       data = [
-              [" ", " ", " "], 
-              [{:content=>" ", :colspan=>3}], 
+              [" ", " ", " "],
+              [{:content=>" ", :colspan=>3}],
               [" ", {:content=>" ", :colspan=>2}]
             ]
       column_widths = [60, 240, 60]
@@ -114,21 +162,49 @@ describe "Prawn::Table" do
        :unresolved, :issue => 612 do
 
       pdf = Prawn::Document.new
-      
+
       first = {:content=>"Foooo fo foooooo",:width=>50,:align=>:center}
       second = {:content=>"Foooo",:colspan=>2,:width=>70,:align=>:center}
       third = {:content=>"fooooooooooo, fooooooooooooo, fooo, foooooo fooooo",:width=>50,:align=>:center}
       fourth = {:content=>"Bar",:width=>20,:align=>:center}
-      
+
       table_content = [[
       first,
       [[second],[third,fourth]]
       ]]
-      
+
       table = Prawn::Table.new table_content, pdf
       table.column_widths.should == [50.0, 70.0]
     end
 
+    it "illustrates issue #710", :issue => 710 do
+      partial_width = 40
+      pdf = Prawn::Document.new({page_size: "LETTER", page_layout: :portrait})
+      col_widths = [
+        50,
+        partial_width, partial_width, partial_width, partial_width
+      ]
+
+      day_header = [{
+          content: "Monday, August 5th, A.S. XLIX",
+          colspan: 5,
+      }]
+
+      times = [{
+        content: "Loc",
+        colspan: 1,
+      }, {
+        content: "8:00",
+        colspan: 4,
+      }]
+
+      data = [ day_header ] + [ times ]
+
+      #raised a Prawn::Errors::CannotFit:
+      #Table's width was set larger than its contents' maximum width (max width 210, requested 218.0)
+      table = Prawn::Table.new data, pdf, :column_widths => col_widths
+    end
+
     it "illustrate issue #533" do
       data = [['', '', '', '', '',''],
               ['',{:content => '', :colspan => 5}]]
@@ -162,7 +238,7 @@ describe "Prawn::Table" do
       table.column_widths.should == [50.0, 200.0]
     end
 
-    it "illustrates a variant of problem in issue #407 - comment 28556698" do 
+    it "illustrates a variant of problem in issue #407 - comment 28556698" do
       pdf = Prawn::Document.new
       table_data = [["a", "b", "c"], [{:content=>"d", :colspan=>3}]]
       column_widths = [50, 60, 400]
@@ -711,6 +787,23 @@ describe "Prawn::Table" do
       output.pages[1][:strings].should == ["Header", "Body"]
     end
 
+    it 'should only draw first-page header if the first multi-row fits',
+        :issue => 707 do
+      pdf = Prawn::Document.new
+
+      pdf.y = 100 # not enough room for the header and multirow cell
+      pdf.table [
+          [{content: 'Header', colspan: 2}],
+          [{content: 'Multirow cell', rowspan: 3}, 'Line 1'],
+      ] + (2..3).map { |i| ["Line #{i}"] }, :header => true
+
+      output = PDF::Inspector::Page.analyze(pdf.render)
+      # Ensure we only drew the header once, on the second page
+      output.pages[0][:strings].should == []
+      output.pages[1][:strings].should == ['Header', 'Multirow cell', 'Line 1',
+          'Line 2', 'Line 3']
+    end
+
     it "should draw background before borders, but only within pages" do
       seq = sequence("drawing_order")