active_attr 0.4.0 → 0.4.1

data/CHANGELOG.md

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

data/lib/active_attr/logger.rb

@@ -40,7 +40,7 @@ module ActiveAttr
 
     included do
       class_attribute :logger
-      self.logger = ActiveAttr::Logger.logger
+      self.logger = Logger.logger
     end
   end
 end

data/lib/active_attr/model.rb

@@ -3,6 +3,7 @@ require "active_attr/block_initialization"
 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 ActiveAttr
     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

data/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

data/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,19 @@ module ActiveAttr
     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
+
+    it "supports attribute name translation" do
+      model_class.human_attribute_name(:first_name).should == "First name"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_attr
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-11-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70208496667400 !ruby/object:Gem::Requirement
+  requirement: &70212854595820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70208496667400
+  version_requirements: *70212854595820
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70208496659840 !ruby/object:Gem::Requirement
+  requirement: &70212854610300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70208496659840
+  version_requirements: *70212854610300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70208496720580 !ruby/object:Gem::Requirement
+  requirement: &70212854618100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70208496720580
+  version_requirements: *70212854618100
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70208496732300 !ruby/object:Gem::Requirement
+  requirement: &70212854630340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *70208496732300
+  version_requirements: *70212854630340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70208496743100 !ruby/object:Gem::Requirement
+  requirement: &70212858706240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70208496743100
+  version_requirements: *70212858706240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70208496750220 !ruby/object:Gem::Requirement
+  requirement: &70212863308060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70208496750220
+  version_requirements: *70212863308060
 description: Create plain old ruby models without reinventing the wheel.
 email:
 - cgriego@gmail.com
@@ -157,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2277450769391114254
+      hash: 3302118214315982046
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2277450769391114254
+      hash: 3302118214315982046
 requirements: []
 rubyforge_project: active_attr
 rubygems_version: 1.8.10