prawn-svg 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d054ded3422dc4cd1cb870dc09549c0a82c1e2813e314565c7a3aec70d95d188
-  data.tar.gz: 123a00b97f78f284a8e11fad37fed42cbec06d678675ec15ff7dafbcfe6505d5
+  metadata.gz: c9f71b82858f8ee91e1ccaf2903c2e2a0d49108b1532a81d15c2275362a0d136
+  data.tar.gz: f3336c6a727df24e6a5877e4d26cf030eabbb1c9af9852f95c35c5bfe5128995
 SHA512:
-  metadata.gz: 4ece284ced16e7b6f4d7562c17a97780375f4e255eb4199d489cfb1fa473dc1f65e6b9fa48894079f0756b42a749cc58f34c00507e19ccdfddab55723c82311d
-  data.tar.gz: 8826f6f457372cc7df38869e6448974f5731fdee1040bca44b8446b71c57e0713340481a3400705c8fd11ec5d13959dcd99f24a0fe8820c89a37ca725545656c
+  metadata.gz: 94f1a140e837ab37b088cc659bc8ef63a3e89778539236441f43e7b4885b9028cce1cb83c9e9636b00ff2ac740770ec8d853c123aa42b0764fb1264405269e76
+  data.tar.gz: 4d02f2e14875214bb5460ace33925f9ab17302b39f46e0a37e0e5521e63b0fdd2f23f6018c8e048bf2bce7d148548aa86b5b9967dca827faddccfa23e8e09b13

data/.github/workflows/test.yml

@@ -1,14 +1,31 @@
 name: test
 on: [push, pull_request]
 jobs:
-  rake:
+  rake_new:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0']
+        ruby: [2.6, 2.7, '3.0', 3.1, 3.2]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        ruby-version: ${{ matrix.ruby }}
+    - name: Run tests
+      run:  bundle exec rake
+      env:
+        RUBYOPT: "--enable-frozen-string-literal"
+  rake_old:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5]
+    steps:
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/README.md

@@ -34,6 +34,7 @@ Option      | Data type | Description
 :enable_file_requests_with_root | string | If not nil, prawn-svg will serve `file:` URLs from your local disk if the file is located under the specified directory. It is very dangerous to specify the root path ("/") if you're not fully in control of your input SVG.  Defaults to `nil` (off).
 :cache_images | boolean   | If true, prawn-svg will cache the result of all URL requests. Defaults to false.
 :fallback_font_name | string | A font name which will override the default fallback font of Times-Roman.  If this value is set to <tt>nil</tt>, prawn-svg will ignore a request for an unknown font and log a warning.
+:color_mode | :rgb, :cmyk | Output color mode.  Defaults to :rgb.
 
 ## Examples
 
@@ -61,7 +62,7 @@ prawn-svg supports most but not all of the full SVG 1.1 specification.  It curre
    implementation of elliptical arc is a bit rough at the moment.
 
  - `<text>`, `<tspan>` and `<tref>` with attributes `x`, `y`, `dx`, `dy`, `rotate`, 'textLength', 'lengthAdjust', and with extra properties
-   `text-anchor`, `text-decoration` (underline only), `font-size`, `font-family`, `font-weight`, `font-style`, `letter-spacing`
+   `text-anchor`, `text-decoration` (underline only), `font-size`, `font-family`, `font-weight`, `font-style`, `letter-spacing`, `dominant-baseline` (middle only)
 
  - <tt>&lt;svg&gt;</tt>, <tt>&lt;g&gt;</tt> and <tt>&lt;symbol&gt;</tt>
 
@@ -69,7 +70,7 @@ prawn-svg supports most but not all of the full SVG 1.1 specification.  It curre
 
  - <tt>&lt;style&gt;</tt> (see CSS section below)
 
- - <tt>&lt;image&gt;</tt> with <tt>http:</tt>, <tt>https:</tt>, <tt>data:image/\*;base64</tt> and `file:` schemes
+ - `<image>` referencing a JPEG or PNG image,  with `http:`, `https:`, `data:image/jpeg;base64`, `data:image/png;base64` and `file:` schemes
    (`file:` is disabled by default for security reasons, see Options section above)
 
  - <tt>&lt;clipPath&gt;</tt>
@@ -93,7 +94,8 @@ prawn-svg supports most but not all of the full SVG 1.1 specification.  It curre
 
  - transform methods: `translate`, `translateX`, `translateY`, `rotate`, `scale`, `skewX`, `skewY`, `matrix`
 
- - colors: HTML standard names, <tt>#xxx</tt>, <tt>#xxxxxx</tt>, <tt>rgb(1, 2, 3)</tt>, <tt>rgb(1%, 2%, 3%)</tt>
+ - colors: HTML standard names, <tt>#xxx</tt>, <tt>#xxxxxx</tt>, <tt>rgb(1, 2, 3)</tt>, <tt>rgb(1%, 2%, 3%)</tt>,
+   and also the non-standard `device-cmyk(1, 2, 3, 4)` for CMYK colors
 
  - measurements specified in <tt>pt</tt>, <tt>cm</tt>, <tt>dm</tt>, <tt>ft</tt>, <tt>in</tt>, <tt>m</tt>, <tt>mm</tt>, <tt>yd</tt>, <tt>pc</tt>, <tt>%</tt>
 
@@ -116,7 +118,7 @@ implemented, but `!important` is not.
 
 ## Not supported
 
-prawn-svg does not support hyperlinks, patterns or filters.
+prawn-svg does not support hyperlinks, patterns, masks or filters.
 
 It does not support text in the clip area, but you can clip shapes and text by any shape.
 

data/lib/prawn/svg/attributes/stroke.rb

@@ -1,5 +1,6 @@
 module Prawn::SVG::Attributes::Stroke
   CAP_STYLE_TRANSLATIONS = {"butt" => :butt, "round" => :round, "square" => :projecting_square}
+  JOIN_STYLE_TRANSLATIONS = {"miter" => :miter, "round" => :round, "bevel" => :bevel}
 
   def parse_stroke_attributes_and_call
     if width_string = properties.stroke_width
@@ -11,6 +12,10 @@ module Prawn::SVG::Attributes::Stroke
     if (linecap = properties.stroke_linecap) && linecap != 'inherit'
       add_call('cap_style', CAP_STYLE_TRANSLATIONS.fetch(linecap, :butt))
     end
+    
+    if (linejoin = properties.stroke_linejoin) && linejoin != 'inherit'
+      add_call('join_style', JOIN_STYLE_TRANSLATIONS.fetch(linejoin, :miter))
+    end
 
     if dasharray = properties.stroke_dasharray
       case dasharray

data/lib/prawn/svg/color.rb

@@ -1,17 +1,9 @@
 class Prawn::SVG::Color
-  class Hex
-    attr_reader :value
+  RGB = Struct.new(:value)
+  CMYK = Struct.new(:value)
 
-    def initialize(value)
-      @value = value
-    end
-
-    def ==(other)
-      value == other.value
-    end
-  end
-
-  DEFAULT_COLOR = Hex.new("000000")
+  RGB_DEFAULT_COLOR = RGB.new("000000")
+  CMYK_DEFAULT_COLOR = CMYK.new([0, 0, 0, 100])
 
   HTML_COLORS = {
     'aliceblue' => 'f0f8ff',
@@ -163,24 +155,25 @@ class Prawn::SVG::Color
     'yellowgreen' => '9acd32'
   }.freeze
 
-  RGB_VALUE_REGEXP = "\s*(-?[0-9.]+%?)\s*"
-  RGB_REGEXP = /\Argb\(#{RGB_VALUE_REGEXP},#{RGB_VALUE_REGEXP},#{RGB_VALUE_REGEXP}\)\z/i
+  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
 
-  def self.parse(color_string, gradients = nil)
+  def self.parse(color_string, gradients = nil, color_mode = :rgb)
     url_specified = false
 
     components = color_string.to_s.strip.scan(/([^(\s]+(\([^)]*\))?)/)
 
     result = components.map do |color, *_|
       if m = color.match(/\A#([0-9a-f])([0-9a-f])([0-9a-f])\z/i)
-        Hex.new("#{m[1] * 2}#{m[2] * 2}#{m[3] * 2}")
+        RGB.new("#{m[1] * 2}#{m[2] * 2}#{m[3] * 2}")
 
       elsif color.match(/\A#[0-9a-f]{6}\z/i)
-        Hex.new(color[1..6])
+        RGB.new(color[1..6])
 
       elsif hex = HTML_COLORS[color.downcase]
-        Hex.new(hex)
+        hex_color(hex, color_mode)
 
       elsif m = color.match(RGB_REGEXP)
         hex = (1..3).collect do |n|
@@ -189,7 +182,16 @@ class Prawn::SVG::Color
           "%02x" % clamp(value.round, 0, 255)
         end.join
 
-        Hex.new(hex)
+        RGB.new(hex)
+
+      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
+
+        CMYK.new(cmyk)
 
       elsif matches = color.match(URL_REGEXP)
         url_specified = true
@@ -203,18 +205,40 @@ class Prawn::SVG::Color
     # 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 unless url_specified
+    result << default_color(color_mode) unless url_specified
 
     result.compact
   end
 
-  def self.color_to_hex(color)
-    result = parse(color).detect {|result| result.is_a?(Hex)}
+  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
 
   protected
+
   def self.clamp(value, min_value, max_value)
     [[value, min_value].max, max_value].min
   end
+
+  def self.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])
+      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
+      RGB.new(hex)
+    end
+  end
 end

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

@@ -10,7 +10,7 @@ module Prawn::SVG::CSS
         case token
         when Modifier
           part = token.type
-          result.last[part] ||= part == :name ? "" : []
+          result.last[part] ||= part == :name ? +"" : []
         when Identifier
           return unless part
           result.last[part] << token.name
@@ -48,7 +48,7 @@ module Prawn::SVG::CSS
           case attribute
           when :pre_key
             if VALID_CSS_IDENTIFIER_CHAR.match(char)
-              result.last.key = char
+              result.last.key = String.new(char)
               attribute = :key
             elsif char != " " && char != "\t"
               return
@@ -60,7 +60,7 @@ module Prawn::SVG::CSS
             elsif char == "]"
               attribute = nil
             elsif "=*~^|$".include?(char)
-              result.last.operator = char
+              result.last.operator = String.new(char)
               attribute = :operator
             elsif char == " " || char == "\t"
               attribute = :pre_operator
@@ -70,7 +70,7 @@ module Prawn::SVG::CSS
 
           when :pre_operator
             if "=*~^|$".include?(char)
-              result.last.operator = char
+              result.last.operator = String.new(char)
               attribute = :operator
             elsif char != " " && char != "\t"
               return
@@ -82,25 +82,25 @@ module Prawn::SVG::CSS
             elsif char == " " || char == "\t"
               attribute = :pre_value
             elsif char == '"' || char == "'"
-              result.last.value = ''
-              attribute = char
+              result.last.value = +''
+              attribute = String.new(char)
             else
-              result.last.value = char
+              result.last.value = String.new(char)
               attribute = :value
             end
 
           when :pre_value
             if char == '"' || char == "'"
-              result.last.value = ''
-              attribute = char
+              result.last.value = +''
+              attribute = String.new(char)
             elsif char != " " && char != "\t"
-              result.last.value = char
+              result.last.value = String.new(char)
               attribute = :value
             end
 
           when :value
             if char == "]"
-              result.last.value = result.last.value.rstrip
+              result.last.value = String.new(result.last.value.rstrip)
               attribute = nil
             else
               result.last.value << char

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

@@ -69,14 +69,14 @@ module Prawn::SVG::CSS
 
         result = case element[:combinator]
                  when :child
-                   "/"
+                   +"/"
                  when :adjacent
                    pseudo_classes << 'first-child'
-                   "/following-sibling::"
+                   +"/following-sibling::"
                  when :siblings
-                   "/following-sibling::"
+                   +"/following-sibling::"
                  else
-                   "//"
+                   +"//"
                  end
 
         positions = []

data/lib/prawn/svg/document.rb

@@ -13,7 +13,8 @@ class Prawn::SVG::Document
     :font_registry,
     :url_loader,
     :elements_by_id, :gradients,
-    :element_styles
+    :element_styles,
+    :color_mode
 
   def initialize(data, bounds, options, font_registry: nil, css_parser: CssParser::Parser.new)
     @root = REXML::Document.new(data).root
@@ -29,9 +30,10 @@ class Prawn::SVG::Document
     @warnings = []
     @options = options
     @elements_by_id = {}
-    @gradients = {}
+    @gradients = Prawn::SVG::Gradients.new(self)
     @fallback_font_name = options.fetch(:fallback_font_name, DEFAULT_FALLBACK_FONT_NAME)
     @font_registry = font_registry
+    @color_mode = load_color_mode
 
     @url_loader = Prawn::SVG::UrlLoader.new(
       enable_cache:          options[:cache_images],
@@ -52,4 +54,15 @@ class Prawn::SVG::Document
     sizing.requested_height = requested_height
     sizing.calculate
   end
+
+  private
+
+  def load_color_mode
+    case @options[:color_mode]
+    when nil, :rgb then :rgb
+    when :cmyk then :cmyk
+    else
+      raise ArgumentError, ":color_mode must be set to :rgb (default) or :cmyk"
+    end
+  end
 end

data/lib/prawn/svg/elements/base.rb

@@ -189,11 +189,11 @@ class Prawn::SVG::Elements::Base
         color = computed_properties.color
       end
 
-      results = Prawn::SVG::Color.parse(color, document.gradients)
+      results = Prawn::SVG::Color.parse(color, document.gradients, document.color_mode)
 
       success = results.detect do |result|
         case result
-        when Prawn::SVG::Color::Hex
+        when Prawn::SVG::Color::RGB, Prawn::SVG::Color::CMYK
           add_call "#{type}_color", result.value
           true
         when Prawn::SVG::Elements::Gradient
@@ -237,16 +237,15 @@ class Prawn::SVG::Elements::Base
 
   def parse_css_declarations(declarations)
     # copied from css_parser
-    declarations.gsub!(/(^[\s]*)|([\s]*$)/, '')
-
-    output = {}
-    declarations.split(/[\;$]+/m).each do |decs|
-      if matches = decs.match(/\s*(.[^:]*)\s*\:\s*(.[^;]*)\s*(;|\Z)/i)
-        property, value, _ = matches.captures
-        output[property.downcase] = value
+    declarations
+      .gsub(/(^[\s]*)|([\s]*$)/, '')
+      .split(/[\;$]+/m)
+      .each_with_object({}) do |decs, output|
+        if matches = decs.match(/\s*(.[^:]*)\s*\:\s*(.[^;]*)\s*(;|\Z)/i)
+          property, value, _ = matches.captures
+          output[property.downcase] = value
+        end
       end
-    end
-    output
   end
 
   def require_attributes(*names)

data/lib/prawn/svg/elements/gradient.rb

@@ -147,8 +147,8 @@ class Prawn::SVG::Elements::Gradient < Prawn::SVG::Elements::Base
         offset = result.last.first
       end
 
-      if color_hex = Prawn::SVG::Color.color_to_hex(child.properties.stop_color)
-        result << [offset, color_hex]
+      if color = Prawn::SVG::Color.css_color_to_prawn_color(child.properties.stop_color)
+        result << [offset, color]
       end
     end
 

data/lib/prawn/svg/elements/image.rb

@@ -67,15 +67,14 @@ class Prawn::SVG::Elements::Image < Prawn::SVG::Elements::Base
   protected
 
   def image_dimensions(data)
-    handler = if data[0, 3].unpack("C*") == [255, 216, 255]
-      Prawn::Images::JPG
-    elsif data[0, 8].unpack("C*") == [137, 80, 78, 71, 13, 10, 26, 10]
-      Prawn::Images::PNG
-    else
-      raise SkipElementError, "Unsupported image type supplied to image tag; Prawn only supports JPG and PNG"
+    unless (handler = find_image_handler(data))
+      raise SkipElementError, 'Unsupported image type supplied to image tag'
     end
-
     image = handler.new(data)
     [image.width.to_f, image.height.to_f]
   end
+
+  def find_image_handler(data)
+    Prawn.image_handler.find(data) rescue nil
+  end
 end

data/lib/prawn/svg/elements/path.rb

@@ -55,8 +55,6 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
   end
 
   def apply
-    add_call 'join_style', :bevel
-
     apply_commands
     apply_markers
   end

data/lib/prawn/svg/elements/root.rb

@@ -9,7 +9,7 @@ class Prawn::SVG::Elements::Root < Prawn::SVG::Elements::Base
 
   def apply
     if [nil, 'inherit', 'none', 'currentColor'].include?(properties.fill)
-      add_call 'fill_color', '000000'
+      add_call 'fill_color', Prawn::SVG::Color.default_color(@document.color_mode).value
     end
 
     add_call 'transformation_matrix', @document.sizing.x_scale, 0, 0, @document.sizing.y_scale, 0, 0

data/lib/prawn/svg/elements/text_component.rb

@@ -41,14 +41,15 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
     font = select_font
     apply_font(font) if font
 
-    # text_anchor isn't a Prawn option; we have to do some math to support it
-    # and so we handle this in Prawn::SVG::Interface#rewrite_call_arguments
+    # text_anchor and dominant_baseline aren't Prawn options; we have to do some math to support them
+    # and so we handle them in Prawn::SVG::Interface#rewrite_call_arguments
     opts = {
       size:        computed_properties.numerical_font_size,
       style:       font && font.subfamily,
       text_anchor: computed_properties.text_anchor,
     }
 
+    opts[:dominant_baseline] = computed_properties.dominant_baseline unless computed_properties.dominant_baseline == 'auto'
     opts[:decoration] = computed_properties.text_decoration unless computed_properties.text_decoration == 'none'
 
     if state.text.parent
@@ -171,7 +172,11 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
 
   def svg_text_children
     text_children.select do |child|
-      child.node_type == :text || child.namespace == SVG_NAMESPACE || child.namespace == ''
+      child.node_type == :text || (
+        child.node_type == :element && (
+          child.namespace == SVG_NAMESPACE || child.namespace == ''
+        )
+      )
     end
   end
 

data/lib/prawn/svg/gradients.rb

@@ -0,0 +1,48 @@
+module Prawn::SVG
+  class Gradients
+    def initialize(document)
+      @document = document
+      @gradients_by_id = {}
+    end
+
+    def [](id)
+      id &&= id.strip
+      return unless id && id != ''
+
+      if element = @gradients_by_id[id]
+        element
+      elsif raw_element = find_raw_gradient_element_by_id(id)
+        create_gradient_element(raw_element)
+      end
+    end
+
+    def []=(id, gradient)
+      @gradients_by_id[id] = gradient
+    end
+
+    private
+
+    def find_raw_gradient_element_by_id(id)
+      raw_element = find_raw_element_by_id(id)
+      raw_element if gradient_element?(raw_element)
+    end
+
+    def create_gradient_element(raw_element)
+      Elements::Gradient.new(@document, raw_element, [], new_state).tap(&:process)
+    end
+
+    def find_raw_element_by_id(id)
+      REXML::XPath.match(@document.root, %(//*[@id="#{id.gsub('"', '\"')}"])).first
+    end
+
+    def gradient_element?(raw_element)
+      Elements::TAG_CLASS_MAPPING[raw_element.name.to_sym] == Elements::Gradient
+    end
+
+    def new_state
+      State.new.tap do |state|
+        state.viewport_sizing = @document.sizing
+      end
+    end
+  end
+end

data/lib/prawn/svg/interface.rb

@@ -5,7 +5,7 @@
 module Prawn
   module SVG
     class Interface
-      VALID_OPTIONS = [:at, :position, :vposition, :width, :height, :cache_images, :enable_web_requests, :enable_file_requests_with_root, :fallback_font_name]
+      VALID_OPTIONS = [:at, :position, :vposition, :width, :height, :cache_images, :enable_web_requests, :enable_file_requests_with_root, :fallback_font_name, :color_mode]
 
       attr_reader :data, :prawn, :document, :options
 
@@ -149,6 +149,13 @@ module Prawn
           at[0] = @cursor[0] if at[0] == :relative
           at[1] = @cursor[1] if at[1] == :relative
 
+          case options.delete(:dominant_baseline)
+          when 'middle'
+            height = prawn.font.height
+            at[1] -= height / 2.0
+            @cursor = [at[0], at[1]]
+          end
+
           if offset = options.delete(:offset)
             at[0] += offset[0]
             at[1] -= offset[1]

data/lib/prawn/svg/properties.rb

@@ -34,10 +34,12 @@ class Prawn::SVG::Properties
     "stroke"           => Config.new("none", true, %w(inherit none currentColor)),
     "stroke-dasharray" => Config.new("none", true, %w(inherit none)),
     "stroke-linecap"   => Config.new("butt", true, %w(inherit butt round square), true),
+    "stroke-linejoin"  => Config.new("miter", true, %w(inherit miter round bevel), true),
     "stroke-opacity"   => Config.new("1", true),
     "stroke-width"     => Config.new("1", true),
     "text-anchor"      => Config.new("start", true, %w(inherit start middle end), true),
     'text-decoration'  => Config.new('none', true, %w(inherit none underline), true),
+    "dominant-baseline" => Config.new("auto", true, %w(inherit auto middle), true),
   }.freeze
 
   PROPERTIES.each do |name, value|

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module SVG
-    VERSION = '0.32.0'
+    VERSION = '0.33.0'
   end
 end

data/lib/prawn-svg.rb

@@ -27,6 +27,7 @@ require 'prawn/svg/css/selector_parser'
 require 'prawn/svg/css/stylesheets'
 require 'prawn/svg/ttf'
 require 'prawn/svg/font'
+require 'prawn/svg/gradients'
 require 'prawn/svg/document'
 require 'prawn/svg/state'
 

data/prawn-svg.gemspec

@@ -1,27 +1,28 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/prawn/svg/version', __FILE__)
+require File.expand_path('lib/prawn/svg/version', __dir__)
 
 Gem::Specification.new do |gem|
   gem.name = 'prawn-svg'
   gem.version = Prawn::SVG::VERSION
-  gem.summary = "SVG renderer for Prawn PDF library"
-  gem.description = "This gem allows you to render SVG directly into a PDF using the 'prawn' gem.  Since PDF is vector-based, you'll get nice scaled graphics if you use SVG instead of an image."
-  gem.author = "Roger Nesbitt"
-  gem.email = "roger@seriousorange.com"
-  gem.homepage = "http://github.com/mogest/prawn-svg"
+  gem.summary = 'SVG renderer for Prawn PDF library'
+  gem.description = <<-EOT.strip
+    This gem allows you to render SVG directly into a PDF using the 'prawn' gem.  Since PDF is vector-based, you'll get nice scaled graphics if you use SVG instead of an image.
+  EOT
+  gem.author = 'Mog Nesbitt'
+  gem.email = 'mog@seriousorange.com'
+  gem.homepage = 'http://github.com/mogest/prawn-svg'
   gem.license = 'MIT'
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "prawn-svg"
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  gem.required_ruby_version = '>= 2.3.0'
+  gem.required_ruby_version = '>= 2.5.0'
 
-  gem.add_runtime_dependency "prawn", ">= 0.11.1", "< 3"
-  gem.add_runtime_dependency "css_parser", "~> 1.6"
-  gem.add_runtime_dependency "rexml", "~> 3.2"
-  gem.add_development_dependency "rspec", "~> 3.0"
-  gem.add_development_dependency "rake", "~> 13.0"
+  gem.add_runtime_dependency 'css_parser', '~> 1.6'
+  gem.add_runtime_dependency 'matrix', '~> 0.4.2'
+  gem.add_runtime_dependency 'prawn', '>= 0.11.1', '< 3'
+  gem.add_runtime_dependency 'rexml', '~> 3.2'
+  gem.add_development_dependency 'rake', '~> 13.0'
+  gem.add_development_dependency 'rspec', '~> 3.0'
 end

data/spec/prawn/svg/color_spec.rb

@@ -1,38 +1,43 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Prawn::SVG::Color do
-  describe "::color_to_hex" do
+  describe "::css_color_to_prawn_color" do
     it "converts #xxx to a hex value" do
-      Prawn::SVG::Color.color_to_hex("#9ab").should == "99aabb"
+      Prawn::SVG::Color.css_color_to_prawn_color("#9ab").should == "99aabb"
     end
 
     it "converts #xxxxxx to a hex value" do
-      Prawn::SVG::Color.color_to_hex("#9ab123").should == "9ab123"
+      Prawn::SVG::Color.css_color_to_prawn_color("#9ab123").should == "9ab123"
     end
 
     it "converts an html colour name to a hex value" do
-      Prawn::SVG::Color.color_to_hex("White").should == "ffffff"
+      Prawn::SVG::Color.css_color_to_prawn_color("White").should == "ffffff"
     end
 
     it "converts an rgb string to a hex value" do
-      Prawn::SVG::Color.color_to_hex("rgb(16, 32, 48)").should == "102030"
-      Prawn::SVG::Color.color_to_hex("rgb(-5, 50%, 120%)").should == "007fff"
+      Prawn::SVG::Color.css_color_to_prawn_color("rgb(16, 32, 48)").should == "102030"
+      Prawn::SVG::Color.css_color_to_prawn_color("rgb(-5, 50%, 120%)").should == "007fff"
+    end
+
+    it "converts a CMYK string to an array of numbers" do
+      expect(Prawn::SVG::Color.css_color_to_prawn_color("device-cmyk(0, 0.32, 0.48, 1)")).to eq [0, 32, 48, 100]
+      expect(Prawn::SVG::Color.css_color_to_prawn_color("device-cmyk(-5, 50%, 120%, -5%)")).to eq [0, 50, 100, 0]
     end
 
     it "scans the string and finds the first colour it can parse" do
-      Prawn::SVG::Color.color_to_hex("function(#someurl, 0) nonexistent rgb( 3 ,4,5 ) white").should == "030405"
+      Prawn::SVG::Color.css_color_to_prawn_color("function(#someurl, 0) nonexistent rgb( 3 ,4,5 ) white").should == "030405"
     end
 
     it "ignores url()s" do
-      expect(Prawn::SVG::Color.color_to_hex("url(#someplace) red")).to eq 'ff0000'
+      expect(Prawn::SVG::Color.css_color_to_prawn_color("url(#someplace) red")).to eq 'ff0000'
     end
 
     it "returns black if the color doesn't exist" do
-      expect(Prawn::SVG::Color.color_to_hex("blurble")).to eq '000000'
+      expect(Prawn::SVG::Color.css_color_to_prawn_color("blurble")).to eq '000000'
     end
 
     it "returns nil if there's no fallback after a url()" do
-      expect(Prawn::SVG::Color.color_to_hex("url(#someplace)")).to be nil
+      expect(Prawn::SVG::Color.css_color_to_prawn_color("url(#someplace)")).to be nil
     end
   end
 
@@ -42,19 +47,27 @@ describe Prawn::SVG::Color do
     let(:drob_gradient) { double }
 
     it "returns a list of all colors parsed, ignoring impossible or non-existent colors" do
-      results = Prawn::SVG::Color.parse("url(#nope) url(#flan) blurble green #123", gradients)
+      results = Prawn::SVG::Color.parse("url(#nope) url(#flan) blurble green #123", gradients, :rgb)
       expect(results).to eq [
         flan_gradient,
-        Prawn::SVG::Color::Hex.new("008000"),
-        Prawn::SVG::Color::Hex.new("112233")
+        Prawn::SVG::Color::RGB.new("008000"),
+        Prawn::SVG::Color::RGB.new("112233")
       ]
     end
 
     it "appends black to the list if there aren't any url() references" do
-      results = Prawn::SVG::Color.parse("blurble green", gradients)
+      results = Prawn::SVG::Color.parse("blurble green", gradients, :rgb)
+      expect(results).to eq [
+        Prawn::SVG::Color::RGB.new("008000"),
+        Prawn::SVG::Color::RGB.new("000000")
+      ]
+    end
+
+    it "works in CMYK color mode" do
+      results = Prawn::SVG::Color.parse("blurble green", gradients, :cmyk)
       expect(results).to eq [
-        Prawn::SVG::Color::Hex.new("008000"),
-        Prawn::SVG::Color::Hex.new("000000")
+        Prawn::SVG::Color::CMYK.new([100, 0, 100, 50]),
+        Prawn::SVG::Color::CMYK.new([0, 0, 0, 100])
       ]
     end
   end

data/spec/prawn/svg/document_spec.rb

@@ -5,6 +5,23 @@ describe Prawn::SVG::Document do
   let(:options) { {} }
 
   describe "#initialize" do
+    context "with a well-formed document" do
+      let(:svg) { "<svg></svg>" }
+      let(:options) { {color_mode: :cmyk} }
+
+      it "parses the XML and yields itself to its block" do
+        yielded = nil
+
+        document = Prawn::SVG::Document.new(svg, bounds, options) do |doc|
+          yielded = doc
+        end
+
+        expect(yielded).to eq document
+        expect(document.color_mode).to eq :cmyk
+        expect(document.root.name).to eq 'svg'
+      end
+    end
+
     context "when unparsable XML is provided" do
       let(:svg) { "this isn't SVG data" }
 

data/spec/prawn/svg/elements/marker_spec.rb

@@ -73,10 +73,10 @@ RSpec.describe Prawn::SVG::Elements::Marker do
                 ["stroke_color", ["000000"], {}, []],
                 ["line_width", [100.0], {}, []],
                 ["cap_style", [:butt], {}, []],
+                ["join_style", [:miter], {}, []],
                 ["undash", [], {}, []],
                 ["save", [], {}, []],
                 ["fill", [], {}, [
-                    ["join_style", [:bevel], {}, []],
                     ["move_to", [[0.0, 600.0]], {}, []],
                     ["line_to", [[10.0, 595.0]], {}, []],
                     ["line_to", [[0.0, 590.0]], {}, []],

data/spec/prawn/svg/elements/root_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Prawn::SVG::Elements::Root do
+  let(:color_mode) { :rgb }
+  let(:sizing) do
+    instance_double(Prawn::SVG::Calculators::DocumentSizing, x_offset: 0, y_offset: 0, x_scale: 1, y_scale: 1)
+  end
+  let(:document) do
+    instance_double(Prawn::SVG::Document, color_mode: color_mode, sizing: sizing)
+  end
+  let(:source) { double(name: 'svg', attributes: {}) }
+  let(:state) { Prawn::SVG::State.new }
+  let(:element) { Prawn::SVG::Elements::Root.new(document, source, [], state) }
+
+  it 'uses RGB black as the default color' do
+    element.apply
+    expect(element.calls.first).to eq ['fill_color', ['000000'], {}, []]
+  end
+
+  context 'when in CMYK mode' do
+    let(:color_mode) { :cmyk }
+
+    it 'uses CMYK black as the default color' do
+      element.apply
+      expect(element.calls.first).to eq ['fill_color', [[0, 0, 0, 100]], {}, []]
+    end
+  end
+end

data/spec/prawn/svg/elements/text_spec.rb

@@ -237,4 +237,31 @@ Even more
       ]
     end
   end
+
+  describe "when there's a comment inside the text element" do
+    let(:svg) { '<text>Hi <!-- comment --> there</text>' }
+
+    it "ignores the comment" do
+      element.process
+
+      expect(flatten_calls(element.calls)).to eq [
+        ["text_group", [], {}],
+        ["font", ["Helvetica"], {:style=>:normal}],
+        ["draw_text",
+          ["Hi "],
+          {:size=>16,
+            :style=>:normal,
+            :text_anchor=>"start",
+            :at=>[:relative, :relative],
+            :offset=>[0, 0]}],
+        ["draw_text",
+          ["there"],
+          {:size=>16,
+            :style=>:normal,
+            :text_anchor=>"start",
+            :at=>[:relative, :relative],
+            :offset=>[0, 0]}]
+      ]
+    end
+  end
 end

data/spec/prawn/svg/interface_spec.rb

@@ -39,11 +39,19 @@ describe Prawn::SVG::Interface do
       end
 
       context "when fill_and_stroke is issued" do
+        def expect_rectangle
+          if RUBY_VERSION.start_with?("2.7.")
+            expect(prawn).to receive(:rectangle)
+          else
+            expect(prawn).to receive(:rectangle).with([0, 100], 10, 10)
+          end
+        end
+
         context "and fill rule is not set" do
           let(:interface) { Prawn::SVG::Interface.new('<svg width="250" height="100"><rect width="10" height="10" stroke="red"></rect></svg>', prawn, {}) }
 
           it "adds content 'B'" do
-            expect(prawn).to receive(:rectangle).with([0, 100], 10, 10)
+            expect_rectangle
             expect(prawn).to receive(:add_content).with("W n")
             expect(prawn).to receive(:add_content).with("B")
             interface.draw
@@ -54,7 +62,7 @@ describe Prawn::SVG::Interface do
           let(:interface) { Prawn::SVG::Interface.new('<svg width="250" height="100"><rect width="10" height="10" stroke="red" fill-rule="evenodd"></rect></svg>', prawn, {}) }
 
           it "adds content 'B*'" do
-            expect(prawn).to receive(:rectangle).with([0, 100], 10, 10)
+            expect_rectangle
             expect(prawn).to receive(:add_content).with("W n")
             expect(prawn).to receive(:add_content).with("B*")
             interface.draw

data/spec/sample_svg/cmyk.svg

@@ -0,0 +1,5 @@
+<svg width="154" height="28" viewBox="0 0 154 28" xmlns="http://www.w3.org/2000/svg">
+  <g fill="device-cmyk(0.5, 50%, 0.0, 0)" fill-rule="evenodd">
+    <path d="m19.88 23.715-4.083 3.337a4.243 4.243 0 0 1-1.626-.965c-.463-.44-.768-.943-.915-1.508l-3.185 1.812c-.125.068-.336.138-.635.212a3.29 3.29 0 0 1-.754.11c-2.451 0-4.476-.841-6.073-2.524C1.011 22.506.212 20.168.212 17.175c0-2.846.83-5.192 2.491-7.039 1.66-1.847 3.777-2.77 6.353-2.77 1.027 0 1.988.203 2.88.61.892.407 1.479.768 1.762 1.084l2.948-1.067 1.034.305V19.92c0 1.016.178 1.824.533 2.422.354.599.91 1.057 1.667 1.373zm-7.166-2.541v-7.945a4.404 4.404 0 0 0-1.33-1.087c-.548-.303-1.217-.454-2.008-.454-1.141 0-2.086.416-2.837 1.248-.751.831-1.126 2.208-1.126 4.131 0 1.527.35 2.752 1.05 3.674.7.922 1.683 1.383 2.948 1.383.723 0 1.4-.113 2.033-.339.632-.227 1.055-.431 1.27-.611zM39.463 26.51h-3.947l-1.118-1.66-2.728 1.491c-.226.125-.553.217-.982.28a7.964 7.964 0 0 1-1.118.093c-2.666 0-4.69-.897-6.073-2.693s-2.081-4.049-2.092-6.759c-.011-2.937.822-5.274 2.499-7.014 1.677-1.739 3.894-2.609 6.649-2.609.79 0 1.485.062 2.083.187a5.903 5.903 0 0 1 1.728.661V.491h5.099V26.51zm-5.099-5.607v-8.03c-.283-.35-.751-.652-1.406-.906a5.855 5.855 0 0 0-2.134-.381c-1.423 0-2.482.415-3.177 1.245-.694.83-1.042 2.149-1.042 3.956 0 1.841.37 3.216 1.109 4.125.74.91 1.742 1.364 3.007 1.364.813 0 1.527-.135 2.143-.406.616-.271 1.116-.595 1.5-.967zM67.009 26.51h-5.184V15.075c0-.666-.237-1.256-.711-1.77-.475-.514-1.203-.771-2.186-.771-.938 0-1.722.195-2.354.584-.633.39-1.135.754-1.508 1.093V26.51h-5.184V8.299l5.184-.373v1.779l2.155-1.237a7.47 7.47 0 0 1 1.976-.805 8.464 8.464 0 0 1 2.01-.246c1.798 0 3.215.557 4.25 1.669 1.035 1.112 1.553 2.578 1.553 4.396V26.51h-.001zM89.303 17.057c0 2.993-.857 5.376-2.572 7.149-1.716 1.773-4.068 2.66-7.059 2.66-3.216 0-5.625-.892-7.227-2.677-1.603-1.784-2.404-4.162-2.404-7.132 0-2.699.863-5.008 2.59-6.929 1.726-1.92 4.073-2.88 7.041-2.88 2.979 0 5.328.887 7.05 2.66 1.72 1.774 2.581 4.156 2.581 7.149zm-5.252 0c0-1.479-.387-2.795-1.16-3.947-.773-1.152-1.844-1.728-3.21-1.728-1.57 0-2.694.525-3.372 1.575-.677 1.05-1.016 2.417-1.016 4.1 0 1.57.406 2.908 1.22 4.015.813 1.107 1.903 1.66 3.27 1.66 1.524 0 2.617-.449 3.278-1.347.66-.897.99-2.34.99-4.328zM101.145 23.325l-3.762 3.541c-1.559-.643-2.727-1.581-3.506-2.814-.779-1.233-1.17-2.708-1.17-4.42v-7.944H90.98V8.3h1.727V2.286l5.185-.373v6.404h2.71v3.354h-2.71v6.486c0 1.295.294 2.37.881 3.226.587.856 1.377 1.503 2.372 1.942zM121.981 23.715l-4.083 3.337a4.243 4.243 0 0 1-1.626-.965c-.464-.44-.769-.943-.915-1.508l-3.185 1.812c-.124.068-.337.138-.636.212a3.29 3.29 0 0 1-.754.11c-2.451 0-4.475-.841-6.072-2.524-1.599-1.683-2.398-4.021-2.398-7.014 0-2.846.83-5.192 2.491-7.039 1.66-1.847 3.777-2.77 6.353-2.77 1.027 0 1.988.203 2.88.61.892.407 1.479.768 1.762 1.084l2.948-1.067 1.033.305V19.92c0 1.016.178 1.824.533 2.422.355.598.913 1.057 1.669 1.373zm-7.166-2.541v-7.945a4.412 4.412 0 0 0-1.329-1.087c-.549-.303-1.218-.454-2.008-.454-1.141 0-2.087.416-2.838 1.248-.752.831-1.127 2.208-1.127 4.131 0 1.527.35 2.752 1.051 3.674.7.922 1.683 1.383 2.947 1.383.723 0 1.4-.113 2.033-.339.634-.227 1.057-.431 1.271-.611zM153.068 26.51h-5.15V15.075c0-.666-.229-1.256-.687-1.77-.457-.514-1.177-.771-2.159-.771-.803 0-1.52.155-2.152.466a4.972 4.972 0 0 0-1.592 1.211V26.51h-5.15V15.075c0-.666-.229-1.256-.686-1.77-.458-.514-1.178-.771-2.16-.771-.926 0-1.705.189-2.338.567-.633.378-1.096.749-1.389 1.11V26.51h-5.15V8.299l5.15-.373v1.779l2.016-1.237c.666-.406 1.32-.683 1.965-.83a8.86 8.86 0 0 1 1.965-.22c1.197 0 2.219.246 3.066.737a4.986 4.986 0 0 1 1.948 2.024l2.796-1.711a6.749 6.749 0 0 1 1.846-.788 8.17 8.17 0 0 1 2.084-.263c1.795 0 3.207.557 4.234 1.669 1.028 1.112 1.543 2.578 1.543 4.396V26.51zm0 0"/>
+  </g>
+</svg>

data/spec/sample_svg/gradients-cmyk.svg

@@ -0,0 +1,40 @@
+<svg width="240" height="240" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+      <style type="text/css"><![CDATA[
+        #rect1 { fill: url(#Gradient1); }
+        .stop1 { stop-color: device-cmyk(0, 1, 1, 0); }
+        .stop2 { stop-color: device-cmyk(0, 0, 0, 1); stop-opacity: 0; }
+        .stop3 { stop-color: device-cmyk(1, 0, 1, 0); }
+      ]]></style>
+      <linearGradient id="Gradient1">
+        <stop class="stop1" offset="0%"/>
+        <stop class="stop2" offset="50%"/>
+        <stop class="stop3" offset="100%"/>
+      </linearGradient>
+      <linearGradient id="Gradient2" x1="0" x2="0" y1="0" y2="1">
+        <stop offset="25%" stop-color="device-cmyk(0, 1, 1, 0)"/>
+        <stop offset="50%" stop-color="device-cmyk(0, 0, 0, 1)" stop-opacity="0"/>
+        <stop offset="75%" stop-color="device-cmyk(1, 0, 1, 0)"/>
+      </linearGradient>
+      <linearGradient id="Gradient3" x1="0" x2="1" y1="0" y2="1">
+        <stop offset="0%" stop-color="device-cmyk(0, 1, 1, 0)"/>
+        <stop offset="30%" stop-color="device-cmyk(1, 0, 1, 0)"/>
+        <stop offset="60%" stop-color="device-cmyk(1, 0, 1, 0)"/>
+        <stop offset="100%" stop-color="device-cmyk(1, 0, 1, 0)"/>
+      </linearGradient>
+      <linearGradient id="userspace" gradientUnits="userSpaceOnUse" x1="160" y1="90" x2="220" y2="90">
+        <stop offset="0" stop-color="device-cmyk(0, 1, 1, 0)"/>
+        <stop offset="1" stop-color="device-cmyk(1, 0, 1, 0)"/>
+      </linearGradient>
+  </defs>
+
+  <rect id="rect1" x="10" y="10" rx="15" ry="15" width="50" height="100" stroke="black"/>
+  <rect x="10" y="120" rx="15" ry="15" width="50" height="100" fill="url(#Gradient2)" stroke="black"/>
+  <circle cx="110" cy="40" r="30" stroke="black" fill="url(#Gradient3)"/>
+  <ellipse cx="110" cy="100" rx="30" ry="20" stroke="black" fill="url(#Gradient1)"/>
+  <line x1="65" y1="120" x2="200" y2="200" stroke="url(#Gradient3)" stroke-width="5"/>
+  <path d="M80,140l0,50l30,20l0-40z" stroke="url(#Gradient3)" fill="url(#Gradient1)" stroke-width="3"/>
+  <polygon points="150,30 170,80 190,55 200,10" fill="url(#Gradient1)"/>
+  <rect x="150" y="90" width="80" height="30" fill="url(#userspace)" stroke="black"/>
+  <polyline points="150,130 170,170 190,155 200,110" stroke="url(#Gradient1)" stroke-width="3" fill="none"/>
+</svg>

data/spec/sample_svg/ordering.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="177.649" height="244.929" version="1.1" viewBox="0 0 177.649 244.929" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g transform="translate(-21.1667 -31.75)">
+    <rect x="21.1667" y="31.75" width="177.649" height="244.929" fill="url(#linearGradient18)" stroke-width=".264583"/>
+  </g>
+  <defs>
+    <linearGradient id="linearGradient18" x1="109.032" x2="109.74" y1="34.6919" y2="273.287" gradientUnits="userSpaceOnUse">
+      <stop stop-color="orange" offset="0"/>
+      <stop stop-color="blue" offset="1"/>
+    </linearGradient>
+  </defs>
+</svg>

metadata

@@ -1,49 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
-- Roger Nesbitt
+- Mog Nesbitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2023-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: prawn
+  name: css_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: css_parser
+  name: matrix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: prawn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -59,37 +73,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.0'
 description: This gem allows you to render SVG directly into a PDF using the 'prawn'
   gem.  Since PDF is vector-based, you'll get nice scaled graphics if you use SVG
   instead of an image.
-email: roger@seriousorange.com
+email: mog@seriousorange.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -143,6 +157,7 @@ files:
 - lib/prawn/svg/extensions/additional_gradient_transforms.rb
 - lib/prawn/svg/font.rb
 - lib/prawn/svg/font_registry.rb
+- lib/prawn/svg/gradients.rb
 - lib/prawn/svg/interface.rb
 - lib/prawn/svg/loaders/data.rb
 - lib/prawn/svg/loaders/file.rb
@@ -173,6 +188,7 @@ files:
 - spec/prawn/svg/elements/path_spec.rb
 - spec/prawn/svg/elements/polygon_spec.rb
 - spec/prawn/svg/elements/polyline_spec.rb
+- spec/prawn/svg/elements/root_spec.rb
 - spec/prawn/svg/elements/text_spec.rb
 - spec/prawn/svg/font_registry_spec.rb
 - spec/prawn/svg/font_spec.rb
@@ -194,6 +210,7 @@ files:
 - spec/sample_svg/circle01.svg
 - spec/sample_svg/clip_path.svg
 - spec/sample_svg/close_path.svg
+- spec/sample_svg/cmyk.svg
 - spec/sample_svg/cubic01.svg
 - spec/sample_svg/cubic01a.svg
 - spec/sample_svg/cubic02.svg
@@ -203,6 +220,7 @@ files:
 - spec/sample_svg/gistfile1.svg
 - spec/sample_svg/google_charts.svg
 - spec/sample_svg/gradient_transform.svg
+- spec/sample_svg/gradients-cmyk.svg
 - spec/sample_svg/gradients.svg
 - spec/sample_svg/hidden_paths.svg
 - spec/sample_svg/highcharts.svg
@@ -221,6 +239,7 @@ files:
 - spec/sample_svg/offset_viewport.svg
 - spec/sample_svg/omnigraffle.svg
 - spec/sample_svg/opacity01.svg
+- spec/sample_svg/ordering.svg
 - spec/sample_svg/path.svg
 - spec/sample_svg/pie_piece.svg
 - spec/sample_svg/polygon01.svg
@@ -270,14 +289,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: SVG renderer for Prawn PDF library
@@ -300,6 +319,7 @@ test_files:
 - spec/prawn/svg/elements/path_spec.rb
 - spec/prawn/svg/elements/polygon_spec.rb
 - spec/prawn/svg/elements/polyline_spec.rb
+- spec/prawn/svg/elements/root_spec.rb
 - spec/prawn/svg/elements/text_spec.rb
 - spec/prawn/svg/font_registry_spec.rb
 - spec/prawn/svg/font_spec.rb
@@ -321,6 +341,7 @@ test_files:
 - spec/sample_svg/circle01.svg
 - spec/sample_svg/clip_path.svg
 - spec/sample_svg/close_path.svg
+- spec/sample_svg/cmyk.svg
 - spec/sample_svg/cubic01.svg
 - spec/sample_svg/cubic01a.svg
 - spec/sample_svg/cubic02.svg
@@ -330,6 +351,7 @@ test_files:
 - spec/sample_svg/gistfile1.svg
 - spec/sample_svg/google_charts.svg
 - spec/sample_svg/gradient_transform.svg
+- spec/sample_svg/gradients-cmyk.svg
 - spec/sample_svg/gradients.svg
 - spec/sample_svg/hidden_paths.svg
 - spec/sample_svg/highcharts.svg
@@ -348,6 +370,7 @@ test_files:
 - spec/sample_svg/offset_viewport.svg
 - spec/sample_svg/omnigraffle.svg
 - spec/sample_svg/opacity01.svg
+- spec/sample_svg/ordering.svg
 - spec/sample_svg/path.svg
 - spec/sample_svg/pie_piece.svg
 - spec/sample_svg/polygon01.svg