acts_as_followable 0.1.7 → 0.1.8

data/README.rdoc

@@ -17,8 +17,12 @@ Run the generator which will generate a migration file.
   rails g acts_as_followable
   rake db:migrate
 
-The plugin comes with a Follow model file. You can override the default model definition by creating a new 
-app/models/follow.rb file. You can copy the content of a model from {here}[https://github.com/xpepermint/acts_as_followable/blob/master/app/models/follow.rb].
+The plugin comes with a Follow model file. You can extend the default model by creating the
+app/models/follow.rb file with content.
+
+  class Follow
+    ... your extension here ...
+  end
 
 == Setup
 
@@ -116,3 +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]

data/lib/acts_as_followable.rb

@@ -1,9 +1,6 @@
 %w( acts_as_followable/version
-    acts_as_followable/followable 
-    ../app/models/follow
+    acts_as_followable/followable
+    acts_as_followable/railtie
 ).each do |lib|
     require File.join(File.dirname(__FILE__), lib)  
-end
-require File.join(Rails.root||RAILS_ROOT, 'app', 'models', 'follow') rescue nil
-
-ActiveRecord::Base.send(:include, ActsAsFollowable::Followable)
+end

data/lib/acts_as_followable/railtie.rb

@@ -0,0 +1,24 @@
+require 'rails'
+
+module ActsAsFollowable
+  if defined? Rails::Railtie
+    class Railtie < Rails::Railtie
+      initializer "acts_as_followable.extend_action_controller_base" do |app|
+        ActiveSupport.on_load(:active_record) do
+          ActsAsFollowable::Railtie.insert
+        end
+      end
+    end
+  end
+
+  class Railtie
+    def self.insert
+      require File.join(File.dirname(__FILE__), '..', '..', 'app', 'models', 'follow')
+      begin
+        require File.join(Rails.root||RAILS_ROOT, 'app', 'models', 'follow')
+      rescue LoadError
+      end
+      ActiveRecord::Base.send(:include, ActsAsFollowable::Followable)
+    end
+  end
+end

data/lib/acts_as_followable/version.rb

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

data/test/acts_as_followable_test.rb

@@ -8,8 +8,8 @@ class ActsAsFollowableTest < ActiveSupport::TestCase
     end
 
     should "be defined" do
-      assert @sam.respond_to?(:followers_count)
-      assert @sam.respond_to?(:followers)
+      assert @sam.respond_to?(:followings)
+      assert @sam.respond_to?(:follows)
       assert @sam.respond_to?(:followed_by?)
     end
   end
@@ -25,46 +25,40 @@ class ActsAsFollowableTest < ActiveSupport::TestCase
 
     context "followers_count" do
       should "return the number of followers" do
-        assert_equal 0, @sam.followers_count
-        assert_equal 1, @jon.followers_count
+        assert_equal 0, @sam.followings.count
+        assert_equal 1, @jon.followings.count
       end
 
       should "return the proper number of multiple followers" do
         @bob = Factory(:bob)
         @sam.follow(@bob)
-        assert_equal 0, @sam.followers_count
-        assert_equal 1, @jon.followers_count
-        assert_equal 1, @bob.followers_count
+        assert_equal 0, @sam.followings.count
+        assert_equal 1, @jon.followings.count
+        assert_equal 1, @bob.followings.count
       end
     end
 
     context "followers" do
       should "return users" do
-        assert_equal [], @sam.followers
-        assert_equal [@sam], @jon.followers
+        assert_equal [], User.following(@sam)
+        assert_equal [@sam], User.following(@jon)
       end
 
       should "return users (multiple followers)" do
         @bob = Factory(:bob)
         @sam.follow(@bob)
-        assert_equal [], @sam.followers
-        assert_equal [@sam], @jon.followers
-        assert_equal [@sam], @bob.followers
+        assert_equal [], @sam.followings
+        assert_equal [@sam], User.following(@jon)
+        assert_equal [@sam], User.following(@bob)
       end
 
       should "return users (multiple followers, complex)" do
         @bob = Factory(:bob)
         @sam.follow(@bob)
         @jon.follow(@bob)
-        assert_equal [], @sam.followers
-        assert_equal [@sam], @jon.followers
-        assert_equal [@sam, @jon], @bob.followers
-      end
-
-      should "accept AR options" do
-        @bob = Factory(:bob)
-        @bob.follow(@jon)
-        assert_equal 1, @jon.followers(:limit => 1).count
+        assert_equal [], User.following(@sam)
+        assert_equal [@sam], User.following(@jon)
+        assert_equal [@sam, @jon], User.following(@bob)
       end
     end
 
@@ -76,110 +70,12 @@ class ActsAsFollowableTest < ActiveSupport::TestCase
     end
 
     context "destroying a followable" do
-      setup do
+      should "also destroy the Follow" do
+        assert_equal 1, Follow.count
+        assert_equal 1, @sam.follows.count
         @jon.destroy
-      end
-
-      should_change("follow count", :by => -1) { Follow.count }
-      should_change("@sam.all_following.size", :by => -1) { @sam.all_following.size }
-    end
-
-    context "blocks" do
-      setup do
-        @bob = Factory(:bob)
-        @jon.block(@sam)
-        @jon.block(@bob)
-      end
-
-      should "accept AR options" do
-        assert_equal 1, @jon.blocks(:limit => 1).count
-      end
-    end
-
-    context "blocking a follower" do
-      context "in my following list" do
-        setup do
-          @jon.block(@sam)
-        end
-
-        should "remove him from followers" do
-          assert_equal 0, @jon.followers_count
-        end
-
-        should "add him to the blocked followers" do
-          assert_equal 1, @jon.blocked_followers_count
-        end
-
-        should "not be able to follow again" do
-          @jon.follow(@sam)
-          assert_equal 0, @jon.followers_count
-        end
-
-        should "not be present when listing followers" do
-          assert_equal [], @jon.followers
-        end
-
-        should "be in the list of blocks" do
-          assert_equal [@sam], @jon.blocks
-        end
-      end
-
-      context "not in my following list" do
-        setup do
-          @sam.block(@jon)
-        end
-
-        should "add him to the blocked followers" do
-          assert_equal 1, @sam.blocked_followers_count
-        end
-
-        should "not be able to follow again" do
-          @sam.follow(@jon)
-          assert_equal 0, @sam.followers_count
-        end
-
-        should "not be present when listing followers" do
-          assert_equal [], @sam.followers
-        end
-
-        should "be in the list of blocks" do
-          assert_equal [@jon], @sam.blocks
-        end
-      end
-    end
-
-    context "unblocking a blocked follow" do
-      setup do
-        @jon.block(@sam)
-        @jon.unblock(@sam)
-      end
-
-      should "not include the unblocked user in the list of followers" do
-        assert_equal [], @jon.followers
-      end
-
-      should "remove him from the blocked followers" do
-        assert_equal 0, @jon.blocked_followers_count
-        assert_equal [], @jon.blocks
-      end
-    end
-
-    context "unblock a non-existent follow" do
-      setup do
-        @sam.stop_following(@jon)
-        @jon.unblock(@sam)
-      end
-
-      should "not be in the list of followers" do
-        assert_equal [], @jon.followers
-      end
-
-      should "not be in the blockked followers count" do
-        assert_equal 0, @jon.blocked_followers_count
-      end
-
-      should "not be in the blocks list" do
-        assert_equal [], @jon.blocks
+        assert_equal 0, Follow.count
+        assert_equal 0, @sam.follows.count
       end
     end
 
@@ -194,19 +90,9 @@ class ActsAsFollowableTest < ActiveSupport::TestCase
         assert_equal [@sam,@jon], @oasis.followers_by_type('User')
       end
 
-      should "not return block followers in the followers for a given type" do
-        @oasis.block(@jon)
-        assert_equal [@sam], @oasis.followers_by_type('User')
-      end
-
       should "return the count for followers_by_type_count for a given type" do
-        assert_equal 1, @jon.followers_by_type_count('User')
-        assert_equal 2, @oasis.followers_by_type_count('User')
-      end
-
-      should "not count blocked follows in the count" do
-        @oasis.block(@sam)
-        assert_equal 1, @oasis.followers_by_type_count('User')
+        assert_equal 1, @jon.followers_by_type('User').count
+        assert_equal 2, @oasis.followers_by_type('User').count
       end
     end
 
@@ -221,19 +107,9 @@ class ActsAsFollowableTest < ActiveSupport::TestCase
         assert_equal [@sam,@jon], @oasis.user_followers
       end
 
-      should "not return block followers in the followers for a given type" do
-        @oasis.block(@jon)
-        assert_equal [@sam], @oasis.user_followers
-      end
-
       should "return the count for followers_by_type_count for a given type" do
-        assert_equal 1, @jon.count_user_followers
-        assert_equal 2, @oasis.count_user_followers
-      end
-
-      should "not count blocked follows in the count" do
-        @oasis.block(@sam)
-        assert_equal 1, @oasis.count_user_followers
+        assert_equal 1, @jon.user_followers.count
+        assert_equal 2, @oasis.user_followers.count
       end
     end
   end

data/test/factories/bands.rb

@@ -0,0 +1,8 @@
+
+Factory.define :oasis, :class => Band do |b|
+  b.name    'Oasis'
+end
+
+Factory.define :metallica, :class => Band do |b|
+  b.name    'Metallica'
+end

data/test/factories/users.rb

@@ -0,0 +1,13 @@
+
+Factory.define :sam, :class => User do |u|
+  u.name  'Sam'
+end
+
+Factory.define :jon, :class => User do |u|
+  u.name  'Jon'
+end
+
+
+Factory.define :bob, :class => User do |u|
+  u.name  'Bob'
+end

data/test/test_helper.rb

@@ -1,19 +1,28 @@
+ENV["RAILS_ENV"] = "test"
+
 require 'rubygems'
+require 'test/unit'
+require 'shoulda'
 require 'logger'
+
+gem 'activerecord',  '~>3.0.0'
+gem 'activesupport', '~>3.0.0'
+gem 'actionpack',    '~>3.0.0'
+
 require 'active_record'
+require 'active_record/version'
+require 'active_support'
+
+require 'acts_as_followable'
+require File.dirname(__FILE__) + '/../rails/init'
+require File.dirname(__FILE__) + '/models/band'
+require File.dirname(__FILE__) + '/models/user'
+require File.dirname(__FILE__) + '/../app/models/follow.rb'
 
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/debug.log')
 ActiveRecord::Base.configurations = YAML::load(File.open(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.establish_connection(ENV['DB'] || 'mysql')
 
-require File.dirname(__FILE__) + '/../init.rb'
-require File.dirname(__FILE__) + '/models/band'
-require File.dirname(__FILE__) + '/models/user'
-require File.dirname(__FILE__) + '/../lib/generators/templates/model.rb'
-
-require 'test/unit'
-require 'active_support'
-require 'shoulda'
 require 'factory_girl'
 Factory.find_definitions
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_followable
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Kristijan Sedlak
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 +01:00
-default_executable: 
+date: 2011-03-09 00:00:00 Z
 dependencies: []
 
 description: Implements the following functionality where one model can be followed by other models and and vice versa.
@@ -32,6 +31,7 @@ files:
 - Rakefile
 - app/models/follow.rb
 - lib/acts_as_followable/followable.rb
+- lib/acts_as_followable/railtie.rb
 - lib/acts_as_followable/version.rb
 - lib/acts_as_followable.rb
 - lib/generators/acts_as_followable_generator.rb
@@ -49,7 +49,6 @@ files:
 - test/TESTING
 - README.rdoc
 - MIT-LICENSE
-has_rdoc: true
 homepage: http://github.com/xpepermint/acts_as_followable
 licenses: []
 
@@ -81,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: ActsAsFollowable - Model following.