savage 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/savage/direction_proxy.rb

@@ -0,0 +1,18 @@
+module Savage
+  module DirectionProxy
+    def self.included(klass)  
+      klass.extend ClassMethods  
+    end
+    
+    module ClassMethods
+      def define_proxies(&block)
+        Directions.constants.each do |constant|
+          unless %w[PointTarget CoordinateTarget Point MoveTo].include? constant
+            sym = constant.gsub(/[A-Z]/) { |p| '_' + p.downcase }[1..-1].to_sym
+            block.call(sym,constant)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/savage/directions/arc_to.rb

@@ -14,11 +14,10 @@ module Savage
       def to_command
         command_code << "#{@radius.x} #{@radius.y} #{@rotation} #{bool_to_int(@large_arc)} #{bool_to_int(@sweep)} #{target.x} #{target.y}".gsub(/ -/,'-')
       end
-    
-      private
-        def command_code
-          (absolute?) ? 'A' : 'a'
-        end
+      
+      def command_code
+        (absolute?) ? 'A' : 'a'
+      end
     end
   end
 end

data/lib/savage/directions/close_path.rb

@@ -7,7 +7,11 @@ module Savage
       end
     
       def to_command
-        command_string = (absolute?) ? 'Z' : 'z'
+        command_code
+      end
+      
+      def command_code
+        (absolute?) ? 'Z' : 'z'
       end
     end
   end

data/lib/savage/directions/coordinate_target.rb

@@ -12,9 +12,6 @@ module Savage
       def to_command
         command_code << @target.to_s
       end
-    
-      private
-        def command_code; ''; end;
     end
   end
 end

data/lib/savage/directions/cubic_curve_to.rb

@@ -3,23 +3,34 @@ module Savage
     class CubicCurveTo < QuadraticCurveTo
       attr_accessor :control_1
     
-      def initialize(control_1_x, control_1_y, control_2_x, control_2_y, target_x, target_y, absolute=true)
-        @control_1 = Point.new(control_1_x, control_1_y)
-        super(control_2_x, control_2_y, target_x, target_y, absolute)
+      def initialize(*args)
+        raise ArgumentError if args.length < 4
+        case args.length
+        when 4
+          super(args[0],args[1],args[2],args[3],true)
+        when 5
+          raise ArgumentError if args[4].kind_of?(Numeric)
+          super(args[0],args[1],args[2],args[3],args[4])
+        when 6
+          @control_1 = Point.new(args[0],args[1])
+          super(args[2],args[3],args[4],args[5],true)
+        when 7
+          @control_1 = Point.new(args[0],args[1])
+          super(args[2],args[3],args[4],args[5],args[6])
+        end
       end
     
-      def to_command(continuous=false)
-        command_code(continuous) << ((!continuous) ? "#{@control_1.x} #{@control_1.y} #{@control.x} #{@control.y} #{@target.x} #{@target.y}".gsub(/ -/,'-') : super().gsub(/[A-Za-z]/,''))
+      def to_command
+        command_code << ((@control_1) ? "#{@control_1.x} #{@control_1.y} #{@control.x} #{@control.y} #{@target.x} #{@target.y}".gsub(/ -/,'-') : super().gsub(/[A-Za-z]/,''))
       end
     
       def control_2; @control; end
       def control_2=(value); @control = value; end
-    
-      private
-        def command_code(continuous=false)
-          return (absolute?) ? 'C' : 'c' unless continuous
-          (absolute?) ? 'S' : 's'
-        end
+  
+      def command_code
+        return (absolute?) ? 'C' : 'c' if @control_1
+        (absolute?) ? 'S' : 's'
+      end
     end
   end
 end

data/lib/savage/directions/horizontal_to.rb

@@ -1,10 +1,9 @@
 module Savage
   module Directions
     class HorizontalTo < CoordinateTarget
-      private
-        def command_code
-          (absolute?) ? 'H' : 'h'
-        end
+      def command_code
+        (absolute?) ? 'H' : 'h'
+      end
     end
   end
 end

data/lib/savage/directions/line_to.rb

@@ -1,10 +1,9 @@
 module Savage
   module Directions
     class LineTo < PointTarget
-      private
-        def command_code
-          (absolute?) ? 'L' : 'l'
-        end
+      def command_code
+        (absolute?) ? 'L' : 'l'
+      end
     end
   end
 end

data/lib/savage/directions/move_to.rb

@@ -1,10 +1,9 @@
 module Savage
   module Directions
     class MoveTo < PointTarget
-      private
-        def command_code
-          (absolute?) ? 'M' : 'm'
-        end
+      def command_code
+        (absolute?) ? 'M' : 'm'
+      end
     end
   end
 end

data/lib/savage/directions/point_target.rb

@@ -12,9 +12,6 @@ module Savage
       def to_command
         command_code << "#{@target.x.to_s} #{@target.y.to_s}".gsub(/ -/,'-')
       end
-    
-      private
-        def command_code; ''; end;
     end
   end
 end

data/lib/savage/directions/quadratic_curve_to.rb

@@ -3,20 +3,31 @@ module Savage
     class QuadraticCurveTo < PointTarget
       attr_accessor :control
     
-      def initialize(control_x, control_y, target_x, target_y, absolute=true)
-        @control = Point.new(control_x, control_y)
-        super(target_x, target_y, absolute)
+      def initialize(*args)
+        raise ArgumentError if args.length < 2
+        case args.length
+        when 2
+          super(args[0],args[1],true)
+        when 3
+          raise ArgumentError if args[2].kind_of?(Numeric)
+          super(args[0],args[1],args[2])
+        when 4
+          @control = Point.new(args[0],args[1])
+          super(args[2],args[3],true)
+        when 5
+          @control = Point.new(args[0],args[1])
+          super(args[2],args[3],args[4])
+        end
       end
     
-      def to_command(continuous=false)
-        command_code(continuous) << ((!continuous) ? "#{@control.x} #{@control.y} #{@target.x} #{@target.y}".gsub(/ -/,'-') : super().gsub(/[A-Za-z]/,''))
+      def to_command
+        command_code << ((@control) ? "#{@control.x} #{@control.y} #{@target.x} #{@target.y}".gsub(/ -/,'-') : super().gsub(/[A-Za-z]/,''))
+      end
+
+      def command_code
+        return (absolute?) ? 'Q' : 'q' if @control
+        (absolute?) ? 'T' : 't'
       end
-    
-      private
-        def command_code(continuous=false)
-          return (absolute?) ? 'Q' : 'q' unless continuous
-          (absolute?) ? 'T' : 't'
-        end
     end
   end
 end

data/lib/savage/directions/vertical_to.rb

@@ -1,10 +1,9 @@
 module Savage
   module Directions
     class VerticalTo < CoordinateTarget
-      private
-        def command_code
-          (absolute?) ? 'V' : 'v'
-        end
+      def command_code
+        (absolute?) ? 'V' : 'v'
+      end
     end
   end
 end

data/lib/savage/parser.rb

@@ -0,0 +1,139 @@
+module Savage
+  class Parser
+    class << self
+      def parse(parsable)
+        raise TypeError if parsable.class != String
+        subpaths = extract_subpaths parsable
+        raise TypeError if (subpaths.empty?)
+        path = Path.new
+        path.subpaths = []
+        subpaths.each do |subpath|
+          path.subpaths << parse_subpath(subpath)
+        end
+        path
+      end
+      
+      private
+        def extract_subpaths(parsable)
+          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|
+              subpaths << $&
+            end
+          else
+            subpaths << parsable
+          end
+          subpaths
+        end
+        
+        def parse_subpath(parsable)
+          subpath = SubPath.new
+          subpath.directions = extract_directions parsable
+          subpath
+        end
+        
+        def extract_directions(parsable)
+          directions = []
+          parsable.scan /[A-Za-z][0-9\-\. ]*/ do |match_group|
+            direction = build_direction $&
+            if direction.kind_of?(Array)
+              directions.concat direction
+            else
+              directions << direction
+            end
+          end
+          directions
+        end
+        
+        def build_direction(parsable)
+          direction = nil
+          implicit_directions = false
+          coordinates = extract_coordinates parsable
+          absolute = (parsable[0,1] == parsable[0,1].upcase) ? true : false
+          recurse_code = parsable[0,1]
+          case recurse_code
+          when /[Mm]/
+            x = coordinates.shift
+            y = coordinates.shift
+            raise TypeError if x.nil? || y.nil?
+            direction = Directions::MoveTo.new(x,y,absolute)
+            recurse_code = 'L'
+          when /[Ll]/
+            x = coordinates.shift
+            y = coordinates.shift
+            raise TypeError if x.nil? || y.nil?
+            direction = Directions::LineTo.new(x,y,absolute)
+          when /[Hh]/
+            target = coordinates.shift
+            raise TypeError if target.nil?
+            direction = Directions::HorizontalTo.new(target,absolute)
+          when /[Vv]/
+            target = coordinates.shift
+            raise TypeError if target.nil?
+            direction = 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?
+            direction = 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?
+            direction = 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?
+            direction = 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?
+            direction = 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?
+            direction = Directions::ArcTo.new(rx,ry,rotation,large_arc,sweep,x,y,absolute)
+          when /[Zz]/
+            direction = Directions::ClosePath.new(absolute)
+          when /[^MmLlHhVvCcSsQqTtAaZz]/
+            coordinates = []
+            raise TypeError
+          end
+          unless coordinates.empty?
+            recursed_direction = build_direction(coordinates.join(' ').insert(0,recurse_code))
+            if recursed_direction.kind_of?(Array)
+              direction = [direction].concat recursed_direction
+            else
+              direction = [direction,recursed_direction]
+            end
+          end
+          direction
+        end
+        
+        def extract_coordinates(command_string)
+          coordinates = []
+          command_string.scan /-?\d+(\.\d+)?/ do |match_group|
+            coordinates << $&.to_f
+          end
+          coordinates
+        end
+    end
+  end
+end

data/lib/savage/path.rb

@@ -1,16 +1,45 @@
 module Savage
   class Path
+    require File.dirname(__FILE__) + "/direction_proxy"
     require File.dirname(__FILE__) + "/sub_path"
     
-    def initialize(path_string=nil)
-      raise ArgumentError unless path_string.nil? || path_string.kind_of?(String)
+    include Utils
+    include DirectionProxy
+    
+    attr_accessor :subpaths
+    
+    define_proxies do |sym,const|
+      define_method(sym) do |*args|
+        @subpaths.last.send(sym,*args)
+      end 
+    end
+    
+    def initialize(*args)
+      @subpaths = [SubPath.new]
+      @subpaths.last.move_to(*args) if (2..3).include?(*args.length)
+      yield self if block_given?
+    end
+    
+    def directions
+      directions = []
+      @subpaths.each { |subpath| directions.concat(subpath.directions) }
+      directions
+    end
+    
+    def move_to(*args)
+      unless (@subpaths.last.directions.empty?)
+        (@subpaths << SubPath.new(*args)).last
+      else
+        @subpaths.last.move_to(*args)
+      end
     end
     
-    def subpaths
-      return []
+    def closed?
+      @subpaths.last.closed?
     end
     
     def to_command
+      @subpaths.collect { |subpath| subpath.to_command }.join
     end
   end
 end

data/lib/savage/sub_path.rb

@@ -1,47 +1,47 @@
 module Savage
   class SubPath
-    Directions.constants.each do |constant|
-      unless %w[PointTarget CoordinateTarget Point MoveTo].include? constant
-        sym = constant.gsub(/[A-Z]/) { |p| '_' + p.downcase }[1..-1].to_sym
-        define_method(sym) do |*args|
-          new_command = ("Savage::Directions::" << constant).constantize.new(*args)
-          @commands << new_command
-          new_command
-        end
-      end
+    include Utils
+    include DirectionProxy
+    
+    define_proxies do |sym,const|
+      define_method(sym) do |*args|
+        (@directions << constantize("Savage::Directions::" << const).new(*args)).last
+      end 
     end
     
-    attr_accessor :commands
+    attr_accessor :directions
     
     def move_to(*args)
-      return nil unless @commands.empty?
-      new_move = Directions::MoveTo.new(*args)
-      @commands <<  new_move
-      new_move
+      return nil unless @directions.empty?
+      (@directions << Directions::MoveTo.new(*args)).last
     end
     
-    def initialize
-      @commands = []
+    def initialize(*args)
+      @directions = []
+      move_to(*args) if (2..3).include?(args.length)
+      yield self if block_given?
     end
     
-    # FIXME - refactor this monstrosity
     def to_command
-      prev_command = nil
-      command = ''
-      @commands.each do |dir|
-        this_command = dir.to_command
-        if dir.class == prev_command || (dir.class == Directions::LineTo && prev_command == Directions::MoveTo)
-          this_command.gsub!(/^[A-Za-z]/,'')
-          this_command = " " << this_command unless this_command.match(/^-/)
+      @directions.to_enum(:each_with_index).collect { |dir, i|
+        command_string = dir.to_command
+        if i > 0
+          prev_command_code = @directions[i-1].command_code
+          if dir.command_code == prev_command_code || (prev_command_code.match(/^[Mm]$/) && dir.command_code == 'L') 
+            command_string.gsub!(/^[A-Za-z]/,'')
+            command_string.insert(0,' ') unless command_string.match(/^-/)
+          end
         end
-        prev_command = dir.class
-        command << this_command
-      end
-      command
+        command_string
+      }.join
+    end
+    
+    def commands
+      @directions
     end
     
     def closed?
-      @commands.last.kind_of? Directions::ClosePath
+      @directions.last.kind_of? Directions::ClosePath
     end
   end
 end

data/lib/savage/utils.rb

@@ -3,5 +3,11 @@ module Savage
     def bool_to_int(value)
       (value) ? 1 : 0
     end
+    def constantize(string)
+      unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ string
+        raise NameError, "#{string.inspect} is not a valid constant name!"
+      end
+      Object.module_eval("::#{$1}", __FILE__, __LINE__)
+    end
   end
 end

data/lib/savage.rb

@@ -1,9 +1,9 @@
 SAVAGE_PATH = File.dirname(__FILE__) + "/savage/"
 [
-  'core_extensions/string',
   'utils',
   'direction',
-  'path'
+  'path',
+  'parser'
 ].each do |library|
   require SAVAGE_PATH + library
 end

data/savage.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{savage}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Holland"]
@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
      "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",
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
      "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",
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
      "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",
@@ -74,6 +76,7 @@ Gem::Specification.new do |s|
      "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",