prawn-svg 0.34.1 → 0.34.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0676f2574c6a16d7d1ea8bec6c43f807f6520a40f99d64ae7731646915576dc8
-  data.tar.gz: a294ac8f3c92bf4bc5030958f1a3f242e4fcc3099fcb3ae7893bc7cdc522decc
+  metadata.gz: 2f405c26de28dcc55e41e63ee5a6f8d433ab7dc4e9900bc3012e869689516698
+  data.tar.gz: f6cfebbb831bbfd6a66608202285acd66a295de102ebd94a2a6be8e73454bec4
 SHA512:
-  metadata.gz: bdd3bac1ac0b2ec43140a84f248acfae5839f51bd7bd757acfc8713e391d136e5753db8110bed039463a7d378c855573230eccdda23a28e11cea2555aa2cdbb7
-  data.tar.gz: a702f63f43e0db24aef08edc8b12033d7dde1c7032746bc3ec7dc0a1e06002587d03d2145ec8e994416e886663013fc6c36153096b5c647f6549f283789913fb
+  metadata.gz: e9092e304d63b84b8947e585448b627be95fcfbaad38b02e386bb9ed0b585871990a3ab1bc87a0480949141010aea67cb60c5c1ddc1be19b674056f8b7adceab
+  data.tar.gz: 4dd717b2d65681f792951ef98a93df4dd1dd7a8f2f4f9caaa13ef7fce9a3428e8f2041e71537244167be257351f1a5720069e5b88c173145fc8f51ae31d1453f

data/lib/prawn/svg/css/stylesheets.rb

@@ -1,5 +1,7 @@
 module Prawn::SVG::CSS
   class Stylesheets
+    USER_AGENT_STYLESHEET = 'svg, symbol, image, marker, pattern, foreignObject { overflow: hidden }'.freeze
+
     attr_reader :css_parser, :root, :media
 
     def initialize(css_parser, root, media = :all)
@@ -9,6 +11,7 @@ module Prawn::SVG::CSS
     end
 
     def load
+      load_user_agent_stylesheet
       load_style_elements
       xpath_styles = gather_xpath_styles
       associate_xpath_styles_with_elements(xpath_styles)
@@ -16,6 +19,10 @@ module Prawn::SVG::CSS
 
     private
 
+    def load_user_agent_stylesheet
+      css_parser.add_block!(USER_AGENT_STYLESHEET)
+    end
+
     def load_style_elements
       REXML::XPath.match(root, '//style').each do |source|
         data = source.texts.map(&:value).join

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

@@ -270,4 +270,14 @@ class Prawn::SVG::Elements::Base
   def href_attribute
     attributes['xlink:href'] || attributes['href']
   end
+
+  def overflow_hidden?
+    ['hidden', 'scroll'].include?(computed_properties.overflow)
+  end
+
+  def clone_element_source(source)
+    new_source = source.dup
+    document.element_styles[new_source] = document.element_styles[source]
+    new_source
+  end
 end

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

@@ -46,8 +46,7 @@ class Prawn::SVG::Elements::Marker < Prawn::SVG::Elements::Base
 
       element.add_call 'transformation_matrix', 1, 0, 0, 1, -ref_x * sizing.x_scale, ref_y * sizing.y_scale
 
-      # `overflow: visible` must be on the <marker> element
-      if properties.overflow != 'visible'
+      if overflow_hidden?
         point = [sizing.x_offset * sizing.x_scale, y(sizing.y_offset * sizing.y_scale)]
         element.add_call "rectangle", point, sizing.output_width, sizing.output_height
         element.add_call "clip"

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

@@ -53,7 +53,7 @@ class Prawn::SVG::Elements::Use < Prawn::SVG::Elements::Base
   def process_child_elements
     add_call 'save'
 
-    source = referenced_element_source.dup
+    source = clone_element_source(referenced_element_source)
 
     if referenced_element_class == Prawn::SVG::Elements::Viewport
       source.attributes['width'] = @width || '100%'

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

@@ -16,8 +16,11 @@ class Prawn::SVG::Elements::Viewport < Prawn::SVG::Elements::Base
       add_call 'transformation_matrix', 1, 0, 0, 1, @x, -@y
     end
 
-    add_call 'rectangle', [0, y(0)], @sizing.output_width, @sizing.output_height
-    add_call 'clip'
+    if overflow_hidden?
+      add_call 'rectangle', [0, y(0)], @sizing.output_width, @sizing.output_height
+      add_call 'clip'
+    end
+
     add_call 'transformation_matrix', @sizing.x_scale, 0, 0, @sizing.y_scale, 0, 0
     add_call 'transformation_matrix', 1, 0, 0, 1, -@sizing.x_offset, @sizing.y_offset
   end

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module SVG
-    VERSION = '0.34.1'
+    VERSION = '0.34.2'
   end
 end

data/spec/prawn/svg/css/stylesheets_spec.rb

@@ -62,6 +62,7 @@ RSpec.describe Prawn::SVG::CSS::Stylesheets do
       width_and_styles = result.map { |k, v| [k.attributes["width"].to_i, v] }.sort_by(&:first)
 
       expected = [
+        [0, [["overflow", "hidden", false]]],
         [1, [["fill", "#ff0000", false]]],
         [2, [["fill", "#ff0000", false], ["fill", "#330000", false], ["fill", "#440000", false], ["fill", "#220000", false]]],
         [3, [["fill", "#ff0000", false], ["fill", "#00ff00", false]]],
@@ -114,6 +115,7 @@ z</style>
     it "scans the document for style tags and adds the style information to the css parser" do
       css_parser = instance_double(CssParser::Parser)
 
+      expect(css_parser).to receive(:add_block!).with("svg, symbol, image, marker, pattern, foreignObject { overflow: hidden }")
       expect(css_parser).to receive(:add_block!).with("a\n  before>\n  x  y\n  inside <>&gt;\n  k  j\n  after\nz")
       expect(css_parser).to receive(:add_block!).with("hello")
       allow(css_parser).to receive(:each_rule_set)

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

@@ -18,18 +18,19 @@ RSpec.describe Prawn::SVG::Elements::Marker do
   end
 
   let(:document) { Prawn::SVG::Document.new(svg, [800, 600], {width: 800, height: 600}) }
-  let(:state) { Prawn::SVG::State.new }
 
-  let(:line_element) do
-    Prawn::SVG::Elements::Line.new(document, document.root.elements[2], [], state)
+  def new_state
+    state = Prawn::SVG::State.new
+    state.viewport_sizing = document.sizing
+    state
   end
 
-  subject do
-    Prawn::SVG::Elements::Marker.new(document, document.root.elements[1], [], state)
+  let(:line_element) do
+    Prawn::SVG::Elements::Line.new(document, document.root.elements[2], [], new_state)
   end
 
-  before do
-    state.viewport_sizing = document.sizing
+  subject do
+    Prawn::SVG::Elements::Marker.new(document, document.root.elements[1], [], new_state)
   end
 
   describe "#parse" do
@@ -70,8 +71,8 @@ RSpec.describe Prawn::SVG::Elements::Marker do
             ["clip", [], {}, []],
             ["transformation_matrix", [0.3, 0, 0, 0.3, 0, 0], {}, []],
             ["transparent", [1.0, 1.0], {}, [
-                ["stroke_color", ["000000"], {}, []],
-                ["line_width", [100.0], {}, []],
+                ["fill_color", ["000000"], {}, []],
+                ["line_width", [1.0], {}, []],
                 ["cap_style", [:butt], {}, []],
                 ["join_style", [:miter], {}, []],
                 ["undash", [], {}, []],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.34.1
+  version: 0.34.2
 platform: ruby
 authors:
 - Mog Nesbitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-06 00:00:00.000000000 Z
+date: 2024-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser