prawn-core 0.6.2 → 0.6.3

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 require "rake/rdoctask"
 require "rake/gempackagetask"  
 
-PRAWN_VERSION = "0.6.2" 
+PRAWN_VERSION = "0.6.3" 
 
 task :default => [:test]
        

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.2"
+  VERSION = "0.6.3"
   
   extend self
 

data/lib/prawn/document.rb

@@ -73,6 +73,10 @@ module Prawn
       @extensions ||= []
     end
 
+    def self.inherited(base)
+      extensions.each { |e| base.extensions << e }
+    end
+
     # Creates and renders a PDF document.
     #
     # When using the implicit block form, Prawn will evaluate the block
@@ -170,6 +174,7 @@ module Prawn
        @version = 1.3
        @store = ObjectStore.new(options[:info])
        @trailer = {}
+       @before_render_callbacks = []
 
        @page_size     = options[:page_size]   || "LETTER"
        @page_layout   = options[:page_layout] || :portrait

data/lib/prawn/document/annotations.rb

@@ -23,7 +23,7 @@ module Prawn
       def annotate(options)
         current_page.data[:Annots] ||= []
         options = sanitize_annotation_hash(options)
-        current_page.data[:Annots] << ref(options)
+        current_page.data[:Annots] << ref!(options)
         return options
       end
 

data/lib/prawn/document/internals.rb

@@ -21,13 +21,8 @@ module Prawn
       #
       # Returns the identifier which points to the reference in the ObjectStore   
       # 
-      # If a block is given, it will be invoked just before the object is written
-      # out to the PDF document stream. This allows you to do deferred processing
-      # on some references (such as fonts, which you might know all the details
-      # about until the last page of the document is finished).
-      #
-      def ref(data, &block)
-        ref!(data, &block).identifier
+      def ref(data)
+        ref!(data).identifier
       end                                               
 
       # Like ref, but returns the actual reference instead of its identifier.
@@ -38,8 +33,8 @@ module Prawn
       # if needed.  If you take this approach, Prawn::Document::Snapshot
       # will probably work with your extension
       #
-      def ref!(data, &block)
-        @store.ref(data, &block)
+      def ref!(data)
+        @store.ref(data)
       end
 
       # Grabs the reference for the current page content
@@ -96,6 +91,12 @@ module Prawn
         @store.root.data[:Names] ||= ref!(:Type => :Names)
       end
 
+      # Defines a block to be called just before the document is rendered.
+      #
+      def before_render(&block)
+        @before_render_callbacks << block
+      end
+
       def go_to_page(k) # :nodoc:
         jump_to = @store.pages.data[:Kids][k]
         @current_page = jump_to.identifier
@@ -125,6 +126,8 @@ module Prawn
       # Write out the PDF Header, as per spec 3.4.1
       #
       def render_header(output)
+        @before_render_callbacks.each{ |c| c.call(self) }
+
         # pdf version
         output << "%PDF-#{@version}\n"
 

data/lib/prawn/font/ttf.rb

@@ -222,7 +222,13 @@ module Prawn
 
       def register(subset)
         temp_name = @ttf.name.postscript_name.gsub("\0","").to_sym
-        @document.ref!(:Type => :Font, :BaseFont => temp_name) { |ref| embed(ref, subset) }
+        ref = @document.ref!(:Type => :Font, :BaseFont => temp_name)
+
+        # Embed the font metrics in the document after everything has been 
+        # drawn, just before the document is emitted.
+        @document.before_render { |doc| embed(ref, subset) }
+
+        ref
       end
 
       def embed(reference, subset)

data/lib/prawn/reference.rb

@@ -15,17 +15,15 @@ module Prawn
    attr_accessor :gen, :data, :offset, :stream
    attr_reader :identifier
     
-    def initialize(id, data, &block)
+    def initialize(id, data)
       @identifier = id 
       @gen        = 0       
       @data       = data     
       @compressed = false
-      @on_encode  = block
       @stream     = nil
     end            
     
     def object 
-      @on_encode.call(self) if @on_encode
       output = "#{@identifier} #{gen} obj\n" <<
                Prawn::PdfObject(data) << "\n"
       if @stream

data/spec/document_spec.rb

@@ -22,13 +22,37 @@ describe "The cursor" do
 end 
 
 describe "when generating a document from a subclass" do
-  it "should be an instance_eval of the subclass" do
+  it "should be an instance of the subclass" do
     custom_document = Class.new(Prawn::Document)
     custom_document.generate(Tempfile.new("generate_test").path) do |e| 
       e.class.should == custom_document
       e.should.be.kind_of(Prawn::Document)
     end
   end
+
+  it "should retain any extensions found on Prawn::Document" do
+    mod1 = Module.new { attr_reader :test_extensions1 }
+    mod2 = Module.new { attr_reader :test_extensions2 }
+
+    Prawn::Document.extensions << mod1 << mod2
+
+    custom_document = Class.new(Prawn::Document)
+    assert_equal [mod1, mod2], custom_document.extensions
+
+    # remove the extensions we added to prawn document
+    Prawn::Document.extensions.delete(mod1)
+    Prawn::Document.extensions.delete(mod2)
+
+    assert ! Prawn::Document.new.respond_to?(:test_extensions1)
+    assert ! Prawn::Document.new.respond_to?(:test_extensions2)
+
+    # verify these still exist on custom class
+    assert_equal [mod1, mod2], custom_document.extensions
+
+    assert custom_document.new.respond_to?(:test_extensions1)
+    assert custom_document.new.respond_to?(:test_extensions2)
+  end
+
 end
 
                                
@@ -226,6 +250,22 @@ describe "The render() feature" do
       str.encoding.to_s.should == "ASCII-8BIT"
     end
   end
+
+  it "should trigger before_render callbacks just before rendering" do
+    pdf = Prawn::Document.new
+    
+    seq = sequence("callback_order")
+
+    # Verify the order: finalize -> fire callbacks -> render body
+    pdf.expects(:finalize_all_page_contents).in_sequence(seq)
+    trigger = mock()
+    trigger.expects(:fire).in_sequence(seq)
+    pdf.expects(:render_body).in_sequence(seq)
+
+    pdf.before_render{ trigger.fire }
+
+    pdf.render
+  end
 end
 
 describe "PDF file versions" do

data/spec/font_spec.rb

@@ -230,6 +230,33 @@ describe "TTF fonts" do
 
   end
 
+  describe "when used with snapshots or transactions" do
+    
+    it "should allow TTF fonts to be used alongside document transactions" do
+      lambda {
+        Prawn::Document.new do
+          font "#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf"
+          text "Hi there"
+          transaction { text "Nice, thank you" }
+        end
+      }.should.not.raise
+    end
+
+    it "should allow TTF fonts to be used inside transactions" do
+      pdf = Prawn::Document.new do
+        transaction do
+          font "#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf"
+          text "Hi there"
+        end
+      end
+
+      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
   
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: prawn-core
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Gregory Brown
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -05:00
+date: 2009-11-17 00:00:00 -05:00
 default_executable: 
 dependencies: []