savage 1.1.4 → 1.1.5

data/README.rdoc

@@ -92,6 +92,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
 
 == Copyright
 

data/Rakefile

@@ -11,7 +11,6 @@ begin
     gem.homepage = "http://github.com/awebneck/savage"
     gem.authors = ["Jeremy Holland"]
     gem.add_development_dependency "rspec", ">= 2.3.0"
-    gem.add_dependency "activesupport", ">= 2.3.5"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/lib/savage.rb

@@ -1,8 +1,3 @@
-begin
-  require 'active_support/core_ext/string/inflections'
-rescue LoadError, NameError
-  require 'activesupport'
-end
 SAVAGE_PATH = File.dirname(__FILE__) + "/savage/"
 [
   'utils',

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
@@ -35,7 +35,7 @@ module Savage
         
         def extract_directions(parsable)
           directions = []
-          parsable.scan /[MmLlHhVvQqCcTtSsAaZz](?:\d|[eE.,-]|\W)*/m do |match_group|
+          parsable.scan /[MmLlHhVvQqCcTtSsAaZz](?:\d|[eE.,+-]|\W)*/m do |match_group|
             direction = build_direction $&
             if direction.kind_of?(Array)
               directions.concat direction
@@ -127,7 +127,7 @@ module Savage
         
         def extract_coordinates(command_string)
           coordinates = []
-          command_string.scan(/-?\d+(\.\d+)?([eE]-?\d+)?/) do |match_group|
+          command_string.scan(/-?\d+(\.\d+)?([eE][+-]?\d+)?/) do |match_group|
             coordinates << $&.to_f
           end
           coordinates

data/lib/savage/sub_path.rb

@@ -7,7 +7,7 @@ module Savage
       define_method(sym) do |*args|
         raise TypeError if const == "QuadraticCurveTo" && @directions.last.class != Directions::QuadraticCurveTo && [2,3].include?(args.length)
         raise TypeError if const == "CubicCurveTo" && @directions.last.class != Directions::CubicCurveTo && [4,5].include?(args.length)
-        (@directions << ("Savage::Directions::" << const).constantize.new(*args)).last
+        (@directions << Savage::Directions.const_get(const).new(*args)).last
       end
     end
 

data/savage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "savage"
-  s.version = "1.1.4"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Holland"]
-  s.date = "2011-12-02"
+  s.date = "2011-12-28"
   s.description = "A little gem for extracting and manipulating SVG vector path data."
   s.email = "jeremy@jeremypholland.com"
   s.extra_rdoc_files = [
@@ -70,14 +70,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
     else
       s.add_dependency(%q<rspec>, [">= 2.3.0"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 2.3.0"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
   end
 end
 

data/spec/savage/parser_spec.rb

@@ -19,7 +19,7 @@ describe Parser do
       path.subpaths.last.directions.length.should == 1
       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
@@ -27,7 +27,7 @@ describe Parser do
       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
@@ -108,7 +108,7 @@ describe Parser do
       path.subpaths.last.directions[2].class.should == Directions::ClosePath
       path.subpaths.last.closed?.should == true
     end
-    
+
     it 'should return a path object with one subpath containing two line_to directions when the string is a line_to command followed by implicit coordinates' do
       path = Parser.parse("L100 200 300 400")
       path.class.should == Path
@@ -183,20 +183,20 @@ 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 = 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
-		
-		it "should support scienfitic notation in paths (eg. 2e-5)" do
-			# this is a 100x100 square
-			path = Parser.parse "M 0,0 L 1e2,0 100,1000e-1 L 0,100"
-			points = path.directions.map{|d| [d.target.x, d.target.y] }
-			points.should == [[0.0, 0.0], [100.0, 0.0], [100.0, 100.0], [0.0, 100.0]]
-		end
+
+    it "should support scientific notation in paths (eg. 2e-5)" do
+      # this is a 100x100 square
+      path = Parser.parse "M 0,0 L 1e2,0 100,1000e-1 L 0,10e+1"
+      points = path.directions.map{|d| [d.target.x, d.target.y] }
+      points.should == [[0.0, 0.0], [100.0, 0.0], [100.0, 100.0], [0.0, 100.0]]
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: savage
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000 Z
+date: 2011-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70224833773340 !ruby/object:Gem::Requirement
+  requirement: &70355808993480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,18 +21,7 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70224833773340
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70224833766920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.5
-  type: :runtime
-  prerelease: false
-  version_requirements: *70224833766920
+  version_requirements: *70355808993480
 description: A little gem for extracting and manipulating SVG vector path data.
 email: jeremy@jeremypholland.com
 executables: []