prawn-svg 0.36.0 → 0.36.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b833a9af0fae6fd2934c6b5ef37bd6d6d90aba36fa9a161520ac6a9a1c19f9db
-  data.tar.gz: 550aa711e413cac65e8af39f029096e3606f84a852b982729ca0252e758805ac
+  metadata.gz: 6e2b791daa33f85948c08bdafec3f1a3ab8dffa8b07dd50ce7bb7a55320d663b
+  data.tar.gz: 78e45c7790de4b1cf2d328ad6ec8bbb77bab707cdeb8e75fcf52055410f36fc4
 SHA512:
-  metadata.gz: 9a522f7b4aa8f713fc453cc3d6061968fce1a28ab60e58f6c321b92979bcb909748a81b8c9cb9a373f918d152e969ea7d0974afd975c8fba7ae70c03cec18a25
-  data.tar.gz: 537a912b7daab1581662cabfc5de5776ebe771d15e448e99a7c7d6125eb29644bbc40de6508429f5a3451f16ebb226f53402320ef4430118b16d05913cd3ede4
+  metadata.gz: da875e08d850fd7d3b74d9e5a629d4f3125bc933614e0d241ddd4c5122ad75495d6b530c01914ad0bc44dbcbdec41ee5e35196e008c484652bbb99ecb0e66e53
+  data.tar.gz: 79f54a51c1acdea4a5d5de5bb72f130b5ca692aed48c72ceb36aced4f16df223be1a81f1152164dbdf3452571b79a676df96a4c38ba825afeedd32748e4f3919

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    prawn-svg (0.36.0)
+    prawn-svg (0.36.2)
       css_parser (~> 1.6)
       matrix (~> 0.4.2)
       prawn (>= 0.11.1, < 3)

data/lib/prawn/svg/document.rb

@@ -18,18 +18,9 @@ class Prawn::SVG::Document
 
   def initialize(data, bounds, options, font_registry: nil, css_parser: CssParser::Parser.new, attribute_overrides: {})
     begin
-      @root = REXML::Document.new(data).root
-    rescue REXML::ParseException
-      @root = nil
-    end
-
-    if @root.nil?
-      if data.respond_to?(:end_with?) && data.end_with?('.svg')
-        raise InvalidSVGData,
-          "The data supplied is not a valid SVG document.  It looks like you've supplied a filename instead; use IO.read(filename) to get the data before you pass it to prawn-svg."
-      else
-        raise InvalidSVGData, 'The data supplied is not a valid SVG document.'
-      end
+      @root = REXML::Document.new(data).root or raise_parse_error(data)
+    rescue REXML::ParseException => e
+      raise_parse_error(data, e.message)
     end
 
     @warnings = []
@@ -73,4 +64,16 @@ class Prawn::SVG::Document
       raise ArgumentError, ':color_mode must be set to :rgb (default) or :cmyk'
     end
   end
+
+  def raise_parse_error(data, exception_message = nil)
+    message = 'The data supplied is not a valid SVG document.'
+
+    if data.respond_to?(:end_with?) && data.end_with?('.svg')
+      message += "  It looks like you've supplied a filename instead; use File.read(filename) to get the data from the file before you pass it to prawn-svg."
+    end
+
+    message += "\n#{exception_message}" if exception_message
+
+    raise InvalidSVGData, message
+  end
 end

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

@@ -262,6 +262,14 @@ class Prawn::SVG::Elements::Base
     ['hidden', 'scroll'].include?(computed_properties.overflow)
   end
 
+  def stroke_width
+    if computed_properties.stroke.none?
+      0
+    else
+      pixels(properties.stroke_width) || 1.0
+    end
+  end
+
   def clone_element_source(source)
     new_source = source.dup
     document.element_styles[new_source] = document.element_styles[source]

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

@@ -28,6 +28,9 @@ class Prawn::SVG::Elements::Gradient < Prawn::SVG::Elements::Base
   def gradient_arguments(element)
     bbox = element.bounding_box
 
+    stroke_width = element.stroke_width
+    bbox_with_stroke = bbox&.zip([-stroke_width, stroke_width, stroke_width, -stroke_width])&.map(&:sum)
+
     if type == :radial
       {
         from:         [fx, fy],
@@ -35,18 +38,18 @@ class Prawn::SVG::Elements::Gradient < Prawn::SVG::Elements::Base
         to:           [cx, cy],
         r2:           r,
         stops:        stops,
-        matrix:       matrix_for_bounding_box(*bbox),
+        matrix:       matrix_for_bounding_box(bbox),
         wrap:         wrap,
-        bounding_box: bbox
+        bounding_box: bbox_with_stroke
       }
     else
       {
         from:         [x1, y1],
         to:           [x2, y2],
         stops:        stops,
-        matrix:       matrix_for_bounding_box(*bbox),
+        matrix:       matrix_for_bounding_box(bbox),
         wrap:         wrap,
-        bounding_box: bbox
+        bounding_box: bbox_with_stroke
       }
     end
   end
@@ -57,8 +60,10 @@ class Prawn::SVG::Elements::Gradient < Prawn::SVG::Elements::Base
 
   private
 
-  def matrix_for_bounding_box(bounding_x1, bounding_y1, bounding_x2, bounding_y2)
-    if units == :bounding_box
+  def matrix_for_bounding_box(bbox)
+    if bbox && units == :bounding_box
+      bounding_x1, bounding_y1, bounding_x2, bounding_y2 = *bbox
+
       width = bounding_x2 - bounding_x1
       height = bounding_y1 - bounding_y2
 

data/lib/prawn/svg/gradient_renderer.rb

@@ -79,10 +79,21 @@ class Prawn::SVG::GradientRenderer
 
     repeat_count, repeat_offset, transform = compute_wrapping(wrap, from, to, current_pdf_translation)
 
+    x0, y0, x1, y1 = bounding_box || prawn_bounding_box
+
+    offset_x, offset_y = prawn.bounds.anchor
+    x0 += offset_x
+    y0 += offset_y
+    x1 += offset_x
+    y1 += offset_y
+
+    width = x1 - x0
+    height = y0 - y1
+
     transparency_group = prawn.ref!(
       Type:      :XObject,
       Subtype:   :Form,
-      BBox:      prawn.state.page.dimensions,
+      BBox:      [x0, y1, x1, y0],
       Group:     {
         Type: :Group,
         S:    :Transparency,
@@ -108,7 +119,7 @@ class Prawn::SVG::GradientRenderer
     )
 
     transparency_group.stream << begin
-      box = PDF::Core.real_params(prawn.state.page.dimensions)
+      box = PDF::Core.real_params([x0, y1, width, height])
 
       <<~CMDS.strip
         /Pattern cs

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module SVG
-    VERSION = '0.36.0'.freeze
+    VERSION = '0.36.2'.freeze
   end
 end

data/lib/prawn-svg.rb

@@ -10,7 +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_utils'
+require 'prawn/svg/pdfmatrix'
 require 'prawn/svg/transform_parser'
 require 'prawn/svg/url_loader'
 require 'prawn/svg/loaders/data'

data/spec/prawn/svg/document_spec.rb

@@ -25,10 +25,22 @@ describe Prawn::SVG::Document do
     context 'when unparsable XML is provided' do
       let(:svg) { "this isn't SVG data" }
 
-      it 'raises an exception' do
+      it "raises an exception, passing on REXML's error message" do
         expect do
           Prawn::SVG::Document.new(svg, bounds, options)
-        end.to raise_error Prawn::SVG::Document::InvalidSVGData, 'The data supplied is not a valid SVG document.'
+        end.to raise_error Prawn::SVG::Document::InvalidSVGData,
+          /\AThe data supplied is not a valid SVG document.+Malformed.+#{Regexp.escape(svg)}/m
+      end
+    end
+
+    context 'when broken XML is provided' do
+      let(:svg) { '<svg><g><rect></rect></svg>' }
+
+      it "raises an exception, passing on REXML's error message" do
+        expect do
+          Prawn::SVG::Document.new(svg, bounds, options)
+        end.to raise_error Prawn::SVG::Document::InvalidSVGData,
+          /\AThe data supplied is not a valid SVG document.+Missing end tag for 'g'/m
       end
     end
 
@@ -36,10 +48,12 @@ describe Prawn::SVG::Document do
       let(:svg) { 'some_file.svg' }
 
       it "raises an exception letting them know what they've done" do
+        message = "The data supplied is not a valid SVG document.  It looks like you've supplied a filename " \
+                  'instead; use File.read(filename) to get the data from the file before you pass it to prawn-svg.'
+
         expect do
           Prawn::SVG::Document.new(svg, bounds, options)
-        end.to raise_error Prawn::SVG::Document::InvalidSVGData,
-          "The data supplied is not a valid SVG document.  It looks like you've supplied a filename instead; use IO.read(filename) to get the data before you pass it to prawn-svg."
+        end.to raise_error Prawn::SVG::Document::InvalidSVGData, /\A#{Regexp.escape(message)}/
       end
     end
   end

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

@@ -24,8 +24,26 @@ describe Prawn::SVG::Elements::Gradient do
       expect(document.gradients['flag']).to eq element
     end
 
+    it 'returns correct gradient arguments for an element with no bounding box' do
+      arguments = element.gradient_arguments(double(bounding_box: nil, stroke_width: 0))
+      expect(arguments).to eq(
+        from:         [0.0, 0.0],
+        to:           [0.2, 1.0],
+        wrap:         :pad,
+        matrix:       Matrix[[1.0, 0.0, 0.0], [0.0, -1.0, 600.0], [0.0, 0.0, 1.0]],
+        bounding_box: nil,
+        stops:        [
+          { offset: 0, color: 'ff0000', opacity: 1.0 },
+          { offset: 0.25, color: 'ff0000', opacity: 1.0 },
+          { offset: 0.5, color: 'ffffff', opacity: 1.0 },
+          { offset: 0.75, color: '0000ff', opacity: 1.0 },
+          { offset: 1, color: '0000ff', opacity: 1.0 }
+        ]
+      )
+    end
+
     it 'returns correct gradient arguments for an element' do
-      arguments = element.gradient_arguments(double(bounding_box: [100, 100, 200, 0]))
+      arguments = element.gradient_arguments(double(bounding_box: [100, 100, 200, 0], stroke_width: 0))
       expect(arguments).to eq(
         from:         [0.0, 0.0],
         to:           [0.2, 1.0],
@@ -59,7 +77,7 @@ describe Prawn::SVG::Elements::Gradient do
     end
 
     it 'returns correct gradient arguments for an element' do
-      arguments = element.gradient_arguments(double(bounding_box: [100, 100, 200, 0]))
+      arguments = element.gradient_arguments(double(bounding_box: [100, 100, 200, 0], stroke_width: 0))
       expect(arguments).to eq(
         from:         [0.5, 0.2],
         to:           [0.0, 0.2],
@@ -90,7 +108,7 @@ describe Prawn::SVG::Elements::Gradient do
     end
 
     it 'returns correct gradient arguments for an element' do
-      arguments = element.gradient_arguments(double(bounding_box: [100, 100, 200, 0]))
+      arguments = element.gradient_arguments(double(bounding_box: [100, 100, 200, 0], stroke_width: 0))
       expect(arguments).to eq(
         from:         [100.0, 500.0],
         to:           [200.0, 600.0],
@@ -113,7 +131,7 @@ describe Prawn::SVG::Elements::Gradient do
     end
 
     it 'returns correct gradient arguments for an element' do
-      arguments = element.gradient_arguments(double(bounding_box: [100, 100, 200, 0]))
+      arguments = element.gradient_arguments(double(bounding_box: [100, 100, 200, 0], stroke_width: 0))
       expect(arguments).to eq(
         from:         [100.0, 500.0],
         to:           [200.0, 600.0],
@@ -138,7 +156,7 @@ describe Prawn::SVG::Elements::Gradient do
     end
 
     it 'passes in the transform via the apply_transformations option' do
-      arguments = element.gradient_arguments(double(bounding_box: [100, 100, 200, 0]))
+      arguments = element.gradient_arguments(double(bounding_box: [100, 100, 200, 0], stroke_width: 0))
 
       expect(arguments).to eq(
         from:         [0.0, 0.0],
@@ -168,7 +186,7 @@ describe Prawn::SVG::Elements::Gradient do
     end
 
     it 'correctly inherits the attributes from the parent element' do
-      arguments = document.gradients['flag-2'].gradient_arguments(double(bounding_box: [100, 100, 200, 0]))
+      arguments = document.gradients['flag-2'].gradient_arguments(double(bounding_box: [100, 100, 200, 0], stroke_width: 0))
       expect(arguments).to eq(
         from:         [150.0, 500.0],
         to:           [220.0, 600.0],
@@ -178,7 +196,7 @@ describe Prawn::SVG::Elements::Gradient do
         bounding_box: [100, 100, 200, 0]
       )
 
-      arguments = document.gradients['flag-3'].gradient_arguments(double(bounding_box: [100, 100, 200, 0]))
+      arguments = document.gradients['flag-3'].gradient_arguments(double(bounding_box: [100, 100, 200, 0], stroke_width: 0))
       expect(arguments).to eq(
         from:         [170.0, 500.0],
         to:           [220.0, 600.0],

data/spec/sample_svg/gradient_offset_transparency.svg

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Illustration" viewBox="0 0 1275 850" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <style>.cls-3{fill:url(#linear-gradient);}.cls-5{fill:url(#linear-gradient-3);}.cls-6{fill:url(#linear-gradient-4);}.cls-7{fill:url(#linear-gradient-2);}</style>
+    <linearGradient gradientTransform="translate(3610.94 -4546.2)" gradientUnits="userSpaceOnUse" id="linear-gradient" x1="-3428.66" x2="-2829.15" y1="4803.57" y2="4803.57">
+      <stop offset="0" stop-color="orange" stop-opacity="0"/>
+      <stop offset=".04" stop-color="orange" stop-opacity=".04"/>
+      <stop offset=".12" stop-color="orange" stop-opacity=".16"/>
+      <stop offset=".21" stop-color="orange" stop-opacity=".34"/>
+      <stop offset=".32" stop-color="orange" stop-opacity=".6"/>
+      <stop offset=".44" stop-color="orange" stop-opacity=".92"/>
+      <stop offset=".47" stop-color="orange"/>
+      <stop offset=".58" stop-color="darksalmon"/>
+      <stop offset=".8" stop-color="darksalmon"/>
+      <stop offset=".9" stop-color="red"/>
+    </linearGradient>
+    <linearGradient gradientTransform="translate(5391.8 -3148.45)" gradientUnits="userSpaceOnUse" id="linear-gradient-2" x1="-4854.3" x2="-4254.78" y1="3443.47" y2="3443.47">
+      <stop offset=".06" stop-color="orange" stop-opacity="0"/>
+      <stop offset=".11" stop-color="orange" stop-opacity=".07"/>
+      <stop offset=".19" stop-color="orange" stop-opacity=".26"/>
+      <stop offset=".31" stop-color="orange" stop-opacity=".56"/>
+      <stop offset=".46" stop-color="orange" stop-opacity=".97"/>
+      <stop offset=".47" stop-color="orange"/>
+      <stop offset="1" stop-color="red"/>
+    </linearGradient>
+    <linearGradient gradientTransform="translate(-1037.04 -401.09)" id="linear-gradient-3" x1="1460.82" x2="2060.34" xlink:href="#linear-gradient-2" y1="1006.26" y2="1006.26"/>
+    <linearGradient gradientTransform="translate(-295.18 -2362.64)" gradientUnits="userSpaceOnUse" id="linear-gradient-4" x1="610.99" x2="1210.5" y1="2682.84" y2="2682.84">
+      <stop offset=".09" stop-color="orange" stop-opacity="0"/>
+      <stop offset=".13" stop-color="orange" stop-opacity=".05"/>
+      <stop offset=".21" stop-color="orange" stop-opacity=".19"/>
+      <stop offset=".31" stop-color="orange" stop-opacity=".41"/>
+      <stop offset=".42" stop-color="orange" stop-opacity=".72"/>
+      <stop offset=".52" stop-color="orange"/>
+      <stop offset=".92" stop-color="red"/>
+    </linearGradient>
+    <linearGradient gradientTransform="translate(520.38 -911.81)" gradientUnits="userSpaceOnUse" id="linear-gradient-5" x1="-366.91" x2="258.33" y1="1381.44" y2="1381.44">
+      <stop offset="0" stop-color="#fff" stop-opacity="0"/>
+      <stop offset="1" stop-color="#fff"/>
+    </linearGradient>
+  </defs>
+  <rect class="cls-3" height="138.93" rx="69.47" ry="69.47" transform="translate(1004.69 98.45) rotate(135)" width="599.51" x="182.2" y="187.85"/>
+  <rect class="cls-7" height="138.93" rx="69.47" ry="69.47" transform="translate(1637.84 -88.45) rotate(135)" width="599.51" x="537.48" y="225.52"/>
+  <rect class="cls-5" height="138.93" rx="69.47" ry="69.47" transform="translate(-216.02 688.88) rotate(-45)" width="599.51" x="423.77" y="535.72"/>
+  <rect class="cls-6" height="138.93" rx="69.47" ry="69.47" transform="translate(-46.13 529.06) rotate(-45)" width="599.51" x="315.78" y="250.74"/>
+</svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.36.2
 platform: ruby
 authors:
 - Mog Nesbitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-05 00:00:00.000000000 Z
+date: 2025-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser
@@ -150,12 +150,12 @@ files:
 - lib/prawn/svg/loaders/web.rb
 - lib/prawn/svg/paint.rb
 - lib/prawn/svg/pathable.rb
+- lib/prawn/svg/pdfmatrix.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
@@ -216,6 +216,7 @@ files:
 - spec/sample_svg/ellipse01.svg
 - spec/sample_svg/gistfile1.svg
 - spec/sample_svg/google_charts.svg
+- spec/sample_svg/gradient_offset_transparency.svg
 - spec/sample_svg/gradient_stress_test.svg
 - spec/sample_svg/gradient_transform.svg
 - spec/sample_svg/gradients-cmyk.svg