prawn-core 0.6.1 → 0.6.2

data/examples/general/stamp.rb

@@ -4,25 +4,21 @@
 #
 require "#{File.dirname(__FILE__)}/../example_helper.rb"
 
-Prawn::Document.generate("stamp.pdf") do
-
-  create_stamp("page_template") do
-    text "This is my page template", :at => [0, bounds.top - 4 * font.height] 
-    text "This is also in my page template", :at => [0, 0] 
-  end
+Prawn::Document.generate("stamp.pdf", :skip_page_creation => true) do
 
   create_stamp("odd_page_template") do
     text "This is the odd page template", 
-      :at => [0, bounds.top - 4 * font.height] 
+      :at => [0, bounds.top - font.height] 
     text "This is also in the odd page template", :at => [0, 0] 
   end
 
   create_stamp("even_page_template") do
     text "This is the even page template", 
-      :at => [0, bounds.top - 4 * font.height] 
+      :at => [0, bounds.top - font.height] 
     text "This is also in the even page template", :at => [0, 0] 
   end
   
+  start_new_page
   stamp("odd_page_template")
 
   create_stamp("MyStamp") do

data/lib/prawn/core.rb

@@ -25,7 +25,7 @@ module Prawn
   # The base source directory for Prawn as installed on the system
   BASEDIR = File.expand_path(File.join(dir, '..', '..'))
   
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
   
   extend self
 

data/lib/prawn/document.rb

@@ -224,7 +224,6 @@ module Prawn
          end
        end
 
-       finish_page_content if @page_content
        build_new_page_content
 
        @store.pages.data[:Kids] << current_page
@@ -279,7 +278,7 @@ module Prawn
     #
     def render
       output = StringIO.new
-      finish_page_content
+      finalize_all_page_contents
 
       render_header(output)
       render_body(output)
@@ -474,12 +473,6 @@ module Prawn
       end
     end
 
-    def go_to_page(k) # :nodoc:
-      jump_to = @store.pages.data[:Kids][k]
-      @current_page = jump_to.identifier
-      @page_content = jump_to.data[:Contents].identifier
-    end
-
     # Returns true if content streams will be compressed before rendering,
     # false otherwise
     #
@@ -499,6 +492,11 @@ module Prawn
                           :Parent    => @store.pages,
                           :MediaBox  => page_dimensions,
                           :Contents  => page_content)
+
+      # include all proc sets, all the time (recommended by PDF 1.4 Reference 
+      # section 9.1)
+      page_resources[:ProcSet] = [:PDF, :Text, :ImageB, :ImageC, :ImageI]
+
       update_colors
       undash if dashed?
     end

data/lib/prawn/document/internals.rb

@@ -42,14 +42,6 @@ module Prawn
         @store.ref(data, &block)
       end
 
-      def page_content
-        @store[@page_content]
-      end
-
-      def current_page
-        @store[@current_page]
-      end
-
       # Grabs the reference for the current page content
       #
       def page_content
@@ -74,13 +66,6 @@ module Prawn
         page_content << str << "\n"
       end  
 
-      # Add a new type to the current pages ProcSet 
-      #
-      def proc_set(*types)
-        current_page.data[:ProcSet] ||= ref!([])
-        current_page.data[:ProcSet].data |= types
-      end
-             
       # The Resources dictionary for the current page
       #
       def page_resources
@@ -111,14 +96,23 @@ module Prawn
         @store.root.data[:Names] ||= ref!(:Type => :Names)
       end
 
+      def go_to_page(k) # :nodoc:
+        jump_to = @store.pages.data[:Kids][k]
+        @current_page = jump_to.identifier
+        @page_content = jump_to.data[:Contents].identifier
+      end
+
       private      
-      
-      def finish_page_content     
-        @header.draw if defined?(@header) and @header
-        @footer.draw if defined?(@footer) and @footer
-        add_content "Q"
-        page_content.compress_stream if compression_enabled?
-        page_content.data[:Length] = page_content.stream.size
+
+      def finalize_all_page_contents
+        page_count.times do |i|
+          go_to_page i
+          @header.draw if defined?(@header) and @header
+          @footer.draw if defined?(@footer) and @footer
+          add_content "Q"
+          page_content.compress_stream if compression_enabled?
+          page_content.data[:Length] = page_content.stream.size
+        end
       end
 
       # raise the PDF version of the file we're going to generate.

data/lib/prawn/document/snapshot.rb

@@ -2,7 +2,7 @@
 
 # snapshot.rb : Implements transactional rendering for Prawn
 #
-# Copyright August 2008, Brad Ediger.  All Rights Reserved.
+# Copyright August 2009, Brad Ediger.  All Rights Reserved.
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 require 'delegate'
@@ -59,6 +59,7 @@ module Prawn
 
         @current_page = shot[:current_page].identifier
         current_page.replace shot[:current_page]
+        current_page.data[:Contents] = page_content
 
         @store.pages.data[:Kids] = shot[:page_kids].map{|id| @store[id]}
         @store.pages.data[:Count] = shot[:page_kids].size

data/lib/prawn/font.rb

@@ -30,7 +30,7 @@ module Prawn
     def font(name=nil, options={})
       return((defined?(@font) && @font) || font("Helvetica")) if name.nil?
 
-      raise Errors::NotOnPage unless defined?(@current_page) && @current_page
+      raise Errors::NotOnPage unless current_page
       new_font = find_font(name, options)
 
       if block_given?
@@ -226,7 +226,6 @@ module Prawn
 
       @family     = options[:family]
 
-      @document.proc_set :PDF, :Text
       @identifier = :"F#{@document.font_registry.size + 1}"
 
       @references = {}

data/lib/prawn/images.rb

@@ -70,9 +70,6 @@ module Prawn
       
       image_sha1 = Digest::SHA1.hexdigest(image_content)
 
-      # register the fact that the current page uses images
-      proc_set :ImageC
-
       # if this image has already been embedded, just reuse it
       if image_registry[image_sha1]
         info = image_registry[image_sha1][:info]

data/lib/prawn/object_store.rb

@@ -2,7 +2,7 @@
 
 # object_store.rb : Implements PDF object repository for Prawn
 #
-# Copyright August 2008, Brad Ediger.  All Rights Reserved.
+# Copyright August 2009, Brad Ediger.  All Rights Reserved.
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 module Prawn

data/lib/prawn/stamp.rb

@@ -11,32 +11,37 @@ module Prawn
   module Stamp
 
     def stamp(user_defined_name)
-      stamp_at(user_defined_name, [0, 0])
-    end
-    
-    def stamp_at(user_defined_name, point)
       raise Prawn::Errors::InvalidName if user_defined_name.empty?
       unless stamp_dictionary_registry[user_defined_name]
         raise Prawn::Errors::UndefinedObjectName
       end
       
-      add_content "q"
-
-      x,y = point
-      translate_position = "1 0 0 1 %.3f %.3f cm" % [x, y]
-      add_content translate_position
-
       dict = stamp_dictionary_registry[user_defined_name]
 
       stamp_dictionary_name = dict[:stamp_dictionary_name]
       stamp_dictionary = dict[:stamp_dictionary]
 
       add_content "/#{stamp_dictionary_name} Do"
-      add_content "Q"
-
+      
       page_xobjects.merge!(stamp_dictionary_name => stamp_dictionary)
     end
     
+    def stamp_at(user_defined_name, point)
+      # Save the graphics state
+      add_content "q"
+
+      # Translate the user space
+      x,y = point
+      translate_position = "1 0 0 1 %.3f %.3f cm" % [x, y]
+      add_content translate_position
+      
+      # Draw the stamp in the now translated user space
+      stamp(user_defined_name)
+      
+      # Restore the graphics state to remove the translation
+      add_content "Q"
+    end
+    
     def create_stamp(user_defined_name="", &block)
       raise Prawn::Errors::InvalidName if user_defined_name.empty?
 
@@ -44,9 +49,12 @@ module Prawn
         raise Prawn::Errors::NameTaken
       end
 
+      # BBox origin is the lower left margin of the page, so we need
+      # it to be the full dimension of the page, or else things that
+      # should appear near the top or right margin are invisible
       stamp_dictionary = ref!(:Type    => :XObject,
                               :Subtype => :Form,
-                              :BBox => [0, 0, bounds.width, bounds.height])
+                              :BBox => [0, 0, page_dimensions[2], page_dimensions[3]])
 
       stamp_dictionary_name = "Stamp#{next_stamp_dictionary_id}"
 
@@ -64,13 +72,7 @@ module Prawn
       stamp_dictionary << @active_stamp_stream
 
       @active_stamp_stream = nil
-      # The ProcSet needs to be assigned at the page level
-      procs = @active_stamp_dictionary.data[:ProcSet]
-      @active_stamp_dictionary.data.delete(:ProcSet)
       @active_stamp_dictionary = nil
-
-      # The ProcSet needs to be assigned at the page level
-      proc_set(procs) if procs
     end
     
     private

data/spec/document_spec.rb

@@ -74,16 +74,14 @@ describe "When beginning each new page" do
 
 end
 
-describe "When ending each page" do
+describe "Document compression" do
 
   it "should not compress the page content stream if compression is disabled" do
 
     pdf = Prawn::Document.new(:compress => false)
-    content_stub = pdf.ref!({})
-    content_stub.stubs(:compress_stream).returns(true)
-    content_stub.expects(:compress_stream).never
+    pdf.page_content.stubs(:compress_stream).returns(true)
+    pdf.page_content.expects(:compress_stream).never
 
-    pdf.instance_variable_set("@page_content", content_stub.identifier)
     pdf.text "Hi There" * 20
     pdf.render
   end
@@ -91,11 +89,9 @@ describe "When ending each page" do
   it "should compress the page content stream if compression is enabled" do
 
     pdf = Prawn::Document.new(:compress => true)
-    content_stub = pdf.ref!({})
-    content_stub.stubs(:compress_stream).returns(true)
-    content_stub.expects(:compress_stream).once
+    pdf.page_content.stubs(:compress_stream).returns(true)
+    pdf.page_content.expects(:compress_stream).once
 
-    pdf.instance_variable_set("@page_content", content_stub.identifier)
     pdf.text "Hi There" * 20
     pdf.render
   end
@@ -113,6 +109,23 @@ describe "When ending each page" do
 
 end                                 
 
+describe "When reopening pages" do
+  it "should modify the content stream size" do
+    @pdf = Prawn::Document.new do |pdf|
+      pdf.text "Page 1"
+      pdf.start_new_page
+      pdf.text "Page 2"
+      pdf.go_to_page 0
+      pdf.text "More for page 1"
+    end
+    
+    # MalformedPDFError raised if content stream actual length does not match
+    # dictionary length
+    lambda{ PDF::Inspector::Page.analyze(@pdf.render) }.
+      should.not.raise(PDF::Reader::MalformedPDFError)
+  end
+end
+
 describe "When setting page size" do
   it "should default to LETTER" do
     @pdf = Prawn::Document.new

data/spec/snapshot_spec.rb

@@ -81,9 +81,21 @@ describe "Prawn::Document#transaction" do
       page_content.identifier.should == old_page_content_id
     end
 
-
   end
 
+  it "page object should refer to the page_content object after restore" do
+
+    Prawn::Document.new do
+      transaction do
+        start_new_page
+        rollback
+      end
+
+      # should be the exact same object, not a clone
+      current_page.data[:Contents].should == page_content
+    end
+
+  end
   
   describe "with a stamp dictionary present" do
 

data/spec/stamp_spec.rb

@@ -1,4 +1,15 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper") 
+require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
+
+describe "create_stamp before any page is added" do
+  it "should work with the font class" do
+    @pdf = Prawn::Document.new(:skip_page_creation => true)
+    lambda {
+      @pdf.create_stamp("my_stamp") do
+        @pdf.font.height
+      end
+    }.should.not.raise(Prawn::Errors::NotOnPage)
+  end
+end
 
 describe "Document with a stamp" do
   it "should raise NameTaken error when attempt to create stamp "+
@@ -73,26 +84,4 @@ describe "Document with a stamp" do
       end
     end
   end
-
-  it "if ProcSet changes are made, they should be added to the Page "+
-     "object, not the stamp XObject" do
-    create_pdf
-    @pdf.create_stamp("MyStamp") do
-      @pdf.text("hello")
-    end
-    @pdf.stamp("MyStamp")
-
-    # Inspector::XObject does not give information about ProcSet, so
-    # resorting to string matching
-
-    output = @pdf.render
-    objects = output.split("endobj")
-    objects.each do |object|
-      if object =~ /\/Type \/Page$/
-        object.should =~ /\/ProcSet/
-      elsif object =~ /\/Type \/XObject$/
-        object.should.not =~ /\/ProcSet/
-      end
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: prawn-core
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Gregory Brown
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 -05:00
+date: 2009-11-13 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - examples/general/background.rb
 - examples/general/canvas.rb
 - examples/general/margin.rb
+- examples/general/measurement_units.pdf
 - examples/general/measurement_units.rb
 - examples/general/metadata-info.rb
 - examples/general/multi_page_layout.rb
@@ -263,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prawn
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A fast and nimble PDF generator for Ruby