Split Follow scopes out into their own module.

James McCarthy
1 parent 36a7807b
Showing 3 changed files with 42 additions and 9 deletions Show diff stats
lib/acts_as_follower.rb
lib/acts_as_follower/follow_scopes.rb
lib/generators/templates/model.rb
@@ -4,6 +4,7 @@ module ActsAsFollower
   autoload :Follower,     'acts_as_follower/follower'
   autoload :Followable,   'acts_as_follower/followable'
   autoload :FollowerLib,  'acts_as_follower/follower_lib'
+  autoload :FollowScopes, 'acts_as_follower/follow_scopes'
  
   require 'acts_as_follower/railtie' if defined?(Rails) && Rails::VERSION::MAJOR >= 3
 end
@@ -0,0 +1,39 @@
+module ActsAsFollower #:nodoc:
+  module FollowScopes
+
+    # Scopes
+    def for_follower(follower)
+      where(:follower_id => follower.id, :follower_type => parent_class_name(follower))
+    end
+
+    def for_followable(followable)
+      where(:followable_id => followable.id, :followable_type => parent_class_name(followable))
+    end
+
+    def for_follower_type(follower_type)
+      where(:follower_type => follower_type)
+    end
+
+    def for_followable_type(followable_type)
+      where(:followable_type => followable_type)
+    end
+
+    def recent(from)
+      where(["created_at > ?", (from || 2.weeks.ago).to_s(:db)])
+    end
+
+    def descending
+      order("follows.created_at DESC")
+    end
+
+    def unblocked
+      where(:blocked => false)
+    end
+
+    def blocked
+      where(:blocked => true)
+    end
+    # end Scopes
+    
+  end
+end
 class Follow < ActiveRecord::Base
+
   extend ActsAsFollower::FollowerLib
-  
-  scope :for_follower,        lambda { |follower| where(["follower_id = ? AND follower_type = ?", follower.id, parent_class_name(follower)]) }
-  scope :for_followable,      lambda { |followable| where(["followable_id = ? AND followable_type = ?", followable.id, parent_class_name(followable)]) }
-  scope :for_follower_type,   lambda { |follower_type| where("follower_type = ?", follower_type) }
-  scope :for_followable_type, lambda { |followable_type| where("followable_type = ?", followable_type) }
-  scope :recent,              lambda { |from| where(["created_at > ?", (from || 2.weeks.ago).to_s(:db)]) }
-  scope :descending,          order("follows.created_at DESC")
-  scope :unblocked,           where(:blocked => false)
-  scope :blocked,             where(:blocked => true)
+  extend ActsAsFollower::FollowScopes
  
   # NOTE: Follows belong to the "followable" interface, and also to followers
   belongs_to :followable, :polymorphic => true
...	...	@@ -4,6 +4,7 @@ module ActsAsFollower
4	4	autoload :Follower, 'acts_as_follower/follower'
5	5	autoload :Followable, 'acts_as_follower/followable'
6	6	autoload :FollowerLib, 'acts_as_follower/follower_lib'
	7	+ autoload :FollowScopes, 'acts_as_follower/follow_scopes'
7	8
8	9	require 'acts_as_follower/railtie' if defined?(Rails) && Rails::VERSION::MAJOR >= 3
9	10	end
...	...
...	...	@@ -0,0 +1,39 @@
	1	+module ActsAsFollower #:nodoc:
	2	+ module FollowScopes
	3	+
	4	+ # Scopes
	5	+ def for_follower(follower)
	6	+ where(:follower_id => follower.id, :follower_type => parent_class_name(follower))
	7	+ end
	8	+
	9	+ def for_followable(followable)
	10	+ where(:followable_id => followable.id, :followable_type => parent_class_name(followable))
	11	+ end
	12	+
	13	+ def for_follower_type(follower_type)
	14	+ where(:follower_type => follower_type)
	15	+ end
	16	+
	17	+ def for_followable_type(followable_type)
	18	+ where(:followable_type => followable_type)
	19	+ end
	20	+
	21	+ def recent(from)
	22	+ where(["created_at > ?", (from \|\| 2.weeks.ago).to_s(:db)])
	23	+ end
	24	+
	25	+ def descending
	26	+ order("follows.created_at DESC")
	27	+ end
	28	+
	29	+ def unblocked
	30	+ where(:blocked => false)
	31	+ end
	32	+
	33	+ def blocked
	34	+ where(:blocked => true)
	35	+ end
	36	+ # end Scopes
	37	+
	38	+ end
	39	+end
...	...
1	1	class Follow < ActiveRecord::Base
	2	+
2	3	extend ActsAsFollower::FollowerLib
3		-
4		- scope :for_follower, lambda { \|follower\| where(["follower_id = ? AND follower_type = ?", follower.id, parent_class_name(follower)]) }
5		- scope :for_followable, lambda { \|followable\| where(["followable_id = ? AND followable_type = ?", followable.id, parent_class_name(followable)]) }
6		- scope :for_follower_type, lambda { \|follower_type\| where("follower_type = ?", follower_type) }
7		- scope :for_followable_type, lambda { \|followable_type\| where("followable_type = ?", followable_type) }
8		- scope :recent, lambda { \|from\| where(["created_at > ?", (from \|\| 2.weeks.ago).to_s(:db)]) }
9		- scope :descending, order("follows.created_at DESC")
10		- scope :unblocked, where(:blocked => false)
11		- scope :blocked, where(:blocked => true)
	4	+ extend ActsAsFollower::FollowScopes
12	5
13	6	# NOTE: Follows belong to the "followable" interface, and also to followers
14	7	belongs_to :followable, :polymorphic => true
...	...