prawn-svg 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34f48795bbd6ee32d7c18228b833137dc52cb5b02f0446de0e3908d0827e7234
-  data.tar.gz: 4f654b0c484f81ba80660940d2823c836c0aaba0156cb9e803c722170fdec993
+  metadata.gz: 9ed78a64dc94709fc5e53f1d6f521f93e3bf41196c29dde616c6139743c9c889
+  data.tar.gz: 7a0a5683370d3478e8b9717069e0f4012337aaf6250106065dfd5ad9b4458a91
 SHA512:
-  metadata.gz: 4bf2b53a65607c75da3907433b40e1f4aaee67a70268f562a3f6c554087ab7a66924874befc1da5a6954b86b71f0e32ab6bff5108f64f3582b677500dc0a2f8b
-  data.tar.gz: 25d862c9b5b6e25a3dc22ac581c2e04c025ff76b3f842033578f2565d8641f2a951d03e0a88c272e52f584c87fb27a2af90593ae6aea8d69c80ec4ec06d0b36a
+  metadata.gz: a58fd3f4508d486b3632f2e337f5e2fe97ef8c2baeeeda9b4f53f816ff18eb10b3e8879c98ea10c645becb29c8351a7addc6867c22abfeda77a7edf654607f44
+  data.tar.gz: 3bdbbc06f25405d3f51de30e81c39406f7ccf535e507bb36b43df3939d1a4931b763cb5308bde72674ab3f2ffcb55171b958f93a3b603bf5cf17a1bbd24d44b4

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 2.1.10
-  - 2.2.7
-  - 2.3.3
-  - 2.4.0
-  - 2.5.3
-  - 2.6.1
+  - 2.2.10
+  - 2.3.8
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1

data/README.md

@@ -61,7 +61,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`, `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`
 
  - <tt>&lt;svg&gt;</tt>, <tt>&lt;g&gt;</tt> and <tt>&lt;symbol&gt;</tt>
 
@@ -76,7 +76,7 @@ prawn-svg supports most but not all of the full SVG 1.1 specification.  It curre
 
  - `<marker>`
 
- - `<linearGradient>` is implemented on Prawn 2.2.0+ with attributes `gradientUnits` and `gradientTransform` (spreadMethod and stop-opacity are unimplemented.)
+ - `<linearGradient>` and `<radialGradient>` are implemented on Prawn 2.2.0+ with attributes `gradientUnits` and `gradientTransform` (spreadMethod and stop-opacity are unimplemented.)
 
  - `<switch>` and `<foreignObject>`, although prawn-svg cannot handle any data that is not SVG so `<foreignObject>`
    tags are always ignored.
@@ -116,7 +116,7 @@ implemented, but `!important` is not.
 
 ## Not supported
 
-prawn-svg does not support radial gradients, patterns or filters.
+prawn-svg does not support hyperlinks, patterns 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/elements.rb

@@ -28,6 +28,7 @@ module Prawn::SVG::Elements
     use: Prawn::SVG::Elements::Use,
     image: Prawn::SVG::Elements::Image,
     linearGradient: Prawn::SVG::Elements::Gradient,
+    radialGradient: Prawn::SVG::Elements::Gradient,
     marker: Prawn::SVG::Elements::Marker,
     style: Prawn::SVG::Elements::Ignored, # because it is pre-parsed by Document
     title: Prawn::SVG::Elements::Ignored,

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

@@ -267,4 +267,8 @@ class Prawn::SVG::Elements::Base
     element = document.elements_by_id[matches[1]] if matches
     element if element && (expected_type.nil? || element.name == expected_type)
   end
+
+  def href_attribute
+    attributes['xlink:href'] || attributes['href']
+  end
 end

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

@@ -1,10 +1,18 @@
 class Prawn::SVG::Elements::Gradient < Prawn::SVG::Elements::Base
-  TAG_NAME_TO_TYPE = {"linearGradient" => :linear}
+  attr_reader :parent_gradient
+  attr_reader :x1, :y1, :x2, :y2, :cx, :cy, :fx, :fy, :radius, :units, :stops, :transform_matrix
+
+  TAG_NAME_TO_TYPE = {
+    "linearGradient" => :linear,
+    "radialGradient" => :radial
+  }
 
   def parse
     # A gradient tag without an ID is inaccessible and can never be used
     raise SkipElementQuietly if attributes['id'].nil?
 
+    @parent_gradient = document.gradients[href_attribute[1..-1]] if href_attribute && href_attribute[0] == '#'
+
     assert_compatible_prawn_version
     load_gradient_configuration
     load_coordinates
@@ -16,31 +24,57 @@ class Prawn::SVG::Elements::Gradient < Prawn::SVG::Elements::Base
   end
 
   def gradient_arguments(element)
-    case @units
-    when :bounding_box
-      x1, y1, x2, y2 = element.bounding_box
-      return if y2.nil?
-
-      width = x2 - x1
-      height = y1 - y2
-
-      from = [x1 + width * @x1, y1 - height * @y1]
-      to   = [x1 + width * @x2, y1 - height * @y2]
-
-    when :user_space
-      from = [@x1, @y1]
-      to   = [@x2, @y2]
-    end
-
     # Passing in a transformation matrix to the apply_transformations option is supported
     # by a monkey patch installed by prawn-svg.  Prawn only sees this as a truthy variable.
     #
     # See Prawn::SVG::Extensions::AdditionalGradientTransforms for details.
-    {from: from, to: to, stops: @stops, apply_transformations: @transform_matrix || true}
+    base_arguments = {stops: stops, apply_transformations: transform_matrix || true}
+
+    arguments = specific_gradient_arguments(element)
+    arguments.merge(base_arguments) if arguments
   end
 
   private
 
+  def specific_gradient_arguments(element)
+    if units == :bounding_box
+      bounding_x1, bounding_y1, bounding_x2, bounding_y2 = element.bounding_box
+      return if bounding_y2.nil?
+
+      width = bounding_x2 - bounding_x1
+      height = bounding_y1 - bounding_y2
+    end
+
+    case [type, units]
+    when [:linear, :bounding_box]
+      from = [bounding_x1 + width * x1, bounding_y1 - height * y1]
+      to   = [bounding_x1 + width * x2, bounding_y1 - height * y2]
+
+      {from: from, to: to}
+
+    when [:linear, :user_space]
+      {from: [x1, y1], to: [x2, y2]}
+
+    when [:radial, :bounding_box]
+      center = [bounding_x1 + width * cx, bounding_y1 - height * cy]
+      focus  = [bounding_x1 + width * fx, bounding_y1 - height * fy]
+
+      # Note: Chrome, at least, implements radial bounding box radiuses as
+      # having separate X and Y components, so in bounding box mode their
+      # gradients come out as ovals instead of circles.  PDF radial shading
+      # doesn't have the option to do this, and it's confusing why the
+      # Chrome user space gradients don't apply the same logic anyway.
+      hypot = Math.sqrt(width * width + height * height)
+      {from: focus, r1: 0, to: center, r2: radius * hypot}
+
+    when [:radial, :user_space]
+      {from: [fx, fy], r1: 0, to: [cx, cy], r2: radius}
+
+    else
+      raise "unexpected type/unit system"
+    end
+  end
+
   def type
     TAG_NAME_TO_TYPE.fetch(name)
   end
@@ -64,18 +98,35 @@ class Prawn::SVG::Elements::Gradient < Prawn::SVG::Elements::Base
   end
 
   def load_coordinates
-    case @units
-    when :bounding_box
+    case [type, units]
+    when [:linear, :bounding_box]
       @x1 = parse_zero_to_one(attributes["x1"], 0)
       @y1 = parse_zero_to_one(attributes["y1"], 0)
       @x2 = parse_zero_to_one(attributes["x2"], 1)
       @y2 = parse_zero_to_one(attributes["y2"], 0)
 
-    when :user_space
+    when [:linear, :user_space]
       @x1 = x(attributes["x1"])
       @y1 = y(attributes["y1"])
       @x2 = x(attributes["x2"])
       @y2 = y(attributes["y2"])
+
+    when [:radial, :bounding_box]
+      @cx = parse_zero_to_one(attributes["cx"], 0.5)
+      @cy = parse_zero_to_one(attributes["cy"], 0.5)
+      @fx = parse_zero_to_one(attributes["fx"], cx)
+      @fy = parse_zero_to_one(attributes["fy"], cy)
+      @radius = parse_zero_to_one(attributes["r"], 0.5)
+
+    when [:radial, :user_space]
+      @cx = x(attributes["cx"] || '50%')
+      @cy = y(attributes["cy"] || '50%')
+      @fx = x(attributes["fx"] || attributes["cx"])
+      @fy = y(attributes["fy"] || attributes["cy"])
+      @radius = pixels(attributes["r"] || '50%')
+
+    else
+      raise "unexpected type/unit system"
     end
   end
 
@@ -101,10 +152,16 @@ class Prawn::SVG::Elements::Gradient < Prawn::SVG::Elements::Base
       end
     end
 
-    raise SkipElementError, "gradient does not have any valid stops" if @stops.empty?
+    if stops.empty?
+      if parent_gradient.nil? || parent_gradient.stops.empty?
+        raise SkipElementError, "gradient does not have any valid stops"
+      end
 
-    @stops.unshift([0, @stops.first.last]) if @stops.first.first > 0
-    @stops.push([1, @stops.last.last])     if @stops.last.first  < 1
+      @stops = parent_gradient.stops
+    else
+      stops.unshift([0, stops.first.last]) if stops.first.first > 0
+      stops.push([1, stops.last.last])     if stops.last.first  < 1
+    end
   end
 
   def parse_zero_to_one(string, default = 0)

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

@@ -15,9 +15,9 @@ class Prawn::SVG::Elements::Image < Prawn::SVG::Elements::Base
 
     raise SkipElementQuietly if state.computed_properties.display == "none"
 
-    @url = attributes['xlink:href'] || attributes['href']
+    @url = href_attribute
     if @url.nil?
-      raise SkipElementError, "image tag must have an xlink:href"
+      raise SkipElementError, "image tag must have an href or xlink:href"
     end
 
     x = x(attributes['x'] || 0)

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

@@ -4,10 +4,31 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
 
   INSIDE_SPACE_REGEXP = /[ \t\r\n,]*/
   OUTSIDE_SPACE_REGEXP = /[ \t\r\n]*/
-  INSIDE_REGEXP = /#{INSIDE_SPACE_REGEXP}([+-]?(?:[0-9]+(?:\.[0-9]*)?|\.[0-9]+)(?:(?<=[0-9])[eE][+-]?[0-9]+)?)/
-  VALUES_REGEXP = /^#{INSIDE_REGEXP}/
+  INSIDE_REGEXP = /#{INSIDE_SPACE_REGEXP}(?>([+-]?(?:[0-9]+(?:\.[0-9]*)?|\.[0-9]+)(?:(?<=[0-9])[eE][+-]?[0-9]+)?))/
+  FLAG_REGEXP = /#{INSIDE_SPACE_REGEXP}([01])/
   COMMAND_REGEXP = /^#{OUTSIDE_SPACE_REGEXP}([A-Za-z])((?:#{INSIDE_REGEXP})*)#{OUTSIDE_SPACE_REGEXP}/
 
+  A_PARAMETERS_REGEXP = /^#{INSIDE_REGEXP}#{INSIDE_REGEXP}#{INSIDE_REGEXP}#{FLAG_REGEXP}#{FLAG_REGEXP}#{INSIDE_REGEXP}#{INSIDE_REGEXP}/
+  ONE_PARAMETER_REGEXP = /^#{INSIDE_REGEXP}/
+  TWO_PARAMETER_REGEXP = /^#{INSIDE_REGEXP}#{INSIDE_REGEXP}/
+  FOUR_PARAMETER_REGEXP = /^#{INSIDE_REGEXP}#{INSIDE_REGEXP}#{INSIDE_REGEXP}#{INSIDE_REGEXP}/
+  SIX_PARAMETER_REGEXP = /^#{INSIDE_REGEXP}#{INSIDE_REGEXP}#{INSIDE_REGEXP}#{INSIDE_REGEXP}#{INSIDE_REGEXP}#{INSIDE_REGEXP}/
+
+  COMMAND_MATCH_MAP = {
+    'A' => A_PARAMETERS_REGEXP,
+    'C' => SIX_PARAMETER_REGEXP,
+    'H' => ONE_PARAMETER_REGEXP,
+    'L' => TWO_PARAMETER_REGEXP,
+    'M' => TWO_PARAMETER_REGEXP,
+    'Q' => FOUR_PARAMETER_REGEXP,
+    'S' => FOUR_PARAMETER_REGEXP,
+    'T' => TWO_PARAMETER_REGEXP,
+    'V' => ONE_PARAMETER_REGEXP,
+    'Z' => //,
+  }
+
+  PARAMETERLESS_COMMANDS = COMMAND_MATCH_MAP.select { |_, v| v == // }.map(&:first)
+
   FLOAT_ERROR_DELTA = 1e-10
 
   attr_reader :commands
@@ -23,14 +44,13 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
     matched_commands = match_all(data, COMMAND_REGEXP)
     raise SkipElementError, "Invalid/unsupported syntax for SVG path data" if matched_commands.nil?
 
-    catch :invalid_command do
-      matched_commands.each do |matched_command|
-        command = matched_command[1]
-        matched_values = match_all(matched_command[2], VALUES_REGEXP)
-        raise "should be impossible to have invalid inside data, but we ended up here" if matched_values.nil?
-        values = matched_values.collect {|value| value[1].to_f}
-        parse_path_command(command, values)
-      end
+    matched_commands.each do |(command, parameters)|
+      regexp = COMMAND_MATCH_MAP[command.upcase] or break
+      matched_values = match_all(parameters, regexp) or break
+      values = matched_values.map { |value| value.map(&:to_f) }
+      break if values.empty? && !PARAMETERLESS_COMMANDS.include?(command.upcase)
+
+      parse_path_command(command, values)
     end
   end
 
@@ -49,8 +69,7 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
 
     case upcase_command
     when 'M' # moveto
-      x = values.shift or throw :invalid_command
-      y = values.shift or throw :invalid_command
+      x, y = values.shift
 
       if relative && @last_point
         x += @last_point.first
@@ -69,8 +88,7 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
 
     when 'L' # lineto
       while values.any?
-        x = values.shift
-        y = values.shift or throw :invalid_command
+        x, y = values.shift
         if relative && @last_point
           x += @last_point.first
           y += @last_point.last
@@ -81,22 +99,21 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
 
     when 'H' # horizontal lineto
       while values.any?
-        x = values.shift
+        x = values.shift.first
         x += @last_point.first if relative && @last_point
         push_command Prawn::SVG::Pathable::Line.new([x, @last_point.last])
       end
 
     when 'V' # vertical lineto
       while values.any?
-        y = values.shift
+        y = values.shift.first
         y += @last_point.last if relative && @last_point
         push_command Prawn::SVG::Pathable::Line.new([@last_point.first, y])
       end
 
     when 'C' # curveto
       while values.any?
-        x1, y1, x2, y2, x, y = values.shift(6)
-        throw :invalid_command unless y
+        x1, y1, x2, y2, x, y = values.shift
 
         if relative && @last_point
           x += @last_point.first
@@ -113,8 +130,7 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
 
     when 'S' # shorthand/smooth curveto
       while values.any?
-        x2, y2, x, y = values.shift(4)
-        throw :invalid_command unless y
+        x2, y2, x, y = values.shift
 
         if relative && @last_point
           x += @last_point.first
@@ -137,13 +153,11 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
     when 'Q', 'T' # quadratic curveto
       while values.any?
         if shorthand = upcase_command == 'T'
-          x, y = values.shift(2)
+          x, y = values.shift
         else
-          x1, y1, x, y = values.shift(4)
+          x1, y1, x, y = values.shift
         end
 
-        throw :invalid_command unless y
-
         if relative && @last_point
           x += @last_point.first
           x1 += @last_point.first if x1
@@ -175,8 +189,7 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
       return unless @last_point
 
       while values.any?
-        rx, ry, phi, fa, fs, x2, y2 = values.shift(7)
-        throw :invalid_command unless y2
+        rx, ry, phi, fa, fs, x2, y2 = values.shift
 
         x1, y1 = @last_point
 
@@ -277,9 +290,8 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
   def match_all(string, regexp) # regexp must start with ^
     result = []
     while string != ""
-      matches = string.match(regexp)
-      result << matches
-      return if matches.nil?
+      matches = string.match(regexp) or return
+      result << matches.captures
       string = matches.post_match
     end
     result

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

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

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

@@ -46,9 +46,11 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
     opts = {
       size:        computed_properties.numerical_font_size,
       style:       font && font.subfamily,
-      text_anchor: computed_properties.text_anchor
+      text_anchor: computed_properties.text_anchor,
     }
 
+    opts[:decoration] = computed_properties.text_decoration unless computed_properties.text_decoration == 'none'
+
     if state.text.parent
       add_call_and_enter 'character_spacing', state.text.spacing unless state.text.spacing == state.text.parent.spacing
       add_call_and_enter 'text_rendering_mode', state.text.mode unless state.text.mode == state.text.parent.mode
@@ -183,7 +185,7 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
   end
 
   def find_referenced_element
-    href = attributes['xlink:href']
+    href = href_attribute
 
     if href && href[0..0] == '#'
       element = document.elements_by_id[href[1..-1]]

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

@@ -1,19 +1,35 @@
 class Prawn::SVG::Elements::Use < Prawn::SVG::Elements::Base
-  attr_reader :referenced_element
+  attr_reader :referenced_element_class
+  attr_reader :referenced_element_source
 
   def parse
-    require_attributes 'xlink:href'
-
-    href = attributes['xlink:href']
+    href = href_attribute
+    if href.nil?
+      raise SkipElementError, "use tag must have an href or xlink:href"
+    end
 
     if href[0..0] != '#'
       raise SkipElementError, "use tag has an href that is not a reference to an id; this is not supported"
     end
 
     id = href[1..-1]
-    @referenced_element = @document.elements_by_id[id]
+    referenced_element = @document.elements_by_id[id]
+
+    if referenced_element
+      @referenced_element_class = referenced_element.class
+      @referenced_element_source = referenced_element.source
+    else
+      # Perhaps the element is defined further down in the document.  This is not recommended but still valid SVG,
+      # so we'll support it with an exception case that's not particularly performant.
+      raw_element = REXML::XPath.match(@document.root, %(//*[@id="#{id.gsub('"', '\"')}"])).first
+
+      if raw_element
+        @referenced_element_class = Prawn::SVG::Elements::TAG_CLASS_MAPPING[raw_element.name.to_sym]
+        @referenced_element_source = raw_element
+      end
+    end
 
-    if referenced_element.nil?
+    if referenced_element_class.nil?
       raise SkipElementError, "no tag with ID '#{id}' was found, referenced by use tag"
     end
 
@@ -36,7 +52,7 @@ class Prawn::SVG::Elements::Use < Prawn::SVG::Elements::Base
   def process_child_elements
     add_call "save"
 
-    child = referenced_element.class.new(referenced_element.document, referenced_element.source, calls, state.dup)
+    child = referenced_element_class.new(document, referenced_element_source, calls, state.dup)
     child.process
 
     add_call "restore"

data/lib/prawn/svg/interface.rb

@@ -119,7 +119,7 @@ module Prawn
 
           if skip
             # the call has been overridden
-          elsif children.empty?
+          elsif children.empty? && call != 'transparent' # some prawn calls complain if they aren't supplied a block
             prawn.send(call, *arguments)
           else
             prawn.send(call, *arguments, &proc_creator(prawn, children))
@@ -172,6 +172,15 @@ module Prawn
             @cursor = [at[0] + width, at[1]]
           end
 
+          decoration = options.delete(:decoration)
+          if decoration == 'underline'
+            prawn.save_graphics_state do
+              prawn.line_width 1
+              prawn.line [at[0], at[1] - 1.25], [at[0] + width, at[1] - 1.25]
+              prawn.stroke
+            end
+          end
+
         when 'transformation_matrix'
           left = prawn.bounds.absolute_left
           top = prawn.bounds.absolute_top

data/lib/prawn/svg/properties.rb

@@ -37,6 +37,7 @@ class Prawn::SVG::Properties
     "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),
   }.freeze
 
   PROPERTIES.each do |name, value|

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module SVG
-    VERSION = '0.30.0'
+    VERSION = '0.31.0'
   end
 end

data/prawn-svg.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "prawn", ">= 0.11.1", "< 3"
   gem.add_runtime_dependency "css_parser", "~> 1.6"
   gem.add_development_dependency "rspec", "~> 3.0"
-  gem.add_development_dependency "rake", "~> 10.1"
+  gem.add_development_dependency "rake", "~> 13.0"
 end

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

@@ -9,7 +9,7 @@ describe Prawn::SVG::Elements::Gradient do
     element.process
   end
 
-  describe "object bounding box" do
+  describe "object bounding box with linear gradient" do
     let(:svg) do
       <<-SVG
         <linearGradient id="flag" x1="0" x2="0.2" y1="0" y2="1">
@@ -40,7 +40,35 @@ describe Prawn::SVG::Elements::Gradient do
     end
   end
 
-  describe "user space on use" do
+  describe "object bounding box with radial gradient" do
+    let(:svg) do
+      <<-SVG
+        <radialGradient id="flag" cx="0" cy="0.2" fx="0.5" r="0.8">
+          <stop offset="25%" stop-color="red"/>
+          <stop offset="50%" stop-color="white"/>
+          <stop offset="75%" stop-color="blue"/>
+        </radialGradient>
+      SVG
+    end
+
+    it "is stored in the document gradients table" do
+      expect(document.gradients["flag"]).to eq element
+    end
+
+    it "returns correct gradient arguments for an element" do
+      arguments = element.gradient_arguments(double(bounding_box: [100, 100, 200, 0]))
+      expect(arguments).to eq(
+        from: [150, 80],
+        to:   [100, 80],
+        r1:   0,
+        r2:   Math.sqrt((0.8 * 100) ** 2 + (0.8 * 100) ** 2),
+        stops: [[0, "ff0000"], [0.25, "ff0000"], [0.5, "ffffff"], [0.75, "0000ff"], [1, "0000ff"]],
+        apply_transformations: true,
+      )
+    end
+  end
+
+  describe "user space on use with linear gradient" do
     let(:svg) do
       <<-SVG
         <linearGradient id="flag" gradientUnits="userSpaceOnUse" x1="100" y1="500" x2="200" y2="600">
@@ -61,6 +89,29 @@ describe Prawn::SVG::Elements::Gradient do
     end
   end
 
+  describe "user space on use with radial gradient" do
+    let(:svg) do
+      <<-SVG
+        <radialGradient id="flag" gradientUnits="userSpaceOnUse" fx="100" fy="500" cx="200" cy="600" r="150">
+          <stop offset="0" stop-color="red"/>
+          <stop offset="1" stop-color="blue"/>
+        </radialGradient>
+      SVG
+    end
+
+    it "returns correct gradient arguments for an element" do
+      arguments = element.gradient_arguments(double)
+      expect(arguments).to eq(
+        from: [100.0, 100.0],
+        to:   [200.0, 0.0],
+        r1:   0,
+        r2:   150,
+        stops: [[0, "ff0000"], [1, "0000ff"]],
+        apply_transformations: true,
+      )
+    end
+  end
+
   context "when gradientTransform is specified" do
     let(:svg) do
       <<-SVG

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

@@ -11,22 +11,22 @@ describe Prawn::SVG::Elements::Path do
 
   describe "command parsing" do
     context "with a valid path" do
-      let(:d) { "A12.34 -56.78 89B4 5 12-34 -.5.7+3 2.3e3 4e4 4e+4 c31,-2e-5C  6,7 T QX 0 Z" }
+      let(:d) { "m12.34 -56.78 1 2M4 5 12-34 -.5.7+3 2.3e3 4e4 4e+4 L31,-2e-5L  6,7 Z ZZa50 50 0 100 100" }
 
       it "correctly parses" do
         calls = []
-        path.stub(:parse_path_command) {|*args| calls << args}
+        allow(path).to receive(:parse_path_command) {|*args| calls << args}
         path.parse
 
-        calls.should == [
-          ["A", [12.34, -56.78, 89]],
-          ["B", [4, 5, 12, -34, -0.5, 0.7, 3, 2.3e3, 4e4, 4e4]],
-          ["c", [31, -2e-5]],
-          ["C", [6, 7]],
-          ["T", []],
-          ["Q", []],
-          ["X", [0]],
-          ["Z", []]
+        expect(calls).to eq [
+          ["m", [[12.34, -56.78], [1, 2]]],
+          ["M", [[4, 5], [12, -34], [-0.5, 0.7], [3, 2.3e3], [4e4, 4e4]]],
+          ["L", [[31, -2e-5]]],
+          ["L", [[6, 7]]],
+          ["Z", []],
+          ["Z", []],
+          ["Z", []],
+          ["a", [[50, 50, 0, 1, 0, 0, 100]]],
         ]
       end
     end
@@ -36,12 +36,12 @@ describe Prawn::SVG::Elements::Path do
 
       it "treats subsequent points to m/M command as relative/absolute depending on command" do
         [
-          ["M", [1,2,3,4]],
-          ["L", [3,4]],
-          ["m", [5,6,7,8]],
-          ["l", [7,8]]
+          ["M", [[1,2],[3,4]]],
+          ["L", [[3,4]]],
+          ["m", [[5,6],[7,8]]],
+          ["l", [[7,8]]]
         ].each do |args|
-          path.should_receive(:parse_path_command).with(*args).and_call_original
+          expect(path).to receive(:parse_path_command).with(*args).and_call_original
         end
 
         path.parse
@@ -52,7 +52,7 @@ describe Prawn::SVG::Elements::Path do
       let(:d) { "" }
 
       it "correctly parses" do
-        path.should_not_receive(:run_path_command)
+        expect(path).not_to receive(:run_path_command)
         path.parse
       end
     end
@@ -292,5 +292,17 @@ describe Prawn::SVG::Elements::Path do
         ]
       end
     end
+
+    context "with highly-compressed flags" do
+      let(:d) { "M100,100a50 50 0 100 100" }
+
+      it "correctly parses them" do
+        expect(subject).to eq [
+          Prawn::SVG::Elements::Path::Move.new([100.0, 100.0]),
+          Prawn::SVG::Elements::Path::Curve.new([50.0, 150.0], [72.57081148225681, 100.0], [50.0, 122.57081148225681]),
+          Prawn::SVG::Elements::Path::Curve.new([99.99999999999999, 200.0], [50.0, 177.42918851774317], [72.5708114822568, 200.0])
+        ]
+      end
+    end
   end
 end

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

@@ -88,6 +88,21 @@ Even more
     end
   end
 
+  describe "underline" do
+    let(:svg) { '<text text-decoration="underline">underlined</text>' }
+
+    it "marks the element to be underlined" do
+      element.process
+
+      expect(element.base_calls).to eq [
+        ["text_group", [], [
+          ["font", ["Helvetica", {:style=>:normal}], []],
+          ["draw_text", ["underlined", default_style.merge(decoration: 'underline')], []]
+        ]]
+      ]
+    end
+  end
+
   describe "fill/stroke modes" do
     context "with a stroke and no fill" do
       let(:svg) { '<text stroke="red" fill="none">stroked</text>' }

data/spec/sample_svg/radgrad01-bounding.svg

@@ -0,0 +1,26 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="8cm" height="4cm" viewBox="0 0 800 400" version="1.1"
+     xmlns="http://www.w3.org/2000/svg">
+  <desc>Example radgrad01 - fill a rectangle by referencing a
+           radial gradient paint server</desc>
+  <g>
+    <defs>
+      <radialGradient id="MyGradient"
+                      cx="0.5" cy="0.5" r="0.2" fx="0.5" fy="0.5">
+        <stop offset="0%" stop-color="red" />
+        <stop offset="50%" stop-color="blue" />
+        <stop offset="100%" stop-color="red" />
+      </radialGradient>
+    </defs>
+
+    <!-- Outline the drawing area in blue -->
+    <rect fill="none" stroke="blue"
+          x="1" y="1" width="798" height="398"/>
+
+    <!-- The rectangle is filled using a radial gradient paint server -->
+    <rect fill="url(#MyGradient)" stroke="black" stroke-width="5"
+          x="100" y="100" width="600" height="200"/>
+  </g>
+</svg>

data/spec/sample_svg/radgrad01.svg

@@ -0,0 +1,26 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="8cm" height="4cm" viewBox="0 0 800 400" version="1.1"
+     xmlns="http://www.w3.org/2000/svg">
+  <desc>Example radgrad01 - fill a rectangle by referencing a
+           radial gradient paint server</desc>
+  <g>
+    <defs>
+      <radialGradient id="MyGradient" gradientUnits="userSpaceOnUse"
+                      cx="400" cy="200" r="50%" fx="200" fy="200">
+        <stop offset="0%" stop-color="red" />
+        <stop offset="50%" stop-color="blue" />
+        <stop offset="100%" stop-color="red" />
+      </radialGradient>
+    </defs>
+
+    <!-- Outline the drawing area in blue -->
+    <rect fill="none" stroke="blue"
+          x="1" y="1" width="798" height="398"/>
+
+    <!-- The rectangle is filled using a radial gradient paint server -->
+    <rect fill="url(#MyGradient)" stroke="black" stroke-width="5"
+          x="100" y="100" width="600" height="200"/>
+  </g>
+</svg>

data/spec/sample_svg/svg_fill.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="12cm" height="5.25cm" viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" version="1.1" fill="red">
+	<text style="font-size: 40pt;">This is red text.</text>
+</svg>

data/spec/sample_svg/text-decoration.svg

@@ -0,0 +1,4 @@
+<svg viewBox="0 0 250 50" xmlns="http://www.w3.org/2000/svg">
+  <text y="20" text-decoration="underline">Underlined text</text>
+  <text x="0" y="40" text-decoration="line-through">Struck-through text</text>
+</svg>

data/spec/sample_svg/use_disordered.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="12cm" height="4cm" viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" xmlns:xlink='http://www.w3.org/1999/xlink' version="1.1">
+  <use xlink:href="#two-rects"/>
+  <use xlink:href="#two-rects" x="90" y="90"/>
+  <use xlink:href="#two-rects" x="180" y="180"/>
+
+  <use xlink:href="#circle" x="0" y="0" style="opacity: 0.5;" transform="scale(1.3)"/>
+  <use xlink:href="#circle" x="0" y="0" style="opacity: 0.2;" transform="scale(1.7)"/>
+
+  <circle id="circle" cx="600" cy="200" r="100" fill="red" stroke="blue" stroke-width="10" />
+
+  <symbol id="two-rects">
+    <rect x="1" y="1" width="1198" height="398" fill="none" stroke="blue" stroke-width="2"/>
+    <rect x="400" y="100" width="400" height="200" fill="yellow" stroke="navy" stroke-width="10"  />
+  </symbol>
+</svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Roger Nesbitt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.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.
@@ -213,6 +213,8 @@ files:
 - spec/sample_svg/polyline01.svg
 - spec/sample_svg/preserve-space.svg
 - spec/sample_svg/quad01.svg
+- spec/sample_svg/radgrad01-bounding.svg
+- spec/sample_svg/radgrad01.svg
 - spec/sample_svg/rect01.svg
 - spec/sample_svg/rect02.svg
 - spec/sample_svg/rotate_scale.svg
@@ -221,6 +223,8 @@ files:
 - spec/sample_svg/subfamilies.svg
 - spec/sample_svg/subviewports.svg
 - spec/sample_svg/subviewports2.svg
+- spec/sample_svg/svg_fill.svg
+- spec/sample_svg/text-decoration.svg
 - spec/sample_svg/text_entities.svg
 - spec/sample_svg/text_stroke.svg
 - spec/sample_svg/transform.svg
@@ -234,6 +238,7 @@ files:
 - spec/sample_svg/tspan05.svg
 - spec/sample_svg/tspan91.svg
 - spec/sample_svg/use.svg
+- spec/sample_svg/use_disordered.svg
 - spec/sample_svg/viewbox.svg
 - spec/sample_svg/viewport.svg
 - spec/sample_svg/warning-radioactive.svg
@@ -243,7 +248,7 @@ homepage: http://github.com/mogest/prawn-svg
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -258,8 +263,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: SVG renderer for Prawn PDF library
 test_files:
@@ -335,6 +340,8 @@ test_files:
 - spec/sample_svg/polyline01.svg
 - spec/sample_svg/preserve-space.svg
 - spec/sample_svg/quad01.svg
+- spec/sample_svg/radgrad01-bounding.svg
+- spec/sample_svg/radgrad01.svg
 - spec/sample_svg/rect01.svg
 - spec/sample_svg/rect02.svg
 - spec/sample_svg/rotate_scale.svg
@@ -343,6 +350,8 @@ test_files:
 - spec/sample_svg/subfamilies.svg
 - spec/sample_svg/subviewports.svg
 - spec/sample_svg/subviewports2.svg
+- spec/sample_svg/svg_fill.svg
+- spec/sample_svg/text-decoration.svg
 - spec/sample_svg/text_entities.svg
 - spec/sample_svg/text_stroke.svg
 - spec/sample_svg/transform.svg
@@ -356,6 +365,7 @@ test_files:
 - spec/sample_svg/tspan05.svg
 - spec/sample_svg/tspan91.svg
 - spec/sample_svg/use.svg
+- spec/sample_svg/use_disordered.svg
 - spec/sample_svg/viewbox.svg
 - spec/sample_svg/viewport.svg
 - spec/sample_svg/warning-radioactive.svg