prawn-svg 0.36.2 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e2b791daa33f85948c08bdafec3f1a3ab8dffa8b07dd50ce7bb7a55320d663b
-  data.tar.gz: 78e45c7790de4b1cf2d328ad6ec8bbb77bab707cdeb8e75fcf52055410f36fc4
+  metadata.gz: d5c28b2e706923d04785979a68f0e457f14df7c71b519d16db6e0bb45e3458bc
+  data.tar.gz: 3ade59453c7005f624b4dcd36d9930f27285291c410b00fe57b3d3d278673e4c
 SHA512:
-  metadata.gz: da875e08d850fd7d3b74d9e5a629d4f3125bc933614e0d241ddd4c5122ad75495d6b530c01914ad0bc44dbcbdec41ee5e35196e008c484652bbb99ecb0e66e53
-  data.tar.gz: 79f54a51c1acdea4a5d5de5bb72f130b5ca692aed48c72ceb36aced4f16df223be1a81f1152164dbdf3452571b79a676df96a4c38ba825afeedd32748e4f3919
+  metadata.gz: 250c187430ff8042898b9ee55a595162824613e13a9760a8e32dd21e5a026dfabe012a80f3c19442b3a97635ab020aa1eb113cd70dcc86ffef888f6bc2d39fa1
+  data.tar.gz: 1d79258d401547d57dd694878e08d9a50d0166cce4fefd9351cfda0ef6a7c3096910a88a29650993f0eeadd44d7f2fba21d25f438e31660750cc4b847cacc760

data/Gemfile.lock

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

data/README.md

@@ -114,9 +114,9 @@ prawn-svg supports CSS, both in `<style>` blocks and `style` attributes.
 In CSS selectors you can use element names, IDs, classes, attributes (existence, `=`, `^=`, `$=`, `*=`, `~=`, `|=`)
 and all combinators (` `, `>`, `+`, `~`).
 The pseudo-classes `:first-child`, `:last-child` and `:nth-child(n)` (where n is a number) also work.
+`!important` is supported.
 
-Pseudo-elements and the other pseudo-classes are not supported.  Specificity ordering is
-implemented, but `!important` is not.
+Pseudo-elements and the other pseudo-classes are not supported.
 
 ## Not supported
 

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

@@ -1,7 +1,5 @@
 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)
@@ -11,7 +9,6 @@ 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)
@@ -19,10 +16,6 @@ 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

@@ -142,7 +142,7 @@ class Prawn::SVG::Elements::Base
     source.elements.select do |elem|
       # To be strict, we shouldn't treat namespace-less elements as SVG, but for
       # backwards compatibility, and because it doesn't hurt, we will.
-      elem.namespace == SVG_NAMESPACE || elem.namespace == ''
+      [SVG_NAMESPACE, ''].include?(elem.namespace)
     end
   end
 
@@ -203,20 +203,27 @@ class Prawn::SVG::Elements::Base
   end
 
   def extract_attributes_and_properties
-    if (styles = document.element_styles[source])
-      # TODO : implement !important, at the moment it's just ignored
-      styles.each do |name, value, _important|
-        @properties.set(name, value)
-      end
+    # Apply user agent stylesheet
+    if %w[svg symbol image marker pattern foreignObject].include?(source.name)
+      @properties.set('overflow', 'hidden')
     end
 
-    @properties.load_hash(parse_css_declarations(source.attributes['style'] || ''))
-
+    # Apply presentation attributes, and set attributes that aren't presentation attributes
     source.attributes.each do |name, value|
       # Properties#set returns nil if it's not a recognised property name
       @properties.set(name, value) or @attributes[name] = value
     end
 
+    # Apply stylesheet styles
+    if (styles = document.element_styles[source])
+      styles.each do |name, value, important|
+        @properties.set(name, value, important: important)
+      end
+    end
+
+    # Apply inline styles
+    @properties.load_hash(parse_css_declarations(source.attributes['style'] || ''))
+
     state.computed_properties.compute_properties(@properties)
   end
 

data/lib/prawn/svg/properties.rb

@@ -1,6 +1,6 @@
 module Prawn::SVG
   class Properties
-    Config = Struct.new(:default, :inheritable?, :valid_values, :attr, :ivar)
+    Config = Struct.new(:default, :inheritable?, :valid_values, :attr, :ivar, :id)
 
     EM = 16
     FONT_SIZES = {
@@ -49,6 +49,7 @@ module Prawn::SVG
 
     PROPERTIES.each do |name, value|
       value.attr = name.gsub('-', '_')
+      value.id = value.attr.to_sym
       value.ivar = "@#{value.attr}"
     end
 
@@ -57,9 +58,11 @@ module Prawn::SVG
     ATTR_NAMES = PROPERTIES.keys.map { |name| name.gsub('-', '_') }
 
     attr_accessor(*ATTR_NAMES)
+    attr_reader :important_ids
 
     def initialize
       @numeric_font_size = EM
+      @important_ids = []
     end
 
     def load_default_stylesheet
@@ -70,10 +73,11 @@ module Prawn::SVG
       self
     end
 
-    def set(name, value)
+    def set(name, value, important: false)
       name = name.to_s.downcase
       if (config = PROPERTIES[name])
-        if (value = parse_value(config, value.strip))
+        if (value = parse_value(config, value.strip)) && (important || !@important_ids.include?(config.id))
+          @important_ids << config.id if important
           instance_variable_set(config.ivar, value)
         end
       elsif name == 'font'
@@ -99,7 +103,7 @@ module Prawn::SVG
       PROPERTY_CONFIGS.each do |config|
         value = other.send(config.attr)
 
-        if value && value != 'inherit'
+        if value && value != 'inherit' && (!@important_ids.include?(config.id) || other.important_ids.include?(config.id))
           instance_variable_set(config.ivar, value)
 
         elsif value.nil? && !config.inheritable?
@@ -107,6 +111,7 @@ module Prawn::SVG
         end
       end
 
+      @important_ids += other.important_ids
       @numeric_font_size = calculate_numeric_font_size
       nil
     end

data/lib/prawn/svg/version.rb

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

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

@@ -62,7 +62,6 @@ 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],
@@ -121,7 +120,6 @@ RSpec.describe Prawn::SVG::CSS::Stylesheets do
     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/base_spec.rb

@@ -175,8 +175,8 @@ describe Prawn::SVG::Elements::Base do
         </style>
         <rect width="100" height="100"></rect>
         <g class="special">
-          <rect width="100" height="100"></rect>
-          <rect width="100" height="100" style="fill: yellow;"></rect>
+          <rect width="100" fill="blue" height="100"></rect>
+          <rect width="100" height="100" fill="blue" style="fill: yellow;"></rect>
         </g>
       </svg>
     SVG

data/spec/sample_svg/important.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="320" height="320">
+    <rect x="10" y="10" width="100" height="100" class="green" id="id" />
+    <text x="10" y="130" fill="green">The square above should be green</text>
+
+    <rect x="10" y="170" width="100" height="100" class="green" style="fill: blue;" />
+    <text x="10" y="290" fill="green">The square above should be also be green</text>
+
+    <style>
+        .green { fill: green !important; }
+        rect.green { fill: red; }
+        #id { fill: orange; }
+    </style>
+</svg>

data/spec/sample_svg/presentation_attribute_precedence.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="320" height="320">
+    <rect x="10" y="10" width="100" height="100" fill="red" />
+    <text x="10" y="130" fill="green">The square above should be green</text>
+
+    <rect x="10" y="170" width="100" height="100" fill="red" style="fill: blue;" />
+    <text x="10" y="290" fill="blue">The square above should be blue</text>
+
+    <style>
+        rect { fill: green; }
+    </style>
+</svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.36.2
+  version: 0.37.0
 platform: ruby
 authors:
 - Mog Nesbitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-01 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser
@@ -227,6 +227,7 @@ files:
 - spec/sample_svg/image02_base64.svg
 - spec/sample_svg/image03.svg
 - spec/sample_svg/image_svg.svg
+- spec/sample_svg/important.svg
 - spec/sample_svg/line01.svg
 - spec/sample_svg/links.svg
 - spec/sample_svg/marker.svg
@@ -244,6 +245,7 @@ files:
 - spec/sample_svg/pie_piece.svg
 - spec/sample_svg/polygon01.svg
 - spec/sample_svg/polyline01.svg
+- spec/sample_svg/presentation_attribute_precedence.svg
 - spec/sample_svg/preserve-space.svg
 - spec/sample_svg/quad01.svg
 - spec/sample_svg/radgrad01-bounding.svg