Merge commit 'origin/master' into mail

3 files changed, 20 insertions, 13 deletions

diff --git a/activemodel/Rakefile b/activemodel/Rakefile
index 8897987518..1f4a8466c9 100755
--- a/activemodel/Rakefile
+++ b/activemodel/Rakefile
@@ -1,4 +1,5 @@
-require File.join(File.dirname(__FILE__), 'lib', 'active_model', 'version')
+dir = File.dirname(__FILE__)
+require "#{dir}/lib/active_model/version"
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'activemodel'
@@ -12,17 +13,19 @@ require 'rake/testtask'
 task :default => :test
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = Dir.glob("test/cases/**/*_test.rb").sort
+  t.libs << "#{dir}/test"
+  t.test_files = Dir.glob("#{dir}/test/cases/**/*_test.rb").sort
   t.verbose = true
   t.warning = true
 end
 
-task :isolated_test do
-  ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
-  Dir.glob("test/**/*_test.rb").all? do |file|
-    system(ruby, '-w', '-Ilib:test', file)
-  end or raise "Failures"
+namespace :test do
+  task :isolated do
+    ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
+    Dir.glob("#{dir}/test/**/*_test.rb").all? do |file|
+      system(ruby, '-w', "-I#{dir}/lib", "-I#{dir}/test", file)
+    end or raise "Failures"
+  end
 end
 
 
@@ -30,20 +33,20 @@ require 'rake/rdoctask'
 
 # Generate the RDoc documentation
 Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'doc'
+  rdoc.rdoc_dir = "#{dir}/doc"
   rdoc.title    = "Active Model"
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
   rdoc.options << '--charset' << 'utf-8'
   rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
-  rdoc.rdoc_files.include('README', 'CHANGES')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.include("#{dir}/README", "#{dir}/CHANGES")
+  rdoc.rdoc_files.include("#{dir}/lib/**/*.rb")
 end
 
 
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 
-spec = eval(File.read('activemodel.gemspec'))
+spec = eval(File.read("#{dir}/activemodel.gemspec"))
 
 Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
diff --git a/activemodel/lib/active_model/translation.rb b/activemodel/lib/active_model/translation.rb
index 2ad8ca9dea..42ca463f82 100644
--- a/activemodel/lib/active_model/translation.rb
+++ b/activemodel/lib/active_model/translation.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/reverse_merge'
+
 module ActiveModel
   module Translation
     include ActiveModel::Naming
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index 49783c2735..c1a3f6a4a7 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -3,9 +3,11 @@ begin
   require "#{root}/vendor/gems/environment"
 rescue LoadError
   $:.unshift("#{root}/activesupport/lib")
-  $:.unshift("#{root}/activemodel/lib")
 end
 
+lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
+$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
+
 require 'config'
 require 'active_model'