socialization 0.5.0.beta → 0.5.0.beta2

data/CHANGELOG.md

@@ -2,11 +2,14 @@
 
 ## 0.5.0.beta (June 6, 2012)
 
-* **MAJOR REFACTORING:** Your Like, Follow and Mention models should now inherit the Socialization store base class instead of using the acts_as helper. (e.g.: class Follow < Socialization::ActiveRecordStores::FollowStore). See demo app for an example. Your code should be mostly unaffected.
-* Changed: The persistence logic has now been moved to the Socialization::ActiveRecordStores namespace. More stores such as Redis or MongoDB can be easily added.
+* **IMPORTANT:** This release includes many changes, some breaking. Make sure to test your code carefully after upgrading.
+* **BREAKING CHANGE:** Your Like, Follow and Mention models should now inherit the Socialization store base class instead of using the acts_as helper. (e.g.: class Follow < Socialization::ActiveRecordStores::Follow). See demo app for an example.
+* **BREAKING CHANGE:** the `followers`, `followables` etc methods now return an array of objects. Use methods such as `followers_relation` for an ActiveRecord::Relation.
+* Changed: The persistence logic has now been moved to the Socialization::ActiveRecordStores namespace. More stores can be easily added.
 * Changed: `like!`, `follow!`, and `mention!` now return a boolean. True when the action was successful, false when it wasn't (e.g.: the relationship already exists).
 * Changed: `unlike!`, `unfollow!` and `unmention!` will now return false if there is no record to destroy rather than raising `ActiveRecord::RecordNotFound`.
 * Changed: Records can now like, follow or mention themselves. If you want to prevent this, it should be enforced directly in your application.
+* Added: Data can now be stored in Redis.
 * Added: `toggle_like!`, `toggle_follow!` and `toggle_mention!` methods. Thanks to [@balvig](https://github.com/balvig).
 * Added: support for single table inheritance. Thanks to [@balvig](https://github.com/balvig).
 

data/demo/app/models/follow.rb

@@ -1,2 +1,3 @@
-class Follow < Socialization::ActiveRecordStores::FollowStore
+class Follow < Socialization::ActiveRecordStores::Follow
+  self.table_name = 'follows'
 end

data/demo/app/models/like.rb

@@ -1,2 +1,2 @@
-class Like < Socialization::ActiveRecordStores::LikeStore
+class Like < Socialization::ActiveRecordStores::Like
 end

data/demo/app/models/mention.rb

@@ -1,2 +1,2 @@
-class Mention < Socialization::ActiveRecordStores::MentionStore
+class Mention < Socialization::ActiveRecordStores::Mention
 end

data/lib/generators/socialization/templates/active_record/model_follow.rb

@@ -1,2 +1,2 @@
-class Follow < Socialization::ActiveRecordStores::FollowStore
+class Follow < Socialization::ActiveRecordStores::Follow
 end

data/lib/generators/socialization/templates/active_record/model_like.rb

@@ -1,2 +1,2 @@
-class Like < Socialization::ActiveRecordStores::LikeStore
+class Like < Socialization::ActiveRecordStores::Like
 end

data/lib/generators/socialization/templates/active_record/model_mention.rb

@@ -1,2 +1,2 @@
-class Mention < Socialization::ActiveRecordStores::MentionStore
+class Mention < Socialization::ActiveRecordStores::Mention
 end

data/lib/generators/socialization/templates/redis/model_follow.rb

@@ -0,0 +1,2 @@
+class Follow < Socialization::RedisStores::Follow
+end

data/lib/generators/socialization/templates/redis/model_like.rb

@@ -0,0 +1,2 @@
+class Like < Socialization::RedisStores::Like
+end

data/lib/generators/socialization/templates/redis/model_mention.rb

@@ -0,0 +1,2 @@
+class Mention < Socialization::RedisStores::Mention
+end

data/lib/socialization.rb

@@ -1,4 +1,19 @@
-require 'socialization/config'
-require 'socialization/acts_as_helpers'
+%w(
+  stores/mixins/base.rb
+  stores/mixins/**/*.rb
+  stores/active_record/mixins/base.rb
+  stores/active_record/mixins/**/*.rb
+  stores/redis/mixins/base.rb
+  stores/redis/mixins/**/*.rb
+  stores/active_record/**/*.rb
+  stores/redis/base.rb
+  stores/redis/**/*.rb
+  actors/**/*.rb
+  victims/**/*.rb
+  helpers/**/*.rb
+  config/**/*.rb
+).each do |path|
+  Dir["#{File.dirname(__FILE__)}/socialization/#{path}"].each { |f| require(f) }
+end
 
 ActiveRecord::Base.send :include, Socialization::ActsAsHelpers

data/lib/socialization/actors/follower.rb

@@ -18,7 +18,7 @@ module Socialization
         true
       end
 
-      # Create a new {FollowStores follow} relationship.
+      # Create a new {Follow follow} relationship.
       #
       # @param [Followable] followable the object to be followed.
       # @return [Boolean]
@@ -27,7 +27,7 @@ module Socialization
         Socialization.follow_model.follow!(self, followable)
       end
 
-      # Delete a {FollowStores follow} relationship.
+      # Delete a {Follow follow} relationship.
       #
       # @param [Followable] followable the object to unfollow.
       # @return [Boolean]
@@ -36,7 +36,7 @@ module Socialization
         Socialization.follow_model.unfollow!(self, followable)
       end
 
-      # Toggles a {FollowStores follow} relationship.
+      # Toggles a {Follow follow} relationship.
       #
       # @param [Followable] followable the object to follow/unfollow.
       # @return [Boolean]
@@ -68,7 +68,17 @@ module Socialization
       def followables(klass, opts = {})
         Socialization.follow_model.followables(self, klass, opts)
       end
+      alias :followees :followables
 
+      # Returns a relation for all the followables of a certain type that are followed by self
+      #
+      # @params [Followable] klass the type of {Followable} you want
+      # @params [Hash] opts a hash of options
+      # @return ActiveRecord::Relation
+      def followables_relation(klass, opts = {})
+        Socialization.follow_model.followables_relation(self, klass, opts)
+      end
+      alias :followees_relation :followables_relation
     end
   end
 end

data/lib/socialization/actors/liker.rb

@@ -18,7 +18,7 @@ module Socialization
         true
       end
 
-      # Create a new {LikeStores like} relationship.
+      # Create a new {Like like} relationship.
       #
       # @param [Likeable] likeable the object to be liked.
       # @return [Boolean]
@@ -27,7 +27,7 @@ module Socialization
         Socialization.like_model.like!(self, likeable)
       end
 
-      # Delete a {LikeStores like} relationship.
+      # Delete a {Like like} relationship.
       #
       # @param [Likeable] likeable the object to unlike.
       # @return [Boolean]
@@ -36,7 +36,7 @@ module Socialization
         Socialization.like_model.unlike!(self, likeable)
       end
 
-      # Toggles a {LikeStores like} relationship.
+      # Toggles a {Like like} relationship.
       #
       # @param [Likeable] likeable the object to like/unlike.
       # @return [Boolean]
@@ -68,7 +68,17 @@ module Socialization
       def likeables(klass, opts = {})
         Socialization.like_model.likeables(self, klass, opts)
       end
+      alias :likees :likeables
 
+      # Returns a relation for all the likeables of a certain type that are liked by self
+      #
+      # @params [Likeable] klass the type of {Likeable} you want
+      # @params [Hash] opts a hash of options
+      # @return ActiveRecord::Relation
+      def likeables_relation(klass, opts = {})
+        Socialization.like_model.likeables_relation(self, klass, opts)
+      end
+      alias :likees_relation :likeables_relation
     end
   end
 end

data/lib/socialization/actors/mentioner.rb

@@ -18,7 +18,7 @@ module Socialization
         true
       end
 
-      # Create a new {MentionStores mention} relationship.
+      # Create a new {Mention mention} relationship.
       #
       # @param [Mentionable] mentionable the object to be mentioned.
       # @return [Boolean]
@@ -27,7 +27,7 @@ module Socialization
         Socialization.mention_model.mention!(self, mentionable)
       end
 
-      # Delete a {MentionStores mention} relationship.
+      # Delete a {Mention mention} relationship.
       #
       # @param [Mentionable] mentionable the object to unmention.
       # @return [Boolean]
@@ -36,7 +36,7 @@ module Socialization
         Socialization.mention_model.unmention!(self, mentionable)
       end
 
-      # Toggles a {MentionStores mention} relationship.
+      # Toggles a {Mention mention} relationship.
       #
       # @param [Mentionable] mentionable the object to mention/unmention.
       # @return [Boolean]
@@ -68,7 +68,17 @@ module Socialization
       def mentionables(klass, opts = {})
         Socialization.mention_model.mentionables(self, klass, opts)
       end
+      alias :mentionees :mentionables
 
+      # Returns a relation for all the mentionables of a certain type that are mentioned by self
+      #
+      # @params [Mentionable] klass the type of {Mentionable} you want
+      # @params [Hash] opts a hash of options
+      # @return ActiveRecord::Relation
+      def mentionables_relation(klass, opts = {})
+        Socialization.mention_model.mentionables_relation(self, klass, opts)
+      end
+      alias :mentionees_relation :mentionables_relation
     end
   end
 end

data/lib/socialization/{acts_as_helpers.rb → helpers/acts_as_helpers.rb}

@@ -1,9 +1,5 @@
 require 'active_support/concern'
 
-%w(helpers stores actors victims).each do |path|
-  Dir["#{File.dirname(__FILE__)}/#{path}/**/*.rb"].each { |f| require(f) }
-end
-
 module Socialization
   module ActsAsHelpers
     extend ActiveSupport::Concern

data/lib/socialization/stores/active_record/{follow_store.rb → follow.rb}

@@ -1,6 +1,9 @@
 module Socialization
   module ActiveRecordStores
-    class FollowStore < ActiveRecord::Base
+    class Follow < ActiveRecord::Base
+      include Socialization::ActiveRecordStores::Mixins::Base
+      include Socialization::Stores::Mixins::Follow
+
       belongs_to :follower,   :polymorphic => true
       belongs_to :followable, :polymorphic => true
 
@@ -14,14 +17,7 @@ module Socialization
         :followable_id   => followable.id)
       }
 
-      @@after_create_hook = nil
-      @@after_destroy_hook = nil
-
       class << self
-        def table_name
-          'follows'
-        end
-
         def follow!(follower, followable)
           unless follows?(follower, followable)
             self.create! do |follow|

data/lib/socialization/stores/active_record/{like_store.rb → like.rb}

@@ -1,6 +1,9 @@
 module Socialization
   module ActiveRecordStores
-    class LikeStore < ActiveRecord::Base
+    class Like < ActiveRecord::Base
+      include Socialization::ActiveRecordStores::Mixins::Base
+      include Socialization::Stores::Mixins::Like
+
       belongs_to :liker,    :polymorphic => true
       belongs_to :likeable, :polymorphic => true
 
@@ -14,14 +17,7 @@ module Socialization
         :likeable_id   => likeable.id)
       }
 
-      @@after_create_hook = nil
-      @@after_destroy_hook = nil
-
       class << self
-        def table_name
-          'likes'
-        end
-
         def like!(liker, likeable)
           unless likes?(liker, likeable)
             self.create! do |like|

data/lib/socialization/stores/active_record/{mention_store.rb → mention.rb}

@@ -1,6 +1,9 @@
 module Socialization
   module ActiveRecordStores
-    class MentionStore < ActiveRecord::Base
+    class Mention < ActiveRecord::Base
+      include Socialization::ActiveRecordStores::Mixins::Base
+      include Socialization::Stores::Mixins::Mention
+
       belongs_to :mentioner,   :polymorphic => true
       belongs_to :mentionable, :polymorphic => true
 
@@ -14,14 +17,7 @@ module Socialization
         :mentionable_id   => mentionable.id)
       }
 
-      @@after_create_hook = nil
-      @@after_destroy_hook = nil
-
       class << self
-        def table_name
-          'mentions'
-        end
-
         def mention!(mentioner, mentionable)
           unless mentions?(mentioner, mentionable)
             self.create! do |mention|

data/lib/socialization/stores/active_record/mixins/base.rb

@@ -0,0 +1,9 @@
+module Socialization
+  module ActiveRecordStores
+    module Mixins
+      module Base
+        include Socialization::Stores::Mixins::Base
+      end
+    end
+  end
+end

data/lib/socialization/stores/mixins/base.rb

@@ -0,0 +1,10 @@
+module Socialization
+  module Stores
+    module Mixins
+      module Base
+        @@after_create_hook = nil
+        @@after_destroy_hook = nil
+      end
+    end
+  end
+end

data/lib/socialization/stores/mixins/follow.rb

@@ -0,0 +1,8 @@
+module Socialization
+  module Stores
+    module Mixins
+      module Follow
+      end
+    end
+  end
+end

data/lib/socialization/stores/mixins/like.rb

@@ -0,0 +1,8 @@
+module Socialization
+  module Stores
+    module Mixins
+      module Like
+      end
+    end
+  end
+end

data/lib/socialization/stores/mixins/mention.rb

@@ -0,0 +1,8 @@
+module Socialization
+  module Stores
+    module Mixins
+      module Mention
+      end
+    end
+  end
+end

data/lib/socialization/stores/redis/base.rb

@@ -1,8 +1,6 @@
 module Socialization
   module RedisStores
     class Base
-      @@after_create_hook = nil
-      @@after_destroy_hook = nil
     end
   end
 end

data/lib/socialization/stores/redis/{follow_store.rb → follow.rb}

@@ -1,8 +1,11 @@
-require File.expand_path(File.dirname(__FILE__)) + '/base'
+# require File.expand_path(File.dirname(__FILE__)) + '/base'
 
 module Socialization
   module RedisStores
-    class FollowStore < Socialization::RedisStores::Base
+    class Follow < Socialization::RedisStores::Base
+      include Socialization::RedisStores::Mixins::Base
+      include Socialization::Stores::Mixins::Follow
+
       class << self
         def follow!(follower, followable)
           unless follows?(follower, followable)

data/lib/socialization/stores/redis/{like_store.rb → like.rb}

@@ -1,8 +1,11 @@
-require File.expand_path(File.dirname(__FILE__)) + '/base'
+# require File.expand_path(File.dirname(__FILE__)) + '/base'
 
 module Socialization
   module RedisStores
-    class LikeStore < Socialization::RedisStores::Base
+    class Like < Socialization::RedisStores::Base
+      include Socialization::RedisStores::Mixins::Base
+      include Socialization::Stores::Mixins::Follow
+
       class << self
         def like!(liker, likeable)
           unless likes?(liker, likeable)

data/lib/socialization/stores/redis/{mention_store.rb → mention.rb}

@@ -1,8 +1,11 @@
-require File.expand_path(File.dirname(__FILE__)) + '/base'
+# require File.expand_path(File.dirname(__FILE__)) + '/base'
 
 module Socialization
   module RedisStores
-    class MentionStore < Socialization::RedisStores::Base
+    class Mention < Socialization::RedisStores::Base
+      include Socialization::RedisStores::Mixins::Base
+      include Socialization::Stores::Mixins::Mention
+
       class << self
         def mention!(mentioner, mentionable)
           unless mentions?(mentioner, mentionable)

data/lib/socialization/stores/redis/mixins/base.rb

@@ -0,0 +1,8 @@
+module Socialization
+  module RedisStores
+    module Mixins
+      module Base
+      end
+    end
+  end
+end

data/lib/socialization/version.rb

@@ -1,3 +1,3 @@
 module Socialization
-  VERSION = "0.5.0.beta"
+  VERSION = "0.5.0.beta2"
 end

data/lib/socialization/victims/followable.rb

@@ -26,13 +26,21 @@ module Socialization
         Socialization.follow_model.follows?(follower, self)
       end
 
-      # Returns a scope of the {Follower}s following self.
+      # Returns an array of {Follower}s following self.
       #
-      # @param [Class] klass the {Follower} class to be included in the scope. e.g. `User`
+      # @param [Class] klass the {Follower} class to be included. e.g. `User`
       # @return [Array<Follower, Numeric>] An array of Follower objects or IDs
       def followers(klass, opts = {})
         Socialization.follow_model.followers(self, klass, opts)
       end
+
+      # Returns a scope of the {Follower}s following self.
+      #
+      # @param [Class] klass the {Follower} class to be included in the scope. e.g. `User`
+      # @return ActiveRecord::Relation
+      def followers_relation(klass, opts = {})
+        Socialization.follow_model.followers_relation(self, klass, opts)
+      end
     end
   end
 end

data/lib/socialization/victims/likeable.rb

@@ -26,13 +26,22 @@ module Socialization
         Socialization.like_model.likes?(liker, self)
       end
 
-      # Returns a scope of the {Liker}s likeing self.
+      # Returns an array of {Liker}s liking self.
       #
-      # @param [Class] klass the {Liker} class to be included in the scope. e.g. `User`.
+      # @param [Class] klass the {Liker} class to be included. e.g. `User`
       # @return [Array<Liker, Numeric>] An array of Liker objects or IDs
       def likers(klass, opts = {})
         Socialization.like_model.likers(self, klass, opts)
       end
+
+      # Returns a scope of the {Liker}s liking self.
+      #
+      # @param [Class] klass the {Liker} class to be included in the scope. e.g. `User`
+      # @return ActiveRecord::Relation
+      def likers_relation(klass, opts = {})
+        Socialization.like_model.likers_relation(self, klass, opts)
+      end
+
     end
   end
 end

data/lib/socialization/victims/mentionable.rb

@@ -26,13 +26,22 @@ module Socialization
         Socialization.mention_model.mentions?(mentioner, self)
       end
 
-      # Returns a scope of the {Mentioner}s mentioning self.
+      # Returns an array of {Mentioner}s mentioning self.
       #
-      # @param [Class] klass the {Mentioner} class to be included in the scope. e.g. `User`.
+      # @param [Class] klass the {Mentioner} class to be included. e.g. `User`
       # @return [Array<Mentioner, Numeric>] An array of Mentioner objects or IDs
       def mentioners(klass, opts = {})
         Socialization.mention_model.mentioners(self, klass, opts)
       end
+
+      # Returns a scope of the {Mentioner}s mentioning self.
+      #
+      # @param [Class] klass the {Mentioner} class to be included in the scope. e.g. `User`
+      # @return ActiveRecord::Relation
+      def mentioners_relation(klass, opts = {})
+        Socialization.mention_model.mentioners_relation(self, klass, opts)
+      end
+
     end
   end
 end

data/test/actors/follower_test.rb

@@ -70,5 +70,27 @@ class FollowerTest < Test::Unit::TestCase
         @follower.followables(@followable.class, { :foo => :bar })
       end
     end
+
+    context "#followees" do
+      should "call $Follow.followables" do
+        $Follow.expects(:followables).with(@follower, @followable.class, { :foo => :bar })
+        @follower.followees(@followable.class, { :foo => :bar })
+      end
+    end
+
+    context "#followables_relation" do
+      should "call $Follow.followables_relation" do
+        $Follow.expects(:followables_relation).with(@follower, @followable.class, { :foo => :bar })
+        @follower.followables_relation(@followable.class, { :foo => :bar })
+      end
+    end
+
+    context "#followees_relation" do
+      should "call $Follow.followables_relation" do
+        $Follow.expects(:followables_relation).with(@follower, @followable.class, { :foo => :bar })
+        @follower.followees_relation(@followable.class, { :foo => :bar })
+      end
+    end
+
   end
 end

data/test/actors/liker_test.rb

@@ -70,5 +70,27 @@ class LikerTest < Test::Unit::TestCase
         @liker.likeables(@likeable.class, { :foo => :bar })
       end
     end
+
+    context "#likees" do
+      should "call $Like.likeables" do
+        $Like.expects(:likeables).with(@liker, @likeable.class, { :foo => :bar })
+        @liker.likees(@likeable.class, { :foo => :bar })
+      end
+    end
+
+    context "#likeables_relation" do
+      should "call $Follow.likeables_relation" do
+        $Like.expects(:likeables_relation).with(@liker, @likeable.class, { :foo => :bar })
+        @liker.likeables_relation(@likeable.class, { :foo => :bar })
+      end
+    end
+
+    context "#likees_relation" do
+      should "call $Follow.likeables_relation" do
+        $Like.expects(:likeables_relation).with(@liker, @likeable.class, { :foo => :bar })
+        @liker.likees_relation(@likeable.class, { :foo => :bar })
+      end
+    end
+
   end
 end

data/test/actors/mentioner_test.rb

@@ -70,5 +70,26 @@ class MentionerTest < Test::Unit::TestCase
         @mentioner.mentionables(@mentionable.class, { :foo => :bar })
       end
     end
+
+    context "#mentionees" do
+      should "call $Mention.mentionables" do
+        $Mention.expects(:mentionables).with(@mentioner, @mentionable.class, { :foo => :bar })
+        @mentioner.mentionees(@mentionable.class, { :foo => :bar })
+      end
+    end
+
+    context "#mentionables_relation" do
+      should "call $Mention.mentionables_relation" do
+        $Mention.expects(:mentionables_relation).with(@mentioner, @mentionable.class, { :foo => :bar })
+        @mentioner.mentionables_relation(@mentionable.class, { :foo => :bar })
+      end
+    end
+
+    context "#mentionees_relation" do
+      should "call $Mention.mentionables_relation" do
+        $Mention.expects(:mentionables_relation).with(@mentioner, @mentionable.class, { :foo => :bar })
+        @mentioner.mentionees_relation(@mentionable.class, { :foo => :bar })
+      end
+    end
   end
 end

data/test/stores/active_record/follow_store_test.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__))+'/../../test_helper'
 class ActiveRecordFollowStoreTest < Test::Unit::TestCase
   context "ActiveRecordStores::FollowStoreTest" do
     setup do
-      @klass = Socialization::ActiveRecordStores::FollowStore
+      @klass = Socialization::ActiveRecordStores::Follow
       @klass.touch nil
       @klass.after_follow nil
       @klass.after_unfollow nil
@@ -12,8 +12,8 @@ class ActiveRecordFollowStoreTest < Test::Unit::TestCase
     end
 
     context "data store" do
-      should "inherit Socialization::ActiveRecordStores::FollowStore" do
-        assert_equal Socialization::ActiveRecordStores::FollowStore, Socialization.follow_model
+      should "inherit Socialization::ActiveRecordStores::Follow" do
+        assert_equal Socialization::ActiveRecordStores::Follow, Socialization.follow_model
       end
     end
 

data/test/stores/active_record/like_store_test.rb

@@ -1,9 +1,9 @@
 require File.expand_path(File.dirname(__FILE__))+'/../../test_helper'
 
 class ActiveRecordLikeStoreTest < Test::Unit::TestCase
-  context "ActiveRecordStore::LikeStoreTest" do
+  context "ActiveRecordStores::LikeStoreTest" do
     setup do
-      @klass = Socialization::ActiveRecordStores::LikeStore
+      @klass = Socialization::ActiveRecordStores::Like
       @klass.touch nil
       @klass.after_like nil
       @klass.after_unlike nil
@@ -12,8 +12,8 @@ class ActiveRecordLikeStoreTest < Test::Unit::TestCase
     end
 
     context "data store" do
-      should "inherit Socialization::ActiveRecordStores::LikeStore" do
-        assert_equal Socialization::ActiveRecordStores::LikeStore, Socialization.like_model
+      should "inherit Socialization::ActiveRecordStores::Like" do
+        assert_equal Socialization::ActiveRecordStores::Like, Socialization.like_model
       end
     end
 

data/test/stores/active_record/mention_store_test.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__))+'/../../test_helper'
 class ActiveRecordMentionStoreTest < Test::Unit::TestCase
   context "ActiveRecordStores::MentionStoreTest" do
     setup do
-      @klass = Socialization::ActiveRecordStores::MentionStore
+      @klass = Socialization::ActiveRecordStores::Mention
       @klass.touch nil
       @klass.after_mention nil
       @klass.after_unmention nil
@@ -12,8 +12,8 @@ class ActiveRecordMentionStoreTest < Test::Unit::TestCase
     end
 
     context "data store" do
-      should "inherit Socialization::ActiveRecordStores::MentionStore" do
-        assert_equal Socialization::ActiveRecordStores::MentionStore, Socialization.mention_model
+      should "inherit Socialization::ActiveRecordStores::Mention" do
+        assert_equal Socialization::ActiveRecordStores::Mention, Socialization.mention_model
       end
     end
 

data/test/stores/redis/follow_store_test.rb

@@ -4,7 +4,7 @@ class RedisFollowStoreTest < Test::Unit::TestCase
   context "RedisStores::FollowStoreTest" do
     setup do
       use_redis_store
-      @klass = Socialization::RedisStores::FollowStore
+      @klass = Socialization::RedisStores::Follow
       @klass.touch nil
       @klass.after_follow nil
       @klass.after_unfollow nil
@@ -13,8 +13,8 @@ class RedisFollowStoreTest < Test::Unit::TestCase
     end
 
     context "Stores" do
-      should "inherit Socialization::RedisStores::FollowStore" do
-        assert_equal Socialization::RedisStores::FollowStore, Socialization.follow_model
+      should "inherit Socialization::RedisStores::Follow" do
+        assert_equal Socialization::RedisStores::Follow, Socialization.follow_model
       end
     end
 

data/test/stores/redis/like_store_test.rb

@@ -4,7 +4,7 @@ class RedisLikeStoreTest < Test::Unit::TestCase
   context "RedisStores::LikeStoreTest" do
     setup do
       use_redis_store
-      @klass = Socialization::RedisStores::LikeStore
+      @klass = Socialization::RedisStores::Like
       @klass.touch nil
       @klass.after_like nil
       @klass.after_unlike nil
@@ -13,8 +13,8 @@ class RedisLikeStoreTest < Test::Unit::TestCase
     end
 
     context "Stores" do
-      should "inherit Socialization::RedisStores::LikeStore" do
-        assert_equal Socialization::RedisStores::LikeStore, Socialization.like_model
+      should "inherit Socialization::RedisStores::Like" do
+        assert_equal Socialization::RedisStores::Like, Socialization.like_model
       end
     end
 

data/test/stores/redis/mention_store_test.rb

@@ -4,7 +4,7 @@ class RedisMentionStoreTest < Test::Unit::TestCase
   context "RedisStores::MentionStoreTest" do
     setup do
       use_redis_store
-      @klass = Socialization::RedisStores::MentionStore
+      @klass = Socialization::RedisStores::Mention
       @klass.touch nil
       @klass.after_mention nil
       @klass.after_unmention nil
@@ -13,8 +13,8 @@ class RedisMentionStoreTest < Test::Unit::TestCase
     end
 
     context "Stores" do
-      should "inherit Socialization::RedisStores::MentionStore" do
-        assert_equal Socialization::RedisStores::MentionStore, Socialization.mention_model
+      should "inherit Socialization::RedisStores::Mention" do
+        assert_equal Socialization::RedisStores::Mention, Socialization.mention_model
       end
     end
 

data/test/string_test.rb

@@ -5,7 +5,7 @@ class StringTest < Test::Unit::TestCase
     should "return a class" do
       assert_equal Socialization, "Socialization".deep_const_get
       assert_equal Socialization::ActiveRecordStores, "Socialization::ActiveRecordStores".deep_const_get
-      assert_equal Socialization::ActiveRecordStores::FollowStore, "Socialization::ActiveRecordStores::FollowStore".deep_const_get
+      assert_equal Socialization::ActiveRecordStores::Follow, "Socialization::ActiveRecordStores::Follow".deep_const_get
 
       assert_raise(NameError) { "Foo::Bar".deep_const_get }
     end

data/test/test_helper.rb

@@ -42,16 +42,16 @@ class Test::Unit::TestCase
 end
 
 def use_redis_store
-  Socialization.follow_model = Socialization::RedisStores::FollowStore
-  Socialization.mention_model = Socialization::RedisStores::MentionStore
-  Socialization.like_model = Socialization::RedisStores::LikeStore
+  Socialization.follow_model = Socialization::RedisStores::Follow
+  Socialization.mention_model = Socialization::RedisStores::Mention
+  Socialization.like_model = Socialization::RedisStores::Like
   setup_model_shortcuts
 end
 
 def use_ar_store
-  Socialization.follow_model = Socialization::ActiveRecordStores::FollowStore
-  Socialization.mention_model = Socialization::ActiveRecordStores::MentionStore
-  Socialization.like_model = Socialization::ActiveRecordStores::LikeStore
+  Socialization.follow_model = Socialization::ActiveRecordStores::Follow
+  Socialization.mention_model = Socialization::ActiveRecordStores::Mention
+  Socialization.like_model = Socialization::ActiveRecordStores::Like
   setup_model_shortcuts
 end
 
@@ -176,9 +176,9 @@ class Movie < ActiveRecord::Base
   has_many :comments
 end
 
-# class Follow < Socialization::ActiveRecordStores::FollowStore; end
-# class Like < Socialization::ActiveRecordStores::LikeStore; end
-# class Mention < Socialization::ActiveRecordStores::MentionStore; end
+# class Follow < Socialization::ActiveRecordStores::Follow; end
+# class Like < Socialization::ActiveRecordStores::Like; end
+# class Mention < Socialization::ActiveRecordStores::Mention; end
 
 class ImAFollower < ActiveRecord::Base
   acts_as_follower

data/test/victims/followable_test.rb

@@ -30,5 +30,13 @@ class FollowableTest < Test::Unit::TestCase
         @followable.followers(@follower.class, { :foo => :bar })
       end
     end
+
+    context "#followers_relation" do
+      should "call $Follow.followers_relation" do
+        $Follow.expects(:followers_relation).with(@followable, @follower.class, { :foo => :bar })
+        @followable.followers_relation(@follower.class, { :foo => :bar })
+      end
+    end
+
   end
 end

data/test/victims/likeable_test.rb

@@ -30,5 +30,12 @@ class LikeableTest < Test::Unit::TestCase
         @likeable.likers(@liker.class, { :foo => :bar })
       end
     end
+
+    context "#likers_relation" do
+      should "call $Like.likers_relation" do
+        $Like.expects(:likers_relation).with(@likeable, @liker.class, { :foo => :bar })
+        @likeable.likers_relation(@liker.class, { :foo => :bar })
+      end
+    end
   end
 end

data/test/victims/mentionable_test.rb

@@ -25,10 +25,17 @@ class MentionableTest < Test::Unit::TestCase
     end
 
     context "#mentioners" do
-      should "call $Mentionmentioners" do
+      should "call $Mention.mentioners" do
         $Mention.expects(:mentioners).with(@mentionable, @mentioner.class, { :foo => :bar })
         @mentionable.mentioners(@mentioner.class, { :foo => :bar })
       end
     end
+
+    context "#mentioners_relation" do
+      should "call $Mention.mentioners" do
+        $Mention.expects(:mentioners_relation).with(@mentionable, @mentioner.class, { :foo => :bar })
+        @mentionable.mentioners_relation(@mentioner.class, { :foo => :bar })
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: socialization
 version: !ruby/object:Gem::Version 
-  hash: 2135628231
+  hash: -1564876628
   prerelease: 6
   segments: 
   - 0
   - 5
   - 0
   - beta
-  version: 0.5.0.beta
+  - 2
+  version: 0.5.0.beta2
 platform: ruby
 authors: 
 - Carl Mercier
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-06 00:00:00 -04:00
+date: 2012-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -224,21 +225,30 @@ files:
 - lib/generators/socialization/templates/active_record/model_follow.rb
 - lib/generators/socialization/templates/active_record/model_like.rb
 - lib/generators/socialization/templates/active_record/model_mention.rb
+- lib/generators/socialization/templates/redis/model_follow.rb
+- lib/generators/socialization/templates/redis/model_like.rb
+- lib/generators/socialization/templates/redis/model_mention.rb
 - lib/socialization.rb
 - lib/socialization/actors/follower.rb
 - lib/socialization/actors/liker.rb
 - lib/socialization/actors/mentioner.rb
-- lib/socialization/acts_as_helpers.rb
-- lib/socialization/config.rb
+- lib/socialization/config/config.rb
+- lib/socialization/helpers/acts_as_helpers.rb
 - lib/socialization/helpers/string.rb
-- lib/socialization/stores/active_record/follow_store.rb
-- lib/socialization/stores/active_record/like_store.rb
-- lib/socialization/stores/active_record/mention_store.rb
+- lib/socialization/stores/active_record/follow.rb
+- lib/socialization/stores/active_record/like.rb
+- lib/socialization/stores/active_record/mention.rb
+- lib/socialization/stores/active_record/mixins/base.rb
+- lib/socialization/stores/mixins/base.rb
+- lib/socialization/stores/mixins/follow.rb
+- lib/socialization/stores/mixins/like.rb
+- lib/socialization/stores/mixins/mention.rb
 - lib/socialization/stores/redis/base.rb
 - lib/socialization/stores/redis/config.rb
-- lib/socialization/stores/redis/follow_store.rb
-- lib/socialization/stores/redis/like_store.rb
-- lib/socialization/stores/redis/mention_store.rb
+- lib/socialization/stores/redis/follow.rb
+- lib/socialization/stores/redis/like.rb
+- lib/socialization/stores/redis/mention.rb
+- lib/socialization/stores/redis/mixins/base.rb
 - lib/socialization/version.rb
 - lib/socialization/victims/followable.rb
 - lib/socialization/victims/likeable.rb