Use class (instead of class name) as identity map key

sferik · Jun 3, 2012 · 5e2eff8 · 5e2eff8
1 parent c1cb8a2
commit 5e2eff8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/twitter/base.rb b/lib/twitter/base.rb
@@ -24,8 +24,8 @@ def self.lazy_attr_reader(*attrs)
     end
 
     def self.new(attrs={})
-      @@identity_map[self.name] ||= {}
-      @@identity_map[self.name][Marshal.dump(attrs)] || super(attrs)
+      @@identity_map[self] ||= {}
+      @@identity_map[self][Marshal.dump(attrs)] || super(attrs)
     end
 
     # Initializes a new object
@@ -34,7 +34,7 @@ def self.new(attrs={})
     # @return [Twitter::Base]
     def initialize(attrs={})
       self.update(attrs)
-      @@identity_map[self.class.name][Marshal.dump(attrs)] = self
+      @@identity_map[self.class][Marshal.dump(attrs)] = self
     end
 
     # Fetches an attribute of an object using hash notation

diff --git a/lib/twitter/identifiable.rb b/lib/twitter/identifiable.rb
@@ -4,8 +4,8 @@ module Twitter
   class Identifiable < Base
 
     def self.new(attrs={})
-      @@identity_map[self.name] ||= {}
-      attrs['id'] && @@identity_map[self.name][attrs['id']] ? @@identity_map[self.name][attrs['id']].update(attrs) : super(attrs)
+      @@identity_map[self] ||= {}
+      attrs['id'] && @@identity_map[self][attrs['id']] ? @@identity_map[self][attrs['id']].update(attrs) : super(attrs)
     end
 
     # Initializes a new object
@@ -15,7 +15,7 @@ def self.new(attrs={})
     def initialize(attrs={})
       if attrs['id']
         self.update(attrs)
-        @@identity_map[self.class.name][attrs['id']] = self
+        @@identity_map[self.class][attrs['id']] = self
       else
         super
       end