prawn-svg 0.35.1 → 0.36.1

data/spec/prawn/svg/transform_parser_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Prawn::SVG::TransformParser do
     include Prawn::SVG::TransformParser
 
     State = Struct.new(:viewport_sizing)
-    Properties = Struct.new(:numerical_font_size)
+    Properties = Struct.new(:numeric_font_size)
     Document = Struct.new(:sizing)
 
     def document
@@ -30,27 +30,27 @@ RSpec.describe Prawn::SVG::TransformParser do
 
   context 'with no transform' do
     let(:transform) { '' }
-    it { is_expected.to eq [1, 0, 0, 1, 0, 0] }
+    it { is_expected.to eq Matrix[[1, 0, 0], [0, 1, 0], [0, 0, 1]] }
   end
 
   context 'with translate' do
     let(:transform) { 'translate(10 20)' }
-    it { is_expected.to eq [1, 0, 0, 1, 10, -20] }
+    it { is_expected.to eq Matrix[[1, 0, 10.0], [0, 1, -20.0], [0, 0, 1.0]] }
   end
 
   context 'with single argument translate' do
     let(:transform) { 'translate(10)' }
-    it { is_expected.to eq [1, 0, 0, 1, 10, 0] }
+    it { is_expected.to eq Matrix[[1, 0, 10.0], [0, 1, 0.0], [0, 0, 1.0]] }
   end
 
   context 'with translateX' do
     let(:transform) { 'translateX(10)' }
-    it { is_expected.to eq [1, 0, 0, 1, 10, 0] }
+    it { is_expected.to eq Matrix[[1, 0, 10.0], [0, 1, 0.0], [0, 0, 1.0]] }
   end
 
   context 'with translateY' do
     let(:transform) { 'translateY(10)' }
-    it { is_expected.to eq [1, 0, 0, 1, 0, -10] }
+    it { is_expected.to eq Matrix[[1, 0, 0.0], [0, 1, -10.0], [0, 0, 1.0]] }
   end
 
   let(:sin30) { Math.sin(30 * Math::PI / 180.0) }
@@ -59,36 +59,36 @@ RSpec.describe Prawn::SVG::TransformParser do
 
   context 'with single argument rotate' do
     let(:transform) { 'rotate(30)' }
-    it { is_expected.to eq [cos30, -sin30, sin30, cos30, 0, 0] }
+    it { is_expected.to eq Matrix[[cos30, sin30, 0], [-sin30, cos30, 0], [0.0, 0.0, 1]] }
   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] }
+    it { is_expected.to eq Matrix[[cos30, sin30, 113.39745962155611], [-sin30, cos30, 23.205080756887753], [0.0, 0.0, 1.0]] }
   end
 
   context 'with scale' do
     let(:transform) { 'scale(1.5)' }
-    it { is_expected.to eq [1.5, 0, 0, 1.5, 0, 0] }
+    it { is_expected.to eq Matrix[[1.5, 0.0, 0], [0.0, 1.5, 0], [0.0, 0.0, 1]] }
   end
 
   context 'with skewX' do
     let(:transform) { 'skewX(30)' }
-    it { is_expected.to eq [1, 0, -tan30, 1, 0, 0] }
+    it { is_expected.to eq Matrix[[1, -tan30, 0], [0, 1.0, 0], [0, 0.0, 1]] }
   end
 
   context 'with skewY' do
     let(:transform) { 'skewY(30)' }
-    it { is_expected.to eq [1, -tan30, 0, 1, 0, 0] }
+    it { is_expected.to eq Matrix[[1.0, 0, 0], [-tan30, 1, 0], [0.0, 0, 1]] }
   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] }
+    it { is_expected.to eq Matrix[[1.0, -3.0, 5.0], [-2.0, 4.0, -6.0], [0.0, 0.0, 1.0]] }
   end
 
   context 'with multiple' do
     let(:transform) { 'scale(2) translate(7) scale(3)' }
-    it { is_expected.to eq [6, 0, 0, 6, 14, 0] }
+    it { is_expected.to eq Matrix[[6.0, 0.0, 14.0], [0.0, 6.0, 0.0], [0.0, 0.0, 1.0]] }
   end
 end

data/spec/sample_svg/gradient_stress_test.svg

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 260 173.33">
+  <defs>
+    <linearGradient id="linear-base">
+      <stop offset="0" stop-color="white"/>
+      <stop offset="0.01" stop-color="red"/>
+      <stop offset="0.49" stop-color="orange"/>
+      <stop offset=".5" stop-color="white"/>
+      <stop offset=".51" stop-color="aqua"/>
+      <stop offset="0.99" stop-color="blue"/>
+      <stop offset="1" stop-color="white"/>
+    </linearGradient>
+
+    <linearGradient id="transparent-linear-base">
+      <stop offset="0" stop-opacity="0" stop-color="white"/>
+      <stop offset="0.01" stop-opacity="0.01" stop-color="red"/>
+      <stop offset="0.49" stop-opacity="0.49" stop-color="orange"/>
+      <stop offset=".5" stop-opacity=".5" stop-color="white"/>
+      <stop offset=".51" stop-opacity=".51" stop-color="aqua"/>
+      <stop offset="0.99" stop-opacity="0.99" stop-color="blue"/>
+      <stop offset="1" stop-opacity="1" stop-color="white"/>
+    </linearGradient>
+
+    <linearGradient id="linear-1" href="#linear-base" gradientTransform="translate(0.2 0)" x1="0" y1="0" x2="1" y2="0" />
+    <linearGradient id="linear-2" href="#linear-base" x1="120" y1="20" x2="120" y2="0" gradientUnits="userSpaceOnUse" />
+    <linearGradient id="linear-3" href="#linear-base" gradientTransform="scale(0.5)" spreadMethod="repeat" />
+    <linearGradient id="linear-4" href="#linear-base" gradientTransform="scale(0.5)" spreadMethod="reflect" />
+    <linearGradient id="linear-5" href="#linear-base" gradientTransform="rotate(10)" />
+    <linearGradient id="linear-6" href="#linear-base" x1="0" y1="200" x2="1" y2="200" gradientTransform="translate(29023.21 20) rotate(-90) scale(20 -167.5)" gradientUnits="userSpaceOnUse" />
+    <linearGradient id="linear-7" href="#linear-base" gradientTransform="skewX(10)" />
+    <linearGradient id="linear-8" href="#linear-base" gradientTransform="skewY(10) rotate(90)" />
+    <linearGradient id="linear-9" href="#linear-base" x1="0" y1="0" x2="20" y2="0" gradientUnits="userSpaceOnUse" spreadMethod="reflect" />
+    <linearGradient id="linear-10" href="#linear-base" x1="210" y1="0" x2="230" y2="0" gradientUnits="userSpaceOnUse" spreadMethod="reflect" />
+
+    <linearGradient id="transparent-linear-1" href="#transparent-linear-base" gradientTransform="translate(0.2 0)" x1="0" y1="0" x2="1" y2="0" />
+    <linearGradient id="transparent-linear-2" href="#transparent-linear-base" x1="120" y1="50" x2="120" y2="30" gradientUnits="userSpaceOnUse" />
+    <linearGradient id="transparent-linear-3" href="#transparent-linear-base" gradientTransform="scale(0.5)" spreadMethod="repeat" />
+    <linearGradient id="transparent-linear-4" href="#transparent-linear-base" gradientTransform="scale(0.5)" spreadMethod="reflect" />
+    <linearGradient id="transparent-linear-5" href="#transparent-linear-base" gradientTransform="rotate(10)" />
+    <linearGradient id="transparent-linear-6" href="#transparent-linear-base" x1="0" y1="200" x2="1" y2="200" gradientTransform="translate(29023.21 50) rotate(-90) scale(20 -167.5)" gradientUnits="userSpaceOnUse" />
+    <linearGradient id="transparent-linear-7" href="#transparent-linear-base" gradientTransform="skewX(10)" />
+    <linearGradient id="transparent-linear-8" href="#transparent-linear-base" gradientTransform="skewY(10) rotate(90)" />
+
+    <radialGradient id="radial-base">
+      <stop offset="25%" stop-color="red"/>
+      <stop offset="49%" stop-color="orange"/>
+      <stop offset="50%" stop-color="white"/>
+      <stop offset="51%" stop-color="aqua"/>
+      <stop offset="75%" stop-color="blue"/>
+    </radialGradient>
+
+    <radialGradient id="transparent-radial-base">
+      <stop offset="25%" stop-opacity="0.01" stop-color="red"/>
+      <stop offset="49%" stop-opacity="0.49" stop-color="orange"/>
+      <stop offset="50%" stop-opacity=".5"  stop-color="white"/>
+      <stop offset="51%" stop-opacity=".51"  stop-color="aqua"/>
+      <stop offset="75%" stop-opacity="0.99" stop-color="blue"/>
+    </radialGradient>
+
+    <radialGradient id="radial-1" href="#radial-base" cx="0.2" fx="0.6" r="50%" gradientTransform="scale(1 0.5)" spreadMethod="repeat" />
+    <radialGradient id="radial-2" href="#radial-base" cx="0.2" fx="0.6" spreadMethod="reflect" />
+    <radialGradient id="radial-3" href="#radial-base" gradientUnits="userSpaceOnUse" cx="130" cy="70" r="5" />
+
+    <radialGradient id="transparent-radial-1" href="#transparent-radial-base" cx="0.2" fx="0.6" r="50%" gradientTransform="scale(1 0.5)" spreadMethod="repeat" />
+    <radialGradient id="transparent-radial-2" href="#transparent-radial-base" cx="0.2" fx="0.6" spreadMethod="reflect" />
+  </defs>
+
+  <rect fill="#0f1941" width="260" height="173.33"/>
+
+  <g>
+    <rect fill="url(#linear-base)" width="20" height="20" />
+    <rect fill="url(#linear-1)" x="30" y="0" width="20" height="20" />
+    <rect fill="url(#linear-2)" x="60" y="0" width="20" height="20"/>
+    <rect fill="url(#linear-3)" x="90" y="0" width="20" height="20"/>
+    <rect fill="url(#linear-4)" x="120" y="0" width="20" height="20"/>
+    <rect fill="url(#linear-5)" x="150" y="0" width="20" height="20"/>
+    <rect fill="url(#linear-6)" x="180" y="0" width="20" height="20"/>
+    <rect fill="url(#linear-7)" x="210" y="0" width="20" height="20"/>
+    <rect fill="url(#linear-8)" x="240" y="0" width="20" height="20"/>
+    <rect fill="url(#linear-9)" x="210" y="60" width="20" height="20"/>
+    <rect fill="url(#linear-10)" x="180" y="60" width="20" height="20"/>
+  </g>
+
+  <g>
+    <rect fill="url(#transparent-linear-base)" y="30" width="20" height="20" />
+    <rect fill="url(#transparent-linear-1)" x="30" y="30" width="20" height="20" />
+    <rect fill="url(#transparent-linear-2)" x="60" y="30" width="20" height="20"/>
+    <rect fill="url(#transparent-linear-3)" x="90" y="30" width="20" height="20"/>
+    <rect fill="url(#transparent-linear-4)" x="120" y="30" width="20" height="20"/>
+    <rect fill="url(#transparent-linear-5)" x="150" y="30" width="20" height="20"/>
+    <rect fill="url(#transparent-linear-6)" x="180" y="30" width="20" height="20"/>
+    <rect fill="url(#transparent-linear-7)" x="210" y="30" width="20" height="20"/>
+    <rect fill="url(#transparent-linear-8)" x="240" y="30" width="20" height="20"/>
+
+    <rect fill="url(#transparent-linear-7)" x="120" y="30" width="20" height="20" transform="rotate(45)" />
+  </g>
+
+  <g>
+    <rect fill="url(#radial-base)" x="0" y="60" width="20" height="20" />
+    <rect fill="url(#radial-base)" x="30" y="60" width="10" height="20" />
+    <rect fill="url(#radial-base)" x="60" y="60" width="20" height="10" />
+    <rect fill="url(#radial-1)" x="90" y="60" width="20" height="20" />
+    <rect fill="url(#radial-2)" x="120" y="60" width="20" height="20" />
+
+    <rect fill="url(#radial-3)" x="120" y="60" width="20" height="20" transform="rotate(45)" />
+  </g>
+
+  <g>
+    <rect fill="url(#transparent-radial-base)" x="0" y="90" width="20" height="20" />
+    <rect fill="url(#transparent-radial-base)" x="30" y="90" width="10" height="20" />
+    <rect fill="url(#transparent-radial-base)" x="60" y="90" width="20" height="10" />
+    <rect fill="url(#transparent-radial-1)" x="90" y="90" width="10" height="20" />
+    <rect fill="url(#transparent-radial-2)" x="120" y="90" width="20" height="10" />
+  </g>
+</svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.35.1
+  version: 0.36.1
 platform: ruby
 authors:
 - Mog Nesbitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2025-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser
@@ -64,7 +64,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.9
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.9
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -110,6 +110,7 @@ files:
 - lib/prawn/svg/calculators/pixels.rb
 - lib/prawn/svg/color.rb
 - lib/prawn/svg/css/font_family_parser.rb
+- lib/prawn/svg/css/font_parser.rb
 - lib/prawn/svg/css/selector_parser.rb
 - lib/prawn/svg/css/stylesheets.rb
 - lib/prawn/svg/css/values_parser.rb
@@ -137,19 +138,24 @@ 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/funciri.rb
+- lib/prawn/svg/gradient_renderer.rb
 - lib/prawn/svg/gradients.rb
 - lib/prawn/svg/interface.rb
+- lib/prawn/svg/length.rb
 - lib/prawn/svg/loaders/data.rb
 - lib/prawn/svg/loaders/file.rb
 - lib/prawn/svg/loaders/web.rb
+- lib/prawn/svg/paint.rb
 - lib/prawn/svg/pathable.rb
+- lib/prawn/svg/percentage.rb
 - lib/prawn/svg/properties.rb
 - lib/prawn/svg/renderer.rb
 - lib/prawn/svg/state.rb
 - lib/prawn/svg/transform_parser.rb
+- lib/prawn/svg/transform_utils.rb
 - lib/prawn/svg/ttf.rb
 - lib/prawn/svg/url_loader.rb
 - lib/prawn/svg/version.rb
@@ -177,11 +183,16 @@ files:
 - spec/prawn/svg/elements/text_spec.rb
 - spec/prawn/svg/font_registry_spec.rb
 - spec/prawn/svg/font_spec.rb
+- spec/prawn/svg/funciri_spec.rb
 - spec/prawn/svg/interface_spec.rb
+- spec/prawn/svg/length_spec.rb
 - spec/prawn/svg/loaders/data_spec.rb
 - spec/prawn/svg/loaders/file_spec.rb
 - spec/prawn/svg/loaders/web_spec.rb
+- spec/prawn/svg/paint_spec.rb
 - spec/prawn/svg/pathable_spec.rb
+- spec/prawn/svg/pdfmatrix_spec.rb
+- spec/prawn/svg/percentage_spec.rb
 - spec/prawn/svg/properties_spec.rb
 - spec/prawn/svg/transform_parser_spec.rb
 - spec/prawn/svg/ttf_spec.rb
@@ -205,6 +216,7 @@ files:
 - spec/sample_svg/ellipse01.svg
 - spec/sample_svg/gistfile1.svg
 - spec/sample_svg/google_charts.svg
+- spec/sample_svg/gradient_stress_test.svg
 - spec/sample_svg/gradient_transform.svg
 - spec/sample_svg/gradients-cmyk.svg
 - spec/sample_svg/gradients.svg

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

@@ -1,23 +0,0 @@
-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