prawn 0.13.0 → 0.13.1

data/spec/text_box_spec.rb

@@ -992,7 +992,7 @@ describe "Text::Box wrapping" do
 
     expected = "©" * 25 + "\n" + "©" * 5
     @pdf.font.normalize_encoding!(expected)
-    expected = expected.force_encoding("utf-8") if expected.respond_to?(:force_encoding)
+    expected = expected.force_encoding(Encoding::UTF_8)
     text_box.text.should == expected
   end
 
@@ -1009,7 +1009,7 @@ describe "Text::Box wrapping" do
     text_box.render
     results_without_accent = text_box.text
 
-    results_with_accent.first_line.length.should == results_without_accent.first_line.length
+    first_line(results_with_accent).length.should == first_line(results_without_accent).length
   end
 end
 
@@ -1028,3 +1028,7 @@ end
 def reduce_precision(float)
   ("%.5f" % float).to_f
 end
+
+def first_line(str)
+  str.each_line { |line| return line }
+end

data/spec/text_spec.rb

@@ -313,34 +313,20 @@ describe "#text" do
     pages[1][:strings].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.text str }.should raise_error(
-        Prawn::Errors::IncompatibleStringEncoding)
-    end
-    it "should_not raise_error 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 raise_error an exception when a utf-8 incompatible string is rendered" do
+    str = "Blah \xDD"
+    str.force_encoding(Encoding::ASCII_8BIT)
+    lambda { @pdf.text str }.should raise_error(
+      Prawn::Errors::IncompatibleStringEncoding)
+  end
 
-      # Expect that the call to text will not raise an encoding error
-      @pdf.text(sjis_str)
-    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.text str }.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.text sjis_str }.should raise_error(
-        Prawn::Errors::IncompatibleStringEncoding)
-    end
+  it "should_not raise_error 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")
+
+    # Expect that the call to text will not raise an encoding error
+    @pdf.text(sjis_str)
   end
 
   it "should call move_past_bottom when printing more text than can fit" +

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Gregory Brown
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pdf-reader
@@ -56,20 +56,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: afm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pdf-inspector
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +133,6 @@ files:
 - lib/pdf/core/stream.rb
 - lib/pdf/core/text.rb
 - lib/pdf/core.rb
-- lib/prawn/compatibility.rb
 - lib/prawn/document/bounding_box.rb
 - lib/prawn/document/column_box.rb
 - lib/prawn/document/graphics_state.rb
@@ -375,13 +360,13 @@ files:
 - manual/text/win_ansi_charset.rb
 - data/encodings/win_ansi.txt
 - data/images/16bit.alpha
-- data/images/16bit.dat
+- data/images/16bit.color
 - data/images/16bit.png
 - data/images/arrow.png
 - data/images/arrow2.png
 - data/images/barcode_issue.png
 - data/images/dice.alpha
-- data/images/dice.dat
+- data/images/dice.color
 - data/images/dice.png
 - data/images/dice_interlaced.png
 - data/images/fractal.jpg
@@ -389,7 +374,7 @@ files:
 - data/images/indexed_color.png
 - data/images/letterhead.jpg
 - data/images/page_white_text.alpha
-- data/images/page_white_text.dat
+- data/images/page_white_text.color
 - data/images/page_white_text.png
 - data/images/pigs.jpg
 - data/images/prawn.png

data/lib/prawn/compatibility.rb

@@ -1,91 +0,0 @@
-# coding: utf-8
-#
-# Compatibility layer to smooth over differences between Ruby implementations
-# The oldest version of Ruby which is supported is MRI 1.8.7
-# Ideally, all version-specific or implementation-specific code should be
-#   kept in this file (but that ideal has not been attained yet)
-
-class String  #:nodoc:
-  def first_line
-    self.each_line { |line| return line }
-  end
-
-  unless "".respond_to?(:codepoints)
-    def codepoints(&block)
-      if block_given?
-        unpack("U*").each(&block)
-      else
-        unpack("U*")
-      end
-    end
-
-    def each_codepoint(&block)
-      unpack("U*").each(&block)
-    end
-  end
-
-  if "".respond_to?(:encode)
-    def normalize_to_utf8
-      begin
-        encode(Encoding::UTF_8)
-      rescue
-        raise Prawn::Errors::IncompatibleStringEncoding, "Encoding " +
-        "#{text.encoding} can not be transparently converted to UTF-8. " +
-        "Please ensure the encoding of the string you are attempting " +
-        "to use is set correctly"
-      end
-    end
-    alias :unicode_characters :each_char
-    alias :unicode_length     :length
-
-  else
-    def normalize_to_utf8
-      begin
-        # use unpack as a hackish way to verify the string is valid utf-8
-        unpack("U*")
-        return dup
-      rescue
-        raise Prawn::Errors::IncompatibleStringEncoding, "The string you " +
-        "are attempting to render is not encoded in valid UTF-8."
-      end
-    end
-    def unicode_characters
-      if block_given?
-        unpack("U*").each { |c| yield [c].pack("U") }
-      else
-        unpack("U*").map { |c| [c].pack("U") }
-      end
-    end
-    def unicode_length
-      unpack("U*").length
-    end
-  end
-end
-
-unless File.respond_to?(:binread)
-  def File.binread(file) #:nodoc:
-    File.open(file,"rb") { |f| f.read }
-  end
-end
-
-if RUBY_VERSION < "1.9"
-
-  def ruby_18  #:nodoc:
-    yield
-  end
-
-  def ruby_19  #:nodoc:
-    false
-  end
-
-else
-
-  def ruby_18  #:nodoc:
-    false
-  end
-
-  def ruby_19  #:nodoc:
-    yield
-  end
-
-end