Merge pull request #21161 from rails/rm-xml-serializer

Remove XML Serialization from core
rails · Aug 7, 2015 · 9645820 · 9645820
2 parents 752432e + f7ebdb1
commit 9645820
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 1,204 deletions.
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
@@ -3,6 +3,10 @@
 
     *Jay Elaraj*
 
+*   Remove `ActiveModel::Serializers::Xml` from core.
+
+    *Zachary Scott*
+
 *   Add `ActiveModel::Dirty#[attr_name]_previously_changed?` and
     `ActiveModel::Dirty#[attr_name]_previous_change` to improve access
     to recorded changes after the model has been saved.

diff --git a/activemodel/README.rdoc b/activemodel/README.rdoc
@@ -155,7 +155,7 @@ behavior out of the box:
 * Making objects serializable
 
   <tt>ActiveModel::Serialization</tt> provides a standard interface for your object
-  to provide +to_json+ or +to_xml+ serialization.
+  to provide +to_json+ serialization.
 
     class SerialPerson
       include ActiveModel::Serialization
@@ -177,13 +177,6 @@ behavior out of the box:
     s = SerialPerson.new
     s.to_json             # => "{\"name\":null}"
 
-    class SerialPerson
-      include ActiveModel::Serializers::Xml
-    end
-
-    s = SerialPerson.new
-    s.to_xml              # => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<serial-person...
-
   {Learn more}[link:classes/ActiveModel/Serialization.html]
 
 * Internationalization (i18n) support

diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
@@ -58,7 +58,6 @@ module Serializers
 
     eager_autoload do
       autoload :JSON
-      autoload :Xml
     end
   end
 

diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb
@@ -40,7 +40,6 @@ module ActiveModel
   #
   #   class Person
   #     include ActiveModel::Serializers::JSON
-  #     include ActiveModel::Serializers::Xml
   #
   #     attr_accessor :name
   #
@@ -55,13 +54,11 @@ module ActiveModel
   #   person.serializable_hash   # => {"name"=>nil}
   #   person.as_json             # => {"name"=>nil}
   #   person.to_json             # => "{\"name\":null}"
-  #   person.to_xml              # => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<serial-person...
   #
   #   person.name = "Bob"
   #   person.serializable_hash   # => {"name"=>"Bob"}
   #   person.as_json             # => {"name"=>"Bob"}
   #   person.to_json             # => "{\"name\":\"Bob\"}"
-  #   person.to_xml              # => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<serial-person...
   #
   # Valid options are <tt>:only</tt>, <tt>:except</tt>, <tt>:methods</tt> and
   # <tt>:include</tt>. The following are all valid examples:

diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb