acts_as_followable 0.1.8 → 0.1.9

data/README.rdoc

@@ -120,4 +120,4 @@ You can also query Follow model records like this:
 
 * {xpepermint}[http://github.com/xpepermint] (Author)
 * {afhammad}[http://github.com/afhammad]
-* (jeanmartin)[http://github.com/jeanmartin]
+* {jeanmartin}[http://github.com/jeanmartin]

data/app/models/follow.rb

@@ -4,6 +4,6 @@ class Follow < ActiveRecord::Base
 
   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 :for_follower, lambda { |follower| where(["follower_id = ?", follower.id]).for_follower_type(follower.class.name) }
-  scope :for_followable, lambda { |followable| where(["followable_id = ?", followable.id]).for_followable_type(followable.class.name) }
+  scope :for_follower, lambda { |follower| where(["follower_id = ?", follower.id]).for_follower_type(ActsAsFollowable::Lib.class_name(follower)) }
+  scope :for_followable, lambda { |followable| where(["followable_id = ?", followable.id]).for_followable_type(ActsAsFollowable::Lib.class_name(followable)) }
 end

data/lib/acts_as_followable.rb

@@ -1,4 +1,5 @@
 %w( acts_as_followable/version
+    acts_as_followable/lib
     acts_as_followable/followable
     acts_as_followable/railtie
 ).each do |lib|

data/lib/acts_as_followable/followable.rb

@@ -1,16 +1,17 @@
 module ActsAsFollowable
   module Followable
-    
+
     def self.included(base)
       base.extend ClassMethods
     end
 
     module ClassMethods
       def acts_as_followable
+        include ActsAsFollowable::Lib::InstanceMethods
         include ActsAsFollowable::Followable::InstanceMethods
         
-        scope :following, lambda{|followable| includes(:follows).where(['follows.followable_id=? AND follows.followable_type=?', followable.id, followable.class.name]) }
-        scope :followed_by, lambda{|follower| includes(:followings).where(['follows.follower_id=? AND follows.follower_type=?', follower.id, follower.class.name]) }
+        scope :following, lambda{|followable| includes(:follows).where(['follows.followable_id=? AND follows.followable_type=?', followable.id, ActsAsFollowable::Lib.class_name(followable)]) }
+        scope :followed_by, lambda{|follower| includes(:followings).where(['follows.follower_id=? AND follows.follower_type=?', follower.id, ActsAsFollowable::Lib.class_name(follower)]) }
         
         has_many :followings, :as => :followable, :dependent => :destroy, :class_name => 'Follow'
         has_many :follows, :as => :follower, :dependent => :destroy
@@ -47,7 +48,7 @@ module ActsAsFollowable
       def follow(followable)
         follow = follow_for_follawable(followable).first
         if follow.blank?
-          Follow.create(:followable => followable, :follower => self)
+          Follow.create(:followable_id => followable.id, :followable_type => class_name(followable), :follower_id => self.id, :follower_type => class_name(self))
         end
       end
 
@@ -65,12 +66,12 @@ module ActsAsFollowable
 
       # Destroys all followers of a given type
       def destroy_followers_by_type(type)
-        Follow.where(['follows.followable_id=? AND follows.followable_type=? AND follows.follower_type=?', self.id, self.class.name, type]).destroy_all
+        Follow.where(['follows.followable_id=? AND follows.followable_type=? AND follows.follower_type=?', self.id, class_name(self), type]).destroy_all
       end
 
       # Destroys all followings of a given type
       def destroy_followings_by_type(type)
-        Follow.where(['follows.follower_id=? AND follows.follower_type=? AND follows.followable_type=?', self.id, self.class.name, type]).destroy_all
+        Follow.where(['follows.follower_id=? AND follows.follower_type=? AND follows.followable_type=?', self.id, class_name(self), type]).destroy_all
       end
 
       # Returns true if the current instance is followed by the passed record
@@ -81,11 +82,11 @@ module ActsAsFollowable
       private
       
       def follow_for_follawable(followable)
-        Follow.where(["follower_id = ? AND follower_type = ? AND followable_id = ? AND followable_type = ?", self.id, self.class.name, followable.id, followable.class.name])
+        Follow.where(["follower_id = ? AND follower_type = ? AND followable_id = ? AND followable_type = ?", self.id, class_name(self), followable.id, class_name(followable)])
       end
       
       def follow_for_follower(follower)
-        Follow.where(["follower_id = ? AND follower_type = ? AND followable_id = ? AND followable_type = ?", follower.id, follower.class.name, self.id, self.class.name])
+        Follow.where(["follower_id = ? AND follower_type = ? AND followable_id = ? AND followable_type = ?", follower.id, class_name(follower), self.id, class_name(self)])
       end
       
     end

data/lib/acts_as_followable/lib.rb

@@ -0,0 +1,16 @@
+module ActsAsFollowable
+  module Lib
+    
+    def self.class_name(obj)
+      return obj.class.name
+    end
+
+    module InstanceMethods
+      def class_name(obj)
+        return obj.class.name
+      end
+    end
+    
+  end
+end
+

data/lib/acts_as_followable/version.rb

@@ -2,7 +2,7 @@ module ActsAsFollowable
   module Version
     MAJOR = 0
     MINOR = 1
-    TINY  = 8
+    TINY  = 9
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_followable
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Kristijan Sedlak
@@ -31,6 +31,7 @@ files:
 - Rakefile
 - app/models/follow.rb
 - lib/acts_as_followable/followable.rb
+- lib/acts_as_followable/lib.rb
 - lib/acts_as_followable/railtie.rb
 - lib/acts_as_followable/version.rb
 - lib/acts_as_followable.rb