savage 0.1.0 → 0.2.0

data/spec/savage/sub_path_spec.rb

@@ -3,8 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 include Savage
 
 describe SubPath do
-  it 'should have a commands list' do
-    SubPath.new.respond_to?(:commands).should == true
+  it 'should have a directions list' do
+    SubPath.new.respond_to?(:directions).should == true
   end
   it 'should have a move_to method' do
     SubPath.new.respond_to?(:move_to).should == true
@@ -36,15 +36,43 @@ describe SubPath do
   it 'should have a to_command method' do
     SubPath.new.respond_to?(:to_command).should == true
   end
+  it 'should be able to be constructed empty' do
+    lambda { SubPath.new }.should_not raise_error
+  end
+  it 'should be able to be constructed with a starting point (absolute move to)' do
+    path = SubPath.new(100,200)
+    path.directions.length.should == 1
+    path.directions.last.class.should == Directions::MoveTo
+  end
+  it 'should be able to build itself in a block' do
+    path = SubPath.new(100,200) do |p|
+      p.line_to 300, 400
+      p.cubic_curve_to 500,600,700,800,900,1000
+      p.arc_to 100,200,123,1,1,300,400
+    end
+    path.directions[0].class.should == Directions::MoveTo
+    path.directions[1].class.should == Directions::LineTo
+    path.directions[2].class.should == Directions::CubicCurveTo
+    path.directions[3].class.should == Directions::ArcTo
+    
+    path2 = SubPath.new do |p|
+      p.line_to 300, 400
+      p.cubic_curve_to 500,600,700,800,900,1000
+      p.arc_to 100,200,123,1,1,300,400
+    end
+    path2.directions[0].class.should == Directions::LineTo
+    path2.directions[1].class.should == Directions::CubicCurveTo
+    path2.directions[2].class.should == Directions::ArcTo
+  end
   describe '#closed?' do
-    it 'should be true if the last direction in the commands list is of type ClosePath' do
+    it 'should be true if the last direction in the directions list is of type ClosePath' do
       path = SubPath.new
       path.move_to 100, 300
       path.line_to 243, 21
       path.close_path
       path.closed?.should == true
     end
-    it 'should be false if the last direction in the commands list is of any other type or absent' do
+    it 'should be false if the last direction in the directions list is of any other type or absent' do
       path = SubPath.new
       path.move_to 100, 300
       path.line_to 234, 21
@@ -54,39 +82,54 @@ describe SubPath do
     end
   end
   describe '#to_command' do
-    it 'should output the concatenation of all the subcommands if no two are the same in sequence' do
-      path = SubPath.new
-      path.move_to 100, 200
-      path.horizontal_to -200
-      path.quadratic_curve_to 342, -341.23, 405, 223
-      path.line_to -342.002, 231.42
-      path.close_path
-      path.to_command.should == 'M100 200H-200Q342-341.23 405 223L-342.002 231.42Z'
+    before :each do
+      @path = SubPath.new
+      @dir_1 = @path.move_to 100, 200
+    end
+    it 'should output the concatenation of all the subdirections if no two are the same in sequence' do
+      dir_2 = @path.horizontal_to -200
+      dir_3 = @path.quadratic_curve_to 342, -341.23, 405, 223
+      dir_4 = @path.line_to -342.002, 231.42
+      dir_5 = @path.close_path
+      @path.to_command.should == @dir_1.to_command << dir_2.to_command << dir_3.to_command << dir_4.to_command << dir_5.to_command
     end
     it 'should strip the command code if the previous code was the same as the present' do
-      path = SubPath.new
-      com1 = path.move_to 100, 200
-      com2 = path.horizontal_to -200
-      com4 = path.line_to -342.002, 231.42
-      com4 = path.line_to -234, 502
-      path.to_command.should == 'M100 200H-200L-342.002 231.42-234 502'
+      dir_2 = @path.horizontal_to -200
+      dir_3 = @path.line_to -342.002, 231.42
+      dir_4 = @path.line_to -234, 502
+      @path.to_command.should == @dir_1.to_command << dir_2.to_command << dir_3.to_command << dir_4.to_command[1..-1]
     end
-    it 'should strip the command code if the previous code was a MoveTo and the current code is a LineTo' do
-      path = SubPath.new
-      com1 = path.move_to 100, 200
-      com4 = path.line_to -342.002, 231.42
-      com4 = path.line_to -234, 502
-      path.to_command.should == 'M100 200-342.002 231.42-234 502'
+    it 'should not strip the command code if the previous code was the same as the present, but of different absoluteness' do
+      dir_2 = @path.horizontal_to -200
+      dir_3 = @path.line_to -342.002, 231.42
+      dir_4 = @path.line_to -234, 502, false
+      @path.to_command.should == @dir_1.to_command << dir_2.to_command << dir_3.to_command << dir_4.to_command
+    end
+    it 'should strip the command code if the previous code was a MoveTo and the current code is an absolute LineTo' do
+      dir_2 = @path.line_to -342.002, 231.42
+      dir_3 = @path.line_to -234, 502
+      @path.to_command.should == @dir_1.to_command << dir_2.to_command[1..-1] << dir_3.to_command[1..-1]
+    end
+    it 'should not strip the command code if the previous code was a MoveTo and the current code is a relative LineTo' do
+      dir_2 = @path.line_to -342.002, 231.42, false
+      dir_3 = @path.line_to -234, 502
+      @path.to_command.should == @dir_1.to_command << dir_2.to_command << dir_3.to_command
+    end
+    it 'should add leading whitespace if the first coordinate of the code-stripped direction is not negative' do
+      dir_2 = @path.horizontal_to -200
+      dir_3 = @path.line_to -342.002, 231.42
+      dir_4 = @path.line_to 234, 502
+      @path.to_command.should == @dir_1.to_command << dir_2.to_command << dir_3.to_command << dir_4.to_command[1..-1].insert(0,' ')
     end
   end
-  describe 'move_to' do
+  describe '#move_to' do
     before :each do
       @path = SubPath.new
     end
     context 'when the command list is empty' do
-      it 'should add a MoveTo command on to the commands list' do
+      it 'should add a MoveTo command on to the directions list' do
         this_move = @path.move_to(100,200)
-        @path.commands.should == [this_move]
+        @path.directions.should == [this_move]
       end
       it 'should return the newly created MoveTo command' do
         @path.move_to(100,200).class.should == Directions::MoveTo
@@ -96,7 +139,7 @@ describe SubPath do
       it 'does something' do
         first_move = @path.move_to(200,400)
         @path.move_to(100,200)
-        @path.commands.should == [first_move]
+        @path.directions.should == [first_move]
       end
       it 'should return nil' do
         @path.move_to(200,400)
@@ -104,9 +147,9 @@ describe SubPath do
       end
     end
   end
-  describe '#commands' do
+  describe '#directions' do
     it 'should be able to access items via the bracket operator' do
-      SubPath.new.commands.respond_to?(:[]).should == true
+      SubPath.new.directions.respond_to?(:[]).should == true
     end
   end
 end

data/spec/shared/direction.rb

@@ -6,16 +6,24 @@ share_as :DirectionShared do
   it 'should have an absolute? method' do
     @dir.respond_to?(:absolute?).should == true
   end
+  it 'should have a command_code method' do
+    @dir.respond_to?(:command_code).should == true
+  end
   describe '#to_command' do
+    it "should start with the command\'s command code" do
+      @dir.to_command[0,1].should == @dir.command_code
+    end
+    it 'should only have one alphabetical command code' do
+      @dir.to_command.match(/[A-Za-z]/).size.should == 1
+    end
+  end
+  describe '#command_code' do
     it 'should start with a lower-case letter when not absolute' do
       rel_dir = create_relative
-      extract_command(rel_dir.to_command).should == command_code.downcase
+      rel_dir.command_code.should == command_code.downcase
     end
     it 'should start with a capital letter when absolute' do
-      extract_command(@dir.to_command).should == command_code.upcase
-    end
-    it 'should only have one alphabetical command code' do
-      @dir.to_command.match(/[A-Za-z]/).size.should == 1
+      @dir.command_code.should == command_code.upcase
     end
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jeremy Holland
@@ -48,8 +48,8 @@ files:
 - Rakefile
 - VERSION
 - lib/savage.rb
-- lib/savage/core_extensions/string.rb
 - lib/savage/direction.rb
+- lib/savage/direction_proxy.rb
 - lib/savage/directions/arc_to.rb
 - lib/savage/directions/close_path.rb
 - lib/savage/directions/coordinate_target.rb
@@ -60,6 +60,7 @@ files:
 - lib/savage/directions/point_target.rb
 - lib/savage/directions/quadratic_curve_to.rb
 - lib/savage/directions/vertical_to.rb
+- lib/savage/parser.rb
 - lib/savage/path.rb
 - lib/savage/sub_path.rb
 - lib/savage/utils.rb
@@ -73,6 +74,7 @@ files:
 - spec/savage/directions/point_spec.rb
 - spec/savage/directions/quadratic_curve_spec.rb
 - spec/savage/directions/vertical_to_spec.rb
+- spec/savage/parser_spec.rb
 - spec/savage/path_spec.rb
 - spec/savage/sub_path_spec.rb
 - spec/savage_spec.rb
@@ -122,6 +124,7 @@ test_files:
 - spec/savage/directions/point_spec.rb
 - spec/savage/directions/quadratic_curve_spec.rb
 - spec/savage/directions/vertical_to_spec.rb
+- spec/savage/parser_spec.rb
 - spec/savage/path_spec.rb
 - spec/savage/sub_path_spec.rb
 - spec/savage_spec.rb

data/lib/savage/core_extensions/string.rb

@@ -1,8 +0,0 @@
-class String
-  def constantize
-    unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ self
-      raise NameError, "#{self.inspect} is not a valid constant name!"
-    end
-    Object.module_eval("::#{$1}", __FILE__, __LINE__)
-  end
-end