prawn 2.0.1 → 2.0.2

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

@@ -10,7 +10,6 @@
 module Prawn
   module Text
     module Formatted #:nodoc:
-
       # @private
 
       class Arranger #:nodoc:
@@ -24,7 +23,7 @@ module Prawn
         attr_reader :fragments
         attr_reader :current_format_state
 
-        def initialize(document, options={})
+        def initialize(document, options = {})
           @document = document
           @fragments = []
           @unconsumed = []
@@ -33,7 +32,7 @@ module Prawn
 
         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
@@ -42,7 +41,7 @@ module Prawn
 
         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
@@ -51,7 +50,7 @@ module Prawn
 
         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)
@@ -101,7 +100,7 @@ module Prawn
 
         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?
@@ -135,7 +134,7 @@ module Prawn
           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]
@@ -153,7 +152,7 @@ module Prawn
 
           @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
@@ -163,7 +162,7 @@ module Prawn
           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
@@ -183,7 +182,7 @@ module Prawn
 
         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
@@ -282,9 +281,7 @@ module Prawn
           @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

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

@@ -88,7 +88,7 @@ module Prawn
       # Raises <tt>Prawn::Errors::CannotFit</tt> if not wide enough to print
       # any text
       #
-      def formatted_text_box(array, options={})
+      def formatted_text_box(array, options = {})
         Text::Formatted::Box.new(array, options.merge(:document => self)).render
       end
 
@@ -136,7 +136,7 @@ module Prawn
 
         # See Prawn::Text#text_box for valid options
         #
-        def initialize(formatted_text, options={})
+        def initialize(formatted_text, options = {})
           @inked             = false
           Prawn.verify_options(valid_options, options)
           options            = options.dup
@@ -187,8 +187,8 @@ module Prawn
             options[:kerning] = @document.default_kerning?
           end
           @options = { :kerning => options[:kerning],
-            :size    => options[:size],
-            :style   => options[:style] }
+                       :size    => options[:size],
+                       :style   => options[:style] }
 
           super(formatted_text, options)
         end
@@ -203,7 +203,7 @@ module Prawn
         #
         # Returns any text that did not print under the current settings
         #
-        def render(flags={})
+        def render(flags = {})
           unprinted_text = []
 
           @document.save_font do
@@ -248,7 +248,7 @@ module Prawn
 
         # <tt>fragment</tt> is a Prawn::Text::Formatted::Fragment object
         #
-        def draw_fragment(fragment, accumulated_width=0, line_width=0, word_spacing=0) #:nodoc:
+        def draw_fragment(fragment, accumulated_width = 0, line_width = 0, word_spacing = 0) #:nodoc:
           case(@align)
           when :left
             x = @at[0]
@@ -279,10 +279,10 @@ module Prawn
             @document.word_spacing(word_spacing) {
               if @draw_text_callback
                 @draw_text_callback.call(fragment.text, :at => [x, y],
-                                         :kerning => @kerning)
+                                                        :kerning => @kerning)
               else
                 @document.draw_text!(fragment.text, :at => [x, y],
-                                     :kerning => @kerning)
+                                                    :kerning => @kerning)
               end
             }
 
@@ -329,17 +329,20 @@ module Prawn
         end
 
         def valid_options
-          PDF::Core::Text::VALID_OPTIONS + [:at, :height, :width,
-                                              :align, :valign,
-                                              :rotate, :rotate_around,
-                                              :overflow, :min_font_size,
-                                              :disable_wrap_by_char,
-                                              :leading, :character_spacing,
-                                              :mode, :single_line,
-                                              :document,
-                                              :direction,
-                                              :fallback_fonts,
-                                              :draw_text_callback]
+          PDF::Core::Text::VALID_OPTIONS + [
+            :at,
+            :height, :width,
+            :align, :valign,
+            :rotate, :rotate_around,
+            :overflow, :min_font_size,
+            :disable_wrap_by_char,
+            :leading, :character_spacing,
+            :mode, :single_line,
+            :document,
+            :direction,
+            :fallback_fonts,
+            :draw_text_callback
+          ]
         end
 
         private
@@ -353,7 +356,7 @@ module Prawn
         end
 
         def original_text
-          @original_array.collect { |hash| hash.dup }
+          @original_array.collect(&:dup)
         end
 
         def original_text=(formatted_text)
@@ -606,9 +609,7 @@ module Prawn
             @document.stroke_line(fragment.strikethrough_points)
           end
         end
-
       end
-
     end
   end
 end

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

@@ -9,14 +9,11 @@
 module Prawn
   module Text
     module Formatted
-
-
       # Prawn::Text::Formatted::Fragment is a state store for a formatted text
       # fragment. It does not render anything.
       #
       # @private
       class Fragment
-
         attr_reader :format_state, :text
         attr_writer :width
         attr_accessor :line_height, :descender, :ascender
@@ -257,7 +254,6 @@ module Prawn
             string
           end
         end
-
       end
     end
   end

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

@@ -11,10 +11,8 @@
 module Prawn
   module Text
     module Formatted #:nodoc:
-
       # @private
       class LineWrap #:nodoc:
-
         # The width of the last wrapped line
         #
         def width
@@ -122,11 +120,11 @@ module Prawn
         # The pattern used to determine chunks of text to place on a given line
         #
         def scan_pattern
-          pattern = "[^#{break_chars}]+#{soft_hyphen}|" +
-            "[^#{break_chars}]+#{hyphen}+|" +
-            "[^#{break_chars}]+|" +
-            "[#{whitespace}]+|" +
-            "#{hyphen}+[^#{break_chars}]*|" +
+          pattern = "[^#{break_chars}]+#{soft_hyphen}|" \
+            "[^#{break_chars}]+#{hyphen}+|" \
+            "[^#{break_chars}]+|" \
+            "[#{whitespace}]+|" \
+            "#{hyphen}+[^#{break_chars}]*|" \
             "#{soft_hyphen}"
 
           Regexp.new(pattern)
@@ -152,13 +150,8 @@ module Prawn
           "-"
         end
 
-        def soft_hyphen
-          @soft_hyphen
-        end
-
-        def zero_width_space
-          @zero_width_space
-        end
+        attr_reader :soft_hyphen
+        attr_reader :zero_width_space
 
         def line_empty?
           @line_empty && @accumulated_width == 0
@@ -202,19 +195,15 @@ module Prawn
           remember_this_fragment_for_backward_looking_ops
         end
 
-        def update_output_based_on_last_fragment(fragment, normalized_soft_hyphen=nil)
+        def update_output_based_on_last_fragment(fragment, normalized_soft_hyphen = nil)
           remaining_text = fragment.slice(@fragment_output.length..fragment.length)
-          raise Prawn::Errors::CannotFit if line_finished? && line_empty? &&
-            @fragment_output.empty? && !fragment.strip.empty?
+          fail Prawn::Errors::CannotFit if line_finished? && line_empty? && @fragment_output.empty? && !fragment.strip.empty?
           @arranger.update_last_string(@fragment_output, remaining_text, normalized_soft_hyphen)
         end
 
         def determine_whether_to_pull_preceding_fragment_to_join_this_one(current_fragment)
-          if @fragment_output.empty? &&
-              !current_fragment.empty? &&
-              @line_contains_more_than_one_word
-            unless previous_fragment_ended_with_breakable? ||
-                fragment_begins_with_breakable?(current_fragment)
+          if @fragment_output.empty? && !current_fragment.empty? && @line_contains_more_than_one_word
+            unless previous_fragment_ended_with_breakable? || fragment_begins_with_breakable?(current_fragment)
               @fragment_output = @previous_fragment_output_without_last_word
               update_output_based_on_last_fragment(@previous_fragment)
             end
@@ -255,11 +244,11 @@ module Prawn
         def wrap_by_char(segment)
           font = @document.font
           segment.each_char do |char|
-            break unless append_char(char,font)
+            break unless append_char(char, font)
           end
         end
 
-        def append_char(char,font)
+        def append_char(char, font)
           # kerning doesn't make sense in the context of a single character
           char_width = font.compute_width_of(char)
 

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

@@ -11,24 +11,23 @@
 module Prawn
   module Text
     module Formatted
-
       class Parser
         # @group Extension API
 
         PARSER_REGEX = begin
-          regex_string = "\n|" +
-                         "<b>|</b>|" +
-                         "<i>|</i>|" +
-                         "<u>|</u>|" +
-                         "<strikethrough>|</strikethrough>|" +
-                         "<sub>|</sub>|" +
-                         "<sup>|</sup>|" +
-                         "<link[^>]*>|</link>|" +
-                         "<color[^>]*>|</color>|" +
-                         "<font[^>]*>|</font>|" +
-                         "<strong>|</strong>|" +
-                         "<em>|</em>|" +
-                         "<a[^>]*>|</a>|" +
+          regex_string = "\n|" \
+                         "<b>|</b>|" \
+                         "<i>|</i>|" \
+                         "<u>|</u>|" \
+                         "<strikethrough>|</strikethrough>|" \
+                         "<sub>|</sub>|" \
+                         "<sup>|</sup>|" \
+                         "<link[^>]*>|</link>|" \
+                         "<color[^>]*>|</color>|" \
+                         "<font[^>]*>|</font>|" \
+                         "<strong>|</strong>|" \
+                         "<em>|</em>|" \
+                         "<a[^>]*>|</a>|" \
                          "[^<\n]+"
           Regexp.new(regex_string, Regexp::MULTILINE)
         end
@@ -82,9 +81,9 @@ module Prawn
 
             if hash[:color]
               if hash[:color].kind_of?(Array)
-                prefix = prefix + "<color c='#{hash[:color][0]}'" +
-                                        " m='#{hash[:color][1]}'" +
-                                        " y='#{hash[:color][2]}'" +
+                prefix = prefix + "<color c='#{hash[:color][0]}'" \
+                                        " m='#{hash[:color][1]}'" \
+                                        " y='#{hash[:color][2]}'" \
                                         " k='#{hash[:color][3]}'>"
               else
                 prefix = prefix + "<color rgb='#{hash[:color]}'>"
@@ -118,8 +117,6 @@ module Prawn
           paragraphs
         end
 
-        private
-
         def self.array_from_tokens(tokens)
           array = []
           styles = []
@@ -217,7 +214,6 @@ module Prawn
           end
           array
         end
-
       end
     end
   end

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

@@ -15,15 +15,13 @@ module Prawn
       # @private
 
       module Wrap #:nodoc:
-
         def initialize(array, options)
           @line_wrap = Prawn::Text::Formatted::LineWrap.new
           @arranger = Prawn::Text::Formatted::Arranger.new(@document,
-            :kerning => options[:kerning])
+                                                           :kerning => options[:kerning])
           @disable_wrap_by_char = options[:disable_wrap_by_char]
         end
 
-
         # See the developer documentation for PDF::Core::Text#wrap
         #
         # Formatted#wrap should set the following variables:
@@ -103,9 +101,7 @@ module Prawn
         end
 
         def word_spacing_for_this_line
-          if @align == :justify &&
-              @line_wrap.space_count > 0 &&
-              !@line_wrap.paragraph_finished?
+          if @align == :justify && @line_wrap.space_count > 0 && !@line_wrap.paragraph_finished?
             (available_width - @line_wrap.width) / @line_wrap.space_count
           else
             0
@@ -153,7 +149,6 @@ module Prawn
                           line_width, word_spacing)
           end
         end
-
       end
     end
   end

data/lib/prawn/utilities.rb

@@ -9,7 +9,6 @@
 require 'thread'
 
 module Prawn
-
   # Throughout the Prawn codebase, repeated calculations which can benefit from caching are made
   # In some cases, caching and reusing results can not only save CPU cycles but also greatly
   #   reduce memory requirements
@@ -23,10 +22,12 @@ module Prawn
       @cache = {}
       @mutex = Mutex.new
     end
+
     def [](key)
       @mutex.synchronize { @cache[key] }
     end
-    def []=(key,value)
+
+    def []=(key, value)
       @mutex.synchronize { @cache[key] = value }
     end
   end
@@ -36,10 +37,12 @@ module Prawn
     def initialize
       @cache_id = "cache_#{self.object_id}".to_sym
     end
+
     def [](key)
       (Thread.current[@cache_id] ||= {})[key]
     end
-    def []=(key,value)
+
+    def []=(key, value)
       (Thread.current[@cache_id] ||= {})[key] = value
     end
   end

data/lib/prawn/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Prawn
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end