active_attr 0.8.0 → 0.8.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# ActiveAttr 0.8.1 (June 9, 2013) #
+
+* #121 Fix compatibility with ActiveModel Serializers gem by dropping support
+  for Rails 3.2 edge prior to RC1
+
 # ActiveAttr 0.8.0 (May 2, 2013) #
 
 * ActiveAttr now supports Rails 4.0.0

data/lib/active_attr/serialization.rb

@@ -19,13 +19,7 @@ module ActiveAttr
     extend ActiveSupport::Concern
     include Attributes
     include MassAssignment
-
-    if defined? ActiveModel::Serializable
-      include ActiveModel::Serializable::JSON
-      include ActiveModel::Serializable::XML
-    else
-      include ActiveModel::Serializers::JSON
-      include ActiveModel::Serializers::Xml
-    end
+    include ActiveModel::Serializers::JSON
+    include ActiveModel::Serializers::Xml
   end
 end

data/lib/active_attr/version.rb

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

data/spec/functional/active_attr/attributes_spec.rb

@@ -104,14 +104,8 @@ module ActiveAttr
       let :model_class do
         Class.new do
           include Attributes
-
-          if defined? ActiveModel::Serializable
-            include ActiveModel::Serializable::JSON
-            include ActiveModel::Serializable::XML
-          else
-            include ActiveModel::Serializers::JSON
-            include ActiveModel::Serializers::Xml
-          end
+          include ActiveModel::Serializers::JSON
+          include ActiveModel::Serializers::Xml
 
           self.include_root_in_json = true
           attribute :first_name

data/spec/support/active_model_lint.rb

@@ -4,6 +4,11 @@ require "test/unit/assertions"
 shared_examples_for "ActiveModel" do
   include ActiveModel::Lint::Tests
   include Test::Unit::Assertions
+  attr_writer :assertions
+
+  def assertions
+    @assertions ||= 0
+  end
 
   before { @model = subject }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_attr
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -258,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 712620086539529581
+      hash: 3855427455424208454
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 712620086539529581
+      hash: 3855427455424208454
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -315,3 +315,4 @@ test_files:
 - spec/unit/active_attr/typecasting_spec.rb
 - spec/unit/active_attr/unknown_attribute_error_spec.rb
 - spec/unit/active_attr/version_spec.rb
+has_rdoc: