savage 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/savage/parser.rb

@@ -18,7 +18,7 @@ module Savage
           subpaths = []
           if move_index = parsable.index(/[Mm]/)
             subpaths << parsable[0...move_index] if move_index > 0
-            parsable.scan /[Mm][0-9\-\. LlHhVvQqCcTtSsAaZz]*/ do |match_group|
+            parsable.scan /[Mm](?:\d|[.,-]|[LlHhVvQqCcTtSsAaZz]|\W)+/m do |match_group|
               subpaths << $&
             end
           else
@@ -35,7 +35,7 @@ module Savage
         
         def extract_directions(parsable)
           directions = []
-          parsable.scan /[A-Za-z][0-9\-\. ]*/ do |match_group|
+          parsable.scan /[MmLlHhVvQqCcTtSsAaZz](?:\d|[.,-]|\W)*/m do |match_group|
             direction = build_direction $&
             if direction.kind_of?(Array)
               directions.concat direction
@@ -129,11 +129,11 @@ module Savage
         
         def extract_coordinates(command_string)
           coordinates = []
-          command_string.scan /-?\d+(\.\d+)?/ do |match_group|
+          command_string.scan(/-?\d+(\.\d+)?/) do |match_group|
             coordinates << $&.to_f
           end
           coordinates
         end
     end
   end
-end
+end

data/savage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{savage}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Holland"]
-  s.date = %q{2010-08-26}
+  s.date = %q{2010-09-04}
   s.description = %q{A little gem for extracting and manipulating SVG vector path data.}
   s.email = %q{jeremy@jeremypholland.com}
   s.extra_rdoc_files = [

data/spec/savage/parser_spec.rb

@@ -20,6 +20,14 @@ describe Parser do
       path.subpaths.last.directions.last.class.should == Directions::MoveTo
     end
     
+    it 'should handle comma separated coordinates' do
+      path = Parser.parse("M100,200")
+      path.class.should == Path
+      path.subpaths.length.should == 1
+      path.subpaths.last.directions.length.should == 1
+      path.subpaths.last.directions.last.class.should == Directions::MoveTo
+    end
+    
     it 'should return a path object with one subpath containing a move_to and a line_to when the string is a move_to command followed by a line_to command' do
       path = Parser.parse("M100 200l-342.65 21")
       path.class.should == Path
@@ -175,5 +183,13 @@ describe Parser do
       path = Parser.parse(path_string)
       path.to_command.should == path_string
     end
+    
+    it "should be able to parse complex paths" do
+      path = Parser.parse("M74.89,146.249c0.042,0.552,0.376,0.685,0.744,0.293m50.543-9.1323c15.445-16.43,32.782-32.859,49.793-49.289		c-6.298,0.001-12.595,0.001-18.893,0c-10.813,10.37-21.759,20.737-32.275,31.107C74.249,134.323,74.424,140.285,74.89,146.249z")
+      path.class.should == Path
+      path.subpaths.length.should == 2
+      path.subpaths[0].directions.length.should == 2
+      path.subpaths[1].directions.length.should == 6
+    end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: savage
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Jeremy Holland
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 -05:00
+date: 2010-09-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency