prawn 2.0.1 → 2.0.2

data/lib/prawn/errors.rb

@@ -8,45 +8,45 @@
 #
 module Prawn
   module Errors
-     # Raised when a table is spanned in an impossible way.
-     #
-     InvalidTableSpan = Class.new(StandardError)
+    # Raised when a table is spanned in an impossible way.
+    #
+    InvalidTableSpan = Class.new(StandardError)
 
-     # This error is raised when a method requiring a current page is called
-     # without being on a page.
-     #
-     NotOnPage = Class.new(StandardError)
+    # This error is raised when a method requiring a current page is called
+    # without being on a page.
+    #
+    NotOnPage = Class.new(StandardError)
 
-     # This error is raised when Prawn cannot find a specified font
-     #
-     UnknownFont = Class.new(StandardError)
+    # This error is raised when Prawn cannot find a specified font
+    #
+    UnknownFont = Class.new(StandardError)
 
-     # Raised when Prawn is asked to draw something into a too-small box
-     #
-     CannotFit = Class.new(StandardError)
+    # Raised when Prawn is asked to draw something into a too-small box
+    #
+    CannotFit = Class.new(StandardError)
 
-     # Raised if group() is called with a block that is too big to be
-     # rendered in the current context.
-     #
-     CannotGroup = Class.new(StandardError)
+    # Raised if group() is called with a block that is too big to be
+    # rendered in the current context.
+    #
+    CannotGroup = Class.new(StandardError)
 
-     # This error is raised when Prawn is being used on a M17N aware VM,
-     # and the user attempts to add text that isn't compatible with UTF-8
-     # to their document
-     #
-     IncompatibleStringEncoding = Class.new(StandardError)
+    # This error is raised when Prawn is being used on a M17N aware VM,
+    # and the user attempts to add text that isn't compatible with UTF-8
+    # to their document
+    #
+    IncompatibleStringEncoding = Class.new(StandardError)
 
-     # This error is raised when Prawn encounters an unknown key in functions
-     # that accept an options hash.  This usually means there is a typo in your
-     # code or that the option you are trying to use has a different name than
-     # what you have specified.
-     #
-     UnknownOption = Class.new(StandardError)
+    # This error is raised when Prawn encounters an unknown key in functions
+    # that accept an options hash.  This usually means there is a typo in your
+    # code or that the option you are trying to use has a different name than
+    # what you have specified.
+    #
+    UnknownOption = Class.new(StandardError)
 
-     # this error is raised when a user attempts to embed an image of an unsupported
-     # type. This can either a completely unsupported format, or a dialect of a
-     # supported format (ie. some types of PNG)
-     UnsupportedImageType = Class.new(StandardError)
+    # this error is raised when a user attempts to embed an image of an unsupported
+    # type. This can either a completely unsupported format, or a dialect of a
+    # supported format (ie. some types of PNG)
+    UnsupportedImageType = Class.new(StandardError)
 
     # This error is raised when a named element has alredy been
     # created. For example, in the stamp module, stamps must have
@@ -75,6 +75,5 @@ module Prawn
     # Raised when unrecognized content is provided for a table cell.
     #
     UnrecognizedTableContent = Class.new(StandardError)
-
   end
 end

data/lib/prawn/font.rb

@@ -12,7 +12,6 @@ require_relative "font/dfont"
 require_relative "font_metric_cache"
 
 module Prawn
-
   class Document
     # @group Stable API
 
@@ -48,11 +47,11 @@ module Prawn
     # the :style option you need to map those font styles to their respective font files.
     # See font_families for more information.
     #
-    def font(name=nil, options={})
+    def font(name = nil, options = {})
       return((defined?(@font) && @font) || font("Helvetica")) if name.nil?
 
       if state.pages.empty? && !state.page.in_stamp_stream?
-        raise Prawn::Errors::NotOnPage
+        fail Prawn::Errors::NotOnPage
       end
 
       new_font = find_font(name.to_s, options)
@@ -95,7 +94,7 @@ module Prawn
     # When called without an argument, this method returns the current font
     # size.
     #
-    def font_size(points=nil)
+    def font_size(points = nil)
       return @font_size unless points
       size_before_yield = @font_size
       @font_size = points
@@ -127,7 +126,7 @@ module Prawn
     # By putting width_of here, on Document itself, extensions may easily override
     # it and redefine the width calculation behavior.
     #++
-    def width_of(string, options={})
+    def width_of(string, options = {})
       if p = options[:inline_format]
         p = [] unless p.is_a?(Array)
 
@@ -170,21 +169,21 @@ module Prawn
     #
     def font_families
       @font_families ||= {}.merge!(
-        { "Courier"     => { :bold        => "Courier-Bold",
-                             :italic      => "Courier-Oblique",
-                             :bold_italic => "Courier-BoldOblique",
-                             :normal      => "Courier" },
-
-          "Times-Roman" => { :bold         => "Times-Bold",
-                             :italic       => "Times-Italic",
-                             :bold_italic  => "Times-BoldItalic",
-                             :normal       => "Times-Roman" },
-
-          "Helvetica"   => { :bold         => "Helvetica-Bold",
-                             :italic       => "Helvetica-Oblique",
-                             :bold_italic  => "Helvetica-BoldOblique",
-                             :normal       => "Helvetica" }
-        })
+        "Courier"     => { :bold        => "Courier-Bold",
+                           :italic      => "Courier-Oblique",
+                           :bold_italic => "Courier-BoldOblique",
+                           :normal      => "Courier" },
+
+        "Times-Roman" => { :bold         => "Times-Bold",
+                           :italic       => "Times-Italic",
+                           :bold_italic  => "Times-BoldItalic",
+                           :normal       => "Times-Roman" },
+
+        "Helvetica"   => { :bold         => "Helvetica-Bold",
+                           :italic       => "Helvetica-Oblique",
+                           :bold_italic  => "Helvetica-BoldOblique",
+                           :normal       => "Helvetica" }
+      )
     end
 
     # @group Experimental API
@@ -192,7 +191,7 @@ module Prawn
     # Sets the font directly, given an actual Font object
     # and size.
     #
-    def set_font(font, size=nil) # :nodoc:
+    def set_font(font, size = nil) # :nodoc:
       @font = font
       @font_size = size if size
     end
@@ -228,7 +227,7 @@ module Prawn
     # ++
     #
     # @private
-    def find_font(name, options={}) #:nodoc:
+    def find_font(name, options = {}) #:nodoc:
       if font_families.key?(name)
         family, name = name, font_families[name][options[:style] || :normal]
         if name.is_a?(::Hash)
@@ -241,10 +240,7 @@ module Prawn
       if name.is_a? Prawn::Font
         font_registry[key] = name
       else
-        font_registry[key] ||= Font.load( self,
-                                          name,
-                                          options.merge(family: family)
-                               )
+        font_registry[key] ||= Font.load(self, name, options.merge(family: family))
       end
     end
 
@@ -256,7 +252,7 @@ module Prawn
 
     private
 
-    def width_of_inline_formatted_string(string, options={})
+    def width_of_inline_formatted_string(string, options = {})
       # Build up an Arranger with the entire string on one line, finalize it,
       # and find its width.
       arranger = Prawn::Text::Formatted::Arranger.new(self, options)
@@ -266,15 +262,14 @@ module Prawn
       arranger.line_width
     end
 
-    def width_of_string(string, options={})
-      font_metric_cache.width_of( string, options )
+    def width_of_string(string, options = {})
+      font_metric_cache.width_of(string, options)
     end
   end
 
   # Provides font information and helper functions.
   #
   class Font
-
     # The current font name
     attr_reader :name
 
@@ -287,7 +282,7 @@ module Prawn
     # Shortcut interface for constructing a font object.  Filenames of the form
     # *.ttf will call Font::TTF.new, *.dfont Font::DFont.new, and anything else
     # will be passed through to Font::AFM.new()
-    def self.load(document, src, options={})
+    def self.load(document, src, options = {})
       case font_format(src, options)
       when 'ttf'   then TTF.new(document, src, options)
       when 'dfont' then DFont.new(document, src, options)
@@ -305,7 +300,7 @@ module Prawn
       end
     end
 
-    def initialize(document,name,options={}) #:nodoc:
+    def initialize(document, name, options = {}) #:nodoc:
       @document   = document
       @name       = name
       @options    = options
@@ -340,7 +335,7 @@ module Prawn
     # and the new string will be returned. For an in-place (destructive)
     # version, see normalize_encoding!.
     def normalize_encoding(string)
-      raise NotImplementedError, "subclasses of Prawn::Font must implement #normalize_encoding"
+      fail NotImplementedError, "subclasses of Prawn::Font must implement #normalize_encoding"
     end
 
     # Destructive version of normalize_encoding; normalizes the encoding of a
@@ -391,7 +386,7 @@ module Prawn
 
     # Compliments the #hash implementation above
     #
-    def eql?( other ) #:nodoc:
+    def eql?(other) #:nodoc:
       self.class == other.class && self.name == other.name &&
         self.family == other.family && size == other.send(:size)
     end
@@ -407,7 +402,5 @@ module Prawn
     def size
       @document.font_size
     end
-
   end
-
 end

data/lib/prawn/font/afm.rb

@@ -10,7 +10,6 @@ require_relative "../encoding"
 
 module Prawn
   class Font
-
     # @private
 
     class AFM < Font
@@ -37,15 +36,16 @@ module Prawn
             ".", "/usr/lib/afm",
             "/usr/local/lib/afm",
             "/usr/openwin/lib/fonts/afm",
-             Prawn::DATADIR+'/fonts']
+            Prawn::DATADIR + '/fonts'
+          ]
         end
       end
 
       attr_reader :attributes #:nodoc:
 
-      def initialize(document, name, options={}) #:nodoc:
+      def initialize(document, name, options = {}) #:nodoc:
         unless BUILT_INS.include?(name)
-          raise Prawn::Errors::UnknownFont, "#{name} is not a known font."
+          fail Prawn::Errors::UnknownFont, "#{name} is not a known font."
         end
 
         super
@@ -54,7 +54,7 @@ module Prawn
 
         file_name = @name.dup
         file_name << ".afm" unless file_name =~ /\.afm$/
-        file_name = file_name[0] == ?/ ? file_name : find_font(file_name)
+        file_name = file_name[0] == '/' ? file_name : find_font(file_name)
 
         font_data = @@font_data[file_name] ||= parse_afm(file_name)
         @glyph_widths    = font_data[:glyph_widths]
@@ -76,12 +76,12 @@ module Prawn
       end
 
       # NOTE: String *must* be encoded as WinAnsi
-      def compute_width_of(string, options={}) #:nodoc:
+      def compute_width_of(string, options = {}) #:nodoc:
         scale = (options[:size] || size) / 1000.0
 
         if options[:kerning]
           strings, numbers = kern(string).partition { |e| e.is_a?(String) }
-          total_kerning_offset = numbers.inject(0.0) { |s,r| s + r }
+          total_kerning_offset = numbers.inject(0.0) { |s, r| s + r }
           (unscaled_width_of(strings.join) - total_kerning_offset) * scale
         else
           unscaled_width_of(string) * scale
@@ -104,8 +104,8 @@ module Prawn
              ::Encoding::UndefinedConversionError
 
         raise Prawn::Errors::IncompatibleStringEncoding,
-          "Your document includes text that's not compatible with the Windows-1252 character set.\n"+
-          "If you need full UTF-8 support, use TTF fonts instead of PDF's built-in fonts\n."
+              "Your document includes text that's not compatible with the Windows-1252 character set.\n" \
+              "If you need full UTF-8 support, use TTF fonts instead of PDF's built-in fonts\n."
       end
 
       def to_utf8(text)
@@ -130,7 +130,7 @@ module Prawn
       #
       # The +text+ parameter must be in WinAnsi encoding (cp1252).
       #
-      def encode_text(text, options={})
+      def encode_text(text, options = {})
         [[0, options[:kerning] ? kern(text) : text]]
       end
 
@@ -143,9 +143,11 @@ module Prawn
       private
 
       def register(subset)
-        font_dict = {:Type     => :Font,
-                     :Subtype  => :Type1,
-                     :BaseFont => name.to_sym}
+        font_dict = {
+          :Type     => :Font,
+          :Subtype  => :Type1,
+          :BaseFont => name.to_sym
+        }
 
         # Symbolic AFM fonts (Symbol, ZapfDingbats) have their own encodings
         font_dict.merge!(:Encoding => :WinAnsiEncoding) unless symbolic?
@@ -161,12 +163,11 @@ module Prawn
         self.class.metrics_path.find { |f| File.exist? "#{f}/#{file}" } + "/#{file}"
       rescue NoMethodError
         raise Prawn::Errors::UnknownFont,
-          "Couldn't find the font: #{file} in any of:\n" +
-           self.class.metrics_path.join("\n")
+              "Couldn't find the font: #{file} in any of:\n" + self.class.metrics_path.join("\n")
       end
 
       def parse_afm(file_name)
-        data    = {:glyph_widths => {}, :bounding_boxes => {}, :kern_pairs => {}, :attributes => {}}
+        data    = { :glyph_widths => {}, :bounding_boxes => {}, :kern_pairs => {}, :attributes => {} }
         section = []
 
         File.foreach(file_name) do |line|
@@ -204,12 +205,11 @@ module Prawn
         end
 
         character_hash = Hash[Encoding::WinAnsi::CHARACTERS.zip((0..Encoding::WinAnsi::CHARACTERS.size).to_a)]
-        data[:kern_pair_table] = data[:kern_pairs].inject({}) do |h,p|
+        data[:kern_pair_table] = data[:kern_pairs].each_with_object({}) do |p, h|
           h[p[0].map { |n| character_hash[n] }] = p[1]
-          h
         end
 
-        data.each_value { |hash| hash.freeze }
+        data.each_value(&:freeze)
         data.freeze
       end
 
@@ -247,7 +247,7 @@ module Prawn
       private
 
       def unscaled_width_of(string)
-        string.bytes.inject(0) do |s,r|
+        string.bytes.inject(0) do |s, r|
           s + @glyph_table[r]
         end
       end

data/lib/prawn/font/dfont.rb

@@ -12,7 +12,6 @@ module Prawn
   class Font
     # @private
     class DFont < TTF
-
       # Returns a list of the names of all named fonts in the given dfont file.
       # Note that fonts are not required to be named in a dfont file, so the
       # list may be empty even if the file does contain fonts. Also, note that

data/lib/prawn/font/ttf.rb

@@ -12,7 +12,6 @@ require 'ttfunk/subset_collection'
 
 module Prawn
   class Font
-
     # @private
     class TTF < Font
       attr_reader :ttf, :subsets
@@ -21,7 +20,7 @@ module Prawn
         true
       end
 
-      def initialize(document, name, options={})
+      def initialize(document, name, options = {})
         super
 
         @ttf              = read_ttf_file
@@ -38,10 +37,10 @@ module Prawn
       end
 
       # NOTE: +string+ must be UTF8-encoded.
-      def compute_width_of(string, options={}) #:nodoc:
+      def compute_width_of(string, options = {}) #:nodoc:
         scale = (options[:size] || size) / 1000.0
         if options[:kerning]
-          kern(string).inject(0) do |s,r|
+          kern(string).inject(0) do |s, r|
             if r.is_a?(Numeric)
               s - r
             else
@@ -49,7 +48,7 @@ module Prawn
             end
           end * scale
         else
-          string.codepoints.inject(0) do |s,r|
+          string.codepoints.inject(0) do |s, r|
             s + character_width_by_code(r)
           end * scale
         end
@@ -74,7 +73,7 @@ module Prawn
       #
       # The +text+ parameter must be UTF8-encoded.
       #
-      def encode_text(text,options={})
+      def encode_text(text, options = {})
         text = text.chomp
 
         if options[:kerning]
@@ -115,14 +114,18 @@ module Prawn
       end
 
       def italic_angle
-        @italic_angle ||= if @ttf.postscript.exists?
+        return @italic_angle if @italic_angle
+
+        if @ttf.postscript.exists?
           raw = @ttf.postscript.italic_angle
           hi, low = raw >> 16, raw & 0xFF
           hi = -((hi ^ 0xFFFF) + 1) if hi & 0x8000 != 0
-          "#{hi}.#{low}".to_f
+          @italic_angle = "#{hi}.#{low}".to_f
         else
-          0
+          @italic_angle = 0
         end
+
+        @italic_angle
       end
 
       def cap_height
@@ -143,7 +146,7 @@ module Prawn
       end
 
       def serif?
-        @serif ||= [1,2,3,4,5,7].include?(family_class)
+        @serif ||= [1, 2, 3, 4, 5, 7].include?(family_class)
       end
 
       def script?
@@ -166,9 +169,9 @@ module Prawn
           text.encode(::Encoding::UTF_8)
         rescue => e
           puts e
-          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 " +
+          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
@@ -191,7 +194,7 @@ module Prawn
       private
 
       def cmap
-        @cmap ||= @ttf.cmap.unicode.first or raise("no unicode cmap for font")
+        @cmap ||= @ttf.cmap.unicode.first or fail("no unicode cmap for font")
       end
 
       # +string+ must be UTF8-encoded.
@@ -244,7 +247,7 @@ module Prawn
       end
 
       def register(subset)
-        temp_name = @ttf.name.postscript_name.gsub("\0","").to_sym
+        temp_name = @ttf.name.postscript_name.gsub("\0", "").to_sym
         ref = @document.ref!(:Type => :Font, :BaseFont => temp_name)
 
         # Embed the font metrics in the document after everything has been
@@ -264,25 +267,25 @@ module Prawn
 
         # empirically, it looks like Adobe Reader will not display fonts
         # if their font name is more than 33 bytes long. Strange. But true.
-        basename = font.name.postscript_name[0, 33].gsub("\0","")
+        basename = font.name.postscript_name[0, 33].gsub("\0", "")
 
-        raise "Can't detect a postscript name for #{file}" if basename.nil?
+        fail "Can't detect a postscript name for #{file}" if basename.nil?
 
         fontfile = @document.ref!(:Length1 => font_content.size)
         fontfile.stream << font_content
         fontfile.stream.compress!
 
         descriptor = @document.ref!(:Type        => :FontDescriptor,
-                                   :FontName    => basename.to_sym,
-                                   :FontFile2   => fontfile,
-                                   :FontBBox    => bbox,
-                                   :Flags       => pdf_flags,
-                                   :StemV       => stemV,
-                                   :ItalicAngle => italic_angle,
-                                   :Ascent      => @ascender,
-                                   :Descent     => @descender,
-                                   :CapHeight   => cap_height,
-                                   :XHeight     => x_height)
+                                    :FontName    => basename.to_sym,
+                                    :FontFile2   => fontfile,
+                                    :FontBBox    => bbox,
+                                    :Flags       => pdf_flags,
+                                    :StemV       => stemV,
+                                    :ItalicAngle => italic_angle,
+                                    :Ascent      => @ascender,
+                                    :Descent     => @descender,
+                                    :CapHeight   => cap_height,
+                                    :XHeight     => x_height)
 
         hmtx = font.horizontal_metrics
         widths = font.cmap.tables.first.code_map.map { |gid|