Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

4 files changed, 21 insertions, 30 deletions

diff --git a/activemodel/Rakefile b/activemodel/Rakefile
index 283380db96..ae2fbdb002 100755
--- a/activemodel/Rakefile
+++ b/activemodel/Rakefile
@@ -10,6 +10,12 @@ Rake::TestTask.new do |t|
   t.test_files = Dir.glob("test/cases/**/*_test.rb").sort
   t.verbose = 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, '-Ilib:test', file)
+  end or raise "Failures"
+end
 
 # Generate the RDoc documentation
 Rake::RDocTask.new do |rdoc|
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index 7f943b60ce..803f5b0157 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -21,15 +21,11 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-begin
-  require 'active_support'
-rescue LoadError
-  activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-  if File.directory?(activesupport_path)
-    $:.unshift activesupport_path
-    require 'active_support'
-  end
-end
+activesupport_path = "#{File.dirname(__FILE__)}/../../../activesupport/lib"
+$:.unshift(activesupport_path) if File.directory?(activesupport_path)
+require 'active_support'
+
+require 'active_support/inflector'
 
 module ActiveModel
   autoload :Base, 'active_model/base'
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index c2bde29895..4be91d0505 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -41,9 +41,10 @@ module ActiveModel
     end
 
     def to_xml(options={})
+      require 'builder' unless defined? ::Builder
       options[:root]    ||= "errors"
       options[:indent]  ||= 2
-      options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
+      options[:builder] ||= ::Builder::XmlMarkup.new(:indent => options[:indent])
 
       options[:builder].instruct! unless options.delete(:skip_instruct)
       options[:builder].errors do |e|
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index a1bb93b731..cc68d847a2 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -29,29 +29,17 @@ class I18nValidationTest < ActiveModel::TestCase
     end
   end
 
-  def test_percent_s_interpolation_syntax_in_error_messages_still_works
-    ActiveSupport::Deprecation.silence do
-      result = I18n.t :does_not_exist, :default => "%s interpolation syntax is deprecated", :value => 'this'
-      assert_equal result, "this interpolation syntax is deprecated"
+  def test_percent_s_interpolation_syntax_in_error_messages_was_deprecated
+    assert_not_deprecated do
+      default = "%s interpolation syntax was deprecated"
+      assert_equal default, I18n.t(:does_not_exist, :default => default, :value => 'this')
     end
   end
 
-  def test_percent_s_interpolation_syntax_in_error_messages_is_deprecated
-    assert_deprecated('using %s in messages') do
-      I18n.t :does_not_exist, :default => "%s interpolation syntax is deprected", :value => 'this'
-    end
-  end
-
-  def test_percent_d_interpolation_syntax_in_error_messages_still_works
-    ActiveSupport::Deprecation.silence do
-      result = I18n.t :does_not_exist, :default => "%d interpolation syntaxes are deprecated", :count => 2
-      assert_equal result, "2 interpolation syntaxes are deprecated"
-    end
-  end
-
-  def test_percent_d_interpolation_syntax_in_error_messages_is_deprecated
-    assert_deprecated('using %d in messages') do
-      I18n.t :does_not_exist, :default => "%d interpolation syntaxes are deprected", :count => 2
+  def test_percent_d_interpolation_syntax_in_error_messages_was_deprecated
+    assert_not_deprecated do
+      default = "%d interpolation syntaxes are deprecated"
+      assert_equal default, I18n.t(:does_not_exist, :default => default, :count => 2)
     end
   end