prawn 0.13.0 → 0.14.0

data/lib/prawn/text/formatted/line_wrap.rb

@@ -119,7 +119,7 @@ module Prawn
             "[#{whitespace}]+|" +
             "#{hyphen}+[^#{break_chars}]*|" +
             "#{soft_hyphen}"
-          new_regexp(pattern)
+          Regexp.new(pattern)
         end
 
         # The pattern used to determine whether any word breaks exist on a
@@ -127,7 +127,7 @@ module Prawn
         # word breaking is needed
         #
         def word_division_scan_pattern
-          new_regexp("\\s|[#{zero_width_space}#{soft_hyphen}#{hyphen}]")
+          Regexp.new("\\s|[#{zero_width_space}#{soft_hyphen}#{hyphen}]")
         end
 
         def break_chars
@@ -241,18 +241,9 @@ module Prawn
         end
 
         def wrap_by_char(segment)
-          # this conditional is only necessary for Ruby 1.8 compatibility
-          # String#unicode_characters is a helper which iterates over UTF-8 characters
-          #   under Ruby 1.9, it is implemented simply by aliasing #each_char
           font = @document.font
-          if font.unicode?
-            segment.unicode_characters do |char|
-              break unless append_char(char,font)
-            end
-          else
-            segment.each_char do |char|
-              break unless append_char(char,font)
-            end
+          segment.each_char do |char|
+            break unless append_char(char,font)
           end
         end
 
@@ -268,18 +259,6 @@ module Prawn
             false
           end
         end
-
-        def new_regexp(pattern)
-          regexp = ruby_19 {
-            Regexp.new(pattern)
-          }
-          regexp = regexp || ruby_18 {
-            lang = @document.font.unicode? ? 'U' : 'N'
-            Regexp.new(pattern, 0, lang)
-          }
-          regexp
-        end
-
       end
     end
   end

data/lib/prawn/text/formatted/wrap.rb

@@ -87,10 +87,7 @@ module Prawn
             accumulated_width += fragment_this_line.width
           end
 
-          if "".respond_to?(:force_encoding)
-            printed_fragments.map! { |s| s.force_encoding("utf-8") }
-          end
-          @printed_lines << printed_fragments.join
+          @printed_lines << printed_fragments.map { |s| s.force_encoding(::Encoding::UTF_8) }.join
         end
 
         def word_spacing_for_this_line

data/lib/prawn.rb

@@ -20,7 +20,7 @@ end
 require "set"
 
 module Prawn
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 
   extend self
 
@@ -73,7 +73,6 @@ module Prawn
   end
 end
 
-require_relative "prawn/compatibility"
 require_relative "prawn/errors"
 
 require_relative "pdf/core"

data/manual/document_and_page_options/document_and_page_options.rb

@@ -14,7 +14,8 @@ Prawn::Example.generate("document_and_page_options.pdf",
     p.example "page_margins", :eval_source => false, :full_source => true
     p.example "background",   :eval_source => false, :full_source => true
     p.example "metadata",     :eval_source => false, :full_source => true
-    
+    p.example "print_scaling",:eval_source => false, :full_source => true
+
     p.intro do
       prose("So far we've already seen how to create new documents and start new pages. This chapter expands on the previous examples by showing other options avialable. Some of the options are only available when creating new documents.
 

data/manual/document_and_page_options/metadata.rb

@@ -2,6 +2,7 @@
 #
 # To set the document metadata just pass a hash to the <code>:info</code>
 # option when creating new documents.
+# The keys in the example below are arbitrary, so you may add whatever keys you want
 #
 require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))
@@ -14,10 +15,9 @@ Prawn::Document.generate("metadata.pdf",
     :Keywords     => "test metadata ruby pdf dry",
     :Creator      => "ACME Soft App", 
     :Producer     => "Prawn",
-    :CreationDate => Time.now,
-    :Grok         => "Test Property"
+    :CreationDate => Time.now
   }) do
   
   text "This is a test of setting metadata properties via the info option."
-  text "It allows one to specify non standard properties like 'Grok'."
+  text "While the keys are arbitrary, the above example sets common attributes."
 end

data/manual/document_and_page_options/print_scaling.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+#
+# (Optional; PDF 1.6) The page scaling option to be selected when a print dialog is displayed for this document.
+# Valid values are <code>None</code>, which indicates that the print dialog should reflect no page scaling,
+# and <code>AppDefault</code>, which indicates that applications should use the current print scaling.
+# If this entry has an unrecognized value, applications should use the current print scaling.
+# Default value: <code>AppDefault</code>.
+#
+# Note: If the print dialog is suppressed and its parameters are provided directly by the application, the value of this entry should still be used.
+#
+
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
+
+Prawn::Document.generate("print_scaling.pdf",
+                         :page_layout => :landscape,
+                         :print_scaling => :none
+) do
+  text "When you print this document, the scale to fit in print preview should be disabled by default."
+end

data/manual/example_file.rb

@@ -103,13 +103,8 @@ module Prawn
     def read_file(folder_name, filename)
       data = File.read(File.expand_path(File.join(
         File.dirname(__FILE__), folder_name, filename)))
-      
-      # XXX If we ever have manual files with source encodings other than
-      # UTF-8, we will need to fix this to work on Ruby 1.9.
-      if data.respond_to?(:encode!)
-        data.encode!("UTF-8")
-      end
-      data
+
+      data.encode(::Encoding::UTF_8)
     end
     
   end

data/manual/manual/cover.rb

@@ -27,8 +27,9 @@ Prawn::Example.generate(filename) do
   #commit = `git show --pretty=%H`
   #short git commit hash
   commit = `git show --pretty=%h`
-  formatted_text_box([  {:text => "Last Update: #{Time.now.strftime("%Y-%m-%d")}\n
-                                   git commit: #{commit}",
+  formatted_text_box([  {:text => "Last Update: #{Time.now.strftime("%Y-%m-%d")}\n"+
+                                  "Prawn Version: #{Prawn::VERSION}\n"+
+                                  "git commit: #{commit}",
                          :size => 12}
                     ],   :at => [390, cursor - 620])
   

data/manual/manual/manual.rb

@@ -3,7 +3,7 @@
 # Generates the Prawn by example manual.
 #
 
-Encoding.default_external = "UTF-8" if defined? Encoding
+Encoding.default_external = Encoding::UTF_8
 
 require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))
@@ -30,6 +30,5 @@ Prawn::Example.generate("manual.pdf",
   load_package "document_and_page_options"
   load_package "outline"
   load_package "repeatable_content"
-  load_package "templates"
   load_package "security"
 end

data/prawn.gemspec

@@ -8,25 +8,29 @@ Gem::Specification.new do |spec|
                 Dir.glob("data/fonts/{MustRead.html,*.afm}") +
                 ["data/shift_jis_text.txt"] +
                 ["Rakefile", "prawn.gemspec", "Gemfile",
-                 "COPYING", "LICENSE", "GPLv2", "GPLv3"]
+                 "COPYING", "LICENSE", "GPLv2", "GPLv3",
+                 ".yardopts"]
   spec.require_path = "lib"
   spec.required_ruby_version = '>= 1.9.3'
   spec.required_rubygems_version = ">= 1.3.6"
 
   spec.test_files = Dir[ "spec/*_spec.rb" ]
-  spec.extra_rdoc_files = %w{README.md LICENSE COPYING GPLv2 GPLv3}
-  spec.rdoc_options << '--title' << 'Prawn Documentation' <<
-                       '--main'  << 'README.md' << '-q'
   spec.authors = ["Gregory Brown","Brad Ediger","Daniel Nelson","Jonathan Greenberg","James Healy"]
   spec.email = ["gregory.t.brown@gmail.com","brad@bradediger.com","dnelson@bluejade.com","greenberg@entryway.net","jimmy@deefa.com"]
   spec.rubyforge_project = "prawn"
+  spec.licenses = ['RUBY', 'GPL-2', 'GPL-3']
+
   spec.add_dependency('pdf-reader', '~>1.2')
   spec.add_dependency('ttfunk', '~>1.0.3')
   spec.add_dependency('ruby-rc4')
-  spec.add_dependency('afm')
+
   spec.add_development_dependency('pdf-inspector', '~> 1.1.0')
   spec.add_development_dependency('coderay', '~> 1.0.7')
-  spec.add_development_dependency('rdoc')
+  spec.add_development_dependency('yard')
+  spec.add_development_dependency('rspec')
+  spec.add_development_dependency('mocha')
+  spec.add_development_dependency('rake')
+
   spec.homepage = "http://prawn.majesticseacreature.com"
   spec.description = <<END_DESC
   Prawn is a fast, tiny, and nimble PDF generator for Ruby

data/spec/bounding_box_spec.rb

@@ -378,6 +378,18 @@ describe "A canvas" do
     end
     @pdf.y.should == 450
   end
+
+  it "should restore the original ypos after execution", :issue => 523 do
+    doc = Prawn::Document.new(:skip_page_creation => true)
+    doc.start_new_page
+
+    original_ypos = doc.y
+
+    doc.canvas {}
+
+    doc.y.should == original_ypos
+  end
+
 end
 
 describe "Deep-copying" do

data/spec/column_box_spec.rb

@@ -30,4 +30,36 @@ describe "A column box" do
         @pdf.bounds.right.should == 500
       end
   end
+
+  it "does not reset the top margin on a new page by default" do
+    create_pdf
+    page_top = @pdf.cursor
+    @pdf.move_down 50
+    init_column_top = @pdf.cursor
+    @pdf.column_box [0, @pdf.cursor], :width => 500,
+      :height => 200, :columns => 2 do
+
+        @pdf.bounds.move_past_bottom
+        @pdf.bounds.move_past_bottom
+
+        @pdf.bounds.absolute_top.should == init_column_top
+        @pdf.bounds.absolute_top.should_not == page_top
+      end
+  end
+
+  it "does reset the top margin when reflow_margins is set" do
+    create_pdf
+    page_top = @pdf.cursor
+    @pdf.move_down 50
+    init_column_top = @pdf.cursor
+    @pdf.column_box [0, @pdf.cursor], :width => 500, :reflow_margins => true,
+      :height => 200, :columns => 2 do
+
+        @pdf.bounds.move_past_bottom
+        @pdf.bounds.move_past_bottom
+
+        @pdf.bounds.absolute_top.should == page_top 
+        @pdf.bounds.absolute_top.should_not == init_column_top
+      end
+  end
 end

data/spec/document_spec.rb

@@ -447,13 +447,11 @@ describe "The group() feature" do
 end
 
 describe "The render() feature" do
-  if "spec".respond_to?(:encode!)
-    it "should return a 8 bit encoded string on a m17n aware VM" do
-      @pdf = Prawn::Document.new(:page_size => "A4", :page_layout => :landscape)
-      @pdf.line [100,100], [200,200]
-      str = @pdf.render
-      str.encoding.to_s.should == "ASCII-8BIT"
-    end
+  it "should return a 8 bit encoded string on a m17n aware VM" do
+    @pdf = Prawn::Document.new(:page_size => "A4", :page_layout => :landscape)
+    @pdf.line [100,100], [200,200]
+    str = @pdf.render
+    str.encoding.to_s.should == "ASCII-8BIT"
   end
 
   it "should trigger before_render callbacks just before rendering" do

data/spec/extensions/encoding_helpers.rb

@@ -1,10 +1,9 @@
 module EncodingHelpers
   def win1252_string(str)
-    ruby_19 { str.force_encoding("Windows-1252") }
-    str
+    str.force_encoding(Encoding::Windows_1252)
   end
 
   def bin_string(str)
-    ruby_19 { str.force_encoding("ASCII-8BIT") } || ruby_18 { str }
+    str.force_encoding(Encoding::ASCII_8BIT)
   end
 end

data/spec/filters_spec.rb

@@ -3,7 +3,7 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
 FILTERS = {
-  :FlateDecode    => {'test' => ruby_19 { "x\x9C+I-.\x01\x00\x04]\x01\xC1".force_encoding(Encoding::ASCII_8BIT) } || "x\x9C+I-.\x01\x00\x04]\x01\xC1" },
+  :FlateDecode    => {'test' => "x\x9C+I-.\x01\x00\x04]\x01\xC1".force_encoding(Encoding::ASCII_8BIT) },
   :DCTDecode      => {'test' => "test"}
 }
 

data/spec/font_spec.rb

@@ -80,8 +80,9 @@ describe "#width_of" do
     styled_bold_hello.should == @bold_hello
   end
 
-  # This is not a fully confirmed bug report... needs further investigation
-  it "should not treat minus as if it were a hyphen", :unresolved, :issue => 578 do
+  it "should not treat minus as if it were a hyphen", :issue => 578 do
+    create_pdf
+
     @pdf.width_of("-0.75").should be < @pdf.width_of("25.00")
   end
 end

data/spec/formatted_text_box_spec.rb

@@ -20,19 +20,17 @@ describe "Text::Formatted::Box wrapping" do
 
   it "should not raise an Encoding::CompatibilityError when keeping a TTF and an " +
     "AFM font together" do
-    ruby_19 do
-      file = "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
-      @pdf.font_families["Kai"] = {
-        :normal => { :file => file, :font => "Kai" }
-      }
+    file = "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
+    @pdf.font_families["Kai"] = {
+      :normal => { :file => file, :font => "Kai" }
+    }
 
-      texts = [{ :text => "Hello " },
-               { :text => "再见", :font => "Kai"},
-               { :text => "World" }]
-      text_box = Prawn::Text::Formatted::Box.new(texts, :document => @pdf, :width => @pdf.width_of("Hello World"))
+    texts = [{ :text => "Hello " },
+              { :text => "再见", :font => "Kai"},
+              { :text => "World" }]
+    text_box = Prawn::Text::Formatted::Box.new(texts, :document => @pdf, :width => @pdf.width_of("Hello World"))
 
-      text_box.render
-    end
+    text_box.render
   end
 
   it "should wrap between two fragments when the preceding fragment ends with white space" do
@@ -86,23 +84,14 @@ describe "Text::Formatted::Box wrapping" do
 
   describe "Unicode" do
     before do
-      if RUBY_VERSION < '1.9'
-        @reset_value = $KCODE
-        $KCODE='u'
-      else
-        @reset_value = [Encoding.default_external, Encoding.default_internal]
-        Encoding.default_external = Encoding::UTF_8
-        Encoding.default_internal = Encoding::UTF_8
-      end
+      @reset_value = [Encoding.default_external, Encoding.default_internal]
+      Encoding.default_external = Encoding::UTF_8
+      Encoding.default_internal = Encoding::UTF_8
     end
 
     after do
-      if RUBY_VERSION < '1.9'
-        $KCODE=@reset_value
-      else
-        Encoding.default_external = @reset_value[0]
-        Encoding.default_internal = @reset_value[1]
-      end
+      Encoding.default_external = @reset_value[0]
+      Encoding.default_internal = @reset_value[1]
     end
 
     it "should properly handle empty slices using Unicode encoding" do

data/spec/graphics_spec.rb

@@ -478,6 +478,24 @@ describe "When using graphics states" do
       @pdf.restore_graphics_state
     }.should raise_error(PDF::Core::Errors::EmptyGraphicStateStack)
   end
+
+  it "should copy mutable attributes when passing a previous_state to the initializer" do
+    new_state = PDF::Core::GraphicState.new(@pdf.graphic_state)
+
+    [:color_space, :dash, :fill_color, :stroke_color].each do |attr|
+      new_state.send(attr).should == @pdf.graphic_state.send(attr)
+      new_state.send(attr).should_not equal(@pdf.graphic_state.send(attr))
+    end
+  end
+
+  it "should copy mutable attributes when duping" do
+    new_state = @pdf.graphic_state.dup
+
+    [:color_space, :dash, :fill_color, :stroke_color].each do |attr|
+      new_state.send(attr).should == @pdf.graphic_state.send(attr)
+      new_state.send(attr).should_not equal(@pdf.graphic_state.send(attr))
+    end
+  end
 end
 
 describe "When using transformation matrix" do

data/spec/image_handler_spec.rb

@@ -28,6 +28,18 @@ describe "ImageHandler" do
     handler.should == handler_b
   end
 
+  it "can unregister a handler" do
+    handler_b.expects(:can_render? => true)
+
+    image_handler.register(handler_a)
+    image_handler.register(handler_b)
+
+    image_handler.unregister(handler_a)
+
+    handler = image_handler.find('arbitrary blob')
+    handler.should == handler_b
+  end
+
   it "raises an error when no matching handler is found" do
     handler_a.expects(:can_render? => false)
     handler_b.expects(:can_render? => false)

data/spec/images_spec.rb

@@ -83,16 +83,12 @@ describe "the image() function" do
     @pdf.state.version.should >= 1.5
   end
 
-  # 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
+  it "should embed 16-bit alpha channels for 16-bit PNGs" do
     @pdf.image "#{Prawn::DATADIR}/images/16bit.png"
 
     output = @pdf.render
     output.should =~ /\/BitsPerComponent 16/
-    output.should =~ /\/BitsPerComponent 8/
+    output.should_not =~ /\/BitsPerComponent 8/
   end
 
   it "should flow an image to a new page if it will not fit on a page" do

data/spec/line_wrap_spec.rb

@@ -113,7 +113,7 @@ 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")
@@ -202,7 +202,7 @@ 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")

data/spec/object_store_spec.rb

@@ -82,6 +82,12 @@ 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

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

data/spec/png_spec.rb

@@ -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,14 +151,14 @@ 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 = Zlib::Inflate.inflate(File.binread(@data_filename))
+    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 = Zlib::Inflate.inflate(File.binread(@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
 
   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,17 +187,14 @@ 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 = Zlib::Inflate.inflate(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
+    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 = Zlib::Inflate.inflate(File.binread(@alpha_data_filename))
+    data = File.binread(@alpha_data_filename)
     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,14 +224,14 @@ 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 = Zlib::Inflate.inflate(File.binread(@data_filename))
+    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 = Zlib::Inflate.inflate(File.binread(@alpha_data_filename))
+    data = File.binread(@alpha_data_filename)
     png.alpha_channel.should == data
   end
 end