prawn-svg 0.29.1 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dbf86f272347e8867b1e7262a49163c316d0160fc35802ceb1f7b0f8ed90e25
-  data.tar.gz: 4244134c0616eaf4aa9ca8ef19bbde2137e589d4f3929dd30b55c4c3d5136c36
+  metadata.gz: 34f48795bbd6ee32d7c18228b833137dc52cb5b02f0446de0e3908d0827e7234
+  data.tar.gz: 4f654b0c484f81ba80660940d2823c836c0aaba0156cb9e803c722170fdec993
 SHA512:
-  metadata.gz: 3d1874a6766112c3084355c21b517b7a1d413f0e9e88c806cb236d69edc9fb7e1c3e253f13746c18e5e9b57d1221341d5c309494429dbae4a377ef91b99c8a52
-  data.tar.gz: bbd80743596ad9c2c25871c5c6542d2ddfb0c3026ac5d0efb61a894b501aabc6657e048f3d52b0b0e42e634e68b0d30f7e5096ce9bfdc81d4a7ffc7ac08d65e9
+  metadata.gz: 4bf2b53a65607c75da3907433b40e1f4aaee67a70268f562a3f6c554087ab7a66924874befc1da5a6954b86b71f0e32ab6bff5108f64f3582b677500dc0a2f8b
+  data.tar.gz: 25d862c9b5b6e25a3dc22ac581c2e04c025ff76b3f842033578f2565d8641f2a951d03e0a88c272e52f584c87fb27a2af90593ae6aea8d69c80ec4ec06d0b36a

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright 2010-2013 Roger Nesbitt
+Copyright 2010-2019 Roger Nesbitt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -60,7 +60,7 @@ prawn-svg supports most but not all of the full SVG 1.1 specification.  It curre
  - <tt>&lt;path&gt;</tt> supports all commands defined in SVG 1.1, although the
    implementation of elliptical arc is a bit rough at the moment.
 
- - `<text>`, `<tspan>` and `<tref>` with attributes `x`, `y`, `dx`, `dy`, `rotate`, and with extra properties
+ - `<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`
 
  - <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 with Prawn 2.2.0+ (gradientTransform, spreadMethod and stop-opacity are unimplemented.)
+ - `<linearGradient>` is 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.
@@ -91,7 +91,7 @@ prawn-svg supports most but not all of the full SVG 1.1 specification.  It curre
 
  - the <tt>preserveAspectRatio</tt> attribute on <tt>&lt;svg&gt;</tt>, <tt>&lt;image&gt;</tt> and `<marker>` elements
 
- - transform methods: <tt>translate()</tt>, <tt>rotate()</tt>, <tt>scale()</tt>, <tt>matrix()</tt>
+ - 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>
 
@@ -135,5 +135,6 @@ Mac OS X and Debian Linux users.  You can add to the font path:
 
 In your Gemfile, put `gem 'prawn-svg'` before `gem 'prawn-rails'` so that prawn-rails can see the prawn-svg extension.
 
---
-Copyright Roger Nesbitt <roger@seriousorange.com>.  MIT licence.
+## Licence
+
+MIT licence.  Copyright Roger Nesbitt.

data/lib/prawn-svg.rb

@@ -10,6 +10,7 @@ require 'prawn/svg/calculators/arc_to_bezier_curve'
 require 'prawn/svg/calculators/aspect_ratio'
 require 'prawn/svg/calculators/document_sizing'
 require 'prawn/svg/calculators/pixels'
+require 'prawn/svg/transform_parser'
 require 'prawn/svg/url_loader'
 require 'prawn/svg/loaders/data'
 require 'prawn/svg/loaders/file'
@@ -29,6 +30,9 @@ require 'prawn/svg/font'
 require 'prawn/svg/document'
 require 'prawn/svg/state'
 
+require 'prawn/svg/extensions/additional_gradient_transforms'
+Prawn::Document.prepend Prawn::SVG::Extensions::AdditionalGradientTransforms
+
 module Prawn
   Svg = SVG # backwards compatibility
 end

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

@@ -1,13 +1,13 @@
 module Prawn::SVG::Attributes::Opacity
   def parse_opacity_attributes_and_call
     # We can't do nested opacities quite like the SVG requires, but this is close enough.
-    fill_opacity = stroke_opacity = clamp(properties.opacity.to_f, 0, 1) if properties.opacity
+    opacity = clamp(properties.opacity.to_f, 0, 1) if properties.opacity
     fill_opacity = clamp(properties.fill_opacity.to_f, 0, 1) if properties.fill_opacity
     stroke_opacity = clamp(properties.stroke_opacity.to_f, 0, 1) if properties.stroke_opacity
 
-    if fill_opacity || stroke_opacity
-      state.fill_opacity *= fill_opacity || 1
-      state.stroke_opacity *= stroke_opacity || 1
+    if opacity || fill_opacity || stroke_opacity
+      state.fill_opacity *= [opacity || 1, fill_opacity || 1].min
+      state.stroke_opacity *= [opacity || 1, stroke_opacity || 1].min
 
       add_call_and_enter 'transparent', state.fill_opacity, state.stroke_opacity
     end

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

@@ -2,49 +2,7 @@ module Prawn::SVG::Attributes::Transform
   def parse_transform_attribute_and_call
     return unless transform = attributes['transform']
 
-    parse_css_method_calls(transform).each do |name, arguments|
-      case name
-      when 'translate'
-        x, y = arguments
-        add_call_and_enter name, x_pixels(x.to_f), -y_pixels(y.to_f)
-
-      when 'rotate'
-        r, x, y = arguments.collect {|a| a.to_f}
-        case arguments.length
-        when 1
-          add_call_and_enter name, -r, :origin => [0, y('0')]
-        when 3
-          add_call_and_enter name, -r, :origin => [x(x), y(y)]
-        else
-          warnings << "transform 'rotate' must have either one or three arguments"
-        end
-
-      when 'scale'
-        x_scale = arguments[0].to_f
-        y_scale = (arguments[1] || x_scale).to_f
-        add_call_and_enter "transformation_matrix", x_scale, 0, 0, y_scale, 0, 0
-
-      when 'matrix'
-        if arguments.length != 6
-          warnings << "transform 'matrix' must have six arguments"
-        else
-          a, b, c, d, e, f = arguments.collect {|argument| argument.to_f}
-          add_call_and_enter "transformation_matrix", a, -b, -c, d, x_pixels(e), -y_pixels(f)
-        end
-
-      else
-        warnings << "Unknown transformation '#{name}'; ignoring"
-      end
-    end
-  end
-
-  private
-
-  def parse_css_method_calls(string)
-    string.scan(/\s*(\w+)\(([^)]+)\)\s*/).collect do |call|
-      name, argument_string = call
-      arguments = argument_string.strip.split(/\s*[,\s]\s*/)
-      [name, arguments]
-    end
+    matrix = parse_transform_attribute(transform)
+    add_call_and_enter "transformation_matrix", *matrix unless matrix == [1, 0, 0, 1, 0, 0]
   end
 end

data/lib/prawn/svg/elements.rb

@@ -13,6 +13,7 @@ module Prawn::SVG::Elements
     g: Prawn::SVG::Elements::Container,
     symbol: Prawn::SVG::Elements::Container,
     defs: Prawn::SVG::Elements::Container,
+    a: Prawn::SVG::Elements::Container,
     clipPath: Prawn::SVG::Elements::ClipPath,
     switch: Prawn::SVG::Elements::Container,
     svg: Prawn::SVG::Elements::Viewport,

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

@@ -11,6 +11,8 @@ class Prawn::SVG::Elements::Base
   include Prawn::SVG::Attributes::Stroke
   include Prawn::SVG::Attributes::Space
 
+  include Prawn::SVG::TransformParser
+
   PAINT_TYPES = %w(fill stroke)
   COMMA_WSP_REGEXP = Prawn::SVG::Elements::COMMA_WSP_REGEXP
   SVG_NAMESPACE = "http://www.w3.org/2000/svg"

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

@@ -32,7 +32,11 @@ class Prawn::SVG::Elements::Gradient < Prawn::SVG::Elements::Base
       to   = [@x2, @y2]
     end
 
-    {from: from, to: to, stops: @stops}
+    # 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}
   end
 
   private
@@ -51,10 +55,7 @@ class Prawn::SVG::Elements::Gradient < Prawn::SVG::Elements::Base
     @units = attributes["gradientUnits"] == 'userSpaceOnUse' ? :user_space : :bounding_box
 
     if transform = attributes["gradientTransform"]
-      matrix = transform.split(COMMA_WSP_REGEXP).map(&:to_f)
-      if matrix != [1, 0, 0, 1, 0, 0]
-        raise SkipElementError, "prawn-svg does not yet support gradients with a non-identity gradientTransform attribute"
-      end
+      @transform_matrix = parse_transform_attribute(transform)
     end
 
     if (spread_method = attributes['spreadMethod']) && spread_method != "pad"

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

@@ -16,6 +16,7 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
     require_attributes 'd'
 
     @commands = []
+    @last_point = nil
 
     data = attributes["d"].gsub(/#{OUTSIDE_SPACE_REGEXP}$/, '')
 

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

@@ -2,7 +2,7 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
   attr_reader :commands
 
   Printable = Struct.new(:element, :text, :leading_space?, :trailing_space?)
-  TextState = Struct.new(:parent, :x, :y, :dx, :dy, :rotation, :spacing, :mode)
+  TextState = Struct.new(:parent, :x, :y, :dx, :dy, :rotation, :spacing, :mode, :text_length, :length_adjust)
 
   def parse
     if state.inside_clip_path
@@ -14,6 +14,8 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
     state.text.dx = (attributes['dx'] || "").split(COMMA_WSP_REGEXP).collect { |n| x_pixels(n) }
     state.text.dy = (attributes['dy'] || "").split(COMMA_WSP_REGEXP).collect { |n| y_pixels(n) }
     state.text.rotation = (attributes['rotate'] || "").split(COMMA_WSP_REGEXP).collect(&:to_f)
+    state.text.text_length = normalize_length(attributes['textLength'])
+    state.text.length_adjust = attributes['lengthAdjust']
     state.text.spacing = calculate_character_spacing
     state.text.mode = calculate_text_rendering_mode
 
@@ -133,6 +135,14 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
         opts.delete(:rotate)
       end
 
+      if state.text.text_length
+        if state.text.length_adjust == 'spacingAndGlyphs'
+          opts[:stretch_to_width] = state.text.text_length
+        else
+          opts[:pad_to_width] = state.text.text_length
+        end
+      end
+
       if remaining
         add_call 'draw_text', text[0..0], opts.dup
         text = text[1..-1]
@@ -222,4 +232,8 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
   # overridden, we don't want to call fill/stroke as draw_text does this for us
   def apply_drawing_call
   end
+
+  def normalize_length(length)
+    x_pixels(length) if length && length.match(/\d/)
+  end
 end

data/lib/prawn/svg/extensions/additional_gradient_transforms.rb

@@ -0,0 +1,23 @@
+module Prawn::SVG::Extensions
+  module AdditionalGradientTransforms
+    def gradient_coordinates(gradient)
+      # As of Prawn 2.2.0, apply_transformations is used as purely a boolean.
+      #
+      # Here we're using it to optionally pass in a 6-tuple transformation matrix that gets applied to the
+      # gradient.  This should be added to Prawn properly, and then this monkey patch will not be necessary.
+
+      if gradient.apply_transformations.is_a?(Array)
+        x1, y1, x2, y2, transformation = super
+        a, b, c, d, e, f = transformation
+        na, nb, nc, nd, ne, nf = gradient.apply_transformations
+
+        matrix = Matrix[[a, c, e], [b, d, f], [0, 0, 1]] * Matrix[[na, nc, ne], [nb, nd, nf], [0, 0, 1]]
+        new_transformation = matrix.to_a[0..1].transpose.flatten
+
+        [x1, y1, x2, y2, new_transformation]
+      else
+        super
+      end
+    end
+  end
+end

data/lib/prawn/svg/interface.rb

@@ -148,6 +148,19 @@ module Prawn
 
           width = prawn.width_of(text, options.merge(kerning: true))
 
+          if stretch_to_width = options.delete(:stretch_to_width)
+            factor = stretch_to_width.to_f * 100 / width.to_f
+            prawn.add_content "#{factor} Tz"
+            width = stretch_to_width.to_f
+          end
+
+          if pad_to_width = options.delete(:pad_to_width)
+            padding_required = pad_to_width.to_f - width.to_f
+            padding_per_character = padding_required / text.length.to_f
+            prawn.add_content "#{padding_per_character} Tc"
+            width = pad_to_width.to_f
+          end
+
           case options.delete(:text_anchor)
           when 'middle'
             at[0] -= width / 2

data/lib/prawn/svg/loaders/data.rb

@@ -2,7 +2,7 @@ require 'base64'
 
 module Prawn::SVG::Loaders
   class Data
-    REGEXP = %r[\A(?i:data):image/(png|jpeg);base64(;[a-z0-9]+)*,]
+    REGEXP = %r[\Adata:image/(png|jpeg);base64(;[a-z0-9]+)*,]i
 
     def from_url(url)
       return if url[0..4].downcase != "data:"

data/lib/prawn/svg/loaders/file.rb

@@ -1,3 +1,5 @@
+require 'addressable/uri'
+
 #
 # Load a file from disk.
 #
@@ -56,7 +58,7 @@ module Prawn::SVG::Loaders
     private
 
     def load_file(path)
-      path = URI.decode(path)
+      path = Addressable::URI.unencode(path)
       path = build_absolute_and_expand_path(path)
       assert_valid_path!(path)
       assert_file_exists!(path)

data/lib/prawn/svg/transform_parser.rb

@@ -0,0 +1,72 @@
+module Prawn::SVG::TransformParser
+  def parse_transform_attribute(transform)
+    matrix = Matrix.identity(3)
+
+    parse_css_method_calls(transform).each do |name, arguments|
+      case name
+      when 'translate'
+        x, y = arguments
+        matrix *= Matrix[[1, 0, x_pixels(x.to_f)], [0, 1, -y_pixels(y.to_f)], [0, 0, 1]]
+
+      when 'translateX'
+        x = arguments.first
+        matrix *= Matrix[[1, 0, x_pixels(x.to_f)], [0, 1, 0], [0, 0, 1]]
+
+      when 'translateY'
+        y = arguments.first
+        matrix *= Matrix[[1, 0, 0], [0, 1, -y_pixels(y.to_f)], [0, 0, 1]]
+
+      when 'rotate'
+        angle, x, y = arguments.collect { |a| a.to_f }
+        angle = angle * Math::PI / 180.0
+
+        case arguments.length
+        when 1
+          matrix *= Matrix[[Math.cos(angle), Math.sin(angle), 0], [-Math.sin(angle), Math.cos(angle), 0], [0, 0, 1]]
+        when 3
+          matrix *= Matrix[[1, 0, x_pixels(x.to_f)], [0, 1, -y_pixels(y.to_f)], [0, 0, 1]]
+          matrix *= Matrix[[Math.cos(angle), Math.sin(angle), 0], [-Math.sin(angle), Math.cos(angle), 0], [0, 0, 1]]
+          matrix *= Matrix[[1, 0, -x_pixels(x.to_f)], [0, 1, y_pixels(y.to_f)], [0, 0, 1]]
+        else
+          warnings << "transform 'rotate' must have either one or three arguments"
+        end
+
+      when 'scale'
+        x_scale = arguments[0].to_f
+        y_scale = (arguments[1] || x_scale).to_f
+        matrix *= Matrix[[x_scale, 0, 0], [0, y_scale, 0], [0, 0, 1]]
+
+      when 'skewX'
+        angle = arguments[0].to_f * Math::PI / 180.0
+        matrix *= Matrix[[1, -Math.tan(angle), 0], [0, 1, 0], [0, 0, 1]]
+
+      when 'skewY'
+        angle = arguments[0].to_f * Math::PI / 180.0
+        matrix *= Matrix[[1, 0, 0], [-Math.tan(angle), 1, 0], [0, 0, 1]]
+
+      when 'matrix'
+        if arguments.length != 6
+          warnings << "transform 'matrix' must have six arguments"
+        else
+          a, b, c, d, e, f = arguments.collect { |argument| argument.to_f }
+          matrix *= Matrix[[a, -c, e], [-b, d, -f], [0, 0, 1]]
+        end
+
+      else
+        warnings << "Unknown/unsupported transformation '#{name}'; ignoring"
+      end
+    end
+
+    matrix.to_a[0..1].transpose.flatten
+  end
+
+  private
+
+  def parse_css_method_calls(string)
+    string.scan(/\s*(\w+)\(([^)]+)\)\s*/).collect do |call|
+      name, argument_string = call
+      arguments = argument_string.strip.split(/\s*[,\s]\s*/)
+      [name, arguments]
+    end
+  end
+end

data/lib/prawn/svg/version.rb

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

data/spec/prawn/svg/attributes/opacity_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe Prawn::SVG::Attributes::Opacity do
+  class OpacityTestElement
+    include Prawn::SVG::Attributes::Opacity
+
+    attr_accessor :properties, :state
+
+    def initialize
+      @properties = ::Prawn::SVG::Properties.new
+      @state = ::Prawn::SVG::State.new
+    end
+
+    def clamp(value, min_value, max_value)
+      [[value, min_value].max, max_value].min
+    end
+  end
+
+  let(:element) { OpacityTestElement.new }
+
+  describe "#parse_opacity_attributes_and_call" do
+    subject { element.parse_opacity_attributes_and_call }
+
+    context "with no opacity specified" do
+      it "does nothing" do
+        expect(element).not_to receive(:add_call_and_enter)
+        subject
+      end
+    end
+
+    context "with opacity" do
+      it "sets fill and stroke opacity" do
+        element.properties.opacity = '0.4'
+
+        expect(element).to receive(:add_call_and_enter).with('transparent', 0.4, 0.4)
+        subject
+
+        expect(element.state.fill_opacity).to eq 0.4
+        expect(element.state.stroke_opacity).to eq 0.4
+      end
+    end
+
+    context "with just fill opacity" do
+      it "sets fill opacity and sets stroke opacity to 1" do
+        element.properties.fill_opacity = '0.4'
+
+        expect(element).to receive(:add_call_and_enter).with('transparent', 0.4, 1)
+        subject
+
+        expect(element.state.fill_opacity).to eq 0.4
+        expect(element.state.stroke_opacity).to eq 1
+      end
+    end
+
+    context "with an existing fill/stroke opacity" do
+      it "multiplies the new opacity by the old" do
+        element.state.fill_opacity = 0.5
+        element.state.stroke_opacity = 0.8
+
+        element.properties.fill_opacity = '0.4'
+        element.properties.stroke_opacity = '0.5'
+
+        expect(element).to receive(:add_call_and_enter).with('transparent', 0.2, 0.4)
+        subject
+
+        expect(element.state.fill_opacity).to eq 0.2
+        expect(element.state.stroke_opacity).to eq 0.4
+      end
+    end
+
+    context "with stroke, fill, and opacity all specified" do
+      it "choses the lower of them" do
+        element.properties.fill_opacity = '0.4'
+        element.properties.stroke_opacity = '0.6'
+        element.properties.opacity = '0.5'
+
+        expect(element).to receive(:add_call_and_enter).with('transparent', 0.4, 0.5)
+        subject
+
+        expect(element.state.fill_opacity).to eq 0.4
+        expect(element.state.stroke_opacity).to eq 0.5
+      end
+    end
+  end
+end

data/spec/prawn/svg/attributes/transform_spec.rb

@@ -14,43 +14,38 @@ describe Prawn::SVG::Attributes::Transform do
 
   let(:element) { TransformTestElement.new }
 
-  describe "#parse_transform_attribute_and_call" do
-    subject { element.send :parse_transform_attribute_and_call }
-
-    describe "translate" do
-      it "handles a missing y argument" do
-        expect(element).to receive(:add_call_and_enter).with('translate', -5.5, 0)
-        expect(element).to receive(:x_pixels).with(-5.5).and_return(-5.5)
-        expect(element).to receive(:y_pixels).with(0.0).and_return(0.0)
-
-        element.attributes['transform'] = 'translate(-5.5)'
-        subject
-      end
+  subject { element.send :parse_transform_attribute_and_call }
+
+  context "when a non-identity matrix is requested" do
+    let(:transform) { 'translate(-5.5)' }
+
+    it "passes the transform and executes the returned matrix" do
+      expect(element).to receive(:parse_transform_attribute).with(transform).and_return([1, 2, 3, 4, 5, 6])
+      expect(element).to receive(:add_call_and_enter).with('transformation_matrix', 1, 2, 3, 4, 5, 6)
+
+      element.attributes['transform'] = transform
+      subject
+    end
+  end
+
+  context "when an identity matrix is requested" do
+    let(:transform) { 'translate(0)' }
+
+    it "does not execute any commands" do
+      expect(element).to receive(:parse_transform_attribute).with(transform).and_return([1, 0, 0, 1, 0, 0])
+      expect(element).not_to receive(:add_call_and_enter)
+
+      element.attributes['transform'] = transform
+      subject
     end
+  end
+
+  context "when transform is blank" do
+    it "does nothing" do
+      expect(element).not_to receive(:parse_transform_attribute)
+      expect(element).not_to receive(:add_call_and_enter)
 
-    describe "rotate" do
-      it "handles a single angle argument" do
-        expect(element).to receive(:add_call_and_enter).with('rotate', -5.5, :origin => [0, 0])
-        expect(element).to receive(:y).with('0').and_return(0)
-
-        element.attributes['transform'] = 'rotate(5.5)'
-        subject
-      end
-
-      it "handles three arguments" do
-        expect(element).to receive(:add_call_and_enter).with('rotate', -5.5, :origin => [1.0, 2.0])
-        expect(element).to receive(:x).with(1.0).and_return(1.0)
-        expect(element).to receive(:y).with(2.0).and_return(2.0)
-
-        element.attributes['transform'] = 'rotate(5.5 1 2)'
-        subject
-      end
-
-      it "does nothing and warns if two arguments" do
-        expect(element).to receive(:warnings).and_return([])
-        element.attributes['transform'] = 'rotate(5.5 1)'
-        subject
-      end
+      subject
     end
   end
 end

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

@@ -25,14 +25,14 @@ describe Prawn::SVG::Elements::Base do
     describe "applying calls from the standard attributes" do
       let(:svg) do
         <<-SVG
-          <something transform="rotate(90)" fill-opacity="0.5" fill="red" stroke="blue" stroke-width="5"/>
+          <something transform="scale(2)" fill-opacity="0.5" fill="red" stroke="blue" stroke-width="5"/>
         SVG
       end
 
       it "appends the relevant calls" do
         element.process
         expect(element.base_calls).to eq [
-          ["rotate", [-90.0, {origin: [0, 600.0]}], [
+          ["transformation_matrix", [2, 0, 0, 2, 0, 0], [
             ["transparent", [0.5, 1], [
               ["fill_color", ["ff0000"], []],
               ["stroke_color", ["0000ff"], []],

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

@@ -29,7 +29,8 @@ describe Prawn::SVG::Elements::Gradient do
       expect(arguments).to eq(
         from: [100.0, 100.0],
         to:   [120.0, 0.0],
-        stops: [[0, "ff0000"], [0.25, "ff0000"], [0.5, "ffffff"], [0.75, "0000ff"], [1, "0000ff"]]
+        stops: [[0, "ff0000"], [0.25, "ff0000"], [0.5, "ffffff"], [0.75, "0000ff"], [1, "0000ff"]],
+        apply_transformations: true,
       )
     end
 
@@ -54,7 +55,30 @@ describe Prawn::SVG::Elements::Gradient do
       expect(arguments).to eq(
         from: [100.0, 100.0],
         to:   [200.0, 0.0],
-        stops: [[0, "ff0000"], [1, "0000ff"]]
+        stops: [[0, "ff0000"], [1, "0000ff"]],
+        apply_transformations: true,
+      )
+    end
+  end
+
+  context "when gradientTransform is specified" do
+    let(:svg) do
+      <<-SVG
+        <linearGradient id="flag" gradientTransform="translateX(10) scale(2)" x1="0" y1="0" x2="10" y2="10">
+          <stop offset="0" stop-color="red"/>
+          <stop offset="1" stop-color="blue"/>
+        </linearGradient>
+      SVG
+    end
+
+    it "passes in the transform via the apply_transformations option" do
+      arguments = element.gradient_arguments(double(bounding_box: [0, 0, 10, 10]))
+
+      expect(arguments).to eq(
+        from: [0, 0],
+        to:   [10, 10],
+        stops: [[0, "ff0000"], [1, "0000ff"]],
+        apply_transformations: [2, 0, 0, 2, 10, 0],
       )
     end
   end

data/spec/prawn/svg/loaders/data_spec.rb

@@ -29,6 +29,14 @@ RSpec.describe Prawn::SVG::Loaders::Data do
     end
   end
 
+  context "with a data URL that's uppercase" do
+    let(:url) { "DATA:IMAGE/PNG;BASE64;METADATA;HERE,aGVsbG8=" }
+
+    it "loads the data" do
+      expect(subject).to eq "hello"
+    end
+  end
+
   context "with a URL that's not a data scheme" do
     let(:url) { "http://some.host" }
 

data/spec/prawn/svg/transform_parser_spec.rb

@@ -0,0 +1,94 @@
+require 'spec_helper'
+
+RSpec.describe Prawn::SVG::TransformParser do
+  class Test
+    include Prawn::SVG::Calculators::Pixels
+    include Prawn::SVG::TransformParser
+
+    State = Struct.new(:viewport_sizing)
+    Properties = Struct.new(:numerical_font_size)
+    Document = Struct.new(:sizing)
+
+    def document
+      Document.new(_sizing)
+    end
+
+    def state
+      State.new(_sizing)
+    end
+
+    def computed_properties
+      Properties.new(14)
+    end
+
+    def _sizing
+      Prawn::SVG::Calculators::DocumentSizing.new([1000, 800])
+    end
+  end
+
+  subject { Test.new.parse_transform_attribute(transform) }
+
+  context "with no transform" do
+    let(:transform) { '' }
+    it { is_expected.to eq [1, 0, 0, 1, 0, 0] }
+  end
+
+  context "with translate" do
+    let(:transform) { 'translate(10 20)' }
+    it { is_expected.to eq [1, 0, 0, 1, 10, -20] }
+  end
+
+  context "with single argument translate" do
+    let(:transform) { 'translate(10)' }
+    it { is_expected.to eq [1, 0, 0, 1, 10, 0] }
+  end
+
+  context "with translateX" do
+    let(:transform) { 'translateX(10)' }
+    it { is_expected.to eq [1, 0, 0, 1, 10, 0] }
+  end
+
+  context "with translateY" do
+    let(:transform) { 'translateY(10)' }
+    it { is_expected.to eq [1, 0, 0, 1, 0, -10] }
+  end
+
+  let(:sin30) { Math.sin(30 * Math::PI / 180.0) }
+  let(:cos30) { Math.cos(30 * Math::PI / 180.0) }
+  let(:tan30) { Math.tan(30 * Math::PI / 180.0) }
+
+  context "with single argument rotate" do
+    let(:transform) { 'rotate(30)' }
+    it { is_expected.to eq [cos30, -sin30, sin30, cos30, 0, 0] }
+  end
+
+  context "with triple argument rotate" do
+    let(:transform) { 'rotate(30 100 200)' }
+    it { is_expected.to eq [cos30, -sin30, sin30, cos30, 113.39745962155611, 23.205080756887753] }
+  end
+
+  context "with scale" do
+    let(:transform) { 'scale(1.5)' }
+    it { is_expected.to eq [1.5, 0, 0, 1.5, 0, 0] }
+  end
+
+  context "with skewX" do
+    let(:transform) { 'skewX(30)' }
+    it { is_expected.to eq [1, 0, -tan30, 1, 0, 0] }
+  end
+
+  context "with skewY" do
+    let(:transform) { 'skewY(30)' }
+    it { is_expected.to eq [1, -tan30, 0, 1, 0, 0] }
+  end
+
+  context "with matrix" do
+    let(:transform) { 'matrix(1 2 3 4 5 6)' }
+    it { is_expected.to eq [1, -2, -3, 4, 5, -6] }
+  end
+
+  context "with multiple" do
+    let(:transform) { 'scale(2) translate(7) scale(3)' }
+    it { is_expected.to eq [6, 0, 0, 6, 14, 0] }
+  end
+end

data/spec/sample_svg/double_opacity.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="206.404" height="167.984" viewBox="0 0 54.611 44.446">
+<g transform="translate(-27.725 -80.097)" stroke="#000" stroke-width=".5">
+<ellipse cx="48.451" cy="103.356" rx="20.476" ry="19.462" fill="#52e0ff"/>
+<ellipse cx="66.77" cy="102.32" rx="15.316" ry="21.973" fill="#ff6c52" style="opacity:.75; fill-opacity:1"/>
+</g>
+</svg>

data/spec/sample_svg/gradient_transform.svg

@@ -0,0 +1,19 @@
+<svg viewBox="0 0 420 200" xmlns="http://www.w3.org/2000/svg">
+  <linearGradient id="gradient1" gradientUnits="userSpaceOnUse"
+      x1="0" y1="0" x2="200" y2="200">
+    <stop offset="0%" stop-color="darkblue" />
+    <stop offset="50%" stop-color="skyblue" />
+    <stop offset="100%" stop-color="darkblue" />
+  </linearGradient>
+  <linearGradient id="gradient2" gradientUnits="userSpaceOnUse"
+      x1="0" y1="0" x2="200" y2="200"
+      xgradientTransform="skewX(45) translate(-100, 0)"
+      gradientTransform="matrix(0.5, 0, 0, 1, 0, 100)">
+    <stop offset="0%" stop-color="darkblue" />
+    <stop offset="50%" stop-color="skyblue" />
+    <stop offset="100%" stop-color="darkblue" />
+  </linearGradient>
+
+  <rect x="0" y="0" width="200" height="200" fill="url(#gradient1)" />
+  <rect x="0" y="0" width="200" height="200" fill="url(#gradient2)" transform="translate(220, 0)" />
+</svg>

data/spec/sample_svg/links.svg

@@ -0,0 +1,18 @@
+<?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="1200" height="400" viewBox="0 0 600 200" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
+  <text fill="#000000" font-family="sans-serif" font-size="13" textLength="78" x="14" y="20">You can use</text>
+  <a target="_top" xlink:actuate="onRequest" xlink:href="http://plantuml.com/start" xlink:show="new" xlink:title="http://plantuml.com/start" xlink:type="simple">
+    <text fill="#0000FF" font-family="sans-serif" font-size="13" text-decoration="underline" textLength="87" x="96" y="20">links in notes</text>
+    <line style="stroke: #0000FF; stroke-width: 1.0;" x1="96" x2="183" y1="20" y2="20"/>
+  </a>
+
+  <g transform="translate(0 20)">
+    <text fill="#000000" font-family="sans-serif" font-size="13" textLength="78" lengthAdjust="spacingAndGlyphs" x="14" y="20">You can use</text>
+    <a target="_top" xlink:actuate="onRequest" xlink:href="http://plantuml.com/start" xlink:show="new" xlink:title="http://plantuml.com/start" xlink:type="simple">
+      <text fill="#0000FF" font-family="sans-serif" font-size="13" text-decoration="underline" textLength="87" lengthAdjust="spacingAndGlyphs" x="96" y="20">links in notes</text>
+      <line style="stroke: #0000FF; stroke-width: 1.0;" x1="96" x2="183" y1="20" y2="20"/>
+    </a>
+  </g>
+</svg>
+

data/spec/sample_svg/transform.svg

@@ -0,0 +1,20 @@
+<svg height="975" version="1.1" width="1275" xmlns="http://www.w3.org/2000/svg">
+  <rect x="0" y="0" width="200" height="100" fill="blue"/>
+  <rect x="0" y="0" width="200" height="100" fill="lightblue" transform="rotate(30 200 100) translate(200)"/>
+  <rect x="0" y="0" width="200" height="100" fill="lightblue" transform="rotate(-5) translate(400)"/>
+
+  <g transform="translate(0 200)">
+    <rect x="0" y="0" width="200" height="100" fill="green"/>
+    <rect x="0" y="0" width="200" height="100" fill="lightgreen" transform="skewX(35) translate(200)"/>
+  </g>
+
+  <g transform="translate(0 320)">
+    <rect x="0" y="0" width="200" height="100" fill="red"/>
+    <rect x="0" y="0" width="200" height="100" fill="pink" transform="skewY(5) translate(200)"/>
+  </g>
+
+  <g transform="translate(0 470)">
+    <rect x="0" y="0" width="200" height="100" fill="black"/>
+    <rect x="0" y="0" width="200" height="100" fill="grey" transform="translate(200) scale(1.5)"/>
+  </g>
+</svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.29.1
+  version: 0.30.0
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -126,6 +126,7 @@ files:
 - lib/prawn/svg/elements/use.rb
 - lib/prawn/svg/elements/viewport.rb
 - lib/prawn/svg/extension.rb
+- lib/prawn/svg/extensions/additional_gradient_transforms.rb
 - lib/prawn/svg/font.rb
 - lib/prawn/svg/font_registry.rb
 - lib/prawn/svg/interface.rb
@@ -135,11 +136,13 @@ files:
 - lib/prawn/svg/pathable.rb
 - lib/prawn/svg/properties.rb
 - lib/prawn/svg/state.rb
+- lib/prawn/svg/transform_parser.rb
 - lib/prawn/svg/ttf.rb
 - lib/prawn/svg/url_loader.rb
 - lib/prawn/svg/version.rb
 - prawn-svg.gemspec
 - spec/integration_spec.rb
+- spec/prawn/svg/attributes/opacity_spec.rb
 - spec/prawn/svg/attributes/transform_spec.rb
 - spec/prawn/svg/calculators/aspect_ratio_spec.rb
 - spec/prawn/svg/calculators/document_sizing_spec.rb
@@ -165,6 +168,7 @@ files:
 - spec/prawn/svg/loaders/web_spec.rb
 - spec/prawn/svg/pathable_spec.rb
 - spec/prawn/svg/properties_spec.rb
+- spec/prawn/svg/transform_parser_spec.rb
 - spec/prawn/svg/ttf_spec.rb
 - spec/prawn/svg/url_loader_spec.rb
 - spec/sample_images/mushroom-long.jpg
@@ -180,9 +184,11 @@ files:
 - spec/sample_svg/cubic01a.svg
 - spec/sample_svg/cubic02.svg
 - spec/sample_svg/display_none.svg
+- spec/sample_svg/double_opacity.svg
 - spec/sample_svg/ellipse01.svg
 - spec/sample_svg/gistfile1.svg
 - spec/sample_svg/google_charts.svg
+- spec/sample_svg/gradient_transform.svg
 - spec/sample_svg/gradients.svg
 - spec/sample_svg/hidden_paths.svg
 - spec/sample_svg/highcharts.svg
@@ -190,6 +196,7 @@ files:
 - spec/sample_svg/image02_base64.svg
 - spec/sample_svg/image03.svg
 - spec/sample_svg/line01.svg
+- spec/sample_svg/links.svg
 - spec/sample_svg/marker.svg
 - spec/sample_svg/markers_degenerate_cp.svg
 - spec/sample_svg/maths.svg
@@ -216,6 +223,7 @@ files:
 - spec/sample_svg/subviewports2.svg
 - spec/sample_svg/text_entities.svg
 - spec/sample_svg/text_stroke.svg
+- spec/sample_svg/transform.svg
 - spec/sample_svg/tref01.svg
 - spec/sample_svg/triangle01.svg
 - spec/sample_svg/tspan01.svg
@@ -256,6 +264,7 @@ specification_version: 4
 summary: SVG renderer for Prawn PDF library
 test_files:
 - spec/integration_spec.rb
+- spec/prawn/svg/attributes/opacity_spec.rb
 - spec/prawn/svg/attributes/transform_spec.rb
 - spec/prawn/svg/calculators/aspect_ratio_spec.rb
 - spec/prawn/svg/calculators/document_sizing_spec.rb
@@ -281,6 +290,7 @@ test_files:
 - spec/prawn/svg/loaders/web_spec.rb
 - spec/prawn/svg/pathable_spec.rb
 - spec/prawn/svg/properties_spec.rb
+- spec/prawn/svg/transform_parser_spec.rb
 - spec/prawn/svg/ttf_spec.rb
 - spec/prawn/svg/url_loader_spec.rb
 - spec/sample_images/mushroom-long.jpg
@@ -296,9 +306,11 @@ test_files:
 - spec/sample_svg/cubic01a.svg
 - spec/sample_svg/cubic02.svg
 - spec/sample_svg/display_none.svg
+- spec/sample_svg/double_opacity.svg
 - spec/sample_svg/ellipse01.svg
 - spec/sample_svg/gistfile1.svg
 - spec/sample_svg/google_charts.svg
+- spec/sample_svg/gradient_transform.svg
 - spec/sample_svg/gradients.svg
 - spec/sample_svg/hidden_paths.svg
 - spec/sample_svg/highcharts.svg
@@ -306,6 +318,7 @@ test_files:
 - spec/sample_svg/image02_base64.svg
 - spec/sample_svg/image03.svg
 - spec/sample_svg/line01.svg
+- spec/sample_svg/links.svg
 - spec/sample_svg/marker.svg
 - spec/sample_svg/markers_degenerate_cp.svg
 - spec/sample_svg/maths.svg
@@ -332,6 +345,7 @@ test_files:
 - spec/sample_svg/subviewports2.svg
 - spec/sample_svg/text_entities.svg
 - spec/sample_svg/text_stroke.svg
+- spec/sample_svg/transform.svg
 - spec/sample_svg/tref01.svg
 - spec/sample_svg/triangle01.svg
 - spec/sample_svg/tspan01.svg