prawn 0.13.0 → 0.13.1

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

@@ -52,11 +52,7 @@ module Prawn
             raise "Lines must be finalized before calling #line"
           end
           @fragments.collect do |fragment|
-            if ruby_18 { true }
-              fragment.text
-            else
-              fragment.text.dup.force_encoding("utf-8")
-            end
+            fragment.text.dup.force_encoding(::Encoding::UTF_8)
           end.join
         end
 

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

@@ -392,7 +392,7 @@ module Prawn
           # all fonts
           fallback_fonts << fragment_font
 
-          hash[:text].unicode_characters do |char|
+          hash[:text].each_char do |char|
             @document.font(fragment_font)
             font_glyph_pairs << [find_font_for_this_glyph(char,
                                                           @document.font.family,

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

@@ -212,11 +212,7 @@ module Prawn
           end
           case direction
           when :rtl
-            if ruby_18 { true }
-              string.scan(/./mu).reverse.join
-            else
-              string.reverse
-            end
+            string.reverse
           else
             string
           end
@@ -232,11 +228,9 @@ module Prawn
 
         def process_soft_hyphens(string)
           if string.length > 0 && normalized_soft_hyphen
-            ruby_19 {
-              if string.encoding != normalized_soft_hyphen.encoding
-                string.force_encoding(normalized_soft_hyphen.encoding)
-              end
-            }
+            if string.encoding != normalized_soft_hyphen.encoding
+              string.force_encoding(normalized_soft_hyphen.encoding)
+            end
             string[0..-2].gsub(normalized_soft_hyphen, "") + string[-1..-1]
           else
             string
@@ -244,7 +238,7 @@ module Prawn
         end
 
         def strip_zero_width_spaces(string)
-          if !"".respond_to?(:encoding) || string.encoding.to_s == "UTF-8"
+          if string.encoding == ::Encoding::UTF_8
             string.gsub(Prawn::Text::ZWSP, "")
           else
             string

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/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/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]))

data/prawn.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   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')

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/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/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

data/spec/text_at_spec.rb

@@ -98,33 +98,18 @@ describe "#draw_text" do
     text.strings.first.should == str
   end
 
-  if "spec".respond_to?(:encode!)
-    # Handle non utf-8 string encodings in a sane way on M17N aware VMs
-    it "should raise_error an exception when a utf-8 incompatible string is rendered" do
-      str = "Blah \xDD"
-      str.force_encoding("ASCII-8BIT")
-      lambda { @pdf.draw_text(str, :at => [0, 0]) }.should raise_error(
-        Prawn::Errors::IncompatibleStringEncoding)
-    end
+  it "should raise_error an exception when a utf-8 incompatible string is rendered" do
+    str = "Blah \xDD"
+    str.force_encoding(Encoding::ASCII_8BIT)
+    lambda { @pdf.draw_text(str, :at => [0, 0]) }.should raise_error(
+      Prawn::Errors::IncompatibleStringEncoding)
+  end
 
-    it "should not raise an exception when a shift-jis string is rendered" do
-      datafile = "#{Prawn::DATADIR}/shift_jis_text.txt"
-      sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets }
-      @pdf.font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf")
+  it "should not raise an exception when a shift-jis string is rendered" do
+    datafile = "#{Prawn::DATADIR}/shift_jis_text.txt"
+    sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets }
+    @pdf.font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf")
 
-      @pdf.draw_text(sjis_str, :at => [0, 0])
-    end
-  else
-    # Handle non utf-8 string encodings in a sane way on non-M17N aware VMs
-    it "should raise_error an exception when a corrupt utf-8 string is rendered" do
-      str = "Blah \xDD"
-      lambda { @pdf.draw_text(str, :at => [0, 0]) }.should raise_error(
-        Prawn::Errors::IncompatibleStringEncoding)
-    end
-    it "should raise_error an exception when a shift-jis string is rendered" do
-      sjis_str = File.read("#{Prawn::DATADIR}/shift_jis_text.txt")
-      lambda { @pdf.draw_text(sjis_str, :at => [0, 0]) }.should raise_error(
-        Prawn::Errors::IncompatibleStringEncoding)
-    end
+    @pdf.draw_text(sjis_str, :at => [0, 0])
   end
 end