prawn 0.1.0 → 0.1.1

data/Rakefile

@@ -4,7 +4,7 @@ require 'spec/rake/spectask'
 require "rake/rdoctask"
 require "rake/gempackagetask"  
 
-PRAWN_VERSION = "0.1.0" 
+PRAWN_VERSION = "0.1.1" 
 
 task :default => [:spec]
 
@@ -33,21 +33,22 @@ end
 desc "run all examples, and then diff them against reference PDFs"
 task :examples do 
   mkdir_p "output"
-  examples = Dir["examples/*.rb"].reject { |e| e =~ /bench|sjis/ }   
+  examples = Dir["examples/*.rb"].reject { |e| e =~ /bench/ }   
   t = Time.now
-  puts "Running Examples"
+  puts "Running Examples, skipping benchmark"
   examples.each { |file| `ruby -Ilib #{file}` }  
   puts "Ran in #{Time.now - t} s"        
   `mv *.pdf output`                     
-=begin
-  # Has some issues     
-  puts "Checking for differences..."
-  output = Dir["output/*.pdf"]
-  ref    = Dir["reference_pdfs/*.pdf"]   
-  output.zip(ref).each do |o,r|
-    system "diff -q #{o} #{r}"
-  end 
-=end
+                   
+  unless RUBY_VERSION < "1.9"    
+    puts "Checking for differences..."
+    output = Dir["output/*.pdf"]
+    ref    = Dir["reference_pdfs/*.pdf"]   
+    output.zip(ref).each do |o,r|
+      system "diff -q #{o} #{r}"
+    end                      
+  end
+
 end
 
 spec = Gem::Specification.new do |spec|

data/examples/fancy_table.rb

@@ -3,10 +3,21 @@
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require "prawn"
 require "rubygems"
-require "fastercsv"
-
-headers, *body = FasterCSV.read("#{Prawn::BASEDIR}/examples/addressbook.csv")
+   
+headers, body = nil, nil   
+     
+ruby_18 do        
+  require "fastercsv" 
+  headers, *body = FasterCSV.read("#{Prawn::BASEDIR}/examples/addressbook.csv")   
+end
 
+ruby_19 do            
+  require "csv"
+  headers, *body = CSV.read("#{Prawn::BASEDIR}/examples/addressbook.csv")
+  headers.map! { |e| e.encode("UTF-8") }
+  body.map! { |e| e.map! { |x| x.encode("UTF-8") } }
+end
+                                                                                  
 Prawn::Document.generate("fancy_table.pdf", :page_layout => :landscape) do
 
   mask(:y) { table body, :headers      => headers, 

data/examples/image_flow.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+require "prawn"
+   
+Prawn::Document.generate("image-flow.pdf", :page_layout => :landscape) do                             
+  stef = "#{Prawn::BASEDIR}/data/images/stef.jpg"  
+  
+  text "o hai"
+  
+  image stef 
+  
+  text "flowing text" 
+  
+  image stef, :position => :center   
+  
+  text "beneath images"
+                 
+  image stef, :position => :right  
+  
+  text "again"
+                 
+  image stef, :position => :left     
+  
+  text "and again"     
+  
+  image stef, :position => 50
+  
+end

data/examples/ruport_formatter.rb

@@ -1,47 +1,50 @@
 # encoding: utf-8
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
-require "prawn"
-require "rubygems"
-require "ruport"
+require "prawn"                                                 
+
+ruby_18 do
+  require "rubygems"
+  require "ruport"
+
+  module Ruport
+    class Formatter 
+      class PrawnPDF < Ruport::Formatter
+        renders :pdf, :for => Ruport::Controller::Table
+
+        def document
+          @document ||= (options.document || Prawn::Document.new)
+        end
+
+        def table_body
+          data.map { |e| e.to_a }
+        end
+
+        build :table_header do
+          @headers = options.headers || data.column_names
+        end
+
+        build :table_body do
+          document.table table_body, 
+            :headers            => @headers, 
+            :row_colors         => :pdf_writer,
+            :position           => :center,
+            :font_size          => 10,
+            :vertical_padding   => 2,
+            :horizontal_padding => 5
+        end
+
+        def finalize
+          output << document.render
+        end
 
-module Ruport
-  class Formatter 
-    class PrawnPDF < Ruport::Formatter
-      renders :pdf, :for => Ruport::Controller::Table
-
-      def document
-        @document ||= (options.document || Prawn::Document.new)
-      end
-
-      def table_body
-        data.map { |e| e.to_a }
       end
-
-      build :table_header do
-        @headers = options.headers || data.column_names
-      end
-
-      build :table_body do
-        document.table table_body, 
-          :headers            => @headers, 
-          :row_colors         => :pdf_writer,
-          :position           => :center,
-          :font_size          => 10,
-          :vertical_padding   => 2,
-          :horizontal_padding => 5
-      end
-
-      def finalize
-        output << document.render
-      end
-
     end
   end
-end
 
-if __FILE__ == $PROGRAM_NAME
-  t = Table("#{Prawn::BASEDIR}/examples/addressbook.csv")
-  headers = t.column_names.map { |c| c.capitalize }
-  t.save_as "addressbook_ruport.pdf", :headers => headers
+  if __FILE__ == $PROGRAM_NAME
+    t = Table("#{Prawn::BASEDIR}/examples/addressbook.csv")
+    headers = t.column_names.map { |c| c.capitalize }
+    t.save_as "addressbook_ruport.pdf", :headers => headers
+  end  
 end

data/examples/sjis.rb

@@ -10,10 +10,12 @@
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require "prawn"
 
-datafile = File.join(File.dirname(__FILE__), "..", "data", "shift_jis_text.txt")
-sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets }
+ruby_19 do  
+  datafile = File.join(File.dirname(__FILE__), "..", "data", "shift_jis_text.txt")
+  sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets }
 
-Prawn::Document.generate("sjis.pdf") do
-  font "#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf"
-  text sjis_str
+  Prawn::Document.generate("sjis.pdf") do
+    font "#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf"
+    text sjis_str
+  end       
 end

data/lib/prawn/document/table.rb

@@ -1,4 +1,10 @@
 # encoding: utf-8
+#
+# table.rb : Simple table drawing functionality
+#
+# Copyright June 2008, Gregory Brown.  All Rights Reserved.
+#
+# This is free software. Please see the LICENSE and COPYING files for details.
 
 module Prawn
   class Document

data/lib/prawn/font/metrics.rb

@@ -159,10 +159,15 @@ module Prawn
         end  
       
         def metrics_path
-          @metrics_path ||= (ENV['METRICS'] || 
-            "/usr/lib/afm:/usr/local/lib/afm:"+
-            "/usr/openwin/lib/fonts/afm/:"+
-            "#{Prawn::BASEDIR+'/data/fonts/'}:.").split(':')
+          if m = ENV['METRICS']
+            @metrics_path ||= m.split(':')
+          else 
+            @metrics_path ||= [
+              "/usr/lib/afm",
+              "/usr/local/lib/afm",
+              "/usr/openwin/lib/fonts/afm/", 
+               Prawn::BASEDIR+'/data/fonts/','.'] 
+          end
         end 
 
         def has_kerning_data?

data/lib/prawn/graphics/cell.rb

@@ -1,5 +1,11 @@
-# encoding: utf-8
+# encoding: utf-8   
 
+
+# cell.rb : Table support functions
+#
+# Copyright June 2008, Gregory Brown.  All Rights Reserved.
+#
+# This is free software. Please see the LICENSE and COPYING files for details.
 module Prawn
 
   class Document

data/lib/prawn/images.rb

@@ -18,10 +18,11 @@ module Prawn
     # <tt>filename</tt>:: the path to the file to be embedded
     #
     # Options:
-    # <tt>:at</tt>:: the location of the top left corner of the image [current position]
+    # <tt>:at</tt>:: the location of the top left corner of the image.
+    # <tt>:position/tt>::  
     # <tt>:height</tt>:: the height of the image [actual height of the image]
     # <tt>:width</tt>:: the width of the image [actual width of the image]
-    # <tt>:scale</tt>:: scale the dimensions of the image proportionally
+    # <tt>:scale</tt>:: scale the dimensions of the image proportionally      
     # 
     #   Prawn::Document.generate("image2.pdf", :page_layout => :landscape) do     
     #     pigs = "#{Prawn::BASEDIR}/data/images/pigs.jpg" 
@@ -66,9 +67,14 @@ module Prawn
         image_registry[image_sha1] = {:obj => image_obj, :info => info}
       end
 
-      # find where the image will be placed and how big it will be
-      x,y = translate(options[:at])
+      # find where the image will be placed and how big it will be  
       w,h = calc_image_dimensions(info, options)
+      if options[:at]       
+        x,y = translate(options[:at]) 
+      else                  
+        x,y = image_position(w,h,options) 
+        move_text_position h   
+      end
 
       # add a reference to the image object to the current page
       # resource list and give it a label
@@ -80,7 +86,25 @@ module Prawn
       add_content instruct % [ w, h, x, y - h, label ]
     end
 
-    private
+    private   
+    
+    def image_position(w,h,options)
+      options[:position] ||= :left
+      case options[:position] 
+      when :left
+        x,y = bounds.absolute_left, self.y
+      when :center
+        x = bounds.absolute_left + (bounds.width - w) / 2.0 
+        y = self.y
+      when :right
+        x,y = bounds.absolute_right - w, self.y  
+      when Numeric
+        x = options[:position] + bounds.absolute_left
+        y = self.y
+      end       
+      
+      return [x,y]
+    end
 
     def build_jpg_object(data, jpg) 
       color_space = case jpg.channels

data/spec/png_spec.rb

@@ -28,7 +28,7 @@ describe "When reading an RGB PNG file" do
 
   it "should read the image data chunk correctly" do
     png = Prawn::Images::PNG.new(@img_data)
-    data = File.open(@data_filename) { |f| f.read }
+    data = File.open(@data_filename, "rb") { |f| f.read }
     png.img_data.should eql(data)
   end  
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: prawn
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2008-08-03 00:00:00 -04:00
+  version: 0.1.1
+date: 2008-08-08 00:00:00 -04:00
 summary: A fast and nimble PDF generator for Ruby
 require_paths: 
 - lib
@@ -31,9 +31,7 @@ authors:
 files: 
 - examples/addressbook.csv
 - examples/alignment.rb
-- examples/bounding_boxes.pdf
 - examples/bounding_boxes.rb
-- examples/canvas.pdf
 - examples/canvas.rb
 - examples/cell.rb
 - examples/currency.csv
@@ -41,10 +39,9 @@ files:
 - examples/fancy_table.rb
 - examples/font_size.rb
 - examples/hexagon.rb
-- examples/image.pdf
 - examples/image.rb
 - examples/image2.rb
-- examples/inline_styles.pdf
+- examples/image_flow.rb
 - examples/kerning.rb
 - examples/line.rb
 - examples/multi_page_layout.rb

data/examples/bounding_boxes.pdf

@@ -1,62 +0,0 @@
-%PDF-1.3
-����
-1 0 obj
-<< /Creator <feff0050007200610077006e>
-/Producer <feff0050007200610077006e>
->>
-endobj
-2 0 obj
-<< /Type /Pages
-/Count 1
-/Kids [5 0 R]
->>
-endobj
-3 0 obj
-<< /Pages 2 0 R
-/Type /Catalog
->>
-endobj
-4 0 obj
-<< /Length 354
->>
-stream
-0.000 0.000 0.000 rg
-0.000 0.000 0.000 RG
-q
-436.000 436.000 m
-436.000 491.228 391.228 536.000 336.000 536.000 c
-280.772 536.000 236.000 491.228 236.000 436.000 c
-236.000 380.772 280.772 336.000 336.000 336.000 c
-391.228 336.000 436.000 380.772 436.000 436.000 c
-336.000 436.000 m
-236.000 536.000 m
-436.000 336.000 l
-436.000 536.000 m
-236.000 336.000 l
-Q
-
-endstream
-endobj
-5 0 obj
-<< /Type /Page
-/Parent 2 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 4 0 R
->>
-endobj
-xref
-0 6
-0000000000 65535 f 
-0000000014 00000 n 
-0000000108 00000 n 
-0000000165 00000 n 
-0000000214 00000 n 
-0000000619 00000 n 
-trailer
-<< /Root 3 0 R
-/Info 1 0 R
-/Size 6
->>
-startxref
-710
-%%EOF

data/examples/canvas.pdf

@@ -1,81 +0,0 @@
-%PDF-1.3
-����
-1 0 obj
-<< /Creator <507261776e>
-/Producer <507261776e>
->>
-endobj
-2 0 obj
-<< /Type /Pages
-/Count 1
-/Kids [5 0 R]
->>
-endobj
-3 0 obj
-<< /Type /Catalog
-/Pages 2 0 R
->>
-endobj
-4 0 obj
-<< /Length 304
->>
-stream
-0.000 0.000 0.000 rg
-0.000 0.000 0.000 RG
-q
-
-              BT
-              /F1 12 Tf
-              0 780.612 Td
-            
-[<54686973207465> 30 <78742073686f756c642061707065617220617420746865206162736f6c75746520746f70206c656674>] TJ
-
-
-              ET
-            
-0.000 0.000 m
-612.000 792.000 l
-S
-Q
-
-endstream
-endobj
-5 0 obj
-<< /Resources << /Font << /F1 7 0 R
->>
->>
-/Type /Page
-/Parent 2 0 R
-/ProcSet 6 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 4 0 R
->>
-endobj
-6 0 obj
-[/PDF /Text]
-endobj
-7 0 obj
-<< /BaseFont /Helvetica
-/Type /Font
-/Subtype /Type1
-/Encoding /MacRomanEncoding
->>
-endobj
-xref
-0 8
-0000000000 65535 f 
-0000000014 00000 n 
-0000000080 00000 n 
-0000000137 00000 n 
-0000000186 00000 n 
-0000000541 00000 n 
-0000000686 00000 n 
-0000000714 00000 n 
-trailer
-<< /Info 1 0 R
-/Size 8
-/Root 3 0 R
->>
-startxref
-812
-%%EOF

data/examples/inline_styles.pdf

@@ -1,117 +0,0 @@
-%PDF-1.3
-����
-1 0 obj
-<< /Creator <feff0050007200610077006e>
-/Producer <feff0050007200610077006e>
->>
-endobj
-2 0 obj
-<< /Count 1
-/Kids [5 0 R]
-/Type /Pages
->>
-endobj
-3 0 obj
-<< /Pages 2 0 R
-/Type /Catalog
->>
-endobj
-4 0 obj
-<< /Length 644
->>
-stream
-0.000 0.000 0.000 rg
-0.000 0.000 0.000 RG
-q
-
-          BT
-          /F1 12 Tf
-          36 744.612 Td
-        
-[<5468697320697320736f6d6520706c61696e207465> 30 <7874>] TJ
-
-
-          ET
-        
-
-          BT
-          /F2 12 Tf
-          36 730.74 Td
-        
-[<54686973207465> 30 <7874206973206974616c6963>] TJ
-
-
-          ET
-        
-
-          BT
-          /F2 12 Tf
-          36 716.868 Td
-        
-[<54686973207465> 30 <787420697320626f6c64>] TJ
-
-
-          ET
-        
-
-          BT
-          /F2 12 Tf
-          36 702.996 Td
-        
-[<54686973206973206f7264696e6172> -30 <79207465> 30 <787420616761696e>] TJ
-
-
-          ET
-        
-Q
-
-endstream
-endobj
-5 0 obj
-<< /Contents 4 0 R
-/ProcSet 6 0 R
-/Resources << /Font << /F2 8 0 R
-/F1 7 0 R
->>
->>
-/Parent 2 0 R
-/Type /Page
-/MediaBox [0 0 612.0 792.0]
->>
-endobj
-6 0 obj
-[/PDF /Text]
-endobj
-7 0 obj
-<< /BaseFont /Helvetica
-/Subtype /Type1
-/Encoding /MacRomanEncoding
-/Type /Font
->>
-endobj
-8 0 obj
-<< /BaseFont /Helvetica-Oblique
-/Subtype /Type1
-/Encoding /MacRomanEncoding
-/Type /Font
->>
-endobj
-xref
-0 9
-0000000000 65535 f 
-0000000014 00000 n 
-0000000108 00000 n 
-0000000165 00000 n 
-0000000214 00000 n 
-0000000909 00000 n 
-0000001064 00000 n 
-0000001092 00000 n 
-0000001190 00000 n 
-trailer
-<< /Size 9
-/Root 3 0 R
-/Info 1 0 R
->>
-startxref
-1296
-%%EOF