lib/prawn/text/formatted/arranger.rb in prawn-2.0.1 vs lib/prawn/text/formatted/arranger.rb in prawn-2.0.2

@@ -8,11 +8,10 @@
 # This is free software. Please see the LICENSE and COPYING files for details.
 
 module Prawn
   module Text
     module Formatted #:nodoc:
-
       # @private
 
       class Arranger #:nodoc:
         attr_reader :max_line_height
         attr_reader :max_descender
@@ -22,38 +21,38 @@
         # The following present only for testing purposes
         attr_reader :unconsumed
         attr_reader :fragments
         attr_reader :current_format_state
 
-        def initialize(document, options={})
+        def initialize(document, options = {})
           @document = document
           @fragments = []
           @unconsumed = []
           @kerning = options[:kerning]
         end
 
         def space_count
           if @unfinalized_line
-            raise "Lines must be finalized before calling #space_count"
+            fail "Lines must be finalized before calling #space_count"
           end
           @fragments.inject(0) do |sum, fragment|
             sum + fragment.space_count
           end
         end
 
         def line_width
           if @unfinalized_line
-            raise "Lines must be finalized before calling #line_width"
+            fail "Lines must be finalized before calling #line_width"
           end
           @fragments.inject(0) do |sum, fragment|
             sum + fragment.width
           end
         end
 
         def line
           if @unfinalized_line
-            raise "Lines must be finalized before calling #line"
+            fail "Lines must be finalized before calling #line"
           end
           @fragments.collect do |fragment|
             fragment.text.dup.force_encoding(::Encoding::UTF_8)
           end.join
         end
@@ -99,11 +98,11 @@
           @unconsumed.length == 0
         end
 
         def next_string
           unless @unfinalized_line
-            raise "Lines must not be finalized when calling #next_string"
+            fail "Lines must not be finalized when calling #next_string"
           end
           hash = @unconsumed.shift
           if hash.nil?
             nil
           else
@@ -133,11 +132,11 @@
           else
             apply_font_settings(fragment, &block)
           end
         end
 
-        def apply_font_settings(fragment=nil, &block)
+        def apply_font_settings(fragment = nil, &block)
           if fragment.nil?
             font = current_format_state[:font]
             size = current_format_state[:size]
             character_spacing = current_format_state[:character_spacing] ||
                                 @document.character_spacing
@@ -151,21 +150,21 @@
             font_style = font_style(styles)
           end
 
           @document.character_spacing(character_spacing) do
             if font || font_style != :normal
-              raise "Bad font family" unless @document.font.family
+              fail "Bad font family" unless @document.font.family
               @document.font(font || @document.font.family, :style => font_style) do
                 apply_font_size(size, styles, &block)
               end
             else
               apply_font_size(size, styles, &block)
             end
           end
         end
 
-        def update_last_string(printed, unprinted, normalized_soft_hyphen=nil)
+        def update_last_string(printed, unprinted, normalized_soft_hyphen = nil)
           return if printed.nil?
           if printed.empty?
             @consumed.pop
           else
             @consumed.last[:text] = printed
@@ -181,11 +180,11 @@
           load_previous_format_state if printed.empty?
         end
 
         def retrieve_fragment
           if @unfinalized_line
-            raise "Lines must be finalized before fragments can be retrieved"
+            fail "Lines must be finalized before fragments can be retrieved"
           end
           @fragments.shift
         end
 
         def repack_unretrieved
@@ -280,11 +279,9 @@
         def set_line_measurement_maximums(fragment)
           @max_line_height = [defined?(@max_line_height) && @max_line_height, fragment.line_height].compact.max
           @max_descender = [defined?(@max_descender) && @max_descender, fragment.descender].compact.max
           @max_ascender = [defined?(@max_ascender) && @max_ascender, fragment.ascender].compact.max
         end
-
       end
-
     end
   end
 end