Merge branch 'master' of git://github.com/rails/rails

1 files changed, 7 insertions, 0 deletions

diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index 73cee9b88f..544121c593 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -26,15 +26,22 @@ $:.unshift(activesupport_path) if File.directory?(activesupport_path)
 require 'active_support'
 
 module ActiveModel
+  autoload :Attributes, 'active_model/attributes'
   autoload :Base, 'active_model/base'
   autoload :DeprecatedErrorMethods, 'active_model/deprecated_error_methods'
   autoload :Errors, 'active_model/errors'
+  autoload :Name, 'active_model/naming'
+  autoload :Naming, 'active_model/naming'
   autoload :Observer, 'active_model/observing'
   autoload :Observing, 'active_model/observing'
   autoload :StateMachine, 'active_model/state_machine'
   autoload :TestCase, 'active_model/test_case'
   autoload :Validations, 'active_model/validations'
   autoload :ValidationsRepairHelper, 'active_model/validations_repair_helper'
+
+  module Serializers
+    autoload :JSON, 'active_model/serializers/json'
+  end
 end
 
 I18n.load_path << File.dirname(__FILE__) + '/active_model/locale/en.yml'