savage 1.1.7 → 1.1.8

data/README.rdoc

@@ -93,6 +93,7 @@ I have no doubt that will be some problems with this thing, as well as features
 * Jeremy Holland (jeremy@jeremypholland.com, github:awebneck) -- author
 * Christoffer Klang (toffeklang@yahoo.se, github:christoffer) -- regexp improvements
 * MatmaRex (github:MatmaRex) -- parser improvements, scientific notation support, bug fixes
+* Brandon Liu (github:bdon) -- spec improvements
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-1.1.7
+1.1.8

data/lib/savage/directions/arc_to.rb

@@ -7,8 +7,8 @@ module Savage
         super(target_x, target_y, absolute)
         @radius = Point.new(radius_x, radius_y)
         @rotation = rotation
-        @large_arc = large_arc
-        @sweep = sweep
+        @large_arc = large_arc.is_a?(Numeric) ? large_arc > 0 : large_arc
+        @sweep = sweep.is_a?(Numeric) ? sweep > 0 : sweep
       end
     
       def to_command
@@ -20,4 +20,4 @@ module Savage
       end
     end
   end
-end
+end

data/lib/savage/parser.rb

@@ -1,5 +1,26 @@
 module Savage
   class Parser
+    DIRECTIONS = {
+      :m => {:class => Directions::MoveTo,
+             :args => 2},
+      :l => {:class => Directions::LineTo,
+             :args => 2},
+      :h => {:class => Directions::HorizontalTo,
+             :args => 1},
+      :v => {:class => Directions::VerticalTo,
+             :args => 1},
+      :c => {:class => Directions::CubicCurveTo,
+             :args => 6},
+      :s => {:class => Directions::CubicCurveTo,
+             :args => 4},
+      :q => {:class => Directions::QuadraticCurveTo,
+             :args => 4},
+      :t => {:class => Directions::QuadraticCurveTo,
+             :args => 2},
+      :a => {:class => Directions::ArcTo,
+             :args => 7}
+    }
+
     class << self
       def parse(parsable)
         raise TypeError if parsable.class != String
@@ -50,84 +71,30 @@ module Savage
         
         def build_direction(parsable, force_absolute=false)
           directions = []
-          coordinates = extract_coordinates parsable
+          @coordinates = extract_coordinates parsable
           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]/
+          if @coordinates.empty? && recurse_code =~ /[Zz]/
             directions << Directions::ClosePath.new(parsable[0,1] == parsable[0,1].upcase)
           end
           
-          until coordinates.empty?
+          until @coordinates.empty?
             absolute = (first_absolute || parsable[0,1] == parsable[0,1].upcase)
-            case recurse_code
-            when /[Mm]/
-              x = coordinates.shift
-              y = coordinates.shift
-              raise TypeError if x.nil? || y.nil?
-              directions << Directions::MoveTo.new(x,y,absolute)
-              recurse_code = 'L'
-            when /[Ll]/
-              x = coordinates.shift
-              y = coordinates.shift
-              raise TypeError if x.nil? || y.nil?
-              directions << Directions::LineTo.new(x,y,absolute)
-            when /[Hh]/
-              target = coordinates.shift
-              raise TypeError if target.nil?
-              directions << Directions::HorizontalTo.new(target,absolute)
-            when /[Vv]/
-              target = coordinates.shift
-              raise TypeError if target.nil?
-              directions << Directions::VerticalTo.new(target,absolute)
-            when /[Cc]/
-              control_1_x = coordinates.shift
-              control_1_y = coordinates.shift
-              control_2_x = coordinates.shift
-              control_2_y = coordinates.shift
-              x = coordinates.shift
-              y = coordinates.shift
-              raise TypeError if x.nil? || y.nil? || control_1_x.nil? || control_1_y.nil? || control_2_x.nil? || control_2_y.nil?
-              directions << Directions::CubicCurveTo.new(control_1_x,control_1_y,control_2_x,control_2_y,x,y,absolute)
-            when /[Ss]/
-              control_2_x = coordinates.shift
-              control_2_y = coordinates.shift
-              x = coordinates.shift
-              y = coordinates.shift
-              raise TypeError if x.nil? || y.nil? || control_2_x.nil? || control_2_y.nil?
-              directions << Directions::CubicCurveTo.new(control_2_x,control_2_y,x,y,absolute)
-            when /[Qq]/
-              control_x = coordinates.shift
-              control_y = coordinates.shift
-              x = coordinates.shift
-              y = coordinates.shift
-              raise TypeError if x.nil? || y.nil? || control_x.nil? || control_y.nil?
-              directions << Directions::QuadraticCurveTo.new(control_x,control_y,x,y,absolute)
-            when /[Tt]/
-              x = coordinates.shift
-              y = coordinates.shift
-              raise TypeError if x.nil? || y.nil?
-              directions << Directions::QuadraticCurveTo.new(x,y,absolute)
-            when /[Aa]/
-              rx = coordinates.shift
-              ry = coordinates.shift
-              rotation = coordinates.shift
-              large_arc = (coordinates.shift > 0) ? true : false
-              sweep = (coordinates.shift > 0) ? true : false
-              x = coordinates.shift
-              y = coordinates.shift
-              raise TypeError if x.nil? || y.nil? || rx.nil? || ry.nil? || rotation.nil?
-              directions << Directions::ArcTo.new(rx,ry,rotation,large_arc,sweep,x,y,absolute)
-            when /[^MmLlHhVvCcSsQqTtAaZz]/
-              coordinates = []
-              raise TypeError
-            end
+            directions << construct_direction(recurse_code.strip[0].downcase.intern, absolute)
+            recurse_code = 'L' if recurse_code.downcase =~ /m/
             first_absolute = false
           end
           
           directions
         end
+
+        def construct_direction(recurse_code, absolute)
+          args = @coordinates.shift DIRECTIONS[recurse_code][:args]
+          raise TypeError if args.any?(&:nil?)
+          DIRECTIONS[recurse_code][:class].new(*args, absolute)
+        end
         
         def extract_coordinates(command_string)
           coordinates = []

data/savage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "savage"
-  s.version = "1.1.7"
+  s.version = "1.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Holland"]
-  s.date = "2012-10-16"
+  s.date = "2013-01-03"
   s.description = "A little gem for extracting and manipulating SVG vector path data."
   s.email = "jeremy@jeremypholland.com"
   s.extra_rdoc_files = [

data/spec/savage/directions/arc_to_spec.rb

@@ -12,7 +12,7 @@ describe ArcTo do
   end
 
   include Command
-  include DirectionShared
+  it_behaves_like 'Direction'
 
   it 'should have a target' do
     @dir.respond_to?(:target).should == true

data/spec/savage/directions/close_path_spec.rb

@@ -9,7 +9,7 @@ describe ClosePath do
   def create_relative; ClosePath.new(false); end
   def command_code; 'z'; end
   include Command
-  include DirectionShared
+  it_behaves_like 'Direction'
   it 'should be constructed with with either no parameters or a single boolean parameter' do
     lambda { ClosePath.new }.should_not raise_error
     lambda { ClosePath.new true }.should_not raise_error

data/spec/savage/directions/cubic_curve_to_spec.rb

@@ -12,7 +12,7 @@ describe CubicCurveTo do
   end
 
   include Command
-  include DirectionShared
+  it_behaves_like 'Direction'
 
   it 'should have a target' do
     @dir.respond_to?(:target).should == true

data/spec/savage/directions/horizontal_to_spec.rb

@@ -6,5 +6,5 @@ describe HorizontalTo do
   def dir_class; HorizontalTo; end
   def create_relative; HorizontalTo.new(100,false); end
   def command_code; 'h'; end
-  include CoordinateTargetShared
+  it_behaves_like 'CoordinateTarget'
 end

data/spec/savage/directions/line_to_spec.rb

@@ -6,5 +6,5 @@ describe LineTo do
   def dir_class; LineTo; end
   def create_relative; LineTo.new(100,200,false); end
   def command_code; 'l'; end
-  include PointTargetShared
+  it_behaves_like 'PointTarget'
 end

data/spec/savage/directions/move_to_spec.rb

@@ -6,5 +6,5 @@ describe MoveTo do
   def dir_class; MoveTo; end
   def create_relative; MoveTo.new(100,200,false); end
   def command_code; 'm'; end
-  include PointTargetShared
+  it_behaves_like 'PointTarget'
 end

data/spec/savage/directions/quadratic_curve_spec.rb

@@ -12,7 +12,7 @@ describe QuadraticCurveTo do
   end
 
   include Command
-  include DirectionShared
+  it_behaves_like 'Direction'
 
   it 'should have a target' do
     @dir.respond_to?(:target).should == true

data/spec/savage/directions/vertical_to_spec.rb

@@ -6,5 +6,5 @@ describe VerticalTo do
   def dir_class; VerticalTo; end
   def create_relative; VerticalTo.new(100,false); end
   def command_code; 'v'; end
-  include CoordinateTargetShared
+  it_behaves_like 'CoordinateTarget'
 end

data/spec/shared/coordinate_target.rb

@@ -1,9 +1,9 @@
-share_as :CoordinateTargetShared do
+shared_examples 'CoordinateTarget' do
   before :each do
     @dir = dir_class.new(100)
   end
   include Command
-  include DirectionShared
+  it_behaves_like 'Direction'
   it 'should have an accessible target, based on the constructor argument' do
     @dir.respond_to?(:target).should == true
     @dir.target.should == 100

data/spec/shared/direction.rb

@@ -1,4 +1,4 @@
-share_as :DirectionShared do
+shared_examples "Direction" do
   include Command
   it 'should have a to_command method' do
     @dir.respond_to?(:to_command).should == true

data/spec/shared/point_target.rb

@@ -1,9 +1,9 @@
-share_as :PointTargetShared do
+shared_examples_for 'PointTarget' do
   before :each do
     @dir = dir_class.new(100,200)
   end
   include Command
-  include DirectionShared
+  it_behaves_like 'Direction'
   it 'should have a target' do
     @dir.respond_to?(:target).should == true
     @dir.target.class.should == Point

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: savage
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec