prawn 2.3.0 → 2.4.0

data/lib/prawn/graphics.rb

@@ -212,7 +212,7 @@ module Prawn
       move_to(x + radius1, y)
 
       # Upper right hand corner
-      curve_to [x,  y + radius2],
+      curve_to [x, y + radius2],
         bounds: [[x + radius1, y + l2], [x + l1, y + radius2]]
 
       # Upper left hand corner
@@ -341,10 +341,8 @@ module Prawn
       }.merge(options)
 
       Prawn.verify_options(
-        %i[
-          at width height step_length
-          negative_axes_length color
-        ], options
+        %i[at width height step_length negative_axes_length color],
+        options
       )
 
       save_graphics_state do
@@ -354,11 +352,13 @@ module Prawn
         dash(1, space: 4)
         stroke_horizontal_line(
           options[:at][0] - options[:negative_axes_length],
-          options[:at][0] + options[:width], at: options[:at][1]
+          options[:at][0] + options[:width],
+          at: options[:at][1]
         )
         stroke_vertical_line(
           options[:at][1] - options[:negative_axes_length],
-          options[:at][1] + options[:height], at: options[:at][0]
+          options[:at][1] + options[:height],
+          at: options[:at][0]
         )
         undash
 
@@ -633,10 +633,10 @@ module Prawn
 
     ops.product(shapes).each do |operation, shape|
       class_eval <<-METHOD, __FILE__, __LINE__ + 1
-        def #{operation}_#{shape}(*args)
-          #{shape}(*args)
-          #{operation}
-        end
+        def #{operation}_#{shape}(*args)    # def fill_polygon(*args)
+          #{shape}(*args)                   #   polygon(*args)
+          #{operation}                      #   fill
+        end                                 # end
       METHOD
     end
 

data/lib/prawn/graphics/color.rb

@@ -154,27 +154,29 @@ module Prawn
           raise ArgumentError, "unknown color space: '#{color_space}'"
         end
 
-        operator = case type
-                   when :fill
-                     'cs'
-                   when :stroke
-                     'CS'
-                   else
-                     raise ArgumentError, "unknown type '#{type}'"
-                   end
+        operator =
+          case type
+          when :fill
+            'cs'
+          when :stroke
+            'CS'
+          else
+            raise ArgumentError, "unknown type '#{type}'"
+          end
 
         renderer.add_content "/#{color_space} #{operator}"
       end
 
       def set_color(type, color, options = {})
-        operator = case type
-                   when :fill
-                     'scn'
-                   when :stroke
-                     'SCN'
-                   else
-                     raise ArgumentError, "unknown type '#{type}'"
-                   end
+        operator =
+          case type
+          when :fill
+            'scn'
+          when :stroke
+            'SCN'
+          else
+            raise ArgumentError, "unknown type '#{type}'"
+          end
 
         if options[:pattern]
           set_color_space type, :Pattern

data/lib/prawn/graphics/join_style.rb

@@ -28,7 +28,7 @@ module Prawn
         unless JOIN_STYLES.key?(current_join_style)
           raise Prawn::Errors::InvalidJoinStyle,
             "#{style} is not a recognized join style. Valid styles are " +
-            JOIN_STYLES.keys.join(', ')
+              JOIN_STYLES.keys.join(', ')
         end
 
         write_stroke_join_style

data/lib/prawn/graphics/patterns.rb

@@ -95,14 +95,15 @@ module Prawn
           patterns["SP#{registry_key}"] = shading
         end
 
-        operator = case type
-                   when :fill
-                     'scn'
-                   when :stroke
-                     'SCN'
-                   else
-                     raise ArgumentError, "unknown type '#{type}'"
-                   end
+        operator =
+          case type
+          when :fill
+            'scn'
+          when :stroke
+            'SCN'
+          else
+            raise ArgumentError, "unknown type '#{type}'"
+          end
 
         set_color_space type, :Pattern
         renderer.add_content "/SP#{registry_key} #{operator}"
@@ -113,6 +114,7 @@ module Prawn
         *arguments, from: nil, to: nil, r1: nil, r2: nil, stops: nil,
         apply_transformations: nil
       )
+
         case arguments.length
         when 0
           apply_transformations = true if apply_transformations.nil?
@@ -128,22 +130,23 @@ module Prawn
           raise ArgumentError, 'At least two stops must be specified'
         end
 
-        stops = stops.map.with_index do |stop, index|
-          case stop
-          when Array, Hash
-            position, color = stop
-          else
-            position = index / (stops.length.to_f - 1)
-            color = stop
+        stops =
+          stops.map.with_index do |stop, index|
+            case stop
+            when Array, Hash
+              position, color = stop
+            else
+              position = index / (stops.length.to_f - 1)
+              color = stop
+            end
+
+            unless (0..1).cover?(position)
+              raise ArgumentError, 'position must be between 0 and 1'
+            end
+
+            GradientStop.new(position, normalize_color(color))
           end
 
-          unless (0..1).cover?(position)
-            raise ArgumentError, 'position must be between 0 and 1'
-          end
-
-          GradientStop.new(position, normalize_color(color))
-        end
-
         if stops.first.position != 0
           raise ArgumentError, 'The first stop must have a position of 0'
         end
@@ -159,8 +162,10 @@ module Prawn
           r1 ? :radial : :axial,
           apply_transformations,
           stops,
-          from, to,
-          r1, r2
+          from,
+          to,
+          r1,
+          r2
         )
       end
       # rubocop: enable Metrics/ParameterLists
@@ -195,37 +200,40 @@ module Prawn
             'for more information.'
         end
 
-        shader_stops = gradient.stops.each_cons(2).map do |first, second|
-          ref!(
-            FunctionType: 2,
-            Domain: [0.0, 1.0],
-            C0: first.color,
-            C1: second.color,
-            N: 1.0
-          )
-        end
+        shader_stops =
+          gradient.stops.each_cons(2).map do |first, second|
+            ref!(
+              FunctionType: 2,
+              Domain: [0.0, 1.0],
+              C0: first.color,
+              C1: second.color,
+              N: 1.0
+            )
+          end
 
         # If there's only two stops, we can use the single shader.
         # Otherwise we stitch the multiple shaders together.
-        shader = if shader_stops.length == 1
-                   shader_stops.first
-                 else
-                   ref!(
-                     FunctionType: 3, # stitching function
-                     Domain: [0.0, 1.0],
-                     Functions: shader_stops,
-                     Bounds: gradient.stops[1..-2].map(&:position),
-                     Encode: [0.0, 1.0] * shader_stops.length
-                   )
-                 end
+        shader =
+          if shader_stops.length == 1
+            shader_stops.first
+          else
+            ref!(
+              FunctionType: 3, # stitching function
+              Domain: [0.0, 1.0],
+              Functions: shader_stops,
+              Bounds: gradient.stops[1..-2].map(&:position),
+              Encode: [0.0, 1.0] * shader_stops.length
+            )
+          end
 
         x1, y1, x2, y2, transformation = gradient_coordinates(gradient)
 
-        coords = if gradient.type == :axial
-                   [0, 0, x2 - x1, y2 - y1]
-                 else
-                   [0, 0, gradient.r1, x2 - x1, y2 - y1, gradient.r2]
-                 end
+        coords =
+          if gradient.type == :axial
+            [0, 0, x2 - x1, y2 - y1]
+          else
+            [0, 0, gradient.r1, x2 - x1, y2 - y1, gradient.r2]
+          end
 
         shading = ref!(
           ShadingType: gradient.type == :axial ? 2 : 3,

data/lib/prawn/graphics/transformation.rb

@@ -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?
+          raise Prawn::Errors::BlockRequired unless block
 
           x = options[:origin][0] + bounds.absolute_left
           y = options[:origin][1] + bounds.absolute_bottom
@@ -118,7 +118,7 @@ module Prawn
         if options[:origin].nil?
           transformation_matrix(factor, 0, 0, factor, 0, 0, &block)
         else
-          raise Prawn::Errors::BlockRequired unless block_given?
+          raise Prawn::Errors::BlockRequired unless block
 
           x = options[:origin][0] + bounds.absolute_left
           y = options[:origin][1] + bounds.absolute_bottom
@@ -149,11 +149,11 @@ module Prawn
           raise ArgumentError,
             'Transformation matrix must have exacty 6 elements'
         end
-        values = matrix.map { |x| x.to_f.round(5) }.join(' ')
         save_graphics_state if block_given?
 
         add_to_transformation_stack(*matrix)
 
+        values = PDF::Core.real_params(matrix)
         renderer.add_content "#{values} cm"
         if block_given?
           yield

data/lib/prawn/grid.rb

@@ -56,6 +56,7 @@ module Prawn
     # @group Experimental API
     class Grid
       attr_reader :pdf, :columns, :rows, :gutter, :row_gutter, :column_gutter
+
       def initialize(pdf, options = {}) # :nodoc:
         valid_options = %i[columns rows gutter row_gutter column_gutter]
         Prawn.verify_options valid_options, options
@@ -213,12 +214,14 @@ module Prawn
     # A MultiBox is specified by 2 Boxes and spans the areas between.
     #
     # @group Experimental API
-    class MultiBox < GridBox
+    class MultiBox
       def initialize(pdf, box1, box2)
         @pdf = pdf
         @boxes = [box1, box2]
       end
 
+      attr_reader :pdf
+
       def name
         @boxes.map(&:name).join(':')
       end
@@ -255,6 +258,38 @@ module Prawn
         bottom_box.bottom
       end
 
+      def top_left
+        [left, top]
+      end
+
+      def top_right
+        [right, top]
+      end
+
+      def bottom_left
+        [left, bottom]
+      end
+
+      def bottom_right
+        [right, bottom]
+      end
+
+      def bounding_box(&blk)
+        pdf.bounding_box(top_left, width: width, height: height, &blk)
+      end
+
+      def show(grid_color = 'CCCCCC')
+        bounding_box do
+          original_stroke_color = pdf.stroke_color
+
+          pdf.stroke_color = grid_color
+          pdf.text name
+          pdf.stroke_bounds
+
+          pdf.stroke_color = original_stroke_color
+        end
+      end
+
       private
 
       def left_box

data/lib/prawn/images.rb

@@ -66,10 +66,10 @@ module Prawn
     # (See also: Prawn::Images::PNG , Prawn::Images::JPG)
     #
     def image(file, options = {})
-      Prawn.verify_options %i[
-        at position vposition height
-        width scale fit
-      ], options
+      Prawn.verify_options(
+        %i[at position vposition height width scale fit],
+        options
+      )
 
       pdf_obj, info = build_image_object(file)
       embed_image(pdf_obj, info, options)
@@ -156,29 +156,31 @@ module Prawn
     def image_position(width, height, options)
       options[:position] ||= :left
 
-      y = case options[:vposition]
-          when :top
-            bounds.absolute_top
-          when :center
-            bounds.absolute_top - (bounds.height - height) / 2.0
-          when :bottom
-            bounds.absolute_bottom + height
-          when Numeric
-            bounds.absolute_top - options[:vposition]
-          else
-            determine_y_with_page_flow(height)
-          end
-
-      x = case options[:position]
-          when :left
-            bounds.left_side
-          when :center
-            bounds.left_side + (bounds.width - width) / 2.0
-          when :right
-            bounds.right_side - width
-          when Numeric
-            options[:position] + bounds.left_side
-          end
+      y =
+        case options[:vposition]
+        when :top
+          bounds.absolute_top
+        when :center
+          bounds.absolute_top - (bounds.height - height) / 2.0
+        when :bottom
+          bounds.absolute_bottom + height
+        when Numeric
+          bounds.absolute_top - options[:vposition]
+        else
+          determine_y_with_page_flow(height)
+        end
+
+      x =
+        case options[:position]
+        when :left
+          bounds.left_side
+        when :center
+          bounds.left_side + (bounds.width - width) / 2.0
+        when :right
+          bounds.right_side - width
+        when Numeric
+          options[:position] + bounds.left_side
+        end
 
       [x, y]
     end

data/lib/prawn/images/jpg.rb

@@ -16,6 +16,8 @@ module Prawn
     # of a JPG image that we need to embed them in a PDF
     #
     class JPG < Image
+      class FormatError < StandardError; end
+
       # @group Extension API
 
       attr_reader :width, :height, :bits, :channels
@@ -35,6 +37,7 @@ module Prawn
       # <tt>:data</tt>:: A binary string of JPEG data
       #
       def initialize(data)
+        super()
         @data = data
         d = StringIO.new(@data)
         d.binmode
@@ -43,7 +46,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
+          raise FormatError, 'JPEG marker not found!' if marker != c_marker
 
           if JPEG_SOF_BLOCKS.include?(code)
             @bits, @height, @width, @channels = d.read(6).unpack('CnnC')

data/lib/prawn/images/png.rb

@@ -34,6 +34,7 @@ module Prawn
       # <tt>data</tt>:: A binary string of PNG data
       #
       def initialize(data)
+        super()
         data = StringIO.new(data.dup)
 
         data.read(8) # Skip the default header
@@ -212,7 +213,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.map { |x| [x, x] }.flatten
         end
 
         # For PNG color types 4 and 6, the transparency data is stored as