prawn 0.15.0 → 1.0.0.rc1

data/spec/images_spec.rb

@@ -1,48 +1,40 @@
 # encoding: utf-8
 
-require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
+require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")  
 require 'set'
 require 'pathname'
 
 describe "the image() function" do
 
   before(:each) do
-    @filename = "#{Prawn::DATADIR}/images/pigs.jpg"
+    @filename = "#{Prawn::BASEDIR}/data/images/pigs.jpg" 
     create_pdf
   end
 
   it "should only embed an image once, even if it's added multiple times" do
     @pdf.image @filename, :at => [100,100]
     @pdf.image @filename, :at => [300,300]
-
+           
     output = @pdf.render
     images = PDF::Inspector::XObject.analyze(output)
     # there should be 2 images in the page resources
     images.page_xobjects.first.size.should == 2
     # but only 1 image xobject
     output.scan(/\/Type \/XObject/).size.should == 1
-  end
-
+  end  
+  
   it "should return the image info object" do
     info =  @pdf.image(@filename)
-
-    info.should be_a_kind_of(Prawn::Images::JPG)
-
+    
+    info.should.be.kind_of(Prawn::Images::JPG)
+    
     info.height.should == 453
   end
-
+  
   it "should accept IO objects" do
     file = File.open(@filename, "rb")
     info = @pdf.image(file)
-
-    info.height.should == 453
-  end
-
-  it "rewinds IO objects to be able to embed them multiply" do
-    file = File.open(@filename, "rb")
-
-    @pdf.image(file)
-    info = @pdf.image(file)
+    
     info.height.should == 453
   end
 
@@ -51,64 +43,51 @@ describe "the image() function" do
     info.height.should == 453
   end
 
-  context "setting the length of the bytestream" do
-    it "should correctly work with images from Pathname objects" do
-      info = @pdf.image(Pathname.new(@filename))
-      expect(@pdf).to have_parseable_xobjects
-    end
-
-    it "should correctly work with images from IO objects" do
-      info = @pdf.image(File.open(@filename, 'rb'))
-      expect(@pdf).to have_parseable_xobjects
-    end
-
-    it "should correctly work with images from IO objects not set to mode rb" do
-      info = @pdf.image(File.open(@filename, 'r'))
-      expect(@pdf).to have_parseable_xobjects
-    end
-  end
-
-  it "should raise_error an UnsupportedImageType if passed a BMP" do
-    filename = "#{Prawn::DATADIR}/images/tru256.bmp"
-    lambda { @pdf.image filename, :at => [100,100] }.should raise_error(Prawn::Errors::UnsupportedImageType)
+  it "should raise an UnsupportedImageType if passed a BMP" do
+    filename = "#{Prawn::BASEDIR}/data/images/tru256.bmp"
+    lambda { @pdf.image filename, :at => [100,100] }.should.raise(Prawn::Errors::UnsupportedImageType)
   end
 
-  it "should raise_error an UnsupportedImageType if passed an interlaced PNG" do
-    filename = "#{Prawn::DATADIR}/images/dice_interlaced.png"
-    lambda { @pdf.image filename, :at => [100,100] }.should raise_error(Prawn::Errors::UnsupportedImageType)
+  it "should raise an UnsupportedImageType if passed an interlaced PNG" do
+    filename = "#{Prawn::BASEDIR}/data/images/dice_interlaced.png"
+    lambda { @pdf.image filename, :at => [100,100] }.should.raise(Prawn::Errors::UnsupportedImageType)
   end
 
   it "should bump PDF version to 1.5 or greater on embedding 16-bit PNGs" do
-    @pdf.image "#{Prawn::DATADIR}/images/16bit.png"
+    @pdf.image "#{Prawn::BASEDIR}/data/images/16bit.png"
     @pdf.state.version.should >= 1.5
   end
 
-  it "should embed 16-bit alpha channels for 16-bit PNGs" do
-    @pdf.image "#{Prawn::DATADIR}/images/16bit.png"
+  # to support Adobe Reader, which apparently doesn't handle 16-bit alpha
+  # channels. Verified experimentally [BE] but not confirmed in documentation
+  # or anything. OS X Preview handles those files just fine.
+  #
+  it "should embed 8-bit alpha channels for 16-bit PNGs" do
+    @pdf.image "#{Prawn::BASEDIR}/data/images/16bit.png"
 
     output = @pdf.render
     output.should =~ /\/BitsPerComponent 16/
-    output.should_not =~ /\/BitsPerComponent 8/
+    output.should =~ /\/BitsPerComponent 8/
   end
-
+  
   it "should flow an image to a new page if it will not fit on a page" do
     @pdf.image @filename, :fit => [600, 600]
     @pdf.image @filename, :fit => [600, 600]
     output = StringIO.new(@pdf.render, 'r+')
     hash = PDF::Reader::ObjectHash.new(output)
     pages = hash.values.find {|obj| obj.is_a?(Hash) && obj[:Type] == :Pages}[:Kids]
-    pages.size.should == 2
+    pages.size.should == 2 
     hash[pages[0]][:Resources][:XObject].keys.should == [:I1]
     hash[pages[1]][:Resources][:XObject].keys.should == [:I2]
-  end
-
+  end 
+  
   it "should not flow an image to a new page if it will fit on one page" do
     @pdf.image @filename, :fit => [400, 400]
     @pdf.image @filename, :fit => [400, 400]
     output = StringIO.new(@pdf.render, 'r+')
     hash = PDF::Reader::ObjectHash.new(output)
     pages = hash.values.find {|obj| obj.is_a?(Hash) && obj[:Type] == :Pages}[:Kids]
-    pages.size.should == 1
+    pages.size.should == 1 
     Set.new(hash[pages[0]][:Resources][:XObject].keys).should ==
       Set.new([:I1, :I2])
   end
@@ -119,7 +98,7 @@ describe "the image() function" do
       @pdf.image @filename
     end
   end
-
+  
   describe ":fit option" do
     it "should fit inside the defined constraints" do
       info = @pdf.image @filename, :fit => [100,400]

data/spec/inline_formatted_text_parser_spec.rb

@@ -1,159 +1,135 @@
 # -*- coding: utf-8 -*-
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
-describe "Text::Formatted::Parser#format" do
+describe "Text::Formatted::Parser#to_array" do
   it "should handle sup" do
     string = "<sup>superscript</sup>"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
     array[0].should == { :text => "superscript",
                          :styles => [:superscript],
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
   end
   it "should handle sub" do
     string = "<sub>subscript</sub>"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
     array[0].should == { :text => "subscript",
                          :styles => [:subscript],
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
   end
   it "should handle rgb" do
     string = "<color rgb='#ff0000'>red text</color>"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
     array[0].should == { :text => "red text",
                          :styles => [],
                          :color => "ff0000",
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
   end
   it "# should be optional in rgb" do
     string = "<color rgb='ff0000'>red text</color>"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
     array[0].should == { :text => "red text",
                          :styles => [],
                          :color => "ff0000",
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
   end
   it "should handle cmyk" do
     string = "<color c='0' m='100' y='0' k='0'>magenta text</color>"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
     array[0].should == { :text => "magenta text",
                          :styles => [],
                          :color => [0, 100, 0, 0],
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
   end
   it "should handle fonts" do
     string = "<font name='Courier'>Courier text</font>"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
     array[0].should == { :text => "Courier text",
                          :styles => [],
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => "Courier",
                          :size => nil,
                          :character_spacing => nil }
   end
   it "should handle size" do
     string = "<font size='14'>14 point text</font>"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
     array[0].should == { :text => "14 point text",
                          :styles => [],
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => 14,
                          :character_spacing => nil }
   end
   it "should handle character_spacing" do
     string = "<font character_spacing='2.5'>extra character spacing</font>"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
     array[0].should == { :text => "extra character spacing",
                          :styles => [],
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => 2.5 }
   end
   it "should handle links" do
     string = "<link href='http://example.com'>external link</link>"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
     array[0].should == { :text => "external link",
                          :styles => [],
                          :color => nil,
                          :link => "http://example.com",
                          :anchor => nil,
-                         :local => nil,
-                         :font => nil,
-                         :size => nil,
-                         :character_spacing => nil }
-  end
-  it "should handle local links" do
-    string = "<link local='/home/example/foo.bar'>local link</link>"
-    array = Prawn::Text::Formatted::Parser.format(string)
-    array[0].should == { :text => "local link",
-                         :styles => [],
-                         :color => nil,
-                         :link => nil,
-                         :anchor => nil,
-                         :local => "/home/example/foo.bar",
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
   end
   it "should handle anchors" do
     string = "<link anchor='ToC'>internal link</link>"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
     array[0].should == { :text => "internal link",
                          :styles => [],
                          :color => nil,
                          :link => nil,
                          :anchor => "ToC",
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
   end
   it "should handle higher order characters properly" do
     string = "<b>©\n©</b>"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
     array[0].should == { :text => "©",
                          :styles => [:bold],
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
@@ -162,7 +138,6 @@ describe "Text::Formatted::Parser#format" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
@@ -171,60 +146,55 @@ describe "Text::Formatted::Parser#format" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
   end
   it "should convert &lt; &gt;, and &amp; to <, >, and &, respectively" do
     string = "hello <b>&lt;, &gt;, and &amp;</b>"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
     array[1].should == { :text => "<, >, and &",
                          :styles => [:bold],
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
   end
   it "should handle double qoutes around tag attributes" do
     string = 'some <font size="14">sized</font> text'
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
     array[1].should == { :text => "sized",
                          :styles => [],
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => 14,
                          :character_spacing => nil }
   end
   it "should handle single qoutes around tag attributes" do
     string = "some <font size='14'>sized</font> text"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
     array[1].should == { :text => "sized",
                          :styles => [],
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => 14,
                          :character_spacing => nil }
   end
   it "should construct a formatted text array from a string" do
     string = "hello <b>world\nhow <i>are</i></b> you?"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
 
     array[0].should == { :text => "hello ",
                          :styles => [],
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
@@ -233,7 +203,6 @@ describe "Text::Formatted::Parser#format" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
@@ -242,7 +211,6 @@ describe "Text::Formatted::Parser#format" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
@@ -251,7 +219,6 @@ describe "Text::Formatted::Parser#format" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
@@ -260,7 +227,6 @@ describe "Text::Formatted::Parser#format" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
@@ -269,21 +235,19 @@ describe "Text::Formatted::Parser#format" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
   end
   it "should accept <strong> as an alternative to <b>" do
     string = "<strong>bold</strong> not bold"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
 
     array[0].should == { :text => "bold",
                          :styles => [:bold],
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
@@ -292,21 +256,19 @@ describe "Text::Formatted::Parser#format" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
   end
   it "should accept <em> as an alternative to <i>" do
     string = "<em>italic</em> not italic"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
 
     array[0].should == { :text => "italic",
                          :styles => [:italic],
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
@@ -315,21 +277,19 @@ describe "Text::Formatted::Parser#format" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
   end
   it "should accept <a> as an alternative to <link>" do
     string = "<a href='http://example.com'>link</a> not a link"
-    array = Prawn::Text::Formatted::Parser.format(string)
+    array = Prawn::Text::Formatted::Parser.to_array(string)
 
     array[0].should == { :text => "link",
                          :styles => [],
                          :color => nil,
                          :link => "http://example.com",
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
@@ -338,14 +298,13 @@ describe "Text::Formatted::Parser#format" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }
   end
 
   it "should turn <br>, <br/> into newline" do
-    array = Prawn::Text::Formatted::Parser.format("hello<br>big<br/>world")
+    array = Prawn::Text::Formatted::Parser.to_array("hello<br>big<br/>world")
     array.map { |frag| frag[:text] }.join.should == "hello\nbig\nworld"
   end
 end
@@ -359,7 +318,6 @@ describe "Text::Formatted::Parser#to_string" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }]
@@ -372,7 +330,6 @@ describe "Text::Formatted::Parser#to_string" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }]
@@ -385,7 +342,6 @@ describe "Text::Formatted::Parser#to_string" do
                          :color => "ff0000",
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }]
@@ -398,7 +354,6 @@ describe "Text::Formatted::Parser#to_string" do
                          :color => [0, 100, 0, 0],
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => nil }]
@@ -411,7 +366,6 @@ describe "Text::Formatted::Parser#to_string" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => "Courier",
                          :size => nil,
                          :character_spacing => nil }]
@@ -424,7 +378,6 @@ describe "Text::Formatted::Parser#to_string" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => 14,
                          :character_spacing => nil }]
@@ -437,7 +390,6 @@ describe "Text::Formatted::Parser#to_string" do
                          :color => nil,
                          :link => nil,
                          :anchor => nil,
-                         :local => nil,
                          :font => nil,
                          :size => nil,
                          :character_spacing => 2.5 }]
@@ -449,7 +401,6 @@ describe "Text::Formatted::Parser#to_string" do
                :color => nil,
                :link => "http://example.com",
                :anchor => nil,
-               :local => nil,
                :font => nil,
                :size => nil,
                :character_spacing => nil }]