prawn-svg 0.29.0 → 0.29.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11124a9218699a441e76a217c95fe1753777e96298f8d5ac4839cac9dc766705
-  data.tar.gz: bc62cefeb7ffbceae1ddfe3f541a23ab7d7a16307b6666bc3c537fe839cd20c8
+  metadata.gz: 2dbf86f272347e8867b1e7262a49163c316d0160fc35802ceb1f7b0f8ed90e25
+  data.tar.gz: 4244134c0616eaf4aa9ca8ef19bbde2137e589d4f3929dd30b55c4c3d5136c36
 SHA512:
-  metadata.gz: cd293d3c50672c0995c106295d9b83c1106261d02302c6f46a95e3d6f6e1f656685537ba69885aa171f615fb4bf1022f2499cfcf54f1b14588bf5776ca622077
-  data.tar.gz: d4f103286a0090992d8608ff63e671a2879016f3f0f1713588634aba2b2fad6ac67f72b98dfec0d4d7ef737adc83078e36829ebad69e1655f1f2d9c4397dfbd5
+  metadata.gz: 3d1874a6766112c3084355c21b517b7a1d413f0e9e88c806cb236d69edc9fb7e1c3e253f13746c18e5e9b57d1221341d5c309494429dbae4a377ef91b99c8a52
+  data.tar.gz: bbd80743596ad9c2c25871c5c6542d2ddfb0c3026ac5d0efb61a894b501aabc6657e048f3d52b0b0e42e634e68b0d30f7e5096ce9bfdc81d4a7ffc7ac08d65e9

data/.travis.yml

@@ -4,3 +4,5 @@ rvm:
   - 2.2.7
   - 2.3.3
   - 2.4.0
+  - 2.5.3
+  - 2.6.1

data/README.md

@@ -107,6 +107,10 @@ 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.
 
+Warning: Ruby versions less than 2.6.0 have a bug in the REXML XPath implementation which means under some
+conditions the `+` combinator will not pick up all matching elements.  See `stylesheets_spec.rb` for an
+explanation if you're stuck on an old version of Ruby.
+
 Pseudo-elements and the other pseudo-classes are not supported.  Specificity ordering is
 implemented, but `!important` is not.
 

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

@@ -65,20 +65,48 @@ module Prawn::SVG::CSS
     def css_selector_to_xpath(selector)
       selector.map do |element|
         pseudo_classes = Set.new(element[:pseudo_class])
+        require_function_name = false
 
         result = case element[:combinator]
                  when :child
-                   '/'
+                   "/"
                  when :adjacent
                    pseudo_classes << 'first-child'
-                   '/following-sibling::'
+                   "/following-sibling::"
                  when :siblings
-                   '/following-sibling::'
+                   "/following-sibling::"
                  else
-                   '//'
+                   "//"
                  end
 
-        result << element[:name] if element[:name]
+        positions = []
+        pseudo_classes.each do |pc|
+          case pc
+          when "first-child" then positions << '1'
+          when "last-child"  then positions << 'last()'
+          when /^nth-child\((\d+)\)$/ then positions << $1
+          end
+        end
+
+        if !positions.empty?
+          result << "*" unless require_function_name
+          require_function_name = true
+
+          logic = if positions.length == 1
+                    positions.first
+                  else
+                    positions.map { |position| "position()=#{position}" }.join(" and ")
+                  end
+
+          result << "[#{logic}]"
+        end
+
+        if require_function_name
+          result << "[name()=#{xpath_quote element[:name]}]" if element[:name]
+        else
+          result << (element[:name] || '*')
+        end
+
         result << ((element[:class] || []).map { |name| "[contains(concat(' ',@class,' '), ' #{name} ')]" }.join)
         result << ((element[:id] || []).map { |name| "[@id='#{name}']" }.join)
 
@@ -101,14 +129,6 @@ module Prawn::SVG::CSS
           end
         end
 
-        pseudo_classes.each do |pc|
-          case pc
-          when "first-child" then result << "[1]"
-          when "last-child"  then result << "[last()]"
-          when /^nth-child\((\d+)\)$/ then result << "[#{$1}]"
-          end
-        end
-
         result
       end.join
     end

data/lib/prawn/svg/loaders/file.rb

@@ -85,7 +85,7 @@ module Prawn::SVG::Loaders
     end
 
     def assert_valid_file_uri!(uri)
-      if uri.host
+      unless uri.host.nil? || uri.host.empty?
         raise Prawn::SVG::UrlLoader::Error, "prawn-svg does not suport file: URLs with a host. Your URL probably doesn't start with three slashes, and it should."
       end
     end

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module SVG
-    VERSION = '0.29.0'
+    VERSION = '0.29.1'
   end
 end

data/prawn-svg.gemspec

@@ -6,7 +6,6 @@ Gem::Specification.new do |gem|
   gem.version = Prawn::SVG::VERSION
   gem.summary = "SVG renderer for Prawn PDF library"
   gem.description = "This gem allows you to render SVG directly into a PDF using the 'prawn' gem.  Since PDF is vector-based, you'll get nice scaled graphics if you use SVG instead of an image."
-  gem.has_rdoc = false
   gem.author = "Roger Nesbitt"
   gem.email = "roger@seriousorange.com"
   gem.homepage = "http://github.com/mogest/prawn-svg"

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

@@ -11,6 +11,7 @@ RSpec.describe Prawn::SVG::CSS::Stylesheets do
           rect { fill: #ff0000; }
           rect ~ rect { fill: #330000; }
           rect + rect { fill: #440000; }
+          rect:first-child:last-child { fill: #441234; }
 
           circle:first-child { fill: #550000; }
           circle:nth-child(2) { fill: #660000; }
@@ -37,9 +38,13 @@ RSpec.describe Prawn::SVG::CSS::Stylesheets do
             <rect width="6" height="6" />
           </g>
 
-          <circle width="7" />
-          <circle width="8" />
-          <circle width="9" />
+          <circle width="100" />
+
+          <g id="circles">
+            <circle width="7" />
+            <circle width="8" />
+            <circle width="9" />
+          </g>
         </g>
 
         <square width="10" chocolate="hi there" />
@@ -56,13 +61,35 @@ RSpec.describe Prawn::SVG::CSS::Stylesheets do
       result = Prawn::SVG::CSS::Stylesheets.new(CssParser::Parser.new, REXML::Document.new(svg)).load
       width_and_styles = result.map { |k, v| [k.attributes["width"].to_i, v] }.sort_by(&:first)
 
-      expect(width_and_styles).to eq [
+      expected = [
         [1, [["fill", "#ff0000", false]]],
         [2, [["fill", "#ff0000", false], ["fill", "#330000", false], ["fill", "#440000", false], ["fill", "#220000", false]]],
         [3, [["fill", "#ff0000", false], ["fill", "#00ff00", false]]],
         [4, [["fill", "#ff0000", false], ["fill", "#330000", false], ["fill", "#440000", false], ["fill", "#00ff00", false]]],
-        [5, [["fill", "#ff0000", false], ["fill", "#330000", false], ["fill", "#330000", false], ["fill", "#00ff00", false]]],
-        [6, [["fill", "#ff0000", false], ["fill", "#0000ff", false]]],
+      ]
+
+      #
+      # Under ruby < 2.6, a bug in REXML causes the /following-sibling selector to
+      # only pick the first matching sibling.  This means the + CSS combinator behaves
+      # incorrectly in the following example:
+      #
+      # <a>
+      #   <b a="1" />
+      #   <b a="2" />
+      #   <b a="3" />
+      # </a>
+      #
+      # The css selector `a b + b` will only pick the second <b>, whereas it should
+      # pick both the second and third <b> elements.
+      #
+      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.6.0')
+        expected << [5, [["fill", "#ff0000", false], ["fill", "#330000", false], ["fill", "#330000", false], ["fill", "#00ff00", false]]]
+      else
+        expected << [5, [["fill", "#ff0000", false], ["fill", "#330000", false], ["fill", "#330000", false], ["fill", "#440000", false], ["fill", "#00ff00", false]]]
+      end
+
+      expected.concat [
+        [6, [["fill", "#ff0000", false], ["fill", "#441234", false], ["fill", "#0000ff", false]]],
         [7, [["fill", "#550000", false]]],
         [8, [["fill", "#660000", false]]],
         [9, [["fill", "#770000", false]]],
@@ -74,6 +101,8 @@ RSpec.describe Prawn::SVG::CSS::Stylesheets do
         [15, [["fill", "#dd0000", false]]],
         [16, [["fill", "#ee0000", false]]],
       ]
+
+      expect(width_and_styles).to eq(expected)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.29.1
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-05 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -250,8 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: SVG renderer for Prawn PDF library