prawn 0.11.1 → 0.15.0

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
@@ -30,7 +30,7 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
                                  :document => @pdf)
     string.should == "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
   end
-  it "should raise CannotFit if a too-small width is given" do
+  it "should raise_error CannotFit if a too-small width is given" do
     array = [{ :text => " hello world, " },
              { :text => "goodbye  ", :style => [:bold] }]
     @arranger.format_array = array
@@ -38,7 +38,7 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
       @line_wrap.wrap_line(:arranger => @arranger,
                            :width => 1,
                            :document => @pdf)
-    end.should.raise(Prawn::Errors::CannotFit)
+    end.should raise_error(Prawn::Errors::CannotFit)
   end
 
   it "should break on space" do
@@ -51,7 +51,7 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
   end
 
   it "should break on zero-width space" do
-    @pdf.font("#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf")
+    @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
     array = [{ :text => "hello#{Prawn::Text::ZWSP}world" }]
     @arranger.format_array = array
     string = @line_wrap.wrap_line(:arranger => @arranger,
@@ -61,7 +61,7 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
   end
 
   it "should not display zero-width space" do
-    @pdf.font("#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf")
+    @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
     array = [{ :text => "hello#{Prawn::Text::ZWSP}world" }]
     @arranger.format_array = array
     string = @line_wrap.wrap_line(:arranger => @arranger,
@@ -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::BASEDIR}/data/fonts/DejaVuSans.ttf")
-    @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+    @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
+    @line_wrap = Prawn::Text::Formatted::LineWrap.new
 
     string = "hello#{Prawn::Text::SHY}world"
     array = [{ :text => string }]
@@ -137,8 +137,8 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
                                   :document => @pdf)
     string.should == "helloworld"
 
-    @pdf.font("#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf")
-    @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+    @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
+    @line_wrap = Prawn::Text::Formatted::LineWrap.new
 
     string = "hello#{Prawn::Text::SHY}world"
     array = [{ :text => string }]
@@ -166,8 +166,8 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
                                   :document => @pdf)
     string.should == "hello"
 
-    @pdf.font("#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf")
-    @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+    @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
+    @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::BASEDIR}/data/fonts/DejaVuSans.ttf")
-    @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+    @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
+    @line_wrap = Prawn::Text::Formatted::LineWrap.new
 
     string = "hello#{Prawn::Text::SHY}-"
     array = [{ :text => string }]
@@ -229,8 +229,8 @@ 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 +255,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 +265,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
@@ -273,23 +273,23 @@ describe "Core::Text::Formatted::LineWrap" do
       line = @line_wrap.wrap_line(:arranger => @arranger,
                                  :width => 200,
                                  :document => @pdf)
-      line.should.not.be.empty
+      line.should_not be_empty
     end
     line = @line_wrap.wrap_line(:arranger => @arranger,
                                :width => 200,
                                :document => @pdf)
-    line.should.be.empty
+    line.should be_empty
   end
 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
+  it "should be_false when the last printed line is not the end of the paragraph" do
     array = [{ :text => "hello world" }]
     @arranger.format_array = array
     string = @line_wrap.wrap_line(:arranger => @arranger,
@@ -298,7 +298,7 @@ describe "Core::Text::Formatted::LineWrap#paragraph_finished?" do
 
     @line_wrap.paragraph_finished?.should == false
   end
-  it "should be true when the last printed line is the last fragment to print" do
+  it "should be_true when the last printed line is the last fragment to print" do
     array = [{ :text => "hello world" }]
     @arranger.format_array = array
     string = @line_wrap.wrap_line(:arranger => @arranger,
@@ -310,7 +310,7 @@ describe "Core::Text::Formatted::LineWrap#paragraph_finished?" do
 
     @line_wrap.paragraph_finished?.should == true
   end
-  it "should be true when a newline exists on the current line" do
+  it "should be_true when a newline exists on the current line" do
     array = [{ :text => "hello\n world" }]
     @arranger.format_array = array
     string = @line_wrap.wrap_line(:arranger => @arranger,
@@ -319,7 +319,7 @@ describe "Core::Text::Formatted::LineWrap#paragraph_finished?" do
 
     @line_wrap.paragraph_finished?.should == true
   end
-  it "should be true when a newline exists in the next fragment" do
+  it "should be_true when a newline exists in the next fragment" do
     array = [{ :text => "hello " },
              { :text => " \n" },
              { :text => "world" }]

data/spec/measurement_units_spec.rb

@@ -1,10 +1,10 @@
-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.close(2.834645669, 0.000000001)
+    1.mm.should be_within(0.000000001).of(2.834645669)
     1.mm.should == (72 / 25.4)
     2.mm.should == (2 * 72 / 25.4)
     3.mm.should == 3 * 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/object_store_spec.rb

@@ -4,60 +4,18 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
 describe "Prawn::ObjectStore" do
   before(:each) do
-    @store = Prawn::Core::ObjectStore.new
+    @store = PDF::Core::ObjectStore.new
   end
 
   it "should create required roots by default, including info passed to new" do
-    store = Prawn::Core::ObjectStore.new(:info => {:Test => 3})
+    store = PDF::Core::ObjectStore.new(:info => {:Test => 3})
     store.size.should == 3 # 3 default roots
     store.info.data[:Test].should == 3
     store.pages.data[:Count].should == 0
     store.root.data[:Pages].should == store.pages
   end
 
-  it "should import objects from an existing PDF" do
-    filename = "#{Prawn::BASEDIR}/reference_pdfs/curves.pdf"
-    store = Prawn::Core::ObjectStore.new(:template => filename)
-    store.size.should == 5
-  end
-
-  it "should point to existing roots when importing objects from an existing PDF" do
-    filename = "#{Prawn::BASEDIR}/reference_pdfs/curves.pdf"
-    store = Prawn::Core::ObjectStore.new(:template => filename)
-    store.info.class.should == Prawn::Core::Reference
-    store.root.class.should == Prawn::Core::Reference
-  end
-
-  it "should initialize with pages when importing objects from an existing PDF" do
-    filename = "#{Prawn::BASEDIR}/reference_pdfs/curves.pdf"
-    store = Prawn::Core::ObjectStore.new(:template => filename)
-    store.pages.data[:Count].should == 1
-  end
-
-  it "should import all objects from a PDF that has an indirect reference in a stream dict" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/indirect_reference.pdf"
-    store = Prawn::Core::ObjectStore.new(:template => filename)
-    store.size.should == 8
-  end
-
-  it "should raise ArgumentError when given a file that doesn exist as a template" do
-    filename = "not_really_there.pdf"
-
-    lambda { Prawn::Core::ObjectStore.new(:template => filename) }.should.raise(ArgumentError)
-  end
-
-  it "should raise Prawn::Errors::TemplateError when given a non PDF as a template" do
-    filename = "#{Prawn::BASEDIR}/data/images/dice.png"
-
-    lambda { Prawn::Core::ObjectStore.new(:template => filename) }.should.raise(Prawn::Errors::TemplateError)
-  end
-
-  it "should raise Prawn::Errors::TemplateError when given an encrypted PDF as a template" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/encrypted.pdf"
-
-    lambda { Prawn::Core::ObjectStore.new(:template => filename) }.should.raise(Prawn::Errors::TemplateError)
-  end
-
+ 
   it "should add to its objects when ref() is called" do
     count = @store.size
     @store.ref("blah")
@@ -65,7 +23,7 @@ describe "Prawn::ObjectStore" do
   end
 
   it "should accept push with a Prawn::Reference" do
-    r = Prawn::Core::Reference(123, "blah")
+    r = PDF::Core::Reference(123, "blah")
     @store.push(r)
     @store[r.identifier].should == r
   end
@@ -82,11 +40,17 @@ describe "Prawn::ObjectStore" do
     end
     @store.map{|ref| ref.identifier}[-3..-1].should == [10, 11, 12]
   end
+
+  it "should accept option to disabling PDF scaling in PDF clients" do
+    @store = PDF::Core::ObjectStore.new(:print_scaling => :none)
+    @store.root.data[:ViewerPreferences].should == {:PrintScaling => :None}
+  end
+
 end
 
 describe "Prawn::ObjectStore#compact" do
   it "should do nothing to an ObjectStore with all live refs" do
-    store = Prawn::Core::ObjectStore.new
+    store = PDF::Core::ObjectStore.new
     store.info.data[:Blah] = store.ref(:some => "structure")
     old_size = store.size
     store.compact
@@ -95,76 +59,23 @@ describe "Prawn::ObjectStore#compact" do
   end
 
   it "should remove dead objects, renumbering live objects from 1" do
-    store = Prawn::Core::ObjectStore.new
+    store = PDF::Core::ObjectStore.new
     store.ref(:some => "structure")
     old_size = store.size
     store.compact
-    
-    store.size.should.be < old_size
+
+    store.size.should be < old_size
     store.map{ |o| o.identifier }.should == (1..store.size).to_a
   end
 
   it "should detect and remove dead objects that were once live" do
-    store = Prawn::Core::ObjectStore.new
+    store = PDF::Core::ObjectStore.new
     store.info.data[:Blah] = store.ref(:some => "structure")
     store.info.data[:Blah] = :overwritten
     old_size = store.size
     store.compact
-    
-    store.size.should.be < old_size
-    store.map{ |o| o.identifier }.should == (1..store.size).to_a
-  end
-end
-
-describe "Prawn::ObjectStorie#object_id_for_page" do
-  it "should return the object ID of an imported template page" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/hexagon.pdf"
-    store = Prawn::Core::ObjectStore.new(:template => filename)
-    store.object_id_for_page(0).should == 4
-  end
-
-  it "should return the object ID of the first imported template page" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/two_hexagons.pdf"
-    store = Prawn::Core::ObjectStore.new(:template => filename)
-    store.object_id_for_page(1).should == 4
-  end
-
-  it "should return the object ID of the last imported template page" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/two_hexagons.pdf"
-    store = Prawn::Core::ObjectStore.new(:template => filename)
-    store.object_id_for_page(-1).should == 6
-  end
 
-  it "should return the object ID of the first page of a template that uses nested Pages" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/nested_pages.pdf"
-    store = Prawn::Core::ObjectStore.new(:template => filename)
-    store.object_id_for_page(1).should == 5
-  end
-
-  it "should return the object ID of the last page of a template that uses nested Pages" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/nested_pages.pdf"
-    store = Prawn::Core::ObjectStore.new(:template => filename)
-    store.object_id_for_page(-1).should == 8
-  end
-
-  it "should return nil if given an invalid page number" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/hexagon.pdf"
-    store = Prawn::Core::ObjectStore.new(:template => filename)
-    store.object_id_for_page(10).should == nil
-  end
-
-  it "should return nil if given an invalid page number" do
-    store = Prawn::Core::ObjectStore.new
-    store.object_id_for_page(10).should == nil
-  end
-
-  it "should accept a stream instead of a filename" do
-    example = Prawn::Document.new()
-    example.text "An example doc, created in memory"
-    example.start_new_page
-    StringIO.open(example.render) do |stream|
-      @pdf = Prawn::Core::ObjectStore.new(:template => stream)
-    end
-    @pdf.page_count.should == 2
+    store.size.should be < old_size
+    store.map{ |o| o.identifier }.should == (1..store.size).to_a
   end
 end