prawn 0.13.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a27927232c4c77d3933d18984c31230475c1b97
-  data.tar.gz: 711b6736c9a1a5bfc2131d0d0cec5e5ef3f2faad
+  metadata.gz: d83c112e79d7d99ade30524585cf7d7cb7d4de52
+  data.tar.gz: a0143b1b1ebf8db3776daafe04dbceeedb62db6b
 SHA512:
-  metadata.gz: cfc74a6d17392cf8d2e97257df8e80e2bb2fd36e55293fd1507efc900a5d8b40161dae98e3e99d6ff5b99052eb64f0d3bcc6654def35fd9384f83ece176237fc
-  data.tar.gz: 9355d24d34c93280b67f161c9aababa5360f8cf685fa081adafaa76fa1dddb4eecd07dacecb413ec671f6081d3aa5e09b728cdee627482f2ec4951903bb0089e
+  metadata.gz: 6f9ac40edd92c31df1f2a63e73684f983069edcb8f1dd15ffb26f9bcc85256ac4adc0f476aa6ef5b4fa2248318515c56a39dc68e5f2352711e30dd4863aa4989
+  data.tar.gz: 7ecbae3e281cae29a8a7234fc32c0148eaae4d27dabc35cecba01073d28319c5480c50dcc1cce2f1bdb5b1c99b4a11e80168d62b8c7c94faa8a1a1f7995f0043

data/.yardopts

@@ -0,0 +1,9 @@
+--charset UTF-8
+--main README.md
+--title 'Prawn Documentation'
+lib/**/*.rb
+-
+CONTRIBUTING.md
+COPYING
+LICENSE
+README.md

data/Gemfile

@@ -1,17 +1,11 @@
 source "https://rubygems.org"
 
-gem "ttfunk", "~>1.0.3"
-gem "pdf-reader", "~> 1.2"
-gem "ruby-rc4"
+gemspec
 
-group :development do
-  gem "coderay", "~> 1.0.7"
-  gem "rdoc"
-end
-
-group :test do
-  gem "pdf-inspector", "~> 1.1.0", :require => "pdf/inspector"
-  gem "rspec"
-  gem "mocha", :require => false
-  gem "rake"
+if ENV["CI"] 
+  platforms :rbx do
+    gem "rubysl-singleton", "~> 2.0"
+    gem "rubysl-digest", "~> 2.0"
+    gem "rubysl-enumerator", "~> 2.0"
+  end
 end

data/Rakefile

@@ -3,7 +3,7 @@ Bundler.setup
 
 require 'rake'
 require 'rspec/core/rake_task'
-require 'rdoc/task'
+require 'yard'
 require 'rubygems/package_task'
 
 task :default => [:spec]
@@ -21,16 +21,11 @@ task :stats do
                       ["Specs", "spec"] ).to_s
 end
 
-desc "genrates documentation"
-RDoc::Task.new do |rdoc|
-  rdoc.rdoc_files.include( "README.md",
-                           "COPYING",
-                           "LICENSE",
-                           "lib/" )
-  rdoc.main     = "README.md"
-  rdoc.rdoc_dir = "doc/html"
-  rdoc.title    = "Prawn Documentation"
+YARD::Rake::YardocTask.new do |t|
+  t.options = ['--output-dir', 'doc/html']
 end
+task :docs => :yard
+
 
 desc "Generate the 'Prawn by Example' manual"
 task :manual do

data/lib/pdf/core/document_state.rb

@@ -5,10 +5,11 @@ module PDF
         normalize_metadata(options)
 
         if options[:template]
-          @store = PDF::Core::ObjectStore.new(:template => options[:template])
+          @store = PDF::Core::ObjectStore.new(:template => options[:template],
+                                                :print_scaling => options[:print_scaling])
           @store.info.data.merge!(options[:info]) if options[:info]
         else
-          @store = PDF::Core::ObjectStore.new(:info => options[:info])
+          @store = PDF::Core::ObjectStore.new(:info => options[:info], :print_scaling => options[:print_scaling])
         end
 
         @version                 = 1.3

data/lib/pdf/core/graphics_state.rb

@@ -43,17 +43,23 @@ module PDF
 
     end
 
+    # NOTE: This class may be a good candidate for a copy-on-write hash.
     class GraphicState
-      attr_accessor :color_space, :dash, :cap_style, :join_style, :line_width, :fill_color, :stroke_color
+      attr_accessor :color_space, :dash, :cap_style, :join_style, :line_width, 
+                    :fill_color, :stroke_color
 
       def initialize(previous_state = nil)
-        @color_space = previous_state ? previous_state.color_space.dup : {}
-        @fill_color = previous_state ? previous_state.fill_color : "000000"
-        @stroke_color = previous_state ? previous_state.stroke_color : "000000"
-        @dash = previous_state ? previous_state.dash : { :dash => nil, :space => nil, :phase => 0 }
-        @cap_style = previous_state ? previous_state.cap_style : :butt
-        @join_style = previous_state ? previous_state.join_style : :miter
-        @line_width = previous_state ? previous_state.line_width : 1
+        if previous_state
+          initialize_copy(previous_state)
+        else
+          @color_space  = {}
+          @fill_color   = "000000"
+          @stroke_color = "000000"
+          @dash         = { :dash => nil, :space => nil, :phase => 0 }
+          @cap_style    = :butt
+          @join_style   = :miter
+          @line_width   = 1
+        end
       end
 
       def dash_setting
@@ -63,6 +69,21 @@ module PDF
           "[#{@dash[:dash]} #{@dash[:space]}] #{@dash[:phase]} d"
         end
       end
+
+      private
+
+      def initialize_copy(other)
+        # mutable state
+        @color_space  = other.color_space.dup
+        @fill_color   = other.fill_color.dup
+        @stroke_color = other.stroke_color.dup
+        @dash         = other.dash.dup
+
+        # immutable state that doesn't need to be duped
+        @cap_style    = other.cap_style
+        @join_style   = other.join_style
+        @line_width   = other.line_width
+      end
     end
   end
 end

data/lib/pdf/core/object_store.rb

@@ -26,6 +26,9 @@ module PDF
 
         @info  ||= ref(opts[:info] || {}).identifier
         @root  ||= ref(:Type => :Catalog).identifier
+        if opts[:print_scaling] == :none
+          root.data[:ViewerPreferences] = {:PrintScaling => :None}
+        end
         if pages.nil?
           root.data[:Pages] = ref(:Type => :Pages, :Count => 0, :Kids => [])
         end

data/lib/prawn.rb

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

data/lib/prawn/document.rb

@@ -62,6 +62,14 @@ module Prawn
     include Prawn::Stamp
     include Prawn::SoftMask
 
+    # NOTE: We probably need to rethink the options validation system, but this
+    # constant temporarily allows for extensions to modify the list.
+
+    VALID_OPTIONS = [:page_size, :page_layout, :margin, :left_margin,
+                     :right_margin, :top_margin, :bottom_margin, :skip_page_creation,
+                     :compress, :skip_encoding, :background, :info,
+                     :optimize_objects, :text_formatter, :print_scaling]
+
     # Any module added to this array will be included into instances of
     # Prawn::Document at the per-object level.  These will also be inherited by
     # any subclasses.
@@ -138,7 +146,6 @@ module Prawn
     # <tt>:background</tt>:: An image path to be used as background on all pages [nil]
     # <tt>:background_scale</tt>:: Backgound image scale [1] [nil]
     # <tt>:info</tt>:: Generic hash allowing for custom metadata properties [nil]
-    # <tt>:template</tt>:: The path to an existing PDF file to use as a template [nil]
     # <tt>:text_formatter</tt>: The text formatter to use for <tt>:inline_format</tt>ted text [Prawn::Text::Formatted::Parser]
     #
     # Setting e.g. the :margin to 100 points and the :left_margin to 50 will result in margins
@@ -173,10 +180,7 @@ module Prawn
     def initialize(options={},&block)
       options = options.dup
 
-      Prawn.verify_options [:page_size, :page_layout, :margin, :left_margin,
-        :right_margin, :top_margin, :bottom_margin, :skip_page_creation,
-        :compress, :skip_encoding, :background, :info,
-        :optimize_objects, :template, :text_formatter], options
+      Prawn.verify_options VALID_OPTIONS, options
 
       # need to fix, as the refactoring breaks this
       # raise NotImplementedError if options[:skip_page_creation]
@@ -186,6 +190,8 @@ module Prawn
       @internal_state.populate_pages_from_store(self)
       min_version(state.store.min_version) if state.store.min_version
 
+      min_version(1.6) if options[:print_scaling] == :none
+
       @background = options[:background]
       @background_scale = options[:background_scale] || 1
       @font_size  = 12
@@ -200,16 +206,7 @@ module Prawn
       options[:size] = options.delete(:page_size)
       options[:layout] = options.delete(:page_layout)
 
-      if options[:template]
-        fresh_content_streams(options)
-        go_to_page(1)
-      else
-        if options[:skip_page_creation] || options[:template]
-          start_new_page(options.merge(:orphan => true))
-        else
-          start_new_page(options)
-        end
-      end
+      initialize_first_page(options)
 
       @bounding_box = @margin_box
 
@@ -232,6 +229,14 @@ module Prawn
       state.page
     end
 
+    def initialize_first_page(options)
+      if options[:skip_page_creation]
+        start_new_page(options.merge(:orphan => true))
+      else
+        start_new_page(options)
+      end
+    end
+
     # Creates and advances to a new page in the document.
     #
     # Page size, margins, and layout can also be set when generating a
@@ -242,14 +247,6 @@ module Prawn
     #   pdf.start_new_page(:left_margin => 50, :right_margin => 50)
     #   pdf.start_new_page(:margin => 100)
     #
-    # A template for a page can be specified by pointing to the path of and existing pdf.
-    # One can also specify which page of the template which defaults otherwise to 1.
-    #
-    #  pdf.start_new_page(:template => multipage_template.pdf, :template_page => 2)
-    #
-    # Note: templates get indexed by either the object_id of the filename or stream
-    # entered so that if you reuse the same template multiple times be sure to use the
-    # same instance for more efficient use of resources and smaller rendered pdfs.
     def start_new_page(options = {})
       if last_page = state.page
         last_page_size    = last_page.size
@@ -266,7 +263,6 @@ module Prawn
         new_graphic_state.color_space = {} if new_graphic_state
         page_options.merge!(:graphic_state => new_graphic_state)
       end
-      merge_template_options(page_options, options) if options[:template]
 
       state.page = PDF::Core::Page.new(self, page_options)
 
@@ -279,9 +275,7 @@ module Prawn
         @bounding_box = @margin_box
       end
 
-      state.page.new_content_stream if options[:template]
-      use_graphic_settings(options[:template])
-      forget_text_rendering_mode! if options[:template]
+      use_graphic_settings
 
       unless options[:orphan]
         state.insert_page(state.page, @page_number)
@@ -651,13 +645,8 @@ module Prawn
 
     private
 
-    def merge_template_options(page_options, options)
-      object_id = state.store.import_page(options[:template], options[:template_page] || 1)
-      page_options.merge!(:object_id => object_id, :page_template => true)
-    end
-
     # setting override_settings to true ensures that a new graphic state does not end up using
-    # previous settings especially from imported template streams
+    # previous settings.
     def use_graphic_settings(override_settings = false)
       set_fill_color if current_fill_color != "000000" || override_settings
       set_stroke_color if current_stroke_color != "000000" || override_settings

data/lib/prawn/document/bounding_box.rb

@@ -188,10 +188,21 @@ module Prawn
 
       parent_box = @bounding_box
 
+      original_ypos = y
+
       init_block.call(parent_box)
 
       self.y = @bounding_box.absolute_top
       user_block.call
+
+      # If the user actions did not modify the y position
+      # restore the original y position before the bounding
+      # box was created.
+      
+      if y == @bounding_box.absolute_top
+        self.y = original_ypos
+      end
+
       unless options[:hold_position] || @bounding_box.stretchy?
         self.y = @bounding_box.absolute_bottom
       end

data/lib/prawn/document/column_box.rb

@@ -15,10 +15,13 @@ module Prawn
     # filled.
     #
     # column_box accepts the same parameters as bounding_box, as well as the
-    # number of :columns and a :spacer (in points) between columns.
-    #
-    # Defaults are :columns = 3 and :spacer = font_size
+    # number of :columns and a :spacer (in points) between columns. If resetting
+    # the top margin is desired on a new page (e.g. to allow for initial page 
+    # wide column titles) the option :reflow_margins => true can be set.
     #
+    # Defaults are :columns = 3, :spacer = font_size, and 
+    # :reflow_margins => false
+    # 
     # Under PDF::Writer, "spacer" was known as "gutter"
     #
     def column_box(*args, &block)
@@ -52,6 +55,7 @@ module Prawn
         @columns = options[:columns] || 3
         @spacer  = options[:spacer]  || @document.font_size
         @current_column = 0
+        @reflow_margins = options[:reflow_margins]
       end
 
       # The column width, not the width of the whole box,
@@ -104,6 +108,9 @@ module Prawn
         @current_column = (@current_column + 1) % @columns
         @document.y = @y
         if 0 == @current_column
+          if @reflow_margins
+            @y = @parent.absolute_top
+          end
           @document.start_new_page
         end
       end

data/lib/prawn/image_handler.rb

@@ -18,6 +18,10 @@ module Prawn
       @handlers.unshift handler
     end
 
+    def unregister(handler)
+      @handlers.reject!{ |h| h == handler }
+    end
+
     def find(image_blob)
       handler = @handlers.find{ |h| h.can_render? image_blob }
 

data/lib/prawn/images.rb

@@ -12,13 +12,8 @@ module Prawn
 
   module Images
     # Add the image at filename to the current page. Currently only
-    # JPG and PNG files are supported.
-    #
-    # NOTE: Prawn is very slow at rendering PNGs with alpha channels, and this
-    # uses a lot of RAM. The workaround for those who don't mind installing
-    # RMagick is to use:
-    #
-    # http://github.com/amberbit/prawn-fast-png
+    # JPG and PNG files are supported. (Note that processing PNG
+    # images with alpha channels can be processor and memory intensive.)
     #
     # Arguments:
     # <tt>file</tt>:: path to file or an object that responds to #read

data/lib/prawn/table/cells.rb

@@ -240,6 +240,9 @@ module Prawn
           end
         end
 
+        #if there are only colspanned or rowspanned cells in a table
+        spanned_width_needs_fixing = true
+
         each do |cell|
           index = cell.send(row_or_column)
           if cell.colspan > 1
@@ -251,8 +254,9 @@ module Prawn
 
             #calculate future return value
             new_sum = cell.send(meth) * cell.colspan
+            spanned_width_needs_fixing = (new_sum > old_sum)
 
-            if new_sum >= old_sum
+            if spanned_width_needs_fixing
               #not entirely sure why we need this line, but with it the tests pass
               values[index] = [values[index], cell.send(meth)].compact.send(aggregate)
               #overwrite the old values with the new ones, but only if all entries existed
@@ -263,7 +267,7 @@ module Prawn
               }
             end
           else
-            if cell.class == Prawn::Table::Cell::SpanDummy
+            if spanned_width_needs_fixing && cell.class == Prawn::Table::Cell::SpanDummy
               values[index] = [values[index], cell.send(meth)].compact.send(aggregate)
             end
           end

data/lib/prawn/templates.rb

@@ -0,0 +1,75 @@
+warn "Templates are no longer supported in Prawn!\n" +
+     "This code is for experimental testing only, and\n" +
+     "will extracted into its own gem in a future Prawn release"
+
+module Prawn
+  module Templates
+    def initialize_first_page(options)
+      return super unless options[:template]
+
+      fresh_content_streams(options)
+      go_to_page(1)
+    end
+   
+    ## FIXME: This is going to be terribly brittle because
+    # it copy-pastes the start_new_page method. But at least
+    # it should only run when templates are used.
+
+    def start_new_page(options = {})
+      return super unless options[:template]
+
+      if last_page = state.page
+        last_page_size    = last_page.size
+        last_page_layout  = last_page.layout
+        last_page_margins = last_page.margins
+      end
+
+      page_options = {:size => options[:size] || last_page_size,
+                      :layout  => options[:layout] || last_page_layout,
+                      :margins => last_page_margins}
+      if last_page
+        new_graphic_state = last_page.graphic_state.dup  if last_page.graphic_state
+        #erase the color space so that it gets reset on new page for fussy pdf-readers
+        new_graphic_state.color_space = {} if new_graphic_state
+        page_options.merge!(:graphic_state => new_graphic_state)
+      end
+
+      merge_template_options(page_options, options)
+
+      state.page = PDF::Core::Page.new(self, page_options)
+
+      apply_margin_options(options)
+      generate_margin_box
+
+      # Reset the bounding box if the new page has different size or layout
+      if last_page && (last_page.size != state.page.size ||
+                       last_page.layout != state.page.layout)
+        @bounding_box = @margin_box
+      end
+
+      state.page.new_content_stream
+      use_graphic_settings(true)
+      forget_text_rendering_mode!
+
+      unless options[:orphan]
+        state.insert_page(state.page, @page_number)
+        @page_number += 1
+
+        canvas { image(@background, :scale => @background_scale, :at => bounds.top_left) } if @background
+        @y = @bounding_box.absolute_top
+
+        float do
+          state.on_page_create_action(self)
+        end
+      end
+    end
+
+    def merge_template_options(page_options, options)
+      object_id = state.store.import_page(options[:template], options[:template_page] || 1)
+      page_options.merge!(:object_id => object_id, :page_template => true)
+    end
+  end
+end
+
+Prawn::Document::VALID_OPTIONS << :template
+Prawn::Document.extensions << Prawn::Templates

data/manual/document_and_page_options/document_and_page_options.rb

@@ -14,7 +14,8 @@ Prawn::Example.generate("document_and_page_options.pdf",
     p.example "page_margins", :eval_source => false, :full_source => true
     p.example "background",   :eval_source => false, :full_source => true
     p.example "metadata",     :eval_source => false, :full_source => true
-    
+    p.example "print_scaling",:eval_source => false, :full_source => true
+
     p.intro do
       prose("So far we've already seen how to create new documents and start new pages. This chapter expands on the previous examples by showing other options avialable. Some of the options are only available when creating new documents.
 

data/manual/document_and_page_options/metadata.rb

@@ -2,6 +2,7 @@
 #
 # To set the document metadata just pass a hash to the <code>:info</code>
 # option when creating new documents.
+# The keys in the example below are arbitrary, so you may add whatever keys you want
 #
 require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))
@@ -14,10 +15,9 @@ Prawn::Document.generate("metadata.pdf",
     :Keywords     => "test metadata ruby pdf dry",
     :Creator      => "ACME Soft App", 
     :Producer     => "Prawn",
-    :CreationDate => Time.now,
-    :Grok         => "Test Property"
+    :CreationDate => Time.now
   }) do
   
   text "This is a test of setting metadata properties via the info option."
-  text "It allows one to specify non standard properties like 'Grok'."
+  text "While the keys are arbitrary, the above example sets common attributes."
 end

data/manual/document_and_page_options/print_scaling.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+#
+# (Optional; PDF 1.6) The page scaling option to be selected when a print dialog is displayed for this document.
+# Valid values are <code>None</code>, which indicates that the print dialog should reflect no page scaling,
+# and <code>AppDefault</code>, which indicates that applications should use the current print scaling.
+# If this entry has an unrecognized value, applications should use the current print scaling.
+# Default value: <code>AppDefault</code>.
+#
+# Note: If the print dialog is suppressed and its parameters are provided directly by the application, the value of this entry should still be used.
+#
+
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
+
+Prawn::Document.generate("print_scaling.pdf",
+                         :page_layout => :landscape,
+                         :print_scaling => :none
+) do
+  text "When you print this document, the scale to fit in print preview should be disabled by default."
+end

data/manual/manual/cover.rb

@@ -27,8 +27,9 @@ Prawn::Example.generate(filename) do
   #commit = `git show --pretty=%H`
   #short git commit hash
   commit = `git show --pretty=%h`
-  formatted_text_box([  {:text => "Last Update: #{Time.now.strftime("%Y-%m-%d")}\n
-                                   git commit: #{commit}",
+  formatted_text_box([  {:text => "Last Update: #{Time.now.strftime("%Y-%m-%d")}\n"+
+                                  "Prawn Version: #{Prawn::VERSION}\n"+
+                                  "git commit: #{commit}",
                          :size => 12}
                     ],   :at => [390, cursor - 620])
   

data/manual/manual/manual.rb

@@ -30,6 +30,5 @@ Prawn::Example.generate("manual.pdf",
   load_package "document_and_page_options"
   load_package "outline"
   load_package "repeatable_content"
-  load_package "templates"
   load_package "security"
 end

data/prawn.gemspec

@@ -8,24 +8,29 @@ Gem::Specification.new do |spec|
                 Dir.glob("data/fonts/{MustRead.html,*.afm}") +
                 ["data/shift_jis_text.txt"] +
                 ["Rakefile", "prawn.gemspec", "Gemfile",
-                 "COPYING", "LICENSE", "GPLv2", "GPLv3"]
+                 "COPYING", "LICENSE", "GPLv2", "GPLv3",
+                 ".yardopts"]
   spec.require_path = "lib"
   spec.required_ruby_version = '>= 1.9.3'
   spec.required_rubygems_version = ">= 1.3.6"
 
   spec.test_files = Dir[ "spec/*_spec.rb" ]
-  spec.extra_rdoc_files = %w{README.md LICENSE COPYING GPLv2 GPLv3}
-  spec.rdoc_options << '--title' << 'Prawn Documentation' <<
-                       '--main'  << 'README.md' << '-q'
   spec.authors = ["Gregory Brown","Brad Ediger","Daniel Nelson","Jonathan Greenberg","James Healy"]
   spec.email = ["gregory.t.brown@gmail.com","brad@bradediger.com","dnelson@bluejade.com","greenberg@entryway.net","jimmy@deefa.com"]
   spec.rubyforge_project = "prawn"
+  spec.licenses = ['RUBY', 'GPL-2', 'GPL-3']
+
   spec.add_dependency('pdf-reader', '~>1.2')
   spec.add_dependency('ttfunk', '~>1.0.3')
   spec.add_dependency('ruby-rc4')
+
   spec.add_development_dependency('pdf-inspector', '~> 1.1.0')
   spec.add_development_dependency('coderay', '~> 1.0.7')
-  spec.add_development_dependency('rdoc')
+  spec.add_development_dependency('yard')
+  spec.add_development_dependency('rspec')
+  spec.add_development_dependency('mocha')
+  spec.add_development_dependency('rake')
+
   spec.homepage = "http://prawn.majesticseacreature.com"
   spec.description = <<END_DESC
   Prawn is a fast, tiny, and nimble PDF generator for Ruby

data/spec/bounding_box_spec.rb

@@ -378,6 +378,18 @@ describe "A canvas" do
     end
     @pdf.y.should == 450
   end
+
+  it "should restore the original ypos after execution", :issue => 523 do
+    doc = Prawn::Document.new(:skip_page_creation => true)
+    doc.start_new_page
+
+    original_ypos = doc.y
+
+    doc.canvas {}
+
+    doc.y.should == original_ypos
+  end
+
 end
 
 describe "Deep-copying" do

data/spec/column_box_spec.rb

@@ -30,4 +30,36 @@ describe "A column box" do
         @pdf.bounds.right.should == 500
       end
   end
+
+  it "does not reset the top margin on a new page by default" do
+    create_pdf
+    page_top = @pdf.cursor
+    @pdf.move_down 50
+    init_column_top = @pdf.cursor
+    @pdf.column_box [0, @pdf.cursor], :width => 500,
+      :height => 200, :columns => 2 do
+
+        @pdf.bounds.move_past_bottom
+        @pdf.bounds.move_past_bottom
+
+        @pdf.bounds.absolute_top.should == init_column_top
+        @pdf.bounds.absolute_top.should_not == page_top
+      end
+  end
+
+  it "does reset the top margin when reflow_margins is set" do
+    create_pdf
+    page_top = @pdf.cursor
+    @pdf.move_down 50
+    init_column_top = @pdf.cursor
+    @pdf.column_box [0, @pdf.cursor], :width => 500, :reflow_margins => true,
+      :height => 200, :columns => 2 do
+
+        @pdf.bounds.move_past_bottom
+        @pdf.bounds.move_past_bottom
+
+        @pdf.bounds.absolute_top.should == page_top 
+        @pdf.bounds.absolute_top.should_not == init_column_top
+      end
+  end
 end

data/spec/graphics_spec.rb

@@ -478,6 +478,24 @@ describe "When using graphics states" do
       @pdf.restore_graphics_state
     }.should raise_error(PDF::Core::Errors::EmptyGraphicStateStack)
   end
+
+  it "should copy mutable attributes when passing a previous_state to the initializer" do
+    new_state = PDF::Core::GraphicState.new(@pdf.graphic_state)
+
+    [:color_space, :dash, :fill_color, :stroke_color].each do |attr|
+      new_state.send(attr).should == @pdf.graphic_state.send(attr)
+      new_state.send(attr).should_not equal(@pdf.graphic_state.send(attr))
+    end
+  end
+
+  it "should copy mutable attributes when duping" do
+    new_state = @pdf.graphic_state.dup
+
+    [:color_space, :dash, :fill_color, :stroke_color].each do |attr|
+      new_state.send(attr).should == @pdf.graphic_state.send(attr)
+      new_state.send(attr).should_not equal(@pdf.graphic_state.send(attr))
+    end
+  end
 end
 
 describe "When using transformation matrix" do

data/spec/image_handler_spec.rb

@@ -28,6 +28,18 @@ describe "ImageHandler" do
     handler.should == handler_b
   end
 
+  it "can unregister a handler" do
+    handler_b.expects(:can_render? => true)
+
+    image_handler.register(handler_a)
+    image_handler.register(handler_b)
+
+    image_handler.unregister(handler_a)
+
+    handler = image_handler.find('arbitrary blob')
+    handler.should == handler_b
+  end
+
   it "raises an error when no matching handler is found" do
     handler_a.expects(:can_render? => false)
     handler_b.expects(:can_render? => false)

data/spec/object_store_spec.rb

@@ -82,6 +82,12 @@ describe "Prawn::ObjectStore" do
     end
     @store.map{|ref| ref.identifier}[-3..-1].should == [10, 11, 12]
   end
+
+  it "should accept option to disabling PDF scaling in PDF clients" do
+    @store = PDF::Core::ObjectStore.new(:print_scaling => :none)
+    @store.root.data[:ViewerPreferences].should == {:PrintScaling => :None}
+  end
+
 end
 
 describe "Prawn::ObjectStore#compact" do

data/spec/table_spec.rb

@@ -46,6 +46,19 @@ describe "Prawn::Table" do
   end
 
   describe "You can explicitly set the column widths and use a colspan > 1" do
+    it "should work with two different given colspans", :issue => 628 do 
+      data = [
+              [" ", " ", " "], 
+              [{:content=>" ", :colspan=>3}], 
+              [" ", {:content=>" ", :colspan=>2}]
+            ]
+      column_widths = [60, 240, 60]
+      pdf = Prawn::Document.new
+      #the next line raised an Prawn::Errors::CannotFit exception before issue 628 was fixed
+      table = Prawn::Table.new data, pdf, :column_widths => column_widths
+      table.column_widths.should == column_widths
+    end
+
     it "should work with a colspan > 1 with given column_widths (issue #407)" do
       #normal entries in line 1
       data = [

data/spec/{template_spec.rb → template_spec_obsolete.rb}

@@ -1,4 +1,5 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
+require_relative "spec_helper"
+require_relative "../lib/prawn/templates"
 
 describe "Document built from a template" do
   it "should have the same page count as the source document" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
 platform: ruby
 authors:
 - Gregory Brown
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pdf-reader
@@ -85,7 +85,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.7
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -108,12 +150,7 @@ email:
 - jimmy@deefa.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
-- LICENSE
-- COPYING
-- GPLv2
-- GPLv3
+extra_rdoc_files: []
 files:
 - lib/pdf/core/annotations.rb
 - lib/pdf/core/byte_string.rb
@@ -178,6 +215,7 @@ files:
 - lib/prawn/table/cells.rb
 - lib/prawn/table/column_width_calculator.rb
 - lib/prawn/table.rb
+- lib/prawn/templates.rb
 - lib/prawn/text/box.rb
 - lib/prawn/text/formatted/arranger.rb
 - lib/prawn/text/formatted/box.rb
@@ -230,7 +268,7 @@ files:
 - spec/stroke_styles_spec.rb
 - spec/table/span_dummy_spec.rb
 - spec/table_spec.rb
-- spec/template_spec.rb
+- spec/template_spec_obsolete.rb
 - spec/text_at_spec.rb
 - spec/text_box_spec.rb
 - spec/text_rendering_mode_spec.rb
@@ -258,6 +296,7 @@ files:
 - manual/document_and_page_options/metadata.rb
 - manual/document_and_page_options/page_margins.rb
 - manual/document_and_page_options/page_size.rb
+- manual/document_and_page_options/print_scaling.rb
 - manual/example_file.rb
 - manual/example_helper.rb
 - manual/example_package.rb
@@ -328,9 +367,6 @@ files:
 - manual/table/style.rb
 - manual/table/table.rb
 - manual/table/width.rb
-- manual/templates/full_template.rb
-- manual/templates/page_template.rb
-- manual/templates/templates.rb
 - manual/text/alignment.rb
 - manual/text/color.rb
 - manual/text/column_box.rb
@@ -422,9 +458,12 @@ files:
 - LICENSE
 - GPLv2
 - GPLv3
-- README.md
+- .yardopts
 homepage: http://prawn.majesticseacreature.com
-licenses: []
+licenses:
+- RUBY
+- GPL-2
+- GPL-3
 metadata: {}
 post_install_message: |2+
 
@@ -440,12 +479,7 @@ post_install_message: |2+
 
     ********************************************
 
-rdoc_options:
-- --title
-- Prawn Documentation
-- --main
-- README.md
-- -q
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -500,7 +534,6 @@ test_files:
 - spec/stream_spec.rb
 - spec/stroke_styles_spec.rb
 - spec/table_spec.rb
-- spec/template_spec.rb
 - spec/text_at_spec.rb
 - spec/text_box_spec.rb
 - spec/text_rendering_mode_spec.rb

data/README.md

@@ -1,110 +0,0 @@
-# Prawn: Fast, Nimble PDF Generation For Ruby
-
-[![Build Status](https://secure.travis-ci.org/prawnpdf/prawn.png)](http://travis-ci.org/prawnpdf/prawn)
-[![Gem Version](https://badge.fury.io/rb/prawn.png)](http://badge.fury.io/rb/prawn)
-
-Prawn is a pure Ruby PDF generation library that provides a lot of great functionality while trying to remain simple and reasonably performant. Here are some of the important features we provide:
-
-* Vector drawing support, including lines, polygons, curves, ellipses, etc.
-* Extensive text rendering support, including flowing text and limited inline formatting options. 
-* Support for both PDF builtin fonts as well as embedded TrueType fonts
-* A variety of low level tools for basic layout needs, including a simple grid system
-* PNG and JPG image embedding, with flexible scaling options
-* Reporting tools for rendering complex data tables, with pagination support
-* Security features including encryption and password protection
-* Tools for rendering repeatable content (i.e headers, footers, and page numbers)
-* Comprehensive internationalization features, including full support for UTF-8 based fonts, right-to-left text rendering, fallback font support, and extension points for customizable text wrapping.
-* Support for PDF outlines for document navigation
-* Low level PDF features, allowing users to create custom extensions by dropping down all the way to the PDF object tree layer. (Mostly useful to those with knowledge of the PDF specification)
-* Lots of other stuff!
-
-## Should You Use Prawn?
-
-If you are looking for a highly flexible PDF document generation system, Prawn might be the tool for you. It is not a reporting tool or a publishing toolchain, though it could be fairly easily used to build those things.
-
-One thing Prawn is not, and will never be, is an HTML to PDF generator. For those needs, consider looking into FlyingSaucer via JRuby, or one of the webkit based tools, like Wicked or PDFKit. We do have basic support for inline styling but it is limited to a very small subset of functionality and is not suitable for rendering rich HTML documents.
-
-## Supported Ruby Versions and Implementations
-
-Because Prawn is pure Ruby and virtually all of its dependencies are maintained by our core team, it should run pretty much anywhere, including Rubinius, JRuby, MacRuby, etc. We officially support MRI {1.9.3 and 2.0.0} and jruby 1.7.x in 1.9 mode, however we will accept patches to fix problems on other Ruby platforms if they aren't too invasive.
-
-## Installing Prawn
-
-Prawn is distributed via RubyGems, and can be installed the usual way that you install gems: by simply typing `gem install prawn` on the command line. 
-
-You can also install from git if you'd like, the _master_ branch contains the latest developments, and _stable_ represents the latest bug fixes to the currently released version of Prawn. If you go this route, using Bundler is encouraged.
-
-## Release Policies
-
-We may introduce backwards incompatible changes each time our minor version number is bumped, but that any tiny version number bump should be bug fixes and internal changes only. Be sure to read the release notes each time we cut a new release and lock your gems accordingly. You can find the project CHANGELOG at: https://github.com/prawnpdf/prawn/wiki/CHANGELOG
-
-## Hello World!
-
-If the following code runs and produces a working PDF file, you've successfully installed Prawn.
-
-    require "prawn"
-
-    Prawn::Document.generate("hello.pdf") do
-      text "Hello World!"
-    end
-
-Of course, you'll probably want to do more interesting things than that...
-
-## Manual
-
-Mendicant University student Felipe Doria provided us with a beautiful system for generating a user manual from our examples. This can be generated from the prawn source or you can download a pre-generated snapshot of it at http://prawn.majesticseacreature.com/manual.pdf
-
-Note that while we will try to keep the downloadable manual up to date, that it's provided as a convenience only and you should generate the manual yourself if you want to be sure the code in it actually runs and works as expected. To build the manual, here's what you need to do:
-
-1. clone the repository
-2. switch to the stable branch (optional, stay on master for development version)
-3. install bundler if necessay
-4. run `bundle install`
-5. run `bundle exec rake manual`, which will generate _manual.pdf_ in the project root
-
-## Support 
-
-The easiest way to get help with Prawn is to post a message to our mailing list:
-
-<http://groups.google.com/group/prawn-ruby>
-
-Feel free to post any Prawn related question there, our community is very responsive and will be happy to help you figure out how to use Prawn, or help you determine whether it's the right tool for the task you are working on.
-
-Please make your posts to the list as specific as possible, including code samples and output where relevant. Do not post any information that should not be shared publicly, and be sure to reduce your example code as much as possible so that those who are responding to your question can more easily see what the issue might be.
-
-## Contributing
-
-If you've found a bug, want to submit a patch, or have a feature request, please enter a ticket into our github tracker:
-
-<http://github.com/prawnpdf/prawn/issues>
-
-We strongly encourage bug reports to come with failing tests or at least a reduced example that demonstrates the problem. Similarly, patches should include tests, API documentation, and an update to the manual where relevant. Feel free to send a pull request early though, if you just want some feedback or a code review before preparing your code to be merged.
-
-If you are unsure about whether or not you've found a bug, or want to check to see whether we'd be interested in the feature you want to add before you start working on it, feel free to post to our mailing list.
-
-You can run our test suite in a few different ways:
-
-1. Running `rake` will run the entire test suite excluding any unresolved issues
-2. Running `rspec` will run the entire test suite including unresolved issues
-3. Running `rspec -t unresolved` will run *only* unresolved issues
-4. Running `rspec -t issue:NUMBER` will run the tests for a specific issue
-
-These filters make it possible for us to add failing test cases for bugs that
-are currently being researched or worked on, without breaking the typical
-full suite run.
-
-## Authorship
-
-Prawn was originally developed by Gregory Brown, under the auspices of the Ruby Mendicant Project, a grassroots initiative in which the Ruby community collectively provided funding so that Gregory could take several months off of work to focus on this project.
-
-Over the last several years, we've received code contributions from over 50 people, which is amazing considering the low-level nature of this project. In 2010, Gregory officially handed the project off to the Prawn core team. Currently active maintainers include Brad Ediger, Daniel Nelson, James Healy, and Jonathan Greenberg.
-
-While he was only with us for a short time before moving on to other things, we'd also like to thank Prawn core team emeritus Jamis Buck for his contributions. He was responsible for introducing font subsetting as well as the first implementation of our inline formatting support.
-
-You can find the full list of folks who have at least one patch accepted to Prawn on github at https://github.com/prawnpdf/prawn/contributors
-
-## License
-
-Prawn is released under a slightly modified form of the License of Ruby, allowing you to choose between Matz's terms, the GPLv2, or GPLv3. For details, please see the LICENSE, GPLv2, and GPLv3 files.
-
-If you wish to contribute to Prawn, you will retain your own copyright but must agree to license your code under the same terms as the project itself.

data/manual/templates/full_template.rb

@@ -1,25 +0,0 @@
-# encoding: utf-8
-#
-#<b>NOTE: Templates are currently unmaintained and may be removed by Prawn 1.0!</b>
-#
-# You may load another PDF while creating a new one. Just pass the loaded PDF
-# filename to the <code>:template</code> option when creating/generating the new
-# PDF.
-#
-# The provided PDF will be loaded and its first page will be set as the
-# current page. If you'd like to resume the document you may take advantage of
-# two helpers: <code>page_count</code> and <code>go_to_page</code>.
-#
-require File.expand_path(File.join(File.dirname(__FILE__),
-                                   %w[.. example_helper]))
-
-filename = "#{Prawn::DATADIR}/pdfs/multipage_template.pdf"
-
-Prawn::Example.generate("full_template.pdf", :template => filename) do
-  go_to_page(page_count)
-
-  start_new_page
-
-  text "Previous pages and content imported.", :align => :center
-  text "This page and content is brand new.",  :align => :center
-end

data/manual/templates/page_template.rb

@@ -1,48 +0,0 @@
-# encoding: utf-8
-# <b>NOTE: Templates are currently unmaintained and may be removed by Prawn 1.0!</b>
-#
-# If you only need to load some pages from another PDF, you can accomplish it
-# with the <code>start_new_page</code> method. You may pass it a
-# <code>:template</code> option with the path for an existing pdf and a
-# <code>:template_page</code> option to specify which page to load.
-# You can also load a <code>:template</code> using a URI:
-#
-# <code>require 'open-uri'</code>
-#
-# <code>start_new_page(:template => open('url_for_your.pdf'))</code>
-#
-# The following example loads some pages from an existing PDF. If we don't
-# specify the <code>:template_page</code> option, the first page of the template
-# PDF will be loaded. That's what happens on the first load below. Then we load
-# a page by specifying the <code>:template_page</code> option and then we do it
-# again this time adding some content to the loaded page.
-#
-require File.expand_path(File.join(File.dirname(__FILE__),
-                                   %w[.. example_helper]))
-
-filename = File.basename(__FILE__).gsub('.rb', '.pdf')
-Prawn::Example.generate(filename) do
-  text "Please scan the next 3 pages to see the page templates in action."
-  move_down 10
-  text "You also might want to look at the pdf used as a template: "
-  url = "https://github.com/prawnpdf/prawn/raw/master/data/pdfs/form.pdf"
-  move_down 10
-  
-  formatted_text [{:text => url, :link => url}]
-  
-  filename = "#{Prawn::DATADIR}/pdfs/form.pdf"
-  start_new_page(:template => filename)
-  
-  start_new_page(:template => filename, :template_page => 2)
-  
-  start_new_page(:template => filename, :template_page => 2)
-  
-  fill_color "FF8888"
-  
-  text_box "John Doe", :at => [75, cursor-75]
-  text_box "john@doe.com", :at => [75, cursor-105]
-  text_box "John Doe inc", :at => [75, cursor-135]
-  text_box "You didn't think I'd tell, did you?", :at => [75, cursor-165]
-  
-  fill_color "000000"
-end

data/manual/templates/templates.rb

@@ -1,27 +0,0 @@
-# encoding: utf-8
-#
-# Examples for loading existing pdfs.
-#
-require File.expand_path(File.join(File.dirname(__FILE__),
-                                   %w[.. example_helper]))
-
-Prawn::Example.generate("templates.pdf", :page_size => "FOLIO") do
-  
-  package "templates" do |p|
-    
-    p.example "full_template", :eval_source => false, :full_source => true
-    p.example "page_template"
-    
-    p.intro do
-      prose("<b>NOTE: Templates are currently unmaintained and may be removed by Prawn 1.0!</b>")
-      prose("Templates let you embed other PDF documents inside the current one.
-
-      The examples show:")
-
-      list( "How to load the whole content from another PDF",
-            "How to load single pages from another PDF"
-          )
-    end
-    
-  end
-end