Merge pull request maccman#10 from ncavig/master

Latest Rails 3.1 rc1 removes some classes
FOMNick · Jun 9, 2011 · 093c2b5 · 093c2b5
2 parents e68c00c + d44ac5a
commit 093c2b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/supermodel.rb b/lib/supermodel.rb
@@ -2,10 +2,8 @@
 gem "activemodel"
 
 require "active_support/core_ext/class/attribute_accessors"
-require "active_support/core_ext/class/inheritable_attributes"
 require "active_support/core_ext/hash/indifferent_access"
 require "active_support/core_ext/kernel/reporting"
-require "active_support/core_ext/module/attr_accessor_with_default"
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/module/aliasing"
 require "active_support/core_ext/object/blank"

diff --git a/lib/supermodel/base.rb b/lib/supermodel/base.rb
@@ -4,7 +4,11 @@ class Base
     self.known_attributes = []
 
     class << self
-      attr_accessor_with_default(:primary_key, 'id') #:nodoc:
+      attr_accessor(:primary_key) #:nodoc:
+
+      def primary_key
+        @primary_key ||= 'id'
+      end
 
       def collection(&block)
         @collection ||= Class.new(Array)