updated to current gem require style

Author: aeden

.gitignore

@@ -0,0 +1 @@
+pkg/*

CHANGELOG

@@ -18,4 +18,4 @@
  * Updated tests to include new table to support union test
 
 0.7.0
- * Updated dependency versions to get on ActiveRecord 2.x
+ * Updated dependency versions to get on ActiveRecord 2.x. May not be compatible with Rails versions less than 2.x.

Rakefile

@@ -124,4 +124,21 @@ end
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
   Rake::SshDirPublisher.new("[email protected]", "/var/www/gforge-projects/activewarehouse/rails_sql_views/rdoc", "rdoc").upload
+end
+
+desc "Install the gem from a local generated package"
+task :install => [:package] do
+  windows = RUBY_PLATFORM =~ /mswin/
+  sudo = windows ? '' : 'sudo'
+  gem = windows ? 'gem.bat' : 'gem'
+  `#{sudo} #{gem} install pkg/#{PKG_NAME}-#{PKG_VERSION}`
+end
+
+desc "Reinstall the gem from a local package copy"
+task :reinstall => [:package] do
+  windows = RUBY_PLATFORM =~ /mswin/
+  sudo = windows ? '' : 'sudo'
+  gem = windows ? 'gem.bat' : 'gem'
+  `#{sudo} #{gem} uninstall #{PKG_NAME} -x`
+  `#{sudo} #{gem} install pkg/#{PKG_NAME}-#{PKG_VERSION}`
 end

lib/rails_sql_views.rb

@@ -24,18 +24,7 @@
 $:.unshift(File.dirname(__FILE__))
 
 require 'rubygems'
-unless Kernel.respond_to?(:gem)
-  Kernel.send :alias_method, :gem, :require_gem
-end
-  
-unless defined?(ActiveRecord)
-  begin
-    $:.unshift(File.dirname(__FILE__) + "/../../activerecord/lib")
-    require 'active_record'
-  rescue LoadError
-    gem 'activerecord'
-  end
-end
+require 'active_record'
 
 require 'core_ext/module'