@@ -1,4 +1,4 @@ -$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib') +$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) require "prawn" require "benchmark" bench/afm_text_bench.rb @@ -1,4 +1,4 @@ -$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib') +$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) require "prawn" require "benchmark" bench/png_type_6.rb @@ -1,14 +1,24 @@ # encoding: utf-8 -require "rubygems" -require "fastercsv" require "benchmark" -$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib') +$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) require "prawn" -csv_data = FasterCSV.read("#{Prawn::BASEDIR}/examples/currency.csv") * - (ARGV.first || 1).to_i +csv_data = nil + +ruby_18 do + require "rubygems" + require "fastercsv" + csv_data = FasterCSV.read("#{Prawn::BASEDIR}/examples/table/currency.csv") * + (ARGV.first || 1).to_i +end + +ruby_19 do + require "csv" + csv_data = CSV.read("#{Prawn::BASEDIR}/examples/table/currency.csv") * + (ARGV.first || 1).to_i +end doc = Prawn::Document.new bench/table_bench.rb @@ -1,4 +1,4 @@ -$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib') +$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) require "prawn" require "benchmark" bench/ttf_text_bench.rb @@ -14,7 +14,7 @@ if RUBY_VERSION < "1.9" end class File #:nodoc: - def self.read_binary(file) + def self.binread(file) File.open(file,"rb") { |f| f.read } end end @@ -27,13 +27,7 @@ if RUBY_VERSION < "1.9" false end -else - - class File #:nodoc: - def self.read_binary(file) - File.open(file,"rb:BINARY") { |f| f.read } - end - end +else def ruby_18 #:nodoc: false lib/prawn/compatibility.rb @@ -62,7 +62,7 @@ module Prawn image_content = file.read else raise ArgumentError, "#{file} not found" unless File.file?(file) - image_content = File.read_binary(file) + image_content = File.binread(file) end image_sha1 = Digest::SHA1.hexdigest(image_content) lib/prawn/images.rb @@ -14,7 +14,7 @@ describe "When reading a greyscale PNG file (color type 0)" do before(:each) do @filename = "#{Prawn::BASEDIR}/data/images/web-links.png" @data_filename = "#{Prawn::BASEDIR}/data/images/web-links.dat" - @img_data = File.read_binary(@filename) + @img_data = File.binread(@filename) end it "should read the attributes from the header chunk correctly" do @@ -31,7 +31,7 @@ describe "When reading a greyscale PNG file (color type 0)" do it "should read the image data chunk correctly" do png = Prawn::Images::PNG.new(@img_data) - data = File.read_binary(@data_filename) + data = File.binread(@data_filename) png.img_data.should == data end end @@ -40,7 +40,7 @@ describe "When reading a greyscale PNG file with transparency (color type 0)" do before(:each) do @filename = "#{Prawn::BASEDIR}/data/images/ruport_type0.png" - @img_data = File.read_binary(@filename) + @img_data = File.binread(@filename) end # In a greyscale type 0 PNG image, the tRNS chunk should contain a single value @@ -58,7 +58,7 @@ describe "When reading an RGB PNG file (color type 2)" do before(:each) do @filename = "#{Prawn::BASEDIR}/data/images/ruport.png" @data_filename = "#{Prawn::BASEDIR}/data/images/ruport_data.dat" - @img_data = File.read_binary(@filename) + @img_data = File.binread(@filename) end it "should read the attributes from the header chunk correctly" do @@ -75,7 +75,7 @@ describe "When reading an RGB PNG file (color type 2)" do it "should read the image data chunk correctly" do png = Prawn::Images::PNG.new(@img_data) - data = File.read_binary(@data_filename) + data = File.binread(@data_filename) png.img_data.should == data end end @@ -84,7 +84,7 @@ describe "When reading an RGB PNG file with transparency (color type 2)" do before(:each) do @filename = "#{Prawn::BASEDIR}/data/images/arrow2.png" - @img_data = File.read_binary(@filename) + @img_data = File.binread(@filename) end # In a RGB type 2 PNG image, the tRNS chunk should contain a single RGB value @@ -105,7 +105,7 @@ describe "When reading an indexed color PNG file (color type 3)" do before(:each) do @filename = "#{Prawn::BASEDIR}/data/images/rails.png" @data_filename = "#{Prawn::BASEDIR}/data/images/rails.dat" - @img_data = File.read_binary(@filename) + @img_data = File.binread(@filename) end it "should read the attributes from the header chunk correctly" do @@ -122,7 +122,7 @@ describe "When reading an indexed color PNG file (color type 3)" do it "should read the image data chunk correctly" do png = Prawn::Images::PNG.new(@img_data) - data = File.read_binary(@data_filename) + data = File.binread(@data_filename) png.img_data.should == data end end @@ -133,7 +133,7 @@ describe "When reading a greyscale+alpha PNG file (color type 4)" do @filename = "#{Prawn::BASEDIR}/data/images/page_white_text.png" @data_filename = "#{Prawn::BASEDIR}/data/images/page_white_text.dat" @alpha_data_filename = "#{Prawn::BASEDIR}/data/images/page_white_text.alpha" - @img_data = File.read_binary(@filename) + @img_data = File.binread(@filename) end it "should read the attributes from the header chunk correctly" do @@ -150,13 +150,13 @@ describe "When reading a greyscale+alpha PNG file (color type 4)" do it "should correctly return the raw image data (with no alpha channel) from the image data chunk" do png = Prawn::Images::PNG.new(@img_data) - data = File.read_binary(@data_filename) + data = File.binread(@data_filename) png.img_data.should == data end it "should correctly extract the alpha channel data from the image data chunk" do png = Prawn::Images::PNG.new(@img_data) - data = File.read_binary(@alpha_data_filename) + data = File.binread(@alpha_data_filename) png.alpha_channel.should == data end end @@ -167,7 +167,7 @@ describe "When reading an RGB+alpha PNG file (color type 6)" do @filename = "#{Prawn::BASEDIR}/data/images/dice.png" @data_filename = "#{Prawn::BASEDIR}/data/images/dice.dat" @alpha_data_filename = "#{Prawn::BASEDIR}/data/images/dice.alpha" - @img_data = File.read_binary(@filename) + @img_data = File.binread(@filename) end it "should read the attributes from the header chunk correctly" do @@ -184,13 +184,13 @@ describe "When reading an RGB+alpha PNG file (color type 6)" do it "should correctly return the raw image data (with no alpha channel) from the image data chunk" do png = Prawn::Images::PNG.new(@img_data) - data = File.read_binary(@data_filename) + data = File.binread(@data_filename) png.img_data.should == data end it "should correctly extract the alpha channel data from the image data chunk" do png = Prawn::Images::PNG.new(@img_data) - data = File.read_binary(@alpha_data_filename) + data = File.binread(@alpha_data_filename) png.alpha_channel.should == data end end spec/png_spec.rb 50a21884cd1fbb32c2e53a76753c357d7b9a9eb1 Gregory Brown gregory.t.brown@gmail.com http://github.com/yob/prawn/commit/a98d99c276dbdea2bbabbe87948830408ec776f8 a98d99c276dbdea2bbabbe87948830408ec776f8 2008-12-15T23:46:00-08:00 2008-12-15T23:46:00-08:00 Rock the new binread hotness e7f3dfc102c0f38afec4aceb98acaf48f2fa31c6 Gregory Brown gregory.t.brown@gmail.com