Restructuring directories.

benchmarks/benchmark.rb

@@ -14,7 +14,7 @@ adapter = options.adapter
 
 # load the library
 LIB_DIR = this_dir.join("../lib")
-require LIB_DIR.join("ar-extensions/import/#{adapter}")
+require LIB_DIR.join("activerecord-import/#{adapter}")
 
 ActiveRecord::Base.logger = Logger.new("log/test.log")
 ActiveRecord::Base.logger.level = Logger::DEBUG

lib/activerecord-import/base.rb

@@ -11,5 +11,5 @@ module ActiveRecord::Extensions
 end
 
 this_dir = Pathname.new File.dirname(__FILE__)
-require this_dir.join("../import")
+require this_dir.join("import")
-require this_dir.join("../active_record/adapters/abstract_adapter")
+require this_dir.join("active_record/adapters/abstract_adapter")

test/mysql/import_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-require "ar-extensions/import/mysql"
+require "activerecord-import/mysql"
 
 describe "#import with :on_duplicate_key_update option (mysql specific functionality)" do
   extend ActiveSupport::TestCase::MySQLAssertions

test/test_helper.rb

@@ -90,7 +90,7 @@ class MyApplication < Rails::Application ; end
 adapter = ENV["ARE_DB"] || "sqlite3"
 
 # load the library
-require "ar-extensions/import/#{adapter}"
+require "activerecord-import/#{adapter}"
 
 ActiveRecord::Base.logger = Logger.new("log/test.log")
 ActiveRecord::Base.logger.level = Logger::DEBUG