savage 1.1.6 → 1.1.7

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.1.7

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](?:\d|[eE.,+-]|[LlHhVvQqCcTtSsAaZz]|\W)+/m do |match_group|
+            parsable.scan(/[Mm](?:\d|[eE.,+-]|[LlHhVvQqCcTtSsAaZz]|\W)+/m) do |match_group|
               subpaths << $&
             end
           else
@@ -36,7 +36,7 @@ module Savage
         def extract_directions(parsable, force_absolute=false)
           directions = []
           i = 0
-          parsable.scan /[MmLlHhVvQqCcTtSsAaZz](?:\d|[eE.,+-]|\W)*/m do |match_group|
+          parsable.scan(/[MmLlHhVvQqCcTtSsAaZz](?:\d|[eE.,+-]|\W)*/m) do |match_group|
             direction = build_direction $&, force_absolute && i == 0
             if direction.kind_of?(Array)
               directions.concat direction
@@ -51,15 +51,16 @@ module Savage
         def build_direction(parsable, force_absolute=false)
           directions = []
           coordinates = extract_coordinates parsable
-          absolute = (force_absolute || parsable[0,1] == parsable[0,1].upcase) ? true : false
           recurse_code = parsable[0,1]
+          first_absolute = force_absolute
           
           # we need to handle this separately, since ClosePath doesn't take any coordinates
           if coordinates.empty? && recurse_code =~ /[Zz]/
-            directions << Directions::ClosePath.new(absolute)
+            directions << Directions::ClosePath.new(parsable[0,1] == parsable[0,1].upcase)
           end
           
           until coordinates.empty?
+            absolute = (first_absolute || parsable[0,1] == parsable[0,1].upcase)
             case recurse_code
             when /[Mm]/
               x = coordinates.shift
@@ -122,6 +123,7 @@ module Savage
               coordinates = []
               raise TypeError
             end
+            first_absolute = false
           end
           
           directions

data/savage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "savage"
-  s.version = "1.1.6"
+  s.version = "1.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Holland"]
-  s.date = "2012-08-02"
+  s.date = "2012-10-16"
   s.description = "A little gem for extracting and manipulating SVG vector path data."
   s.email = "jeremy@jeremypholland.com"
   s.extra_rdoc_files = [
@@ -62,7 +62,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/awebneck/savage"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.24"
   s.summary = "A little library to manipulate SVG path data"
 
   if s.respond_to? :specification_version then

data/spec/savage/parser_spec.rb

@@ -165,37 +165,63 @@ describe Parser do
       path.subpaths.last.directions[1].target.y.should == 400
     end
 
-    it 'should return a path object with one subpath containing a move_to and two line_to directions when the string is a move_to command followed by more than one set of implicit coordinates' do
+    it 'should return a path object with one subpath containing an absolute move_to and two absolute line_to directions when the string is an absolute move_to command followed by more than one set of implicit coordinates' do
       path = Parser.parse("M100 200 300 400 500 600 ")
       path.class.should == Path
       path.subpaths.length.should == 1
       path.subpaths.last.directions.length.should == 3
       path.subpaths.last.directions[0].class.should == Directions::MoveTo
+      path.subpaths.last.directions[0].should be_absolute
       path.subpaths.last.directions[0].target.x.should == 100
       path.subpaths.last.directions[0].target.y.should == 200
       path.subpaths.last.directions[1].class.should == Directions::LineTo
+      path.subpaths.last.directions[1].should be_absolute
       path.subpaths.last.directions[1].target.x.should == 300
       path.subpaths.last.directions[1].target.y.should == 400
       path.subpaths.last.directions[2].class.should == Directions::LineTo
+      path.subpaths.last.directions[2].should be_absolute
+      path.subpaths.last.directions[2].target.x.should == 500
+      path.subpaths.last.directions[2].target.y.should == 600
+    end
+
+    it 'should return a path object with one subpath containing an absolute move_to and two relative line_to directions when the string is a relative move_to command followed by more than one set of implicit coordinates' do
+      path = Parser.parse("m100 200 300 400 500 600 ")
+      path.class.should == Path
+      path.subpaths.length.should == 1
+      path.subpaths.last.directions.length.should == 3
+      path.subpaths.last.directions[0].class.should == Directions::MoveTo
+      path.subpaths.last.directions[0].should be_absolute
+      path.subpaths.last.directions[0].target.x.should == 100
+      path.subpaths.last.directions[0].target.y.should == 200
+      path.subpaths.last.directions[1].class.should == Directions::LineTo
+      path.subpaths.last.directions[1].should_not be_absolute
+      path.subpaths.last.directions[1].target.x.should == 300
+      path.subpaths.last.directions[1].target.y.should == 400
+      path.subpaths.last.directions[2].class.should == Directions::LineTo
+      path.subpaths.last.directions[2].should_not be_absolute
       path.subpaths.last.directions[2].target.x.should == 500
       path.subpaths.last.directions[2].target.y.should == 600
     end
 
     it 'should return a path object with two subpaths containing one line_to directions each when the string is two move_to commands each followed by a line_to command' do
-      path = Parser.parse("M100 200 332 -12.3M594 230-423 11.1")
+      path = Parser.parse("M100 200 332 -12.3m594 230-423 11.1")
       path.class.should == Path
       path.subpaths.length.should == 2
       path.subpaths[0].directions.length.should == 2
       path.subpaths[0].directions[0].class.should == Directions::MoveTo
+      path.subpaths[0].directions[0].should be_absolute
       path.subpaths[0].directions[0].target.x.should == 100
       path.subpaths[0].directions[0].target.y.should == 200
       path.subpaths[0].directions[1].class.should == Directions::LineTo
+      path.subpaths[0].directions[1].should be_absolute
       path.subpaths[0].directions[1].target.x.should == 332
       path.subpaths[0].directions[1].target.y.should == -12.3
       path.subpaths[1].directions[0].class.should == Directions::MoveTo
+      path.subpaths[1].directions[0].should_not be_absolute
       path.subpaths[1].directions[0].target.x.should == 594
       path.subpaths[1].directions[0].target.y.should == 230
       path.subpaths[1].directions[1].class.should == Directions::LineTo
+      path.subpaths[1].directions[1].should_not be_absolute
       path.subpaths[1].directions[1].target.x.should == -423
       path.subpaths[1].directions[1].target.y.should == 11.1
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: savage
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8559400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *8559400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 description: A little gem for extracting and manipulating SVG vector path data.
 email: jeremy@jeremypholland.com
 executables: []
@@ -92,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A little library to manipulate SVG path data