prawn-svg 0.34.2 → 0.35.0

data/lib/prawn/svg/calculators/pixels.rb

@@ -4,7 +4,7 @@ module Prawn::SVG::Calculators::Pixels
 
     def self.to_pixels(value, axis_length = nil, font_size: Prawn::SVG::Properties::EM)
       if value.is_a?(String)
-        if match = value.match(/\d(em|ex|pc|cm|mm|in)$/)
+        if (match = value.match(/\d(em|ex|pc|cm|mm|in)$/))
           case match[1]
           when 'em'
             value.to_f * font_size
@@ -15,7 +15,7 @@ module Prawn::SVG::Calculators::Pixels
           else
             send("#{match[1]}2pt", value.to_f)
           end
-        elsif value[-1..-1] == "%"
+        elsif value[-1..] == '%'
           value.to_f * axis_length / 100.0
         else
           value.to_f
@@ -39,14 +39,17 @@ module Prawn::SVG::Calculators::Pixels
   end
 
   def pixels(value)
-    value && Measurement.to_pixels(value, state.viewport_sizing.viewport_diagonal, font_size: computed_properties.numerical_font_size)
+    value && Measurement.to_pixels(value, state.viewport_sizing.viewport_diagonal,
+      font_size: computed_properties.numerical_font_size)
   end
 
   def x_pixels(value)
-    value && Measurement.to_pixels(value, state.viewport_sizing.viewport_width, font_size: computed_properties.numerical_font_size)
+    value && Measurement.to_pixels(value, state.viewport_sizing.viewport_width,
+      font_size: computed_properties.numerical_font_size)
   end
 
   def y_pixels(value)
-    value && Measurement.to_pixels(value, state.viewport_sizing.viewport_height, font_size: computed_properties.numerical_font_size)
+    value && Measurement.to_pixels(value, state.viewport_sizing.viewport_height,
+      font_size: computed_properties.numerical_font_size)
   end
 end

data/lib/prawn/svg/color.rb

@@ -2,243 +2,240 @@ class Prawn::SVG::Color
   RGB = Struct.new(:value)
   CMYK = Struct.new(:value)
 
-  RGB_DEFAULT_COLOR = RGB.new("000000")
+  RGB_DEFAULT_COLOR = RGB.new('000000')
   CMYK_DEFAULT_COLOR = CMYK.new([0, 0, 0, 100])
 
   HTML_COLORS = {
-    'aliceblue' => 'f0f8ff',
-    'antiquewhite' => 'faebd7',
-    'aqua' => '00ffff',
-    'aquamarine' => '7fffd4',
-    'azure' => 'f0ffff',
-    'beige' => 'f5f5dc',
-    'bisque' => 'ffe4c4',
-    'black' => '000000',
-    'blanchedalmond' => 'ffebcd',
-    'blue' => '0000ff',
-    'blueviolet' => '8a2be2',
-    'brown' => 'a52a2a',
-    'burlywood' => 'deb887',
-    'cadetblue' => '5f9ea0',
-    'chartreuse' => '7fff00',
-    'chocolate' => 'd2691e',
-    'coral' => 'ff7f50',
-    'cornflowerblue' => '6495ed',
-    'cornsilk' => 'fff8dc',
-    'crimson' => 'dc143c',
-    'cyan' => '00ffff',
-    'darkblue' => '00008b',
-    'darkcyan' => '008b8b',
-    'darkgoldenrod' => 'b8860b',
-    'darkgray' => 'a9a9a9',
-    'darkgreen' => '006400',
-    'darkgrey' => 'a9a9a9',
-    'darkkhaki' => 'bdb76b',
-    'darkmagenta' => '8b008b',
-    'darkolivegreen' => '556b2f',
-    'darkorange' => 'ff8c00',
-    'darkorchid' => '9932cc',
-    'darkred' => '8b0000',
-    'darksalmon' => 'e9967a',
-    'darkseagreen' => '8fbc8f',
-    'darkslateblue' => '483d8b',
-    'darkslategray' => '2f4f4f',
-    'darkslategrey' => '2f4f4f',
-    'darkturquoise' => '00ced1',
-    'darkviolet' => '9400d3',
-    'deeppink' => 'ff1493',
-    'deepskyblue' => '00bfff',
-    'dimgray' => '696969',
-    'dimgrey' => '696969',
-    'dodgerblue' => '1e90ff',
-    'firebrick' => 'b22222',
-    'floralwhite' => 'fffaf0',
-    'forestgreen' => '228b22',
-    'fuchsia' => 'ff00ff',
-    'gainsboro' => 'dcdcdc',
-    'ghostwhite' => 'f8f8ff',
-    'gold' => 'ffd700',
-    'goldenrod' => 'daa520',
-    'gray' => '808080',
-    'grey' => '808080',
-    'green' => '008000',
-    'greenyellow' => 'adff2f',
-    'honeydew' => 'f0fff0',
-    'hotpink' => 'ff69b4',
-    'indianred' => 'cd5c5c',
-    'indigo' => '4b0082',
-    'ivory' => 'fffff0',
-    'khaki' => 'f0e68c',
-    'lavender' => 'e6e6fa',
-    'lavenderblush' => 'fff0f5',
-    'lawngreen' => '7cfc00',
-    'lemonchiffon' => 'fffacd',
-    'lightblue' => 'add8e6',
-    'lightcoral' => 'f08080',
-    'lightcyan' => 'e0ffff',
+    'aliceblue'            => 'f0f8ff',
+    'antiquewhite'         => 'faebd7',
+    'aqua'                 => '00ffff',
+    'aquamarine'           => '7fffd4',
+    'azure'                => 'f0ffff',
+    'beige'                => 'f5f5dc',
+    'bisque'               => 'ffe4c4',
+    'black'                => '000000',
+    'blanchedalmond'       => 'ffebcd',
+    'blue'                 => '0000ff',
+    'blueviolet'           => '8a2be2',
+    'brown'                => 'a52a2a',
+    'burlywood'            => 'deb887',
+    'cadetblue'            => '5f9ea0',
+    'chartreuse'           => '7fff00',
+    'chocolate'            => 'd2691e',
+    'coral'                => 'ff7f50',
+    'cornflowerblue'       => '6495ed',
+    'cornsilk'             => 'fff8dc',
+    'crimson'              => 'dc143c',
+    'cyan'                 => '00ffff',
+    'darkblue'             => '00008b',
+    'darkcyan'             => '008b8b',
+    'darkgoldenrod'        => 'b8860b',
+    'darkgray'             => 'a9a9a9',
+    'darkgreen'            => '006400',
+    'darkgrey'             => 'a9a9a9',
+    'darkkhaki'            => 'bdb76b',
+    'darkmagenta'          => '8b008b',
+    'darkolivegreen'       => '556b2f',
+    'darkorange'           => 'ff8c00',
+    'darkorchid'           => '9932cc',
+    'darkred'              => '8b0000',
+    'darksalmon'           => 'e9967a',
+    'darkseagreen'         => '8fbc8f',
+    'darkslateblue'        => '483d8b',
+    'darkslategray'        => '2f4f4f',
+    'darkslategrey'        => '2f4f4f',
+    'darkturquoise'        => '00ced1',
+    'darkviolet'           => '9400d3',
+    'deeppink'             => 'ff1493',
+    'deepskyblue'          => '00bfff',
+    'dimgray'              => '696969',
+    'dimgrey'              => '696969',
+    'dodgerblue'           => '1e90ff',
+    'firebrick'            => 'b22222',
+    'floralwhite'          => 'fffaf0',
+    'forestgreen'          => '228b22',
+    'fuchsia'              => 'ff00ff',
+    'gainsboro'            => 'dcdcdc',
+    'ghostwhite'           => 'f8f8ff',
+    'gold'                 => 'ffd700',
+    'goldenrod'            => 'daa520',
+    'gray'                 => '808080',
+    'grey'                 => '808080',
+    'green'                => '008000',
+    'greenyellow'          => 'adff2f',
+    'honeydew'             => 'f0fff0',
+    'hotpink'              => 'ff69b4',
+    'indianred'            => 'cd5c5c',
+    'indigo'               => '4b0082',
+    'ivory'                => 'fffff0',
+    'khaki'                => 'f0e68c',
+    'lavender'             => 'e6e6fa',
+    'lavenderblush'        => 'fff0f5',
+    'lawngreen'            => '7cfc00',
+    'lemonchiffon'         => 'fffacd',
+    'lightblue'            => 'add8e6',
+    'lightcoral'           => 'f08080',
+    'lightcyan'            => 'e0ffff',
     'lightgoldenrodyellow' => 'fafad2',
-    'lightgray' => 'd3d3d3',
-    'lightgreen' => '90ee90',
-    'lightgrey' => 'd3d3d3',
-    'lightpink' => 'ffb6c1',
-    'lightsalmon' => 'ffa07a',
-    'lightseagreen' => '20b2aa',
-    'lightskyblue' => '87cefa',
-    'lightslategray' => '778899',
-    'lightslategrey' => '778899',
-    'lightsteelblue' => 'b0c4de',
-    'lightyellow' => 'ffffe0',
-    'lime' => '00ff00',
-    'limegreen' => '32cd32',
-    'linen' => 'faf0e6',
-    'magenta' => 'ff00ff',
-    'maroon' => '800000',
-    'mediumaquamarine' => '66cdaa',
-    'mediumblue' => '0000cd',
-    'mediumorchid' => 'ba55d3',
-    'mediumpurple' => '9370db',
-    'mediumseagreen' => '3cb371',
-    'mediumslateblue' => '7b68ee',
-    'mediumspringgreen' => '00fa9a',
-    'mediumturquoise' => '48d1cc',
-    'mediumvioletred' => 'c71585',
-    'midnightblue' => '191970',
-    'mintcream' => 'f5fffa',
-    'mistyrose' => 'ffe4e1',
-    'moccasin' => 'ffe4b5',
-    'navajowhite' => 'ffdead',
-    'navy' => '000080',
-    'oldlace' => 'fdf5e6',
-    'olive' => '808000',
-    'olivedrab' => '6b8e23',
-    'orange' => 'ffa500',
-    'orangered' => 'ff4500',
-    'orchid' => 'da70d6',
-    'palegoldenrod' => 'eee8aa',
-    'palegreen' => '98fb98',
-    'paleturquoise' => 'afeeee',
-    'palevioletred' => 'db7093',
-    'papayawhip' => 'ffefd5',
-    'peachpuff' => 'ffdab9',
-    'peru' => 'cd853f',
-    'pink' => 'ffc0cb',
-    'plum' => 'dda0dd',
-    'powderblue' => 'b0e0e6',
-    'purple' => '800080',
-    'red' => 'ff0000',
-    'rosybrown' => 'bc8f8f',
-    'royalblue' => '4169e1',
-    'saddlebrown' => '8b4513',
-    'salmon' => 'fa8072',
-    'sandybrown' => 'f4a460',
-    'seagreen' => '2e8b57',
-    'seashell' => 'fff5ee',
-    'sienna' => 'a0522d',
-    'silver' => 'c0c0c0',
-    'skyblue' => '87ceeb',
-    'slateblue' => '6a5acd',
-    'slategray' => '708090',
-    'slategrey' => '708090',
-    'snow' => 'fffafa',
-    'springgreen' => '00ff7f',
-    'steelblue' => '4682b4',
-    'tan' => 'd2b48c',
-    'teal' => '008080',
-    'thistle' => 'd8bfd8',
-    'tomato' => 'ff6347',
-    'turquoise' => '40e0d0',
-    'violet' => 'ee82ee',
-    'wheat' => 'f5deb3',
-    'white' => 'ffffff',
-    'whitesmoke' => 'f5f5f5',
-    'yellow' => 'ffff00',
-    'yellowgreen' => '9acd32'
+    'lightgray'            => 'd3d3d3',
+    'lightgreen'           => '90ee90',
+    'lightgrey'            => 'd3d3d3',
+    'lightpink'            => 'ffb6c1',
+    'lightsalmon'          => 'ffa07a',
+    'lightseagreen'        => '20b2aa',
+    'lightskyblue'         => '87cefa',
+    'lightslategray'       => '778899',
+    'lightslategrey'       => '778899',
+    'lightsteelblue'       => 'b0c4de',
+    'lightyellow'          => 'ffffe0',
+    'lime'                 => '00ff00',
+    'limegreen'            => '32cd32',
+    'linen'                => 'faf0e6',
+    'magenta'              => 'ff00ff',
+    'maroon'               => '800000',
+    'mediumaquamarine'     => '66cdaa',
+    'mediumblue'           => '0000cd',
+    'mediumorchid'         => 'ba55d3',
+    'mediumpurple'         => '9370db',
+    'mediumseagreen'       => '3cb371',
+    'mediumslateblue'      => '7b68ee',
+    'mediumspringgreen'    => '00fa9a',
+    'mediumturquoise'      => '48d1cc',
+    'mediumvioletred'      => 'c71585',
+    'midnightblue'         => '191970',
+    'mintcream'            => 'f5fffa',
+    'mistyrose'            => 'ffe4e1',
+    'moccasin'             => 'ffe4b5',
+    'navajowhite'          => 'ffdead',
+    'navy'                 => '000080',
+    'oldlace'              => 'fdf5e6',
+    'olive'                => '808000',
+    'olivedrab'            => '6b8e23',
+    'orange'               => 'ffa500',
+    'orangered'            => 'ff4500',
+    'orchid'               => 'da70d6',
+    'palegoldenrod'        => 'eee8aa',
+    'palegreen'            => '98fb98',
+    'paleturquoise'        => 'afeeee',
+    'palevioletred'        => 'db7093',
+    'papayawhip'           => 'ffefd5',
+    'peachpuff'            => 'ffdab9',
+    'peru'                 => 'cd853f',
+    'pink'                 => 'ffc0cb',
+    'plum'                 => 'dda0dd',
+    'powderblue'           => 'b0e0e6',
+    'purple'               => '800080',
+    'red'                  => 'ff0000',
+    'rosybrown'            => 'bc8f8f',
+    'royalblue'            => '4169e1',
+    'saddlebrown'          => '8b4513',
+    'salmon'               => 'fa8072',
+    'sandybrown'           => 'f4a460',
+    'seagreen'             => '2e8b57',
+    'seashell'             => 'fff5ee',
+    'sienna'               => 'a0522d',
+    'silver'               => 'c0c0c0',
+    'skyblue'              => '87ceeb',
+    'slateblue'            => '6a5acd',
+    'slategray'            => '708090',
+    'slategrey'            => '708090',
+    'snow'                 => 'fffafa',
+    'springgreen'          => '00ff7f',
+    'steelblue'            => '4682b4',
+    'tan'                  => 'd2b48c',
+    'teal'                 => '008080',
+    'thistle'              => 'd8bfd8',
+    'tomato'               => 'ff6347',
+    'turquoise'            => '40e0d0',
+    'violet'               => 'ee82ee',
+    'wheat'                => 'f5deb3',
+    'white'                => 'ffffff',
+    'whitesmoke'           => 'f5f5f5',
+    'yellow'               => 'ffff00',
+    'yellowgreen'          => '9acd32'
   }.freeze
 
-  VALUE_REGEXP = "\s*(-?[0-9.]+%?)\s*"
-  RGB_REGEXP = /\Argb\(#{VALUE_REGEXP},#{VALUE_REGEXP},#{VALUE_REGEXP}\)\z/i
-  CMYK_REGEXP = /\Adevice-cmyk\(#{VALUE_REGEXP},#{VALUE_REGEXP},#{VALUE_REGEXP},#{VALUE_REGEXP}\)\z/i
-  URL_REGEXP = /\Aurl\(([^)]*)\)\z/i
+  class << self
+    def parse(color_string, gradients = nil, color_mode = :rgb)
+      url_specified = false
 
-  def self.parse(color_string, gradients = nil, color_mode = :rgb)
-    url_specified = false
+      values = ::Prawn::SVG::CSS::ValuesParser.parse(color_string)
 
-    components = color_string.to_s.strip.scan(/([^(\s]+(\([^)]*\))?)/)
+      result = values.map do |value|
+        case value
+        in ['rgb', args]
+          hex = (0..2).collect do |n|
+            number = args[n].to_f
+            number *= 2.55 if args[n][-1..] == '%'
+            format('%02x', number.round.clamp(0, 255))
+          end.join
 
-    result = components.map do |color, *_|
-      if m = color.match(/\A#([0-9a-f])([0-9a-f])([0-9a-f])\z/i)
-        RGB.new("#{m[1] * 2}#{m[2] * 2}#{m[3] * 2}")
+          RGB.new(hex)
 
-      elsif color.match(/\A#[0-9a-f]{6}\z/i)
-        RGB.new(color[1..6])
+        in ['device-cmyk', args]
+          cmyk = (0..3).collect do |n|
+            number = args[n].to_f
+            number *= 100 unless args[n][-1..] == '%'
+            number.clamp(0, 100)
+          end
 
-      elsif hex = HTML_COLORS[color.downcase]
-        hex_color(hex, color_mode)
+          CMYK.new(cmyk)
 
-      elsif m = color.match(RGB_REGEXP)
-        hex = (1..3).collect do |n|
-          value = m[n].to_f
-          value *= 2.55 if m[n][-1..-1] == '%'
-          "%02x" % clamp(value.round, 0, 255)
-        end.join
+        in ['url', [url]]
+          url_specified = true
+          if url[0] == '#' && gradients && (gradient = gradients[url[1..]])
+            gradient
+          end
 
-        RGB.new(hex)
+        in /\A#([0-9a-f])([0-9a-f])([0-9a-f])\z/i
+          RGB.new("#{$1 * 2}#{$2 * 2}#{$3 * 2}")
 
-      elsif m = color.match(CMYK_REGEXP)
-        cmyk = (1..4).collect do |n|
-          value = m[n].to_f
-          value *= 100 unless m[n][-1..-1] == '%'
-          clamp(value, 0, 100)
-        end
+        in /\A#[0-9a-f]{6}\z/i
+          RGB.new(value[1..])
 
-        CMYK.new(cmyk)
+        in String => color
+          if (hex = HTML_COLORS[color.downcase])
+            hex_color(hex, color_mode)
+          end
 
-      elsif matches = color.match(URL_REGEXP)
-        url_specified = true
-        url = matches[1]
-        if url[0] == "#" && gradients && gradient = gradients[url[1..-1]]
-          gradient
+        else
+          nil
         end
       end
-    end
-
-    # Generally, we default to black if the colour was unparseable.
-    # http://www.w3.org/TR/SVG/painting.html section 11.2 says if a URL was
-    # supplied without a fallback, that's an error.
-    result << default_color(color_mode) unless url_specified
 
-    result.compact
-  end
-
-  def self.css_color_to_prawn_color(color)
-    result = parse(color).detect {|result| result.is_a?(RGB) || result.is_a?(CMYK)}
-    result.value if result
-  end
+      # Generally, we default to black if the colour was unparseable.
+      # http://www.w3.org/TR/SVG/painting.html section 11.2 says if a URL was
+      # supplied without a fallback, that's an error.
+      result << default_color(color_mode) unless url_specified
 
-  protected
+      result.compact
+    end
 
-  def self.clamp(value, min_value, max_value)
-    [[value, min_value].max, max_value].min
-  end
+    def css_color_to_prawn_color(color)
+      parse(color).detect { |value| value.is_a?(RGB) || value.is_a?(CMYK) }&.value
+    end
 
-  def self.default_color(color_mode)
-    color_mode == :cmyk ? CMYK_DEFAULT_COLOR : RGB_DEFAULT_COLOR
-  end
+    def default_color(color_mode)
+      color_mode == :cmyk ? CMYK_DEFAULT_COLOR : RGB_DEFAULT_COLOR
+    end
 
-  def self.hex_color(hex, color_mode)
-    if color_mode == :cmyk
-      r, g, b = [hex[0..1], hex[2..3], hex[4..5]].map { |h| h.to_i(16) / 255.0 }
-      k = 1 - [r, g, b].max
-      if k == 1
-        CMYK.new([0, 0, 0, 100])
+    private
+
+    def hex_color(hex, color_mode)
+      if color_mode == :cmyk
+        r, g, b = [hex[0..1], hex[2..3], hex[4..5]].map { |h| h.to_i(16) / 255.0 }
+        k = 1 - [r, g, b].max
+        if k == 1
+          CMYK.new([0, 0, 0, 100])
+        else
+          c = (1 - r - k) / (1 - k)
+          m = (1 - g - k) / (1 - k)
+          y = (1 - b - k) / (1 - k)
+          CMYK.new([c, m, y, k].map { |v| (v * 100).round })
+        end
       else
-        c = (1 - r - k) / (1 - k)
-        m = (1 - g - k) / (1 - k)
-        y = (1 - b - k) / (1 - k)
-        CMYK.new([c, m, y, k].map { |v| (v * 100).round })
+        RGB.new(hex)
       end
-    else
-      RGB.new(hex)
     end
   end
 end

data/lib/prawn/svg/css/font_family_parser.rb

@@ -6,7 +6,7 @@ module Prawn::SVG::CSS
       current = nil
       fonts = []
 
-      string.chars.each do |char|
+      string.each_char do |char|
         if in_escape
           in_escape = false
           if current.nil?
@@ -19,7 +19,7 @@ module Prawn::SVG::CSS
           current = nil
         elsif char == in_quote
           in_quote = nil
-        elsif in_quote.nil? && (char == '"' || char == "'")
+        elsif in_quote.nil? && ['"', "'"].include?(char)
           in_quote = char
         elsif char == '\\'
           in_escape = true