prawn 0.11.1 → 0.12.0

data/README.md

@@ -0,0 +1,96 @@
+# Prawn: Fast, Nimble PDF Generation For Ruby
+
+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. While we officially support MRI 1.8.7 and 1.9.2 only, 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/sandal/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/sandal/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.
+
+## 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/sandal/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/Rakefile

@@ -34,17 +34,6 @@ Rake::RDocTask.new do |rdoc|
   rdoc.main     = "README"
   rdoc.rdoc_dir = "doc/html"
   rdoc.title    = "Prawn Documentation"
-end     
-
-desc "run all examples"
-task :examples do
-  mkdir_p "output"
-  examples = Dir["examples/**/*.rb"]
-  t = Time.now
-  puts "Running Examples"
-  examples.each { |file| `ruby -Ilib #{file}` }
-  puts "Ran in #{Time.now - t} s"
-  `mv *.pdf output`
 end
 
 desc "Generate the 'Prawn by Example' manual"
@@ -60,4 +49,3 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
 end
-

data/examples/example_helper.rb

@@ -1,5 +1,8 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
+require "bundler"
+Bundler.setup
+
 require 'prawn'
 require 'prawn/security'
 require "prawn/layout"

data/lib/prawn.rb

@@ -5,7 +5,7 @@
 # into the lib/prawn/core/* source tree.
 #
 module Prawn #:nodoc:
-  VERSION = "0.11.1"
+  VERSION = "0.12.0"
 end
 
 require "prawn/core"

data/lib/prawn/core/page.rb

@@ -28,7 +28,7 @@ module Prawn
           init_from_object(options)
         else
           init_new_page(options)
-        end 
+        end
       end
 
       def layout
@@ -58,7 +58,7 @@ module Prawn
         document.save_graphics_state
         document.send(:freeze_stamp_graphics)
         yield if block_given?
-        
+
         until graphic_stack_size == stack.stack.size
           document.restore_graphics_state
         end
@@ -160,6 +160,8 @@ module Prawn
 
       def init_from_object(options)
         @dictionary = options[:object_id].to_i
+        dictionary.data[:Parent] = document.state.store.pages
+
         unless dictionary.data[:Contents].is_a?(Array) # content only on leafs
           @content    = dictionary.data[:Contents].identifier
         end

data/lib/prawn/core/pdf_object.rb

@@ -13,7 +13,13 @@ module Prawn
                                              
     module_function
 
-    ruby_18 do
+    if "".respond_to?(:encode)
+      # Ruby 1.9+
+      def utf8_to_utf16(str)
+        "\xFE\xFF".force_encoding("UTF-16BE") + str.encode("UTF-16BE")
+      end
+    else
+      # Ruby 1.8
       def utf8_to_utf16(str)
         utf16 = "\xFE\xFF"
 
@@ -31,12 +37,6 @@ module Prawn
         utf16
       end
     end
-
-    ruby_19 do
-      def utf8_to_utf16(str)
-        "\xFE\xFF".force_encoding("UTF-16BE") + str.encode("UTF-16BE")
-      end
-    end
       
     # Serializes Ruby objects to their PDF equivalents.  Most primitive objects
     # will work as expected, but please note that Name objects are represented 

data/lib/prawn/core/text/formatted/arranger.rb

@@ -23,10 +23,11 @@ module Prawn
           attr_reader :fragments
           attr_reader :current_format_state
 
-          def initialize(document)
+          def initialize(document, options={})
             @document = document
             @fragments = []
             @unconsumed = []
+            @kerning = options[:kerning]
           end
 
           def space_count

data/lib/prawn/core/text/formatted/line_wrap.rb

@@ -203,7 +203,8 @@ module Prawn
             @previous_fragment = @fragment_output.dup
             pf = @previous_fragment
             @previous_fragment_ended_with_breakable = pf =~ /[#{break_chars}]$/
-            last_word_length = pf.slice(/[^#{break_chars}]*$/).length
+            last_word = pf.slice(/[^#{break_chars}]*$/)
+            last_word_length = last_word.nil? ? 0 : last_word.length
             @previous_fragment_output_without_last_word = pf.slice(0, pf.length - last_word_length)
           end
 

data/lib/prawn/core/text/formatted/wrap.rb

@@ -9,7 +9,8 @@ module Prawn
 
           def initialize(array, options)
             @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
-            @arranger = Prawn::Core::Text::Formatted::Arranger.new(@document)
+            @arranger = Prawn::Core::Text::Formatted::Arranger.new(@document,
+              :kerning => options[:kerning])
           end
           
 
@@ -38,6 +39,9 @@ module Prawn
 
             stop = false
             while !stop
+              # wrap before testing if enough height for this line because the
+              # height of the highest fragment on this line will be used to
+              # determine the line height
               @line_wrap.wrap_line(:document => @document,
                                    :kerning => @kerning,
                                    :width => available_width,

data/lib/prawn/document.rb

@@ -169,113 +169,122 @@ module Prawn
     #   pdf = Prawn::Document.new(:background => "#{Prawn::BASEDIR}/data/images/pigs.jpg")
     #
     def initialize(options={},&block)
-       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], options
-
-       # need to fix, as the refactoring breaks this
-       # raise NotImplementedError if options[:skip_page_creation]
-
-       self.class.extensions.reverse_each { |e| extend e }
-       @internal_state = Prawn::Core::DocumentState.new(options)
-       @internal_state.populate_pages_from_store(self)
-       min_version(state.store.min_version) if state.store.min_version
-
-       @background = options[:background]
-       @font_size  = 12
-
-       @bounding_box  = nil
-       @margin_box    = nil
-
-       @page_number = 0
-
-       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
-
-       @bounding_box = @margin_box
-
-       if block
-         block.arity < 1 ? instance_eval(&block) : block[self]
-       end
-     end
-
-     attr_accessor :margin_box
-     attr_reader   :margins, :y
-     attr_writer   :font_size
-     attr_accessor :page_number
-
-     def state
-       @internal_state
-     end
-
-     def page
-       state.page
-     end
-
-     # Creates and advances to a new page in the document.
-     #
-     # Page size, margins, and layout can also be set when generating a
-     # new page. These values will become the new defaults for page creation
-     #
-     #   pdf.start_new_page #=> Starts new page keeping current values
-     #   pdf.start_new_page(:size => "LEGAL", :layout => :landscape)
-     #   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)
-     #
-     def start_new_page(options = {})
-       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
-         #erase the color space so that it gets reset on new page for fussy pdf-readers
-         new_graphic_state.color_space = {}
-         page_options.merge!(:graphic_state => new_graphic_state)
-       end
-       merge_template_options(page_options, options) if options[:template]
-
-       state.page = Prawn::Core::Page.new(self, page_options)
-
-       apply_margin_options(options)
-       state.page.new_content_stream if options[:template]
-       use_graphic_settings(options[:template])
-
-       unless options[:orphan]
-         state.insert_page(state.page, @page_number)
-         @page_number += 1
-
-         canvas { image(@background, :at => bounds.top_left) } if @background
-         @y = @bounding_box.absolute_top
-
-         float do
-           state.on_page_create_action(self)
-         end
-       end
+      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], options
+
+      # need to fix, as the refactoring breaks this
+      # raise NotImplementedError if options[:skip_page_creation]
+
+      self.class.extensions.reverse_each { |e| extend e }
+      @internal_state = Prawn::Core::DocumentState.new(options)
+      @internal_state.populate_pages_from_store(self)
+      min_version(state.store.min_version) if state.store.min_version
+
+      @background = options[:background]
+      @font_size  = 12
+
+      @bounding_box  = nil
+      @margin_box    = nil
+
+      @page_number = 0
+
+      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
+
+      @bounding_box = @margin_box
+
+      if block
+        block.arity < 1 ? instance_eval(&block) : block[self]
+      end
+    end
+
+    attr_accessor :margin_box
+    attr_reader   :margins, :y
+    attr_writer   :font_size
+    attr_accessor :page_number
+
+    def state
+      @internal_state
+    end
+
+    def page
+      state.page
+    end
+
+    # Creates and advances to a new page in the document.
+    #
+    # Page size, margins, and layout can also be set when generating a
+    # new page. These values will become the new defaults for page creation
+    #
+    #   pdf.start_new_page #=> Starts new page keeping current values
+    #   pdf.start_new_page(:size => "LEGAL", :layout => :landscape)
+    #   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)
+    #
+    def start_new_page(options = {})
+      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
+        #erase the color space so that it gets reset on new page for fussy pdf-readers
+        new_graphic_state.color_space = {}
+        page_options.merge!(:graphic_state => new_graphic_state)
+      end
+      merge_template_options(page_options, options) if options[:template]
+
+      state.page = Prawn::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 if options[:template]
+      use_graphic_settings(options[:template])
 
-     end
+      unless options[:orphan]
+        state.insert_page(state.page, @page_number)
+        @page_number += 1
+
+        canvas { image(@background, :at => bounds.top_left) } if @background
+        @y = @bounding_box.absolute_top
+
+        float do
+          state.on_page_create_action(self)
+        end
+      end
+    end
 
     # Returns the number of pages in the document
     #
@@ -318,7 +327,9 @@ module Prawn
       self.y = new_y + bounds.absolute_bottom
     end
 
-    # Executes a block and then restores the original y position
+    # Executes a block and then restores the original y position. If new pages
+    # were created during this block, it will teleport back to the original
+    # page when done.
     #
     #   pdf.text "A"
     #
@@ -330,7 +341,11 @@ module Prawn
     #   pdf.text "B"
     #
     def float
-      mask(:y) { yield }
+      original_page = page_number
+      original_y = y
+      yield
+      go_to_page(original_page) unless page_number == original_page
+      self.y = original_y
     end
 
     # Renders the PDF document to string
@@ -388,6 +403,12 @@ module Prawn
       @bounding_box
     end
 
+    # Returns the innermost non-stretchy bounding box.
+    #
+    def reference_bounds
+      @bounding_box.reference_bounds
+    end
+
     # Sets Document#bounds to the BoundingBox provided.  See above for a brief
     # description of what a bounding box is.  This function is useful if you
     # really need to change the bounding box manually, but usually, just entering
@@ -548,7 +569,11 @@ module Prawn
     def number_pages(string, options={})
       opts = options.dup
       start_count_at = opts.delete(:start_count_at).to_i
-      page_filter = opts.delete(:page_filter)
+      page_filter = if opts.has_key?(:page_filter)
+        opts.delete(:page_filter)
+      else
+        :all
+      end
       total_pages = opts.delete(:total_pages)
       txtcolor = opts.delete(:color)
       # An explicit height so that we can draw page numbers in the margins
@@ -642,7 +667,7 @@ module Prawn
       )
 
       # This check maintains indentation settings across page breaks
-      if (old_margin_box)
+      if old_margin_box
         @margin_box.add_left_padding(old_margin_box.total_left_padding)
         @margin_box.add_right_padding(old_margin_box.total_right_padding)
       end
@@ -671,8 +696,6 @@ module Prawn
            state.page.margins[side] = margin
          end
       end
-
-      generate_margin_box
     end
   end
 end