Removed require 'rubygems' and moved all files into validatable subfo…

…lder in lib.

Regarding: http://weblog.rubyonrails.org/2009/9/1/gem-packaging-best-practices

Rakefile

@@ -1,54 +1,23 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "jnunemaker-validatable"
-    gem.summary = %Q{Validatable is a library for adding validations.}
-    gem.email = "nunemaker@gmail.com"
-    gem.homepage = "http://github.com/jnunemaker/validatable"
-    gem.authors = ['Jay Fields', 'John Nunemaker']
-    gem.files = FileList['lib/**/*.rb', '[A-Z]*', 'test/**/*'].to_a
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  gem.name     = "jnunemaker-validatable"
+  gem.summary  = %Q{Validatable is a library for adding validations.}
+  gem.email    = "nunemaker@gmail.com"
+  gem.homepage = "http://github.com/jnunemaker/validatable"
+  gem.authors  = ['Jay Fields', 'John Nunemaker']
+  gem.files    = FileList['lib/**/*.rb', '[A-Z]*', 'test/**/*'].to_a
 end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << 'test'
+  test.ruby_opts << '-rubygems'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
+task :test    => :check_dependencies
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "validatable #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

lib/validatable.rb

@@ -1,25 +1,22 @@
 require 'forwardable'
-require 'rubygems'
-require 'activesupport'
+require 'active_support'
 
-dir = File.expand_path(File.dirname(__FILE__))
-
-require File.join(dir, 'object_extension')
-require File.join(dir, 'errors')
-require File.join(dir, 'validatable_class_methods')
-require File.join(dir, 'macros')
-require File.join(dir, 'validatable_instance_methods')
-require File.join(dir, 'included_validation')
-require File.join(dir, 'child_validation')
-require File.join(dir, 'understandable')
-require File.join(dir, 'requireable')
-require File.join(dir, 'validations/validation_base')
-require File.join(dir, 'validations/validates_format_of')
-require File.join(dir, 'validations/validates_presence_of')
-require File.join(dir, 'validations/validates_acceptance_of')
-require File.join(dir, 'validations/validates_confirmation_of')
-require File.join(dir, 'validations/validates_length_of')
-require File.join(dir, 'validations/validates_true_for')
-require File.join(dir, 'validations/validates_numericality_of')
-require File.join(dir, 'validations/validates_each')
-require File.join(dir, 'validations/validates_associated')
+require 'validatable/object_extension'
+require 'validatable/errors'
+require 'validatable/validatable_class_methods'
+require 'validatable/macros'
+require 'validatable/validatable_instance_methods'
+require 'validatable/included_validation'
+require 'validatable/child_validation'
+require 'validatable/understandable'
+require 'validatable/requireable'
+require 'validatable/validations/validation_base'
+require 'validatable/validations/validates_format_of'
+require 'validatable/validations/validates_presence_of'
+require 'validatable/validations/validates_acceptance_of'
+require 'validatable/validations/validates_confirmation_of'
+require 'validatable/validations/validates_length_of'
+require 'validatable/validations/validates_true_for'
+require 'validatable/validations/validates_numericality_of'
+require 'validatable/validations/validates_each'
+require 'validatable/validations/validates_associated'

test/test_helper.rb

@@ -1,11 +1,10 @@
 require 'test/unit'
-require 'rubygems'
 require 'mocha'
 require 'dust'
 require 'set'
 require 'expectations'
 
-require File.dirname(__FILE__) + '/../lib/validatable'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/validatable')
 
 class << Test::Unit::TestCase
   def expect(expected_value, &block)