:include the follower for followers(), use parent_class_name.

Jonathan George
1 parent d2604e8c
Showing 1 changed file with 3 additions and 2 deletions Show diff stats
lib/acts_as_followable.rb
@@ -24,14 +24,15 @@ module ActiveRecord
  
         # Returns the following records.
         def followers
-          self.follows.collect{ |f| f.follower }
+          Follow.find(:all, :include => [:follower], :conditions => ["followable_id = ? AND followable_type = ?", 
+              self.id, parent_class_name(self)]).collect {|f| f.follower }
         end
  
         # Returns true if the current instance is followed by the passed record.
         def followed_by?(follwer)
           rtn = false
           self.follows.each do |f|
-            rtn = true if follwer.id == f.follower_id && follwer.class.name == f.follower_type 
+            rtn = true if follwer.id == f.follower_id && parent_class_name(follwer) == f.follower_type 
           end
           rtn
         end
...	...	@@ -24,14 +24,15 @@ module ActiveRecord
24	24
25	25	# Returns the following records.
26	26	def followers
27		- self.follows.collect{ \|f\| f.follower }
	27	+ Follow.find(:all, :include => [:follower], :conditions => ["followable_id = ? AND followable_type = ?",
	28	+ self.id, parent_class_name(self)]).collect {\|f\| f.follower }
28	29	end
29	30
30	31	# Returns true if the current instance is followed by the passed record.
31	32	def followed_by?(follwer)
32	33	rtn = false
33	34	self.follows.each do \|f\|
34		- rtn = true if follwer.id == f.follower_id && follwer.class.name == f.follower_type
	35	+ rtn = true if follwer.id == f.follower_id && parent_class_name(follwer) == f.follower_type
35	36	end
36	37	rtn
37	38	end
...	...