savage 1.1.0 → 1.1.1

data/README.rdoc

@@ -2,6 +2,10 @@
 
 A little gem for extracting and manipulating SVG vector path data, Savage will make your life easier when it comes time to dynamically draw new and manipulate existing SVG paths. No more wacky regex to capture those cryptic path data strings; just pass the whole "d" attribute into Savage's parser, et voilá: You'll be given an instance of Savage::Path, replete with an array of subpaths split on the "move to" commands (to better help with those pesky winding issues). In turn, each subpath contains its own array of directions that can be swapped around, reconfigured, and otherwise manipulated to your heart's content in a truly human-readable way.
 
+== Latest Update
+
+Version 1.1.0 adds support for Rails 3 and Ruby 1.9.2. Enjoy!
+
 == Usage
 
 <b>Parsing existing data</b>
@@ -11,7 +15,7 @@ Easy-peasy Japanesey. Just take a look at the below:
   path = Savage::Parser.parse my_path_data_string
   path.subpaths # [subpath_1, subpath_2, ... subpath_n]
   path.subpaths.last.directions # [direction_1, direction_2, ... direction_n]
-  
+
 Once extracted, you can manipulate, add, and remove the subpaths and directions as you see fit. See below for instructions on using the various direction types
 
 <b>Creating from scratch</b>
@@ -24,7 +28,7 @@ What if you want to roll your own from the get-go? No problem:
     p.horizontal_to 500
     p.close_path
   end
-  
+
 We'll learn more about the actual drawing methods here shortly, but suffice it to say they are provided both as methods on the constructor block parameter for the sake of your visual organization, and the path itself after instantiation, as below:
 
   path = Savage::Path.new
@@ -32,7 +36,7 @@ We'll learn more about the actual drawing methods here shortly, but suffice it t
   path.line_to 300, 400
   path.horizontal_to 500
   path.close_path
-  
+
 <b>Drawing with Savage</b>
 
 So what are the different directions we can give our virtual pen? Here I'll refer you first to the SVG 1.1 specification by our friends down at the W3C, as they can describe all the specifics much better than I: http://www.w3.org/TR/SVG/paths.html#PathData. Each "command" listed in that section has an analog method on the Savage::SubPath class as well as the Savage::Path class (calling one of the methods on an instance of the Savage::Path class actually just delegates the call to the last SubPath in that path's selection of subpaths). Every parameter of these methods is expected to be a Numeric except where noted otherwise.  The methods are as follows:
@@ -51,14 +55,14 @@ So what are the different directions we can give our virtual pen? Here I'll refe
 There you have it, pretty much right out of the book. One thing to keep in mind is that all of these methods use ABSOLUTE coordinates by default; if you want to use relative coordinates (based on the current position of the 'pen'), just pass false as the final argument to any of them:
 
   path.line_to 100, 200, false
-  
+
 Each of these commands just creates a new instance of the appropriate subclass of the Savage::Direction class and pushes it onto the end of the directions list in question. Don't necessarily want to draw onto the end? Just create your own instance using the standard constructor and insert it wherever it butters your biscuit so to do:
 
   direction = Savage::Directions::LineTo.new(100,200)
   subpath.directions.insert(3,direction)
 
 Did you mess up before and need to change a directions coordinates after you drew it (or, more likely, after you parsed it out of some pre-existing data)? No problem:
-  
+
   direction = Savage::Directions::LineTo.new(100,200)
   direction.target.x = 234
 
@@ -77,13 +81,18 @@ Note that the #to_command method exists on Savage::Path, Savage::SubPath, and ea
 I have no doubt that will be some problems with this thing, as well as features missing that some of you fine folks might want. Please, please, please check Github's issue-tracking system to see if a ticket for the problem has already been submitted, or create a new one if not. I'll check the issues listed therein regularly, but you email me directly at your own risk (and by risk, I mean risk of not receiving a reply). :)
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix. I very much prefer feature-specific branches.
 * Add specs for it. This is important so I don't break it in a future version unintentionally, which I can guarantee I will do.
 * Commit. Do not mess with rakefile, version, or history, please.
 * Send me a pull request - again, bonus points for topic branches.
 
+== Contributors
+
+* Jeremy Holland (jeremy@jeremypholland.com, github:awebneck) -- author
+* Christoffer Klang (toffeklang@yahoo.se, github:christoffer) -- regexp improvements
+
 == Copyright
 
 Copyright (c) 2010 Jeremy Holland. See LICENSE for details.

data/Rakefile

@@ -8,9 +8,9 @@ begin
     gem.summary = %Q{A little library to manipulate SVG path data}
     gem.description = %Q{A little gem for extracting and manipulating SVG vector path data.}
     gem.email = "jeremy@jeremypholland.com"
-    gem.homepage = "http://github.com/therubyneck/savage"
+    gem.homepage = "http://github.com/awebneck/savage"
     gem.authors = ["Jeremy Holland"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    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
@@ -19,15 +19,9 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/savage.gemspec

@@ -1,90 +1,88 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{savage}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Holland"]
-  s.date = %q{2010-10-07}
+  s.date = %q{2010-12-30}
   s.description = %q{A little gem for extracting and manipulating SVG vector path data.}
   s.email = %q{jeremy@jeremypholland.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/savage.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",
-     "lib/savage/directions/cubic_curve_to.rb",
-     "lib/savage/directions/horizontal_to.rb",
-     "lib/savage/directions/line_to.rb",
-     "lib/savage/directions/move_to.rb",
-     "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",
-     "savage.gemspec",
-     "spec/savage/directions/arc_to_spec.rb",
-     "spec/savage/directions/close_path_spec.rb",
-     "spec/savage/directions/cubic_curve_to_spec.rb",
-     "spec/savage/directions/horizontal_to_spec.rb",
-     "spec/savage/directions/line_to_spec.rb",
-     "spec/savage/directions/move_to_spec.rb",
-     "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",
-     "spec/shared/command.rb",
-     "spec/shared/coordinate_target.rb",
-     "spec/shared/direction.rb",
-     "spec/shared/point_target.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    ".rspec",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/savage.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",
+    "lib/savage/directions/cubic_curve_to.rb",
+    "lib/savage/directions/horizontal_to.rb",
+    "lib/savage/directions/line_to.rb",
+    "lib/savage/directions/move_to.rb",
+    "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",
+    "savage.gemspec",
+    "spec/savage/directions/arc_to_spec.rb",
+    "spec/savage/directions/close_path_spec.rb",
+    "spec/savage/directions/cubic_curve_to_spec.rb",
+    "spec/savage/directions/horizontal_to_spec.rb",
+    "spec/savage/directions/line_to_spec.rb",
+    "spec/savage/directions/move_to_spec.rb",
+    "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",
+    "spec/shared/command.rb",
+    "spec/shared/coordinate_target.rb",
+    "spec/shared/direction.rb",
+    "spec/shared/point_target.rb",
+    "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/therubyneck/savage}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.homepage = %q{http://github.com/awebneck/savage}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A little library to manipulate SVG path data}
   s.test_files = [
     "spec/savage/directions/arc_to_spec.rb",
-     "spec/savage/directions/close_path_spec.rb",
-     "spec/savage/directions/cubic_curve_to_spec.rb",
-     "spec/savage/directions/horizontal_to_spec.rb",
-     "spec/savage/directions/line_to_spec.rb",
-     "spec/savage/directions/move_to_spec.rb",
-     "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",
-     "spec/shared/command.rb",
-     "spec/shared/coordinate_target.rb",
-     "spec/shared/direction.rb",
-     "spec/shared/point_target.rb",
-     "spec/spec_helper.rb"
+    "spec/savage/directions/close_path_spec.rb",
+    "spec/savage/directions/cubic_curve_to_spec.rb",
+    "spec/savage/directions/horizontal_to_spec.rb",
+    "spec/savage/directions/line_to_spec.rb",
+    "spec/savage/directions/move_to_spec.rb",
+    "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",
+    "spec/shared/command.rb",
+    "spec/shared/coordinate_target.rb",
+    "spec/shared/direction.rb",
+    "spec/shared/point_target.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -92,14 +90,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, [">= 2.3.0"])
       s.add_dependency(%q<activesupport>, [">= 2.3.5"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, [">= 2.3.0"])
     s.add_dependency(%q<activesupport>, [">= 2.3.5"])
   end
 end

data/spec/savage/directions/arc_to_spec.rb

@@ -6,13 +6,14 @@ describe ArcTo do
   def dir_class; ArcTo; end
   def create_relative; ArcTo.new(100,200,300,true,false,400,500,false); end
   def command_code; 'a'; end
-  
+
   before :each do
     @dir = dir_class.new(100,200,300,true,false,400,500)
   end
-  
+
+  include Command
   include DirectionShared
-  
+
   it 'should have a target' do
     @dir.respond_to?(:target).should == true
     @dir.target.class.should == Point
@@ -93,4 +94,4 @@ describe ArcTo do
       extract_coordinates(@dir.to_command)[6].should == 500
     end
   end
-end
+end

data/spec/savage/directions/close_path_spec.rb

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

data/spec/savage/directions/cubic_curve_to_spec.rb

@@ -6,13 +6,14 @@ describe CubicCurveTo do
   def dir_class; CubicCurveTo; end
   def create_relative; CubicCurveTo.new(100,200,300,400,500,600,false); end
   def command_code; 'c'; end
-  
+
   before :each do
     @dir = dir_class.new(100,200,300,400,500,600)
   end
-  
+
+  include Command
   include DirectionShared
-  
+
   it 'should have a target' do
     @dir.respond_to?(:target).should == true
     @dir.target.class.should == Point
@@ -142,4 +143,4 @@ describe CubicCurveTo do
       end
     end
   end
-end
+end

data/spec/savage/directions/quadratic_curve_spec.rb

@@ -6,13 +6,14 @@ describe QuadraticCurveTo do
   def dir_class; QuadraticCurveTo; end
   def create_relative; QuadraticCurveTo.new(100,200,300,400,false); end
   def command_code; 'q'; end
-  
+
   before :each do
     @dir = dir_class.new(100,200,300,400)
   end
-  
+
+  include Command
   include DirectionShared
-  
+
   it 'should have a target' do
     @dir.respond_to?(:target).should == true
     @dir.target.class.should == Point
@@ -119,4 +120,4 @@ describe QuadraticCurveTo do
       end
     end
   end
-end
+end

data/spec/shared/coordinate_target.rb

@@ -2,6 +2,7 @@ share_as :CoordinateTargetShared do
   before :each do
     @dir = dir_class.new(100)
   end
+  include Command
   include DirectionShared
   it 'should have an accessible target, based on the constructor argument' do
     @dir.respond_to?(:target).should == true
@@ -32,4 +33,4 @@ share_as :CoordinateTargetShared do
       extract_coordinates(@dir.to_command)[0].should == 100
     end
   end
-end
+end

data/spec/shared/point_target.rb

@@ -2,6 +2,7 @@ share_as :PointTargetShared do
   before :each do
     @dir = dir_class.new(100,200)
   end
+  include Command
   include DirectionShared
   it 'should have a target' do
     @dir.respond_to?(:target).should == true
@@ -41,4 +42,4 @@ share_as :PointTargetShared do
       extract_coordinates(@dir.to_command)[1].should == 200
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -2,31 +2,31 @@ require 'rubygems'
 require 'spork'
 
 Spork.prefork do
-  # Loading more in this block will cause your tests to run faster. However, 
+  # Loading more in this block will cause your tests to run faster. However,
   # if you change any configuration or code from libraries loaded here, you'll
   # need to restart spork for it take effect.
   $LOAD_PATH.unshift(File.dirname(__FILE__))
   $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
   $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'shared'))
-  
+
   require 'savage'
-  require 'spec'
-  require 'spec/autorun'
-  Spec::Runner.configure do |config|
+  require 'rspec'
+  require 'rspec/autorun'
+  RSpec.configure do |config|
 
   end
-  
+
   Dir[File.join(File.dirname(__FILE__) << '/shared', "*.rb")].each {|file| require File.basename(file) }
 end
 
 Spork.each_run do
   # This code will be run each time you run your specs.
-  
+
 end
 
 # --- Instructions ---
-# - Sort through your spec_helper file. Place as much environment loading 
-#   code that you don't normally modify during development in the 
+# - Sort through your spec_helper file. Place as much environment loading
+#   code that you don't normally modify during development in the
 #   Spork.prefork block.
 # - Place the rest under Spork.each_run block
 # - Any code that is left outside of the blocks will be ran during preforking

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Jeremy Holland
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -05:00
+date: 2010-12-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +26,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 3
+        - 0
+        version: 2.3.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -58,7 +58,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
+- .rspec
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -98,15 +98,14 @@ files:
 - spec/shared/coordinate_target.rb
 - spec/shared/direction.rb
 - spec/shared/point_target.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/therubyneck/savage
+homepage: http://github.com/awebneck/savage
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC