prawn 0.11.1 → 0.15.0

data/spec/text_at_spec.rb

@@ -5,12 +5,12 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 describe "#draw_text" do
   before(:each) { create_pdf }
 
-  it "should raise ArgumentError if :at option omitted" do
-    lambda { @pdf.draw_text("hai", { }) }.should.raise(ArgumentError)
+  it "should raise_error ArgumentError if :at option omitted" do
+    lambda { @pdf.draw_text("hai", { }) }.should raise_error(ArgumentError)
   end
 
-  it "should raise ArgumentError if :align option included" do
-    lambda { @pdf.draw_text("hai", :at => [0, 0], :align => :center) }.should.raise(ArgumentError)
+  it "should raise_error ArgumentError if :align option included" do
+    lambda { @pdf.draw_text("hai", :at => [0, 0], :align => :center) }.should raise_error(ArgumentError)
   end
 
   it "should allow drawing empty strings to the page" do
@@ -85,8 +85,8 @@ describe "#draw_text" do
     text.font_settings[1][:name].should == :Courier
   end
 
-  it "should raise an exception when an unknown font is used" do
-    lambda { @pdf.font "Pao bu" }.should.raise(Prawn::Errors::UnknownFont)
+  it "should raise_error an exception when an unknown font is used" do
+    lambda { @pdf.font "Pao bu" }.should raise_error(Prawn::Errors::UnknownFont)
   end
 
   it "should correctly render a utf-8 string when using a built-in font" do
@@ -98,32 +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 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(
-        Prawn::Errors::IncompatibleStringEncoding)
-    end
-    it "should not raise an exception when a shift-jis string is rendered" do
-      datafile = "#{Prawn::BASEDIR}/data/shift_jis_text.txt"
-      sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets }
-      @pdf.font("#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf")
-      lambda { @pdf.draw_text(sjis_str, :at => [0, 0]) }.should.not.raise(
-        Prawn::Errors::IncompatibleStringEncoding)
-    end
-  else
-    # Handle non utf-8 string encodings in a sane way on non-M17N aware VMs
-    it "should raise an exception when a corrupt utf-8 string is rendered" do
-      str = "Blah \xDD"
-      lambda { @pdf.draw_text(str, :at => [0, 0]) }.should.raise(
-        Prawn::Errors::IncompatibleStringEncoding)
-    end
-    it "should raise an exception when a shift-jis string is rendered" do
-      sjis_str = File.read("#{Prawn::BASEDIR}/data/shift_jis_text.txt")
-      lambda { @pdf.draw_text(sjis_str, :at => [0, 0]) }.should.raise(
-        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")
+
+    @pdf.draw_text(sjis_str, :at => [0, 0])
   end
 end

data/spec/text_box_spec.rb

@@ -3,55 +3,55 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
 describe "Text::Box#nothing_printed?" do
-  it "should be true when nothing printed" do
+  it "should be_true when nothing printed" do
     create_pdf
     string = "Hello world, how are you?\nI'm fine, thank you."
     text_box = Prawn::Text::Box.new(string,
                                     :height => 2,
                                     :document => @pdf)
     text_box.render
-    text_box.nothing_printed?.should.be true
+    text_box.nothing_printed?.should be_true
   end
-  it "should be false when something printed" do
+  it "should be_false when something printed" do
     create_pdf
     string = "Hello world, how are you?\nI'm fine, thank you."
     text_box = Prawn::Text::Box.new(string,
                                     :height => 14,
                                     :document => @pdf)
     text_box.render
-    text_box.nothing_printed?.should.be false
+    text_box.nothing_printed?.should be_false
   end
 end
 
 describe "Text::Box#everything_printed?" do
-  it "should be false when not everything printed" do
+  it "should be_false when not everything printed" do
     create_pdf
     string = "Hello world, how are you?\nI'm fine, thank you."
     text_box = Prawn::Text::Box.new(string,
                                     :height => 14,
                                     :document => @pdf)
     text_box.render
-    text_box.everything_printed?.should.be false
+    text_box.everything_printed?.should be_false
   end
-  it "should be true when everything printed" do
+  it "should be_true when everything printed" do
     create_pdf
     string = "Hello world, how are you?\nI'm fine, thank you."
     text_box = Prawn::Text::Box.new(string,
                                     :document => @pdf)
     text_box.render
-    text_box.everything_printed?.should.be true
+    text_box.everything_printed?.should be_true
   end
 end
 
 describe "Text::Box#line_gap" do
-  it "should equal the line gap of the font when using a single " +
+  it "should == the line gap of the font when using a single " +
     "font and font size" do
     create_pdf
     string = "Hello world, how are you?\nI'm fine, thank you."
     text_box = Prawn::Text::Box.new(string,
                                     :document => @pdf)
     text_box.render
-    text_box.line_gap.should.be.close(@pdf.font.line_gap, 0.0001)
+    text_box.line_gap.should be_within(0.0001).of(@pdf.font.line_gap)
   end
 end
 
@@ -74,7 +74,7 @@ describe "Text::Box" do
     @pdf.text_direction(:rtl)
     @pdf.text_direction = :rtl
     @pdf.text_direction = :rtl
-    @pdf.font("#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf", :size => 16) do
+    @pdf.font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf", :size => 16) do
       @pdf.text "写个小"
     end
     text = PDF::Inspector::Text.analyze(@pdf.render)
@@ -116,7 +116,7 @@ describe "Text::Box" do
   end
   it "should default to document-wide leading if no" +
     "leading option is provided" do
-    
+
   end
 end
 
@@ -128,7 +128,7 @@ describe "Text::Box#render with :align => :justify" do
     text_box = Prawn::Text::Box.new(string, options)
     text_box.render
     contents = PDF::Inspector::Text.analyze(@pdf.render)
-    contents.word_spacing[0].should.be > 0
+    contents.word_spacing[0].should be > 0
   end
   it "should not justify the last line of a paragraph" do
     create_pdf
@@ -137,7 +137,7 @@ describe "Text::Box#render with :align => :justify" do
     text_box = Prawn::Text::Box.new(string, options)
     text_box.render
     contents = PDF::Inspector::Text.analyze(@pdf.render)
-    contents.word_spacing.should.be.empty
+    contents.word_spacing.should be_empty
   end
 end
 
@@ -160,19 +160,19 @@ describe "Text::Box" do
 end
 
 describe "Text::Box#height without leading" do
-  it "should equal the sum of the height of each line, " +
+  it "should == the sum of the height of each line, " +
     "not including the space below the last line" do
     create_pdf
     text = "Oh hai text rect.\nOh hai text rect."
     options = { :document => @pdf }
     text_box = Prawn::Text::Box.new(text, options)
     text_box.render
-    text_box.height.should.be.close(@pdf.font.height * 2 - @pdf.font.line_gap, 0.001)
+    text_box.height.should be_within(0.001).of(@pdf.font.height * 2 - @pdf.font.line_gap)
   end
 end
 
 describe "Text::Box#height with leading" do
-  it "should equal the sum of the height of each line plus leading, " +
+  it "should == the sum of the height of each line plus leading, " +
     "but not including the space below the last line" do
     create_pdf
     text = "Oh hai text rect.\nOh hai text rect."
@@ -180,7 +180,38 @@ describe "Text::Box#height with leading" do
     options = { :document => @pdf, :leading => leading }
     text_box = Prawn::Text::Box.new(text, options)
     text_box.render
-    text_box.height.should.be.close((@pdf.font.height + leading) * 2 - @pdf.font.line_gap - leading, 0.001)
+    text_box.height.should be_within(0.001).of((@pdf.font.height + leading) * 2 - @pdf.font.line_gap - leading)
+  end
+end
+
+describe "Text::Box with :draw_text_callback" do
+  before(:each) { create_pdf }
+
+  it "hits the callback whenever text is drawn" do
+    draw_block = stub()
+    draw_block.expects(:kick).with("this text is long enough to")
+    draw_block.expects(:kick).with("span two lines")
+
+    @pdf.text_box "this text is long enough to span two lines",
+      :width => 150,
+      :draw_text_callback => lambda { |text, _| draw_block.kick(text) }
+  end
+
+  it "hits the callback once per fragment for :inline_format" do
+    draw_block = stub()
+    draw_block.expects(:kick).with("this text has ")
+    draw_block.expects(:kick).with("fancy")
+    draw_block.expects(:kick).with(" formatting")
+
+    @pdf.text_box "this text has <b>fancy</b> formatting",
+      :inline_format => true, :width => 500,
+      :draw_text_callback => lambda { |text, _| draw_block.kick(text) }
+  end
+
+  it "does not call #draw_text!" do
+    @pdf.expects(:draw_text!).never
+    @pdf.text_box "some text", :width => 500,
+      :draw_text_callback => lambda { |_, _| }
   end
 end
 
@@ -188,7 +219,7 @@ describe "Text::Box#valid_options" do
   it "should return an array" do
     create_pdf
     text_box = Prawn::Text::Box.new("", :document => @pdf)
-    text_box.valid_options.should.be.kind_of(Array)
+    text_box.valid_options.should be_a_kind_of(Array)
   end
 end
 
@@ -211,7 +242,7 @@ describe "Text::Box#render" do
     text_box = Prawn::Text::Box.new(@text, @options)
     text_box.render
     text = PDF::Inspector::Text.analyze(@pdf.render)
-    text.strings.should.not.be.empty
+    text.strings.should_not be_empty
   end
   it "should not draw a transformation matrix" do
     create_pdf
@@ -245,16 +276,17 @@ describe "Text::Box#render(:dry_run => true)" do
     text_box = Prawn::Text::Box.new(@text, @options)
     text_box.render(:dry_run => true)
     text = PDF::Inspector::Text.analyze(@pdf.render)
-    text.strings.should.be.empty
+    text.strings.should be_empty
   end
-  it "subsequent calls to render should not raise an ArgumentError exception" do
+
+  it "subsequent calls to render should_not raise_error an ArgumentError exception" do
     create_pdf
     @text = "™©"
     @options = { :document => @pdf }
     text_box = Prawn::Text::Box.new(@text, @options)
     text_box.render(:dry_run => true)
-    lambda { text_box.render }.should.not.raise(
-      Prawn::Errors::IncompatibleStringEncoding)
+
+    text_box.render
   end
 end
 
@@ -275,6 +307,23 @@ describe "Text::Box#render(:valign => :bottom)" do
   end
 end
 
+describe "Text::Box#render(:valign => :center)" do
+  it "#at should be the same from one dry run to the next" do
+    create_pdf
+    text = "this is center text " * 12
+    options = { :width => 162,
+                :valign => :center,
+                :document => @pdf }
+    text_box = Prawn::Text::Box.new(text, options)
+
+    text_box.render(:dry_run => true)
+    original_at = text_box.at.dup
+
+    text_box.render(:dry_run => true)
+    text_box.at.should == original_at
+  end
+end
+
 describe "Text::Box#render with :rotate option of 30)" do
   before(:each) do
     create_pdf
@@ -312,7 +361,7 @@ describe "Text::Box#render with :rotate option of 30)" do
                                       reduce_precision(@cos), 0, 0]
 
       text = PDF::Inspector::Text.analyze(@pdf.render)
-      text.strings.should.not.be.empty
+      text.strings.should_not be_empty
     end
   end
   context ":rotate_around option of :upper_left" do
@@ -335,7 +384,7 @@ describe "Text::Box#render with :rotate option of 30)" do
                                       reduce_precision(@cos), 0, 0]
 
       text = PDF::Inspector::Text.analyze(@pdf.render)
-      text.strings.should.not.be.empty
+      text.strings.should_not be_empty
     end
   end
   context "default :rotate_around" do
@@ -357,7 +406,7 @@ describe "Text::Box#render with :rotate option of 30)" do
                                       reduce_precision(@cos), 0, 0]
 
       text = PDF::Inspector::Text.analyze(@pdf.render)
-      text.strings.should.not.be.empty
+      text.strings.should_not be_empty
     end
   end
   context ":rotate_around option of :upper_right" do
@@ -380,7 +429,7 @@ describe "Text::Box#render with :rotate option of 30)" do
                                       reduce_precision(@cos), 0, 0]
 
       text = PDF::Inspector::Text.analyze(@pdf.render)
-      text.strings.should.not.be.empty
+      text.strings.should_not be_empty
     end
   end
   context ":rotate_around option of :lower_right" do
@@ -403,7 +452,7 @@ describe "Text::Box#render with :rotate option of 30)" do
                                       reduce_precision(@cos), 0, 0]
 
       text = PDF::Inspector::Text.analyze(@pdf.render)
-      text.strings.should.not.be.empty
+      text.strings.should_not be_empty
     end
   end
   context ":rotate_around option of :lower_left" do
@@ -426,7 +475,7 @@ describe "Text::Box#render with :rotate option of 30)" do
                                       reduce_precision(@cos), 0, 0]
 
       text = PDF::Inspector::Text.analyze(@pdf.render)
-      text.strings.should.not.be.empty
+      text.strings.should_not be_empty
     end
   end
 end
@@ -439,7 +488,7 @@ describe "Text::Box default height" do
     @text = "Oh hai\n" * 60
     text_box = Prawn::Text::Box.new(@text, :document => @pdf)
     text_box.render
-    text_box.height.should.be.close(target_height, @pdf.font.height)
+    text_box.height.should be_within(@pdf.font.height).of(target_height)
   end
 
   it "should use the margin-box bottom if only in a stretchy bbox" do
@@ -448,7 +497,7 @@ describe "Text::Box default height" do
       @text = "Oh hai\n" * 60
       text_box = Prawn::Text::Box.new(@text, :document => @pdf)
       text_box.render
-      text_box.height.should.be.close(target_height, @pdf.font.height)
+      text_box.height.should be_within(@pdf.font.height).of(target_height)
     end
   end
 
@@ -460,7 +509,7 @@ describe "Text::Box default height" do
       text_box = Prawn::Text::Box.new(@text, :document => @pdf,
         :height => 100, :overflow => :expand)
       text_box.render
-      text_box.height.should.be.close(target_height, @pdf.font.height)
+      text_box.height.should be_within(@pdf.font.height).of(target_height)
     end
   end
 
@@ -471,7 +520,7 @@ describe "Text::Box default height" do
         @text = "Oh hai\n" * 60
         text_box = Prawn::Text::Box.new(@text, :document => @pdf)
         text_box.render
-        text_box.height.should.be.close(200, @pdf.font.height)
+        text_box.height.should be_within(@pdf.font.height).of(200)
       end
     end
   end
@@ -500,7 +549,7 @@ describe "Text::Box with text than can fit in the box" do
       :document => @pdf
     }
   end
-  
+
   it "printed text should match requested text, except that preceding and " +
     "trailing white space will be stripped from each line, and newlines may " +
     "be inserted" do
@@ -508,7 +557,7 @@ describe "Text::Box with text than can fit in the box" do
     text_box.render
     text_box.text.gsub("\n", " ").should == @text.strip
   end
-  
+
   it "render should return an empty string because no text remains unprinted" do
     text_box = Prawn::Text::Box.new(@text, @options)
     text_box.render.should == ""
@@ -518,7 +567,7 @@ describe "Text::Box with text than can fit in the box" do
     @options[:leading] = 40
     text_box = Prawn::Text::Box.new(@text, @options)
     text_box.render
-    text_box.text.gsub("\n", " ").should.not == @text.strip
+    text_box.text.gsub("\n", " ").should_not == @text.strip
   end
 end
 
@@ -534,12 +583,12 @@ describe "Text::Box with text that fits exactly in the box" do
       :document => @pdf
     }
   end
-  
+
   it "should have the expected height" do
     expected_height = @options.delete(:height)
     text_box = Prawn::Text::Box.new(@text, @options)
     text_box.render
-    text_box.height.should.be.close(expected_height, 0.0001)
+    text_box.height.should be_within(0.0001).of(expected_height)
   end
 
   it "should print everything" do
@@ -564,7 +613,7 @@ describe "Text::Box with text that fits exactly in the box" do
       @options[:height] += @options[:leading] * @interlines - 1
       text_box = Prawn::Text::Box.new(@text, @options)
       text_box.render
-      text_box.text.should.not == @text
+      text_box.text.should_not == @text
     end
   end
 
@@ -584,14 +633,14 @@ describe "Text::Box with text that fits exactly in the box" do
       @options[:height] += @options[:leading] * @interlines - 1
       text_box = Prawn::Text::Box.new(@text, @options)
       text_box.render
-      text_box.text.should.not == @text
+      text_box.text.should_not == @text
     end
   end
 end
 
 describe "Text::Box printing UTF-8 string with higher bit characters" do
   before(:each) do
-    create_pdf    
+    create_pdf
     @text = "©"
     # not enough height to print any text, so we can directly compare against
     # the input string
@@ -600,7 +649,7 @@ describe "Text::Box printing UTF-8 string with higher bit characters" do
       :height => bounding_height,
       :document => @pdf
     }
-    file = "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont"
+    file = "#{Prawn::DATADIR}/fonts/Action Man.dfont"
     @pdf.font_families["Action Man"] = {
       :normal      => { :file => file, :font => "ActionMan" },
       :italic      => { :file => file, :font => "ActionMan-Italic" },
@@ -615,13 +664,14 @@ describe "Text::Box printing UTF-8 string with higher bit characters" do
       remaining_text = @text_box.render
       remaining_text.should == @text
     end
+
     it "subsequent calls to Text::Box need not include the" +
        " :skip_encoding => true option" do
       @pdf.font("Action Man")
       remaining_text = @text_box.render
-      lambda {
-        @pdf.text_box(remaining_text, :document => @pdf)
-      }.should.not.raise(Prawn::Errors::IncompatibleStringEncoding)
+
+      # expect that calling text_box will not raise an encoding error
+      @pdf.text_box(remaining_text, :document => @pdf)
     end
   end
 
@@ -635,18 +685,17 @@ describe "Text::Box printing UTF-8 string with higher bit characters" do
       remaining_text = @text_box.render
       lambda {
         @pdf.text_box(remaining_text, :document => @pdf)
-      }.should.raise(Prawn::Errors::IncompatibleStringEncoding)
-      lambda {
-        @pdf.text_box(remaining_text, :skip_encoding => true,
-                                      :document => @pdf)
-      }.should.not.raise(Prawn::Errors::IncompatibleStringEncoding)
+      }.should raise_error(Prawn::Errors::IncompatibleStringEncoding)
+
+      @pdf.text_box(remaining_text, :skip_encoding => true,
+                                    :document => @pdf)
     end
   end
 end
 
 describe "Text::Box with more text than can fit in the box" do
   before(:each) do
-    create_pdf    
+    create_pdf
     @text = "Oh hai text rect. " * 30
     @bounding_height = 162.0
     @options = {
@@ -655,7 +704,7 @@ describe "Text::Box with more text than can fit in the box" do
       :document => @pdf
     }
   end
-  
+
   context "truncated overflow" do
     before(:each) do
       @options[:overflow] = :truncate
@@ -663,18 +712,18 @@ describe "Text::Box with more text than can fit in the box" do
     end
     it "should be truncated" do
       @text_box.render
-      @text_box.text.gsub("\n", " ").should.not == @text.strip
+      @text_box.text.gsub("\n", " ").should_not == @text.strip
     end
     it "render should not return an empty string because some text remains unprinted" do
-      @text_box.render.should.not.be.empty
+      @text_box.render.should_not be_empty
     end
     it "#height should be no taller than the specified height" do
       @text_box.render
-      @text_box.height.should.be <= @bounding_height
+      @text_box.height.should be <= @bounding_height
     end
     it "#height should be within one font height of the specified height" do
       @text_box.render
-      @bounding_height.should.be.close(@text_box.height, @pdf.font.height)
+      @bounding_height.should be_within(@pdf.font.height).of(@text_box.height)
     end
     context "with :rotate option" do
       it "unrendered text should be the same as when not rotated" do
@@ -693,7 +742,7 @@ describe "Text::Box with more text than can fit in the box" do
       end
     end
   end
-  
+
   context "truncated with text and size taken from the manual" do
     it "should return the right text" do
       @text = "This is the beginning of the text. It will be cut somewhere and " +
@@ -783,7 +832,7 @@ describe "Text::Box with a solid block of Chinese characters" do
       :height => 162.0,
       :document => @pdf
     }
-    @pdf.font "#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf"
+    @pdf.font "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
     @options[:overflow] = :truncate
     text_box = Prawn::Text::Box.new(@text, @options)
     text_box.render
@@ -792,8 +841,8 @@ describe "Text::Box with a solid block of Chinese characters" do
 end
 
 
-describe "drawing bounding boxes" do    
-  before(:each) { create_pdf }   
+describe "drawing bounding boxes" do
+  before(:each) { create_pdf }
 
   it "should restore the margin box when bounding box exits" do
     margin_box = @pdf.bounds
@@ -828,7 +877,7 @@ describe "Text::Box#render with :character_spacing option" do
     text_box.text.should == "hello\nworld"
   end
 end
-  
+
 describe "Text::Box wrapping" do
   before(:each) do
     create_pdf
@@ -943,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
 
@@ -960,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
 
@@ -979,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_rendering_mode_spec.rb

@@ -18,7 +18,7 @@ describe "#text_rendering_mode" do
       @pdf.text("hello world")
     end
     contents = PDF::Inspector::Text.analyze(@pdf.render)
-    contents.text_rendering_mode.should.be.empty
+    contents.text_rendering_mode.should be_empty
   end
   it "should restore character spacing to 0" do
     create_pdf
@@ -36,10 +36,10 @@ describe "#text_rendering_mode" do
     end
     @pdf.text_rendering_mode.should == :fill
   end
-  it "should raise an exception when passed an invalid mode" do
+  it "should raise_error an exception when passed an invalid mode" do
     create_pdf
-    lambda { @pdf.text_rendering_mode(-1) }.should.raise(ArgumentError)
-    lambda { @pdf.text_rendering_mode(8) }.should.raise(ArgumentError)
-    lambda { @pdf.text_rendering_mode(:flil) }.should.raise(ArgumentError)
+    lambda { @pdf.text_rendering_mode(-1) }.should raise_error(ArgumentError)
+    lambda { @pdf.text_rendering_mode(8) }.should raise_error(ArgumentError)
+    lambda { @pdf.text_rendering_mode(:flil) }.should raise_error(ArgumentError)
   end
 end

data/spec/text_spacing_spec.rb

@@ -18,7 +18,7 @@ describe "#character_spacing" do
       @pdf.text("hello world")
     end
     contents = PDF::Inspector::Text.analyze(@pdf.render)
-    contents.character_spacing.should.be.empty
+    contents.character_spacing.should be_empty
   end
   it "should restore character spacing to 0" do
     create_pdf
@@ -36,6 +36,24 @@ describe "#character_spacing" do
     end
     @pdf.character_spacing.should == 0
   end
+
+  # ensure that we properly internationalize by using the number of characters
+  # in a string, not the number of bytes, to insert character spaces
+  #
+  it "should calculate character spacing widths by characters, not bytes" do
+    create_pdf
+    @pdf.font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf")
+
+    str = "こんにちは世界"
+    @pdf.character_spacing(0) do
+      @raw_width = @pdf.width_of(str)
+    end
+
+    @pdf.character_spacing(10) do
+      # the new width should include seven 10-pt character spaces.
+      @pdf.width_of(str).should be_within(0.001).of(@raw_width + (10 * 7))
+    end
+  end
 end
 
 describe "#word_spacing" do
@@ -54,7 +72,7 @@ describe "#word_spacing" do
       @pdf.text("hello world")
     end
     contents = PDF::Inspector::Text.analyze(@pdf.render)
-    contents.word_spacing.should.be.empty
+    contents.word_spacing.should be_empty
   end
   it "should restore word spacing to 0" do
     create_pdf