prawn-svg 0.12.0.9 → 0.12.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 794edc93815eb1be1232a47f423a2674e3954ef2
-  data.tar.gz: 32b09e40134dfe543a9a4ca1fcf8f4d23264d307
+  metadata.gz: d0b52746c9532e73303a557f3036a453670acc1f
+  data.tar.gz: 2f60c07e2e83617b5068da3ed62aa88882964baf
 SHA512:
-  metadata.gz: b96820f0566d903c2fa4234ab8a400c022fa34f77685912c17deb864bab7236918d57acf4bc8b03caca304e07b973e5c6eff07d84f5fdcfe38397419122d3fbe
-  data.tar.gz: 4e013c2b63dbe5472117c820f342668e79e38bcbeb5551088ffebe23293aeecd87207a722822ae906ab05e752eacedbd2bc4f6a9c444143366391f298a7069cb
+  metadata.gz: ec07a8b000e4564f0a13c442028cf20d388ba8d3a15309ee48e1b2858415e79d1f13a8e4e74ef4070e04dcaf6a489dfe54226b3cb58002e74a71d34ae344e3cd
+  data.tar.gz: 141d6c320f073e83a3360d83abf19ad71e0da9de6f6dec11af4665826f94e174075b553bf9abd08af42a4da8600f502214238ca53e0b2686866ae41d7fe4754d

data/lib/prawn/svg/parser/path.rb

@@ -4,43 +4,33 @@ module Prawn
       # Raised if the SVG path cannot be parsed.
       InvalidError = Class.new(StandardError)
 
+      INSIDE_SPACE_REGEXP = /[ \t\r\n,]*/
+      OUTSIDE_SPACE_REGEXP = /[ \t\r\n]*/
+      INSIDE_REGEXP = /#{INSIDE_SPACE_REGEXP}([+-]?(?:[0-9]+(?:\.[0-9]*)?|\.[0-9]+)(?:(?<=[0-9])e[+-]?[0-9]+)?)/
+      VALUES_REGEXP = /^#{INSIDE_REGEXP}/
+      COMMAND_REGEXP = /^#{OUTSIDE_SPACE_REGEXP}([A-Za-z])((?:#{INSIDE_REGEXP})*)#{OUTSIDE_SPACE_REGEXP}/
+
+
       #
       # Parses an SVG path and returns a Prawn-compatible call tree.
       #
       def parse(data)
-        cmd = values = nil
-        value = ""
         @subpath_initial_point = @last_point = nil
         @previous_control_point = @previous_quadratic_control_point = nil
         @calls = []
 
-        data.each_char do |c|
-          if c >= 'A' && c <= 'Z' || (c >= 'a' && c <= 'z' && c != 'e')
-            values << value.to_f if value != ""
-            run_path_command(cmd, values) if cmd
-            cmd = c
-            values = []
-            value = ""
-          elsif c >= '0' && c <= '9' || c == '.' || c == "-" || c == "e" # handle scientific notation, e.g. 10e-4
-            unless cmd
-              raise InvalidError, "Numerical value specified before character command in SVG path data"
-            end
-            value << c
-          elsif c == ' ' || c == "\t" || c == "\r" || c == "\n" || c == ","
-            if value != ""
-              values << value.to_f
-              value = ""
-            end
-          elsif c == '-'
-            values << value.to_f
-            value = c
-          else
-            raise InvalidError, "Invalid character '#{c}' in SVG path data"
-          end
-        end
+        data = data.gsub(/#{OUTSIDE_SPACE_REGEXP}$/, '')
 
-        values << value.to_f if value != ""
-        run_path_command(cmd, values) if cmd
+        matched_commands = match_all(data, COMMAND_REGEXP)
+        raise InvalidError, "Invalid/unsupported syntax for SVG path data" if matched_commands.nil?
+
+        matched_commands.each do |matched_command|
+          command = matched_command[1]
+          matched_values = match_all(matched_command[2], VALUES_REGEXP)
+          raise "should be impossible to have invalid inside data, but we ended up here" if matched_values.nil?
+          values = matched_values.collect {|value| value[1].to_f}
+          run_path_command(command, values)
+        end
 
         @calls
       end
@@ -183,6 +173,17 @@ module Prawn
         @previous_control_point = nil unless %w(C S).include?(upcase_command)
         @previous_quadratic_control_point = nil unless %w(Q T).include?(upcase_command)
       end
+
+      def match_all(string, regexp) # regexp must start with ^
+        result = []
+        while string != ""
+          matches = string.match(regexp)
+          result << matches
+          return if matches.nil?
+          string = matches.post_match
+        end
+        result
+      end
     end
   end
 end

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module Svg
-    VERSION = '0.12.0.9'
+    VERSION = '0.12.0.10'
   end
 end

data/spec/lib/path_spec.rb

@@ -9,11 +9,11 @@ describe Prawn::Svg::Parser::Path do
     it "correctly parses a valid path" do
       calls = []
       @path.stub!(:run_path_command) {|*args| calls << args}
-      @path.parse("A12.34 -56.78 89B4 5   c31,-2e-5C  6,7 T QX 0 Z")
+      @path.parse("A12.34 -56.78 89B4 5 12-34 -.5.7+3 2.3e3 4e4 4e+4 c31,-2e-5C  6,7 T QX 0 Z")
 
       calls.should == [
         ["A", [12.34, -56.78, 89]],
-        ["B", [4, 5]],
+        ["B", [4, 5, 12, -34, -0.5, 0.7, 3, 2.3e3, 4e4, 4e4]],
         ["c", [31, -2e-5]],
         ["C", [6, 7]],
         ["T", []],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.12.0.9
+  version: 0.12.0.10
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn