prawn-svg 0.36.0 → 0.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b833a9af0fae6fd2934c6b5ef37bd6d6d90aba36fa9a161520ac6a9a1c19f9db
-  data.tar.gz: 550aa711e413cac65e8af39f029096e3606f84a852b982729ca0252e758805ac
+  metadata.gz: 28ccc4cc947f9d497484516d673f66098fd4624e11aba0035afc4d4373ec27cc
+  data.tar.gz: 19344cb3568acff4b85de31d199024070dacaa10eeaf4305d9d35265a547dbda
 SHA512:
-  metadata.gz: 9a522f7b4aa8f713fc453cc3d6061968fce1a28ab60e58f6c321b92979bcb909748a81b8c9cb9a373f918d152e969ea7d0974afd975c8fba7ae70c03cec18a25
-  data.tar.gz: 537a912b7daab1581662cabfc5de5776ebe771d15e448e99a7c7d6125eb29644bbc40de6508429f5a3451f16ebb226f53402320ef4430118b16d05913cd3ede4
+  metadata.gz: 535e9463f1577596e42889fec04c0d0a41cfb30ee6cd0c293c4a028987bde0bf607c482767d1d916445ad7042d14c653a696e2da9c096ff8e40dc6ccc3a69ae6
+  data.tar.gz: 929c06b75e31fd7314b5ade1ad86f00a6b4d8b98fceff0f66672cf7f1a0b1b70cf75fc28461042c8f91915d43bc5778ea27e49d6aa00aa280037835f9683db8c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    prawn-svg (0.36.0)
+    prawn-svg (0.36.1)
       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/version.rb

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.36.1
 platform: ruby
 authors:
 - Mog Nesbitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-05 00:00:00.000000000 Z
+date: 2025-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser