prawn 1.0.0.rc2 → 1.0.0

data/spec/jpg_spec.rb

@@ -4,7 +4,7 @@
 # contents of palette and transparency to ensure they're correct.
 # Need to find files that have these sections first.
 
-require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")  
+require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
 describe "When reading a JPEG file" do
 
@@ -12,10 +12,10 @@ describe "When reading a JPEG file" do
     @filename = "#{Prawn::DATADIR}/images/pigs.jpg"
     @img_data = File.open(@filename, "rb") { |f| f.read }
   end
-   
+
   it "should read the basic attributes correctly" do
     jpg = Prawn::Images::JPG.new(@img_data)
-    
+
     jpg.width.should == 604
     jpg.height.should == 453
     jpg.bits.should == 8

data/spec/line_wrap_spec.rb

@@ -5,8 +5,8 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 describe "Core::Text::Formatted::LineWrap#wrap_line" do
   before(:each) do
     create_pdf
-    @arranger = Prawn::Core::Text::Formatted::Arranger.new(@pdf)
-    @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+    @arranger = Prawn::Text::Formatted::Arranger.new(@pdf)
+    @line_wrap = Prawn::Text::Formatted::LineWrap.new
     @one_word_width = 50
   end
   it "should strip leading and trailing spaces" do
@@ -113,11 +113,11 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
                                   :width => @one_word_width,
                                   :document => @pdf)
     expected = @pdf.font.normalize_encoding("hello#{Prawn::Text::SHY}")
-    expected.force_encoding("utf-8") if "".respond_to?(:force_encoding)
+    expected.force_encoding(Encoding::UTF_8)
     string.should == expected
 
     @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
-    @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+    @line_wrap = Prawn::Text::Formatted::LineWrap.new
 
     string = "hello#{Prawn::Text::SHY}world"
     array = [{ :text => string }]
@@ -138,7 +138,7 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
     string.should == "helloworld"
 
     @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
-    @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+    @line_wrap = Prawn::Text::Formatted::LineWrap.new
 
     string = "hello#{Prawn::Text::SHY}world"
     array = [{ :text => string }]
@@ -167,7 +167,7 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
     string.should == "hello"
 
     @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
-    @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+    @line_wrap = Prawn::Text::Formatted::LineWrap.new
     enough_width_for_hello_world = 68
 
     array = [{ :text => "hello world" }]
@@ -202,11 +202,11 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
                                   :width => @one_word_width,
                                   :document => @pdf)
     expected = @pdf.font.normalize_encoding("hello#{Prawn::Text::SHY}")
-    expected.force_encoding("utf-8") if "".respond_to?(:force_encoding)
+    expected.force_encoding(Encoding::UTF_8)
     string.should == expected
 
     @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
-    @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+    @line_wrap = Prawn::Text::Formatted::LineWrap.new
 
     string = "hello#{Prawn::Text::SHY}-"
     array = [{ :text => string }]
@@ -224,13 +224,24 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
                                   :document => @pdf)
     string.should == "hello#{Prawn::Text::SHY}"
   end
+
+  it "should process UTF-8 chars", :unresolved, :issue => 693 do
+    array = [{ :text => "Ｔｅｓｔ" }]
+    @arranger.format_array = array
+
+    # Should not raise an encoding error
+    string = @line_wrap.wrap_line(:arranger => @arranger,
+                                  :width => 300,
+                                  :document => @pdf)
+    string.should == "Ｔｅｓｔ"
+  end
 end
 
 describe "Core::Text::Formatted::LineWrap#space_count" do
   before(:each) do
     create_pdf
-    @arranger = Prawn::Core::Text::Formatted::Arranger.new(@pdf)
-    @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+    @arranger = Prawn::Text::Formatted::Arranger.new(@pdf)
+    @line_wrap = Prawn::Text::Formatted::LineWrap.new
   end
   it "should return the number of spaces in the last wrapped line" do
     array = [{ :text => "hello world, " },
@@ -255,7 +266,7 @@ end
 describe "Core::Text::Formatted::LineWrap" do
   before(:each) do
     create_pdf
-    @arranger = Prawn::Core::Text::Formatted::Arranger.new(@pdf)
+    @arranger = Prawn::Text::Formatted::Arranger.new(@pdf)
     array = [{ :text => "hello\nworld\n\n\nhow are you?" },
              { :text => "\n" },
              { :text => "\n" },
@@ -265,7 +276,7 @@ describe "Core::Text::Formatted::LineWrap" do
              { :text => "\n" },
              { :text => "" }]
     @arranger.format_array = array
-    @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+    @line_wrap = Prawn::Text::Formatted::LineWrap.new
   end
   it "should only return an empty string if nothing fit or there" +
      "was nothing to wrap" do
@@ -285,8 +296,8 @@ end
 describe "Core::Text::Formatted::LineWrap#paragraph_finished?" do
   before(:each) do
     create_pdf
-    @arranger = Prawn::Core::Text::Formatted::Arranger.new(@pdf)
-    @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+    @arranger = Prawn::Text::Formatted::Arranger.new(@pdf)
+    @line_wrap = Prawn::Text::Formatted::LineWrap.new
     @one_word_width = 50
   end
   it "should be_false when the last printed line is not the end of the paragraph" do

data/spec/measurement_units_spec.rb

@@ -1,8 +1,8 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")           
+require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 require "prawn/measurement_extensions"
 
 describe "Measurement units" do
-  
+
   it "should convert units to PostScriptPoints" do
     1.mm.should be_within(0.000000001).of(2.834645669)
     1.mm.should == (72 / 25.4)
@@ -12,12 +12,12 @@ describe "Measurement units" do
     1.cm.should == 10 * 72 / 25.4
     1.dm.should == 100 * 72 / 25.4
     1.m.should == 1000 * 72 / 25.4
-    
+
     1.in.should == 72
     1.ft.should == 72 * 12
     1.yd.should == 72 * 12 * 3
     1.pt.should == 1
   end
-  
+
 end
-  
+

data/spec/outline_spec.rb

@@ -16,20 +16,20 @@ describe "Outline" do
       end
     end
   end
-  if RUBY_VERSION >= "1.9"
-    describe "outline encoding" do
-      it "should store all outline titles as UTF-16" do
-        render_and_find_objects
-        @hash.values.each do |obj|
-          if obj.is_a?(Hash) && obj[:Title]
-            title = obj[:Title].dup
-            title.force_encoding("UTF-16LE")
-            title.valid_encoding?.should == true
-          end
+
+  describe "outline encoding" do
+    it "should store all outline titles as UTF-16" do
+      render_and_find_objects
+      @hash.values.each do |obj|
+        if obj.is_a?(Hash) && obj[:Title]
+          title = obj[:Title].dup
+          title.force_encoding(Encoding::UTF_16LE)
+          title.valid_encoding?.should == true
         end
       end
     end
   end
+
   describe "#generate_outline" do
     before(:each) do
       render_and_find_objects
@@ -87,6 +87,28 @@ describe "Outline" do
 
   end
 
+  describe "adding a custom destination" do
+    before(:each) do
+      @pdf.start_new_page
+      @pdf.text "Page 3 with a destination"
+      @pdf.add_dest('customdest', @pdf.dest_xyz(200, 200))
+      pdf = @pdf
+      @pdf.outline.update do
+        page :destination => pdf.dest_xyz(200, 200), :title => 'Custom Destination'
+      end
+      render_and_find_objects
+    end
+
+    it "should create an outline item" do
+      @custom_dest.should_not be_nil
+    end
+
+    it "should reference the custom destination" do
+      referenced_object(@custom_dest[:Dest].first).should == referenced_object(@pages.last)
+    end
+
+  end
+
   describe "addding a section later with outline#section" do
     before(:each) do
       @pdf.start_new_page
@@ -120,11 +142,11 @@ describe "Outline" do
       @outline_root[:Count].should == 5
     end
 
-  end  
-  
-  describe "#outline.add_subsection_to" do  
+  end
+
+  describe "#outline.add_subsection_to" do
     context "positioned last" do
-    
+
       before(:each) do
         @pdf.start_new_page
         @pdf.text "Page 3. An added subsection "
@@ -133,45 +155,45 @@ describe "Outline" do
             section 'Added SubSection', :destination => 3 do
               page :destination => 3, :title => 'Added Page 3'
             end
-          end 
+          end
         end
         render_and_find_objects
       end
-    
+
       it "should add new outline items to document" do
         [@subsection, @added_page_3].each { |item| item.should_not be_nil}
       end
-    
+
       it "should reset the last item for parent item dictionary" do
         referenced_object(@section_1[:First]).should == @page_1
         referenced_object(@section_1[:Last]).should == @subsection
       end
-    
+
       it "should set the prev relation for the new subsection to its parent's old last item" do
         referenced_object(@subsection[:Prev]).should == @page_2
       end
-    
-    
+
+
       it "the subsection should become the next relation for its parent's old last item" do
          referenced_object(@page_2[:Next]).should == @subsection
        end
-    
+
       it "should set the first relation for the new subsection" do
         referenced_object(@subsection[:First]).should == @added_page_3
       end
-    
+
       it "should set the correct last relation of the added to section" do
         referenced_object(@subsection[:Last]).should == @added_page_3
       end
-    
+
       it "should increase the count of root outline dictionary" do
         @outline_root[:Count].should == 5
       end
-    
-    end  
-    
+
+    end
+
     context "positioned first" do
-    
+
       before(:each) do
         @pdf.start_new_page
         @pdf.text "Page 3. An added subsection "
@@ -193,7 +215,7 @@ describe "Outline" do
         referenced_object(@section_1[:First]).should == @subsection
         referenced_object(@section_1[:Last]).should == @page_2
       end
-    
+
       it "should set the next relation for the new subsection to its parent's old first item" do
         referenced_object(@subsection[:Next]).should == @page_1
       end
@@ -215,7 +237,7 @@ describe "Outline" do
       end
 
     end
-    
+
     it "should require an existing title" do
       lambda do
         @pdf.go_to_page 1
@@ -229,7 +251,7 @@ describe "Outline" do
         render_and_find_objects
       end.should raise_error(Prawn::Errors::UnknownOutlineTitle)
     end
-  end     
+  end
 
   describe "#outline.insert_section_after" do
     describe "inserting in the middle of another section" do
@@ -248,45 +270,45 @@ describe "Outline" do
         render_and_find_objects
         @inserted_page.should_not be_nil
       end
-      
+
       it "should adjust the count of all ancestors" do
         render_and_find_objects
         @outline_root[:Count].should == 4
         @section_1[:Count].abs.should == 3
       end
-       
+
       describe "#adjust_relations" do
-      
+
         it "should reset the sibling relations of adjoining items to inserted item" do
           render_and_find_objects
           referenced_object(@page_1[:Next]).should == @inserted_page
           referenced_object(@page_2[:Prev]).should == @inserted_page
         end
-      
+
         it "should set the sibling relation of added item to adjoining items" do
           render_and_find_objects
           referenced_object(@inserted_page[:Next]).should == @page_2
           referenced_object(@inserted_page[:Prev]).should == @page_1
         end
-      
+
         it "should not affect the first and last relations of parent item" do
           render_and_find_objects
           referenced_object(@section_1[:First]).should == @page_1
           referenced_object(@section_1[:Last]).should == @page_2
         end
-      
-      end 
-      
-      
-      context "when adding another section afterwards" do 
+
+      end
+
+
+      context "when adding another section afterwards" do
         it "should have reset the root position so that a new section is added at the end of root sections" do
           @pdf.start_new_page
           @pdf.text "Another Inserted Page"
           @pdf.outline.update do
             section 'Added Section' do
               page :destination => page_number, :title => "Inserted Page"
-            end 
-          end 
+            end
+          end
           render_and_find_objects
           referenced_object(@outline_root[:Last]).should == @section_2
           referenced_object(@section_1[:Next]).should == @section_2
@@ -305,7 +327,7 @@ describe "Outline" do
          @pdf.outline.update do
            insert_section_after 'Page 2' do
              page :destination => page_number, :title => "Inserted Page"
-           end 
+           end
          end
          render_and_find_objects
       end
@@ -357,7 +379,7 @@ describe "Outline" do
     end
   end
 end
-  
+
 describe "foreign character encoding" do
   before(:each) do
     pdf = Prawn::Document.new() do
@@ -374,24 +396,6 @@ describe "foreign character encoding" do
   end
 end
 
-describe "with optimize_objects option" do
-  before(:each) do
-    @pdf = Prawn::Document.new(:optimize_objects => true) do
-      outline.define do
-        section 'Chapter 1', :destination => 1, :closed => true do
-          page :destination => 1, :title => 'Page 1'
-        end
-      end
-    end
-    render_and_find_objects
-  end
-
-  it "should generate an outline" do
-    @section_1.should_not be_nil
-    @page_1.should_not be_nil
-  end
-end
-
 def render_and_find_objects
   output = StringIO.new(@pdf.render, 'r+')
   @hash = PDF::Reader::ObjectHash.new(output)
@@ -402,9 +406,10 @@ def render_and_find_objects
   @page_2 = find_by_title('Page 2')
   @section_2 = find_by_title('Added Section')
   @page_3 = find_by_title('Page 3')
-  @inserted_page = find_by_title('Inserted Page') 
+  @inserted_page = find_by_title('Inserted Page')
   @subsection = find_by_title('Added SubSection')
   @added_page_3 = find_by_title('Added Page 3')
+  @custom_dest = find_by_title('Custom Destination')
 end
 
 # Outline titles are stored as UTF-16. This method accepts a UTF-8 outline title
@@ -423,4 +428,3 @@ end
 def referenced_object(reference)
   @hash[reference]
 end
-

data/spec/png_spec.rb

@@ -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.binread(@data_filename)
+    data = Zlib::Inflate.inflate(File.binread(@data_filename))
     png.img_data.should == data
   end
 end
@@ -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.binread(@data_filename)
+    data = Zlib::Inflate.inflate(File.binread(@data_filename))
     png.img_data.should == data
   end
 end
@@ -103,16 +103,16 @@ end
 describe "When reading an indexed color PNG file (color type 3)" do
 
   before(:each) do
-    @filename = "#{Prawn::DATADIR}/images/rails.png"
-    @data_filename = "#{Prawn::DATADIR}/images/rails.dat"
+    @filename = "#{Prawn::DATADIR}/images/indexed_color.png"
+    @data_filename = "#{Prawn::DATADIR}/images/indexed_color.dat"
     @img_data = File.binread(@filename)
   end
 
   it "should read the attributes from the header chunk correctly" do
     png = Prawn::Images::PNG.new(@img_data)
 
-    png.width.should == 50
-    png.height.should == 64
+    png.width.should == 150
+    png.height.should == 200
     png.bits.should == 8
     png.color_type.should == 3
     png.compression_method.should == 0
@@ -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.binread(@data_filename)
+    data = Zlib::Inflate.inflate(File.binread(@data_filename))
     png.img_data.should == data
   end
 end
@@ -131,7 +131,7 @@ describe "When reading a greyscale+alpha PNG file (color type 4)" do
 
   before(:each) do
     @filename = "#{Prawn::DATADIR}/images/page_white_text.png"
-    @data_filename = "#{Prawn::DATADIR}/images/page_white_text.dat"
+    @color_data_filename = "#{Prawn::DATADIR}/images/page_white_text.color"
     @alpha_data_filename = "#{Prawn::DATADIR}/images/page_white_text.alpha"
     @img_data = File.binread(@filename)
   end
@@ -151,7 +151,7 @@ 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)
     png.split_alpha_channel!
-    data = File.binread(@data_filename)
+    data = File.binread(@color_data_filename)
     png.img_data.should == data
   end
 
@@ -167,7 +167,7 @@ describe "When reading an RGB+alpha PNG file (color type 6)" do
 
   before(:each) do
     @filename = "#{Prawn::DATADIR}/images/dice.png"
-    @data_filename = "#{Prawn::DATADIR}/images/dice.dat"
+    @color_data_filename = "#{Prawn::DATADIR}/images/dice.color"
     @alpha_data_filename = "#{Prawn::DATADIR}/images/dice.alpha"
     @img_data = File.binread(@filename)
   end
@@ -187,18 +187,15 @@ 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)
     png.split_alpha_channel!
-    data = File.binread(@data_filename)
-    # compare decompressed rather than compressed image data
-    # because JRuby's implementation of Zlib is different from MRI --
-    #   both generate valid gzipped data, but not bit-identical to each other
-    Zlib::Inflate.inflate(png.img_data).should == Zlib::Inflate.inflate(data)
+    data = File.binread(@color_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)
     png.split_alpha_channel!
     data = File.binread(@alpha_data_filename)
-    Zlib::Inflate.inflate(png.alpha_channel).should == Zlib::Inflate.inflate(data)
+    png.alpha_channel.should == data
   end
 end
 
@@ -206,7 +203,7 @@ describe "When reading a 16bit RGB+alpha PNG file (color type 6)" do
 
   before(:each) do
     @filename = "#{Prawn::DATADIR}/images/16bit.png"
-    @data_filename = "#{Prawn::DATADIR}/images/16bit.dat"
+    @color_data_filename = "#{Prawn::DATADIR}/images/16bit.color"
     # alpha channel truncated to 8-bit
     @alpha_data_filename = "#{Prawn::DATADIR}/images/16bit.alpha"
     @img_data = File.binread(@filename)
@@ -227,7 +224,7 @@ describe "When reading a 16bit 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)
     png.split_alpha_channel!
-    data = File.binread(@data_filename)
+    data = File.binread(@color_data_filename)
     png.img_data.should == data
   end