prawn 2.0.1 → 2.0.2

data/lib/prawn/graphics/transformation.rb

@@ -40,7 +40,7 @@ module Prawn
       #     pdf.stroke_rectangle([x, y], width, height)
       #   end
       #
-      def rotate(angle, options={}, &block)
+      def rotate(angle, options = {}, &block)
         Prawn.verify_options(:origin, options)
         rad = degree_to_rad(angle)
         cos = Math.cos(rad)
@@ -48,7 +48,7 @@ module Prawn
         if options[:origin].nil?
           transformation_matrix(cos, sin, -sin, cos, 0, 0, &block)
         else
-          raise Prawn::Errors::BlockRequired unless block_given?
+          fail Prawn::Errors::BlockRequired unless block_given?
           x = options[:origin][0] + bounds.absolute_left
           y = options[:origin][1] + bounds.absolute_bottom
           x_prime = x * cos - y * sin
@@ -112,12 +112,12 @@ module Prawn
       #     pdf.stroke_rectangle([x, y], width, height)
       #   end
       #
-      def scale(factor, options={}, &block)
+      def scale(factor, options = {}, &block)
         Prawn.verify_options(:origin, options)
         if options[:origin].nil?
           transformation_matrix(factor, 0, 0, factor, 0, 0, &block)
         else
-          raise Prawn::Errors::BlockRequired unless block_given?
+          fail Prawn::Errors::BlockRequired unless block_given?
           x = options[:origin][0] + bounds.absolute_left
           y = options[:origin][1] + bounds.absolute_bottom
           x_prime = factor * x
@@ -151,7 +151,6 @@ module Prawn
           restore_graphics_state
         end
       end
-
     end
   end
 end

data/lib/prawn/graphics/transparency.rb

@@ -9,7 +9,6 @@
 
 module Prawn
   module Graphics
-
     # The Prawn::Transparency module is used to place transparent
     # content on the page. It has the capacity for separate
     # transparency values for stroked content and all other content.
@@ -29,7 +28,6 @@ module Prawn
     #   end
     #
     module Transparency
-
       # @group Stable API
 
       # Sets the <tt>opacity</tt> and <tt>stroke_opacity</tt> for all
@@ -53,7 +51,7 @@ module Prawn
       #     pdf.fill_and_stroke_circle([x, y], 25)
       #   end
       #
-      def transparent(opacity, stroke_opacity=opacity, &block)
+      def transparent(opacity, stroke_opacity = opacity, &block)
         renderer.min_version(1.4)
 
         opacity        = [[opacity, 0.0].max, 1.0].min
@@ -82,10 +80,11 @@ module Prawn
           dictionary =  opacity_dictionary_registry[key][:obj]
           dictionary_name =  opacity_dictionary_registry[key][:name]
         else
-          dictionary = ref!(:Type => :ExtGState,
-                                    :CA   => stroke_opacity,
-                                    :ca   => opacity
-                                    )
+          dictionary = ref!(
+            :Type => :ExtGState,
+            :CA   => stroke_opacity,
+            :ca   => opacity
+          )
 
           dictionary_name = "Tr#{next_opacity_dictionary_id}"
           opacity_dictionary_registry[key] = { :name => dictionary_name,
@@ -95,7 +94,6 @@ module Prawn
         page.ext_gstates.merge!(dictionary_name => dictionary)
         dictionary_name
       end
-
     end
   end
 end

data/lib/prawn/grid.rb

@@ -33,17 +33,21 @@ module Prawn
     #
     def grid(*args)
       @boxes ||= {}
-      @boxes[args] ||= if args.empty?
-        @grid
+      return @boxes[args] if @boxes[args]
+
+      if args.empty?
+        @boxes[args] = @grid
       else
         g1, g2 = args
-        if(g1.class == Array && g2.class == Array &&
-          g1.length == 2 && g2.length == 2)
-          multi_box(single_box(*g1), single_box(*g2))
+
+        if g1.class == Array && g2.class == Array && g1.length == 2 && g2.length == 2
+          @boxes[args] = multi_box(single_box(*g1), single_box(*g2))
         else
-          single_box(g1, g2)
+          @boxes[args] = single_box(g1, g2)
         end
       end
+
+      @boxes[args]
     end
 
     # A Grid represents the entire grid system of a Page and calculates
@@ -69,14 +73,14 @@ module Prawn
 
       # Calculates the base height of boxes.
       def row_height
-       @row_height ||= subdivide(pdf.bounds.height, rows, row_gutter)
+        @row_height ||= subdivide(pdf.bounds.height, rows, row_gutter)
       end
 
       # Diagnostic tool to show all of the grids.  Defaults to gray.
       def show_all(color = "CCCCCC")
         self.rows.times do |i|
           self.columns.times do |j|
-            pdf.grid(i,j).show(color)
+            pdf.grid(i, j).show(color)
           end
         end
       end
@@ -88,7 +92,7 @@ module Prawn
       end
 
       def set_gutter(options)
-        if options.has_key?(:gutter)
+        if options.key?(:gutter)
           @gutter = options[:gutter].to_f
           @row_gutter, @column_gutter = @gutter, @gutter
         else
@@ -199,6 +203,7 @@ module Prawn
       end
 
       private
+
       def grid
         pdf.grid
       end
@@ -214,7 +219,7 @@ module Prawn
       end
 
       def name
-        @bs.map {|b| b.name}.join(":")
+        @bs.map(&:name).join(":")
       end
 
       def total_height
@@ -250,24 +255,26 @@ module Prawn
       end
 
       private
+
       def left_box
-        @left_box ||= @bs.min {|a,b| a.left <=> b.left}
+        @left_box ||= @bs.min { |a, b| a.left <=> b.left }
       end
 
       def right_box
-        @right_box ||= @bs.max {|a,b| a.right <=> b.right}
+        @right_box ||= @bs.max { |a, b| a.right <=> b.right }
       end
 
       def top_box
-        @top_box ||= @bs.max {|a,b| a.top <=> b.top}
+        @top_box ||= @bs.max { |a, b| a.top <=> b.top }
       end
 
       def bottom_box
-        @bottom_box ||= @bs.min {|a,b| a.bottom <=> b.bottom}
+        @bottom_box ||= @bs.min { |a, b| a.bottom <=> b.bottom }
       end
     end
 
     private
+
     def single_box(i, j)
       GridBox.new(self, i, j)
     end

data/lib/prawn/image_handler.rb

@@ -37,8 +37,8 @@ module Prawn
 
       return handler if handler
 
-      raise Prawn::Errors::UnsupportedImageType,
-            "image file is an unrecognised format"
+      fail Prawn::Errors::UnsupportedImageType,
+           "image file is an unrecognised format"
     end
   end
 end

data/lib/prawn/images.rb

@@ -9,7 +9,6 @@ require 'digest/sha1'
 require 'pathname'
 
 module Prawn
-
   module Images
     # @group Stable API
 
@@ -60,7 +59,7 @@ module Prawn
     # dimensions of an image object if needed.
     # (See also: Prawn::Images::PNG , Prawn::Images::JPG)
     #
-    def image(file, options={})
+    def image(file, options = {})
       Prawn.verify_options [:at, :position, :vposition, :height,
                             :width, :scale, :fit], options
 
@@ -70,7 +69,6 @@ module Prawn
       info
     end
 
-
     # Builds an info object (Prawn::Images::*) and a PDF reference representing
     # the given image. Return a pair: [pdf_obj, info].
     #
@@ -93,7 +91,7 @@ module Prawn
 
         # Add the image to the PDF and register it in case we see it again.
         image_obj = info.build_pdf_object(self)
-        image_registry[image_sha1] = {:obj => image_obj, :info => info}
+        image_registry[image_sha1] = { :obj => image_obj, :info => info }
       end
 
       [image_obj, info]
@@ -107,12 +105,12 @@ module Prawn
     # @private
     def embed_image(pdf_obj, info, options)
       # find where the image will be placed and how big it will be
-      w,h = info.calc_image_dimensions(options)
+      w, h = info.calc_image_dimensions(options)
 
       if options[:at]
-        x,y = map_to_absolute(options[:at])
+        x, y = map_to_absolute(options[:at])
       else
-        x,y = image_position(w,h,options)
+        x, y = image_position(w, h, options)
         move_text_position h
       end
 
@@ -141,39 +139,39 @@ module Prawn
       end
       # String or Pathname
       io_or_path = Pathname.new(io_or_path)
-      raise ArgumentError, "#{io_or_path} not found" unless io_or_path.file?
+      fail ArgumentError, "#{io_or_path} not found" unless io_or_path.file?
       io = io_or_path.open('rb')
       io
     end
 
-    def image_position(w,h,options)
+    def image_position(w, h, options)
       options[:position] ||= :left
 
       y = case options[:vposition]
-      when :top
-        bounds.absolute_top
-      when :center
-        bounds.absolute_top - (bounds.height - h) / 2.0
-      when :bottom
-        bounds.absolute_bottom + h
-      when Numeric
-        bounds.absolute_top - options[:vposition]
-      else
-        determine_y_with_page_flow(h)
-      end
+          when :top
+            bounds.absolute_top
+          when :center
+            bounds.absolute_top - (bounds.height - h) / 2.0
+          when :bottom
+            bounds.absolute_bottom + h
+          when Numeric
+            bounds.absolute_top - options[:vposition]
+          else
+            determine_y_with_page_flow(h)
+          end
 
       x = case options[:position]
-      when :left
-        bounds.left_side
-      when :center
-        bounds.left_side + (bounds.width - w) / 2.0
-      when :right
-        bounds.right_side - w
-      when Numeric
-        options[:position] + bounds.left_side
-      end
-
-      return [x,y]
+          when :left
+            bounds.left_side
+          when :center
+            bounds.left_side + (bounds.width - w) / 2.0
+          when :right
+            bounds.right_side - w
+          when Numeric
+            options[:position] + bounds.left_side
+          end
+
+      return [x, y]
     end
 
     def determine_y_with_page_flow(h)

data/lib/prawn/images/image.rb

@@ -42,7 +42,7 @@ module Prawn
         self.scaled_width = w
         self.scaled_height = h
 
-        [w,h]
+        [w, h]
       end
     end
   end

data/lib/prawn/images/jpg.rb

@@ -10,7 +10,6 @@ require 'stringio'
 
 module Prawn
   module Images
-
     # A convenience class that wraps the logic for extracting the parts
     # of a JPG image that we need to embed them in a PDF
     #
@@ -39,7 +38,7 @@ module Prawn
         d.seek(2)    # Skip the first two bytes of JPEG identifier.
         loop do
           marker, code, length = d.read(4).unpack('CCn')
-          raise "JPEG marker not found!" if marker != c_marker
+          fail "JPEG marker not found!" if marker != c_marker
 
           if JPEG_SOF_BLOCKS.include?(code)
             @bits, @height, @width, @channels = d.read(6).unpack("CnnC")
@@ -55,15 +54,15 @@ module Prawn
       #
       def build_pdf_object(document)
         color_space = case channels
-        when 1
-          :DeviceGray
-        when 3
-          :DeviceRGB
-        when 4
-          :DeviceCMYK
-        else
-          raise ArgumentError, 'JPG uses an unsupported number of channels'
-        end
+                      when 1
+                        :DeviceGray
+                      when 3
+                        :DeviceRGB
+                      when 4
+                        :DeviceCMYK
+                      else
+                        fail ArgumentError, 'JPG uses an unsupported number of channels'
+                      end
 
         obj = document.ref!(
           :Type             => :XObject,
@@ -85,7 +84,6 @@ module Prawn
         obj.stream.filters << :DCTDecode
         obj
       end
-
     end
   end
 end

data/lib/prawn/images/png.rb

@@ -68,9 +68,9 @@ module Prawn
             @transparency = {}
             case @color_type
             when 3
-              raise Errors::UnsupportedImageType,
-                "Pallete-based transparency in PNG is not currently supported.\n" +
-                "See https://github.com/prawnpdf/prawn/issues/783"
+              fail Errors::UnsupportedImageType,
+                   "Pallete-based transparency in PNG is not currently supported.\n" \
+                   "See https://github.com/prawnpdf/prawn/issues/783"
             when 0
               # Greyscale. Corresponding to entries in the PLTE chunk.
               # Grey is two bytes, range 0 .. (2 ^ bit-depth) - 1
@@ -121,18 +121,18 @@ module Prawn
       #
       def build_pdf_object(document)
         if compression_method != 0
-          raise Errors::UnsupportedImageType,
-            'PNG uses an unsupported compression method'
+          fail Errors::UnsupportedImageType,
+               'PNG uses an unsupported compression method'
         end
 
         if filter_method != 0
-          raise Errors::UnsupportedImageType,
-            'PNG uses an unsupported filter method'
+          fail Errors::UnsupportedImageType,
+               'PNG uses an unsupported filter method'
         end
 
         if interlace_method != 0
-          raise Errors::UnsupportedImageType,
-            'PNG uses unsupported interlace method'
+          fail Errors::UnsupportedImageType,
+               'PNG uses unsupported interlace method'
         end
 
         # some PNG types store the colour and alpha channel data together,
@@ -145,8 +145,8 @@ module Prawn
         when 3
           color = :DeviceRGB
         else
-          raise Errors::UnsupportedImageType,
-            "PNG uses an unsupported number of colors (#{png.colors})"
+          fail Errors::UnsupportedImageType,
+               "PNG uses an unsupported number of colors (#{png.colors})"
         end
 
         # build the image dict
@@ -181,7 +181,7 @@ module Prawn
           # build the color space array for the image
           obj.data[:ColorSpace] = [:Indexed,
                                    :DeviceRGB,
-                                   (palette.size / 3) -1,
+                                   (palette.size / 3) - 1,
                                    palette_obj]
         end
 
@@ -203,7 +203,7 @@ module Prawn
           # - An array with N elements, where N is two times the number of color
           #   components.
           rgb = transparency[:rgb]
-          obj.data[:Mask] = rgb.collect { |x| [x,x] }.flatten
+          obj.data[:Mask] = rgb.collect { |x| [x, x] }.flatten
         end
 
         # For PNG color types 4 and 6, the transparency data is stored as a alpha

data/lib/prawn/measurements.rb

@@ -7,37 +7,30 @@ module Prawn
   # @group Stable API
 
   module Measurements
-
-    # ============================================================================
-    #metric conversions
+    # metric conversions
     def cm2mm(cm)
-      return cm*10
+      return cm * 10
     end
 
     def dm2mm(dm)
-      return dm*100
+      return dm * 100
     end
 
     def m2mm(m)
-      return m*1000
+      return m * 1000
     end
 
-    # ============================================================================
     # imperial conversions
     # from http://en.wikipedia.org/wiki/Imperial_units
-
     def ft2in(ft)
       return ft * 12
     end
 
     def yd2in(yd)
-      return yd*36
+      return yd * 36
     end
 
-
-    # ============================================================================
     # PostscriptPoint-converisons
-
     def pt2pt(pt)
       return pt
     end
@@ -55,7 +48,7 @@ module Prawn
     end
 
     def mm2pt(mm)
-        return mm*(72 / 25.4)
+      return mm * (72 / 25.4)
     end
 
     def cm2pt(cm)
@@ -71,7 +64,7 @@ module Prawn
     end
 
     def pt2mm(pt)
-      return pt * 1 / mm2pt(1)# (25.4 / 72)
+      return pt * 1 / mm2pt(1) # (25.4 / 72)
     end
   end
 end