Add ActiveModel serialization to Model, closes #43

CHANGELOG.md

@@ -1,3 +1,7 @@
+# ActiveAttr 0.4.1 (unreleased) #
+
+* Implemented ActiveModel serialization in Model
+
 # ActiveAttr 0.4.0 (November 26, 2011) #
 
 * Added Model

lib/active_attr/logger.rb

@@ -40,7 +40,7 @@ def self.logger=(new_logger)
 
     included do
       class_attribute :logger
-      self.logger = ActiveAttr::Logger.logger
+      self.logger = Logger.logger
     end
   end
 end

lib/active_attr/model.rb

@@ -3,6 +3,7 @@
 require "active_attr/logger"
 require "active_attr/mass_assignment_security"
 require "active_attr/query_attributes"
+require "active_model"
 require "active_support/concern"
 
 module ActiveAttr
@@ -24,5 +25,13 @@ module Model
     include Logger
     include MassAssignmentSecurity
     include QueryAttributes
+
+    if defined? ActiveModel::Serializable
+      include ActiveModel::Serializable::JSON
+      include ActiveModel::Serializable::XML
+    else
+      include ActiveModel::Serializers::JSON
+      include ActiveModel::Serializers::Xml
+    end
   end
 end

lib/active_attr/version.rb

@@ -1,5 +1,5 @@
 module ActiveAttr
   # Complete version string
   # @since 0.1.0
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

spec/functional/active_attr/model_spec.rb

@@ -1,5 +1,7 @@
 require "spec_helper"
 require "active_attr/model"
+require "active_support/core_ext/hash/conversions"
+require "active_support/json/decoding"
 
 module ActiveAttr
   describe Model do
@@ -67,5 +69,15 @@ def self.name
     it "does not use strict mass assignment" do
       expect { subject.assign_attributes :middle_initial => "J" }.not_to raise_error
     end
+
+    it "serializes to/from JSON" do
+      subject.first_name = "Chris"
+      model_class.new.from_json(subject.to_json).first_name.should == "Chris"
+    end
+
+    it "serializes to/from XML" do
+      subject.first_name = "Chris"
+      model_class.new.from_xml(subject.to_xml).first_name.should == "Chris"
+    end
   end
 end