acts_as_follower 0.1.0 → 0.1.1

data/README.rdoc

@@ -191,14 +191,16 @@ If you have updates or patches or want to contribute I would love to see what yo
 
 Thanks to everyone for their interest and time in committing to making this plugin better.
 
-* dougal (Douglas F Shearer) - http://github.com/dougal
-* jdg (Jonathan George) - http://github.com/jdg
-* m3talsmith (Michael Christenson II) - http://github.com/m3talsmith
-* joergbattermann (Jörg Battermann) - http://github.com/joergbattermann
-* TomK32 (Thomas R. Koll) - http://github.com/TomK32
-* drcapulet (Alex Coomans) - http://github.com/drcapulet
-* jhchabran (Jean Hadrien Chabran) - http://github.com/jhchabran
-* arthurgeek (Arthur Zapparoli) - http://github.com/arthurgeek
+* dougal (Douglas F Shearer) - https://github.com/dougal
+* jdg (Jonathan George) - https://github.com/jdg
+* m3talsmith (Michael Christenson II) - https://github.com/m3talsmith
+* joergbattermann (Jörg Battermann) - https://github.com/joergbattermann
+* TomK32 (Thomas R. Koll) - https://github.com/TomK32
+* drcapulet (Alex Coomans) - https://github.com/drcapulet
+* jhchabran (Jean Hadrien Chabran) - https://github.com/jhchabran
+* arthurgeek (Arthur Zapparoli) - https://github.com/arthurgeek
+* james2m (James McCarthy) - https://github.com/james2m
+* peterjm (Peter McCracken) - https://github.com/peterjm
 
 Please let me know if I missed you.
 

data/Rakefile

@@ -25,7 +25,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
 end
 
 namespace :rcov do
-
   desc "Generate a coverage report in coverage/"
   task :gen do
     sh "rcov --output coverage test/*_test.rb --exclude 'gems/*'"
@@ -35,5 +34,4 @@ namespace :rcov do
   task :clobber do
     sh "rm -rdf coverage"
   end
-
-end
+end

data/lib/acts_as_follower.rb

@@ -4,8 +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
-
-

data/lib/acts_as_follower/follow_scopes.rb

@@ -0,0 +1,37 @@
+module ActsAsFollower #:nodoc:
+  module FollowScopes
+
+    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
+end

data/lib/acts_as_follower/followable.rb

@@ -13,7 +13,6 @@ module ActsAsFollower #:nodoc:
       end
     end
 
-
     module InstanceMethods
 
       # Returns the number of followers a record has.
@@ -24,15 +23,17 @@ module ActsAsFollower #:nodoc:
       # Returns the followers by a given type
       def followers_by_type(follower_type, options={})
         follows = follower_type.constantize.
-          includes(:follows).
-          where('blocked = ?', false).
-          where(
-            "follows.followable_id = ? AND follows.followable_type = ? AND follows.follower_type = ?", 
-            self.id, parent_class_name(self), follower_type
-          )
+          joins(:follows).
+          where('follows.blocked'         => false,
+                'follows.followable_id'   => self.id, 
+                'follows.followable_type' => parent_class_name(self), 
+                'follows.follower_type'   => follower_type)
         if options.has_key?(:limit)
           follows = follows.limit(options[:limit])
         end
+        if options.has_key?(:includes)
+          follows = follows.includes(options[:includes])
+        end
         follows
       end
 
@@ -70,8 +71,7 @@ module ActsAsFollower #:nodoc:
       # Returns true if the current instance is followed by the passed record
       # Returns false if the current instance is blocked by the passed record or no follow is found
       def followed_by?(follower)
-        f = get_follow_for(follower)
-        (f && !f.blocked?) ? true : false
+        self.followings.unblocked.for_follower(follower).exists?
       end
 
       def block(follower)
@@ -82,12 +82,12 @@ module ActsAsFollower #:nodoc:
         get_follow_for(follower).try(:delete)
       end
 
-      private
-
       def get_follow_for(follower)
-        Follow.for_followable(self).for_follower(follower).first
+        self.followings.for_follower(follower).first
       end
 
+      private
+
       def block_future_follow(follower)
         follows.create(:followable => self, :follower => follower, :blocked => true)
       end

data/lib/acts_as_follower/follower.rb

@@ -28,9 +28,8 @@ module ActsAsFollower #:nodoc:
       # Creates a new follow record for this instance to follow the passed object.
       # Does not allow duplicate records to be created.
       def follow(followable)
-        follow = get_follow(followable)
-        if follow.blank? && self != followable
-          Follow.create(:followable => followable, :follower => self)
+        if self != followable
+          self.follows.find_or_create_by_followable_id_and_followable_type(followable.id, parent_class_name(followable))
         end
       end
 
@@ -43,7 +42,7 @@ module ActsAsFollower #:nodoc:
 
       # Returns the follow records related to this instance by type.
       def follows_by_type(followable_type, options={})
-        Follow.unblocked.includes(:followable).for_follower(self).for_followable_type(followable_type).find(:all, options)
+        self.follows.unblocked.includes(:followable).for_followable_type(followable_type).all(options)
       end
 
       # Returns the follow records related to this instance with the followable included.
@@ -58,21 +57,23 @@ module ActsAsFollower #:nodoc:
 
       # Returns the actual records of a particular type which this record is following.
       def following_by_type(followable_type, options={})
-        follows = followable_type.constantize.
-          includes(:followings).
-          where('blocked = ?', false).
-          where(
-            "follows.follower_id = ? AND follows.follower_type = ? AND follows.followable_type = ?", 
-            self.id, parent_class_name(self), followable_type
-          )
+        followables = followable_type.constantize.
+          joins(:followings).
+          where('follows.blocked'         => false,
+                'follows.follower_id'     => self.id, 
+                'follows.follower_type'   => parent_class_name(self), 
+                'follows.followable_type' => followable_type)
         if options.has_key?(:limit)
-          follows = follows.limit(options[:limit])
+          followables = followables.limit(options[:limit])
         end
-        follows
+        if options.has_key?(:includes)
+          followables = followables.includes(options[:includes])
+        end
+        followables
       end
 
       def following_by_type_count(followable_type)
-        Follow.unblocked.for_follower(self).for_followable_type(followable_type).count
+        follows.unblocked.for_followable_type(followable_type).count
       end
 
       # Allows magic names on following_by_type
@@ -91,7 +92,7 @@ module ActsAsFollower #:nodoc:
 
       # Returns a follow record for the current instance and followable object.
       def get_follow(followable)
-        Follow.unblocked.for_follower(self).for_followable(followable).first
+        self.follows.unblocked.for_followable(followable).first
       end
 
     end

data/lib/acts_as_follower/follower_lib.rb

@@ -1,8 +1,8 @@
 module ActsAsFollower
   module FollowerLib
-    
+
     private
-    
+
     # Retrieves the parent class name if using STI.
     def parent_class_name(obj)
       if obj.class.superclass != ActiveRecord::Base
@@ -10,6 +10,6 @@ module ActsAsFollower
       end
       return obj.class.name
     end
-    
+
   end
 end

data/lib/acts_as_follower/railtie.rb

@@ -3,13 +3,13 @@ require 'rails'
 
 module ActsAsFollower
   class Railtie < Rails::Railtie
-    
+
     initializer "acts_as_follower.active_record" do |app|
       ActiveSupport.on_load :active_record do
         include ActsAsFollower::Follower
         include ActsAsFollower::Followable
       end
     end
-    
+
   end
-end
+end

data/lib/acts_as_follower/version.rb

@@ -1,3 +1,3 @@
 module ActsAsFollower
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/generators/templates/model.rb

@@ -1,21 +1,14 @@
 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
   belongs_to :follower,   :polymorphic => true
-  
+
   def block!
     self.update_attribute(:blocked, true)
   end
-  
+
 end

data/test/acts_as_followable_test.rb

@@ -84,6 +84,21 @@ class ActsAsFollowableTest < ActiveSupport::TestCase
       should_change("@sam.all_following.size", :by => -1) { @sam.all_following.size }
     end
 
+    context "get follow record" do
+      setup do
+        @bob = Factory(:bob)
+        @follow = @bob.follow(@sam)
+      end
+
+      should "return follow record" do
+        assert_equal @follow, @sam.get_follow_for(@bob)
+      end
+
+      should "return nil" do
+        assert_nil @sam.get_follow_for(@jon)
+      end
+    end
+
     context "blocks" do
       setup do
         @bob = Factory(:bob)

data/test/acts_as_follower_test.rb

@@ -148,7 +148,7 @@ class ActsAsFollowerTest < ActiveSupport::TestCase
       should "accept AR options" do
         @metallica = Factory(:metallica)
         @sam.follow(@metallica)
-        assert_equal 1, @sam.following_by_type('Band', :limit => 1).count
+        assert_equal 1, @sam.following_by_type('Band', :limit => 1).to_a.size
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_follower
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tom Cocca
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 -04:00
+date: 2011-11-06 01:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -94,6 +94,7 @@ files:
 - acts_as_follower.gemspec
 - init.rb
 - lib/acts_as_follower.rb
+- lib/acts_as_follower/follow_scopes.rb
 - lib/acts_as_follower/followable.rb
 - lib/acts_as_follower/follower.rb
 - lib/acts_as_follower/follower_lib.rb