From e34725dde757bed639ad0cc2d8632dc4b6d6dd59 Mon Sep 17 00:00:00 2001
From: Michael Guterl <michael@diminishing.org>
Date: Mon, 12 Dec 2011 08:28:59 -0500
Subject: [PATCH] #attributes should work with ActiveRecord >= 3.1

---
 lib/serializable_attributes/schema.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/serializable_attributes/schema.rb b/lib/serializable_attributes/schema.rb
index 1d9f8a7..fa2e431 100644
--- a/lib/serializable_attributes/schema.rb
+++ b/lib/serializable_attributes/schema.rb
@@ -102,6 +102,12 @@ def reload(options = nil)
         end
       end
 
+      if ActiveRecord::VERSION::STRING >= '3.1'
+        @model.send(:define_method, :attributes) do
+          super.merge(send(data_field))
+        end
+      end
+
       @model.send(:define_method, data_field) do
         instance_variable_get("@#{data_field}") || begin
           instance_variable_get("@#{changed_ivar}").clear if send("#{changed_ivar}?")