Merge commit 'rails/master'

Conflicts:
	activerecord/lib/active_record/associations.rb

1 files changed, 6 insertions, 2 deletions

diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb
index 76a0e54a56..4508a39347 100644
--- a/activemodel/lib/active_model/serializers/xml.rb
+++ b/activemodel/lib/active_model/serializers/xml.rb
@@ -90,7 +90,7 @@ module ActiveModel
         end
 
         def root
-          root = (options[:root] || @serializable.class.to_s.underscore).to_s
+          root = (options[:root] || @serializable.class.model_name.singular).to_s
           reformat_name(root)
         end
 
@@ -152,7 +152,11 @@ module ActiveModel
           def add_procs
             if procs = options.delete(:procs)
               [ *procs ].each do |proc|
-                proc.call(options)
+                if proc.arity > 1
+                  proc.call(options, @serializable)
+                else
+                  proc.call(options)
+                end
               end
             end
           end