prawn 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97df184b88392e64c3213125e2e3d49ed8921dfd
-  data.tar.gz: ae198cc6d4e658db982a4fcab6119c6c082937d1
+  metadata.gz: 0a27927232c4c77d3933d18984c31230475c1b97
+  data.tar.gz: 711b6736c9a1a5bfc2131d0d0cec5e5ef3f2faad
 SHA512:
-  metadata.gz: fcf93119b67b6497601c38ebdfce11c7ff22739941a5c2adafe7f0f2636bfeefdb86f7fd6a35285e387bc77dc76896c87b1120e44ce3e357ce99754ac0380d52
-  data.tar.gz: afbfa0adfca9f371ada957a127e7737f6248a3be75f99fc401d1081199d22e9fdeac62e13ea752dd24418c76e29d6aaa3aad4e4bf503433dc585169f03b52e47
+  metadata.gz: cfc74a6d17392cf8d2e97257df8e80e2bb2fd36e55293fd1507efc900a5d8b40161dae98e3e99d6ff5b99052eb64f0d3bcc6654def35fd9384f83ece176237fc
+  data.tar.gz: 9355d24d34c93280b67f161c9aababa5360f8cf685fa081adafaa76fa1dddb4eecd07dacecb413ec671f6081d3aa5e09b728cdee627482f2ec4951903bb0089e

data/lib/prawn.rb

@@ -20,7 +20,7 @@ end
 require "set"
 
 module Prawn
-  VERSION = "0.13.1"
+  VERSION = "0.13.2"
 
   extend self
 

data/lib/prawn/document.rb

@@ -7,12 +7,12 @@
 # This is free software. Please see the LICENSE and COPYING files for details.
 
 require "stringio"
-require "prawn/document/bounding_box"
-require "prawn/document/column_box"
-require "prawn/document/internals"
-require "prawn/document/span"
-require "prawn/document/snapshot"
-require "prawn/document/graphics_state"
+require_relative "document/bounding_box"
+require_relative "document/column_box"
+require_relative "document/internals"
+require_relative "document/span"
+require_relative "document/snapshot"
+require_relative "document/graphics_state"
 
 module Prawn
 

data/lib/prawn/document/column_box.rb

@@ -4,7 +4,8 @@
 #
 # Author Paul Ostazeski.
 
-require "prawn/document/bounding_box"
+require_relative "bounding_box"
+
 module Prawn
   class Document
 

data/lib/prawn/font.rb

@@ -6,10 +6,10 @@
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 #
-require "prawn/font/afm"
-require "prawn/font/ttf"
-require "prawn/font/dfont"
-require "prawn/font_metric_cache"
+require_relative "font/afm"
+require_relative "font/ttf"
+require_relative "font/dfont"
+require_relative "font_metric_cache"
 
 module Prawn
 
@@ -174,10 +174,9 @@ module Prawn
     # wish to support.
     #
     # By default the styles :bold, :italic, :bold_italic, and :normal are
-    # defined for fonts "Courier", "Times-Roman" and "Helvetica".
-    #
-    # You probably want to provide those four styles, but are free to define
-    # custom ones, like :thin, and use them in font calls.
+    # defined for fonts "Courier", "Times-Roman" and "Helvetica". When
+    # defining your own font families, you can map any or all of these
+    # styles to whatever font files you'd like.
     #
     def font_families
       @font_families ||= {}.merge!(

data/lib/prawn/font/afm.rb

@@ -6,7 +6,7 @@
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 
-require 'prawn/encoding'
+require_relative '../../prawn/encoding'
 
 module Prawn
   class Font

data/lib/prawn/font/dfont.rb

@@ -6,7 +6,7 @@
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 #
-require 'prawn/font/ttf'
+require_relative 'ttf'
 
 module Prawn
   class Font

data/lib/prawn/graphics.rb

@@ -6,13 +6,14 @@
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 
-require "prawn/graphics/color"
-require "prawn/graphics/dash"
-require "prawn/graphics/cap_style"
-require "prawn/graphics/join_style"
-require "prawn/graphics/transparency"
-require "prawn/graphics/transformation"
-require "prawn/graphics/patterns"
+
+require_relative "graphics/color"
+require_relative "graphics/dash"
+require_relative "graphics/cap_style"
+require_relative "graphics/join_style"
+require_relative "graphics/transparency"
+require_relative "graphics/transformation"
+require_relative "graphics/patterns"
 
 module Prawn
 

data/lib/prawn/layout.rb

@@ -1,5 +1,5 @@
-require "prawn/table"
-require 'prawn/layout/grid'
+require_relative "table"
+require_relative "layout/grid"
 
 module Prawn
 

data/lib/prawn/measurement_extensions.rb

@@ -5,7 +5,7 @@
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 
-require 'prawn/measurements'
+require_relative 'measurements'
 
 class Numeric
   include Prawn::Measurements

data/lib/prawn/table.rb

@@ -6,13 +6,14 @@
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 
-require 'prawn/table/cells'
-require 'prawn/table/cell'
-require 'prawn/table/cell/in_table'
-require 'prawn/table/cell/text'
-require 'prawn/table/cell/subtable'
-require 'prawn/table/cell/image'
-require 'prawn/table/cell/span_dummy'
+require_relative 'table/column_width_calculator'
+require_relative 'table/cells'
+require_relative 'table/cell'
+require_relative 'table/cell/in_table'
+require_relative 'table/cell/text'
+require_relative 'table/cell/subtable'
+require_relative 'table/cell/image'
+require_relative 'table/cell/span_dummy'
 
 module Prawn
 
@@ -549,21 +550,7 @@ module Prawn
     # Returns an array of each column's natural (unconstrained) width.
     #
     def natural_column_widths
-      @natural_column_widths ||=
-        begin
-          widths_by_column = Hash.new(0)
-          cells.each do |cell|
-            next if cell.is_a?(Cell::SpanDummy)
-
-            # Split the width of colspanned cells evenly by columns
-            width_per_column = cell.width.to_f / cell.colspan
-            cell.colspan.times do |i|
-              widths_by_column[cell.column + i] =
-                [widths_by_column[cell.column + i], width_per_column].max
-            end
-          end
-          widths_by_column.sort_by { |col, _| col }.map { |_, w| w }
-        end
+      @natural_column_widths ||= ColumnWidthCalculator.new(cells).natural_widths
     end
 
     # Returns the "natural" (unconstrained) width of the table. This may be

data/lib/prawn/table/column_width_calculator.rb

@@ -0,0 +1,55 @@
+module Prawn
+  class Table
+    class ColumnWidthCalculator
+      def initialize(cells)
+        @cells = cells
+
+        @widths_by_column        = Hash.new(0)
+        @rows_with_a_span_dummy  = Hash.new(false)
+      end
+
+      def natural_widths
+        @cells.each do |cell|
+          @rows_with_a_span_dummy[cell.row] = true if cell.is_a?(Cell::SpanDummy)
+        end
+
+        #calculate natural column width for all rows that do not include a span dummy
+        @cells.each do |cell|
+          unless @rows_with_a_span_dummy[cell.row]
+            @widths_by_column[cell.column] = 
+              [@widths_by_column[cell.column], cell.width.to_f].max
+          end
+        end
+
+        #integrate natural column widths for all rows that do include a span dummy
+        @cells.each do |cell|
+          next unless @rows_with_a_span_dummy[cell.row]
+          #the width of a SpanDummy cell will be calculated by the "mother" cell
+          next if cell.is_a?(Cell::SpanDummy)
+
+          if cell.colspan == 1
+            @widths_by_column[cell.column] = 
+              [@widths_by_column[cell.column], cell.width.to_f].max
+          else
+            #calculate the current with of all cells that will be spanned by the current cell
+            current_width_of_spanned_cells = 
+              @widths_by_column.to_a[cell.column..(cell.column + cell.colspan - 1)]
+                               .collect{|key, value| value}.inject(0, :+)
+
+            #update the Hash only if the new with is at least equal to the old one
+            if cell.width.to_f > current_width_of_spanned_cells
+              # Split the width of colspanned cells evenly by columns
+              width_per_column = cell.width.to_f / cell.colspan
+              # Update the Hash
+              cell.colspan.times do |i|
+                @widths_by_column[cell.column + i] = width_per_column
+              end
+            end
+          end
+        end
+
+        @widths_by_column.sort_by { |col, _| col }.map { |_, w| w }
+      end
+    end
+  end
+end

data/spec/table_spec.rb

@@ -80,6 +80,25 @@ describe "Prawn::Table" do
 
     end
 
+    it "should not increase column width when rendering a subtable",
+       :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 "illustrate issue #533" do
       data = [['', '', '', '', '',''],
               ['',{:content => '', :colspan => 5}]]
@@ -91,15 +110,36 @@ describe "Prawn::Table" 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=>55,:align=>:center}
-      fourth = {:content=>"Bar",:width=>15,: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]]
       ]]
       pdf.move_down(20)
+      table = Prawn::Table.new table_content, pdf
       pdf.table(table_content)
     end
+
+    #https://github.com/prawnpdf/prawn/issues/407#issuecomment-28556698
+    it "correctly computes column widths with empty cells + colspan" do
+      data = [['', ''],
+              [{:content => '', :colspan => 2}]
+              ]
+      pdf = Prawn::Document.new
+
+      table = Prawn::Table.new data, pdf, :column_widths => [50, 200]
+      table.column_widths.should == [50.0, 200.0]
+    end
+
+    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]
+
+      # Before we fixed #407, this line incorrectly raise a CannotFit error
+      pdf.table(table_data, :column_widths => column_widths)
+    end
   end
 
   describe "#initialize" do

data/spec/text_spec.rb

@@ -408,4 +408,30 @@ describe "#text" do
       @pdf.text "VAT", :kerning => false
     end
   end
+
+  describe "#shrink_to_fit with special utf-8 text" do
+    it "Should not throw an exception", 
+        :unresolved, :issue => 603 do
+      pages = 0
+      doc = Prawn::Document.new(page_size: 'A4', margin: [2, 2, 2, 2]) do |pdf|
+        add_unicode_fonts(pdf)
+        pdf.bounding_box([1, 1], :width => 90, :height => 50) do
+          broken_text = " Sample Text\nSAMPLE SAMPLE SAMPLEoddělení ZMĚN\nSAMPLE"
+          pdf.text broken_text, :overflow => :shrink_to_fit
+        end
+      end
+    end
+  end
+
+
+  def add_unicode_fonts(pdf)
+    dejavu = "#{::Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf"
+    pdf.font_families.update("dejavu" => {
+      :normal      => dejavu,
+      :italic      => dejavu,
+      :bold        => dejavu,
+      :bold_italic => dejavu
+    })
+    pdf.fallback_fonts = ["dejavu"]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Gregory Brown
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pdf-reader
@@ -176,6 +176,7 @@ files:
 - lib/prawn/table/cell/text.rb
 - lib/prawn/table/cell.rb
 - lib/prawn/table/cells.rb
+- lib/prawn/table/column_width_calculator.rb
 - lib/prawn/table.rb
 - lib/prawn/text/box.rb
 - lib/prawn/text/formatted/arranger.rb
@@ -507,3 +508,4 @@ test_files:
 - spec/text_spec.rb
 - spec/text_with_inline_formatting_spec.rb
 - spec/transparency_spec.rb
+has_rdoc: