voteable_mongoid 0.7.2 → 0.7.3

data/.rvmrc

@@ -0,0 +1,2 @@
+rvm_gemset_create_on_use_flag=1
+rvm use 1.9.2@mongoid

data/CHANGELOG.rdoc

@@ -1,10 +1,16 @@
+== 0.7.3
+  * Add :return_votee => true option to vote function to warranty always return voteable object
+  * Add Voteable.voted?, Voteable.up_voted?, Voteable.down_voted?
+  * Update parent for ManyToMany relationship
+  * Refactor
+  
 == 0.7.2
   * Use Collection#find_and_modify to retrieve updated votes data and parent_ids (don't need an extra query to get parent_ids)
 
 == 0.7.1
-  * Refactor & cleanup source code
-  * Better doc
   * Add votee#voted_by?(voter or voter_id)
+  * Better doc
+  * Refactor & cleanup source code
 
 == 0.7.0
   * Use readable field names (up, down, up_count, down_count, count, point) instead of very short field names (u, d, uc, dc, c, p)

data/README.rdoc

@@ -3,7 +3,9 @@
 Voteable Mongoid allows you to make your Mongoid::Document objects voteable (up or down).
 For instance, in a forum, a user can vote up (or down) on a post or a comment.
 
-Voteable Mongoid is built for speed. It uses only one database request per collection to do both data validation and data update.
+Initial idea is based on http://cookbook.mongodb.org/patterns/votes
+
+Voteable Mongoid is built for speed. It uses only one database request per collection to validate data, update data, and get updated data.
 
 Sample app at https://github.com/vinova/simple_qa
 
@@ -30,7 +32,7 @@ post.rb
       # set points for each vote
       voteable self, :up => +1, :down => -1
 
-      references_many :comments
+      has_many :comments
     end
 
 comment.rb
@@ -41,7 +43,7 @@ comment.rb
       include Mongoid::Document
       include Mongoid::Voteable
 
-      referenced_in :post
+      belongs_to :post
 
       voteable self, :up => +1, :down => -3
 
@@ -59,11 +61,12 @@ user.rb
 === Making a vote
 
     @user.vote(@post, :up)
-    # is equivalent to
+
+Is equivalent to
     @user.vote(:votee => @post, :value => :up)
     @post.vote(:voter => @user, :value => :up)
 
-    # In case you don't need to init voter and / or votee objects you can    
+In case you don't need to init voter and / or votee objects you can
     @user.vote(:votee_type => 'Post', :votee_id => post_id, :value => :down)
     @post.vote(:voter_id => user_id, :value => :up)
     Post.vote(:voter_id => user_id, :votee_id => post_id, :value => :up)
@@ -72,10 +75,19 @@ user.rb
 
     @user.unvote(@comment)
 
-=== If have full information you do not need to init voter and votee object
+=== If have voter_id, votee_id and vote value you don't need to init voter and votee objects (suitable for API calls)
+
+New vote
+    Post.vote(:voter_id => user_id, :votee_id => post_id, :value => :up)
 
+Re-vote
     Post.vote(:voter_id => user_id, :votee_id => post_id, :value => :up, :revote => true)
+
+Un-vote
     Post.vote(:voter_id => user_id, :votee_id => post_id, :value => :up, :unvote => true)
+    
+In-case you need updated voteable object, add :return_votee => true
+    votee = Post.vote(:voter_id => user_id, :votee_id => post_id, :value => :up, :return_votee => true)
 
 === Getting vote_value
     
@@ -126,8 +138,8 @@ Ruby
 
 == Credits
 
-* Alex N. - Author
-* Stefan N. - Unvoting
+* Alex Nguyen (alex@vinova.sg) - Author
+* Stefan Nguyen (stefan@vinova.sg) - Unvoting
 
 Copyright (c) 2010-2011 Vinova Pte Ltd (http://vinova.sg)
 

data/TODO

@@ -1,2 +1,2 @@
 * Option hash validations
-
+* Refactor specs

data/lib/voteable_mongoid/version.rb

@@ -1,3 +1,3 @@
 module VoteableMongoid
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

data/lib/voteable_mongoid/voteable/voting.rb

@@ -10,28 +10,25 @@ module Mongoid
         #   - :votee_id: the votee document id
         #   - :voter_id: the voter document id
         #   - :value: :up or :down
-        #   - :revote: change from vote up to vote down
-        #   - :unvote: unvote the vote value (:up or :down)
+        #   - :revote: if true change vote vote from :up to :down and vise versa
+        #   - :unvote: if true undo the voting
+        #   - :return: if true always return updated voteable object
+        # 
+        # @return [votes, false, nil]
         def vote(options)
-          options.symbolize_keys!
-          options[:votee_id] ||= options[:votee].id
-          options[:votee_id] = BSON::ObjectId(options[:votee_id]) if options[:votee_id].is_a?(String)
-          options[:voter_id] = BSON::ObjectId(options[:voter_id]) if options[:voter_id].is_a?(String)
-          options[:value] = options[:value].to_sym
+          validate_and_normalize_vote_options(options)
           options[:voteable] = VOTEABLE[name][name]
           
-          update_parents = options[:voteable][:update_parents]
-
           if options[:voteable]
              query, update = if options[:revote]
-              revote(options)
+              revote_query_and_update(options)
             elsif options[:unvote]
-              unvote(options)
+              unvote_query_and_update(options)
             else
-              new_vote(options)
+              new_vote_query_and_update(options)
             end
 
-            if options[:votee] || update_parents
+            if options[:voteable][:update_parents] || options[:votee] || options[:return_votee]
               # If votee exits or need to update parent
               # use Collection#find_and_modify to retrieve updated votes data and parent_ids
               begin
@@ -42,9 +39,11 @@ module Mongoid
                 )
                 # Update new votes data
                 options[:votee].write_attribute('votes', doc['votes']) if options[:votee]
-                update_parent_votes(doc, options) if update_parents
+                update_parent_votes(doc, options) if options[:voteable][:update_parents]
+                return options[:votee] || new(doc)
               rescue
                 # Don't update parents if operation fail or no matching object found
+                return false
               end
             else
               # Just update and don't care the result
@@ -55,7 +54,14 @@ module Mongoid
 
         
         private
-          def new_vote(options)
+          def validate_and_normalize_vote_options(options)
+            options.symbolize_keys!
+            options[:votee_id] = BSON::ObjectId(options[:votee_id]) if options[:votee_id].is_a?(String)
+            options[:voter_id] = BSON::ObjectId(options[:voter_id]) if options[:voter_id].is_a?(String)
+            options[:value] &&= options[:value].to_sym
+          end
+        
+          def new_vote_query_and_update(options)
             if options[:value] == :up
               positive_voter_ids = 'votes.up'
               positive_votes_count = 'votes.up_count'
@@ -80,7 +86,7 @@ module Mongoid
           end
 
           
-          def revote(options)
+          def revote_query_and_update(options)
             if options[:value] == :up
               positive_voter_ids = 'votes.up'
               negative_voter_ids = 'votes.down'
@@ -113,7 +119,7 @@ module Mongoid
           end
           
 
-          def unvote(options)
+          def unvote_query_and_update(options)
             if options[:value] == :up
               positive_voter_ids = 'votes.up'
               negative_voter_ids = 'votes.down'
@@ -142,28 +148,36 @@ module Mongoid
           
 
           def update_parent_votes(doc, options)
-            value = options[:value]
-            votee ||= options[:votee]
-            
             VOTEABLE[name].each do |class_name, voteable|
-              # For other class in VOTEABLE options, if is parent of current class
-              next unless relation_metadata = relations[class_name.underscore]
-              # If can find current votee foreign_key value for that class
-              next unless foreign_key_value = doc[relation_metadata.foreign_key.to_s]
+              # For other class in VOTEABLE options, if has relationship with current class
+              relation_metadata = relations.find{ |x, r| r.class_name == class_name }.try(:last)
+              next unless relation_metadata.present?
 
-              class_name.constantize.collection.update(
-                { '_id' => foreign_key_value }, 
-                { '$inc' => parent_inc_options(value, voteable, options) }
-              )
+              # If cannot find current votee foreign_key value for that class
+              foreign_key_value = doc[relation_metadata.foreign_key.to_s]
+              next unless foreign_key_value.present?
+
+              if relation_metadata.relation == Mongoid::Relations::Referenced::In
+                class_name.constantize.collection.update( 
+                  { '_id' => foreign_key_value },
+                  { '$inc' => parent_inc_options(voteable, options) }
+                )
+              elsif relation_metadata.relation == Mongoid::Relations::Referenced::ManyToMany
+                class_name.constantize.collection.update( 
+                  { '_id' => { '$in' => foreign_key_value } },
+                  { '$inc' => parent_inc_options(voteable, options) },
+                  { :multi => true }
+                )
+              end
             end
           end
 
           
-          def parent_inc_options(value, voteable, options)
+          def parent_inc_options(voteable, options)
             inc_options = {}
 
             if options[:revote]
-              if value == :up
+              if options[:value] == :up
                 inc_options['votes.point'] = voteable[:up] - voteable[:down]
                 unless voteable[:update_counters] == false
                   inc_options['votes.up_count'] = +1
@@ -178,10 +192,10 @@ module Mongoid
               end
 
             elsif options[:unvote]
-              inc_options['votes.point'] = -voteable[value]
+              inc_options['votes.point'] = -voteable[options[:value]]
               unless voteable[:update_counters] == false
                 inc_options['votes.count'] = -1
-                if value == :up
+                if options[:value] == :up
                   inc_options['votes.up_count'] = -1
                 else
                   inc_options['votes.down_count'] = -1
@@ -189,10 +203,10 @@ module Mongoid
               end
 
             else # new vote
-              inc_options['votes.point'] = voteable[value]
+              inc_options['votes.point'] = voteable[options[:value]]
               unless voteable[:update_counters] == false
                 inc_options['votes.count'] = +1
-                if value == :up
+                if options[:value] == :up
                   inc_options['votes.up_count'] = +1
                 else
                   inc_options['votes.down_count'] = +1

data/lib/voteable_mongoid/voteable.rb

@@ -6,8 +6,8 @@ module Mongoid
     extend ActiveSupport::Concern
 
     included do
-      include Document
-      include Voting
+      include ::Mongoid::Document
+      include ::Mongoid::Voteable::Voting
       
       field :votes, :type => Votes
 
@@ -50,70 +50,108 @@ module Mongoid
           VOTEABLE[name][name][:update_parents] = true
         end
       end
+      
+      # Check if voter_id do a vote on votee_id
+      #
+      # @param [Hash] options a hash containings:
+      #   - :votee_id: the votee document id
+      #   - :voter_id: the voter document id
+      # 
+      # @return [true, false]
+      def voted?(options)
+        validate_and_normalize_vote_options(options)
+        up_voted?(options) || down_voted?(options)
+      end
+      
+      # Check if voter_id do an up vote on votee_id
+      #
+      # @param [Hash] options a hash containings:
+      #   - :votee_id: the votee document id
+      #   - :voter_id: the voter document id
+      # 
+      # @return [true, false]
+      def up_voted?(options)
+        validate_and_normalize_vote_options(options)
+        up_voted_by(options[:voter_id]).where(:_id => options[:votee_id]).count == 1
+      end
+      
+      # Check if voter_id do a down vote on votee_id
+      #
+      # @param [Hash] options a hash containings:
+      #   - :votee_id: the votee document id
+      #   - :voter_id: the voter document id
+      # 
+      # @return [true, false]
+      def down_voted?(options)
+        validate_and_normalize_vote_options(options)
+        down_voted_by(options[:voter_id]).where(:_id => options[:votee_id]).count == 1
+      end
     end
     
-    # Make a vote on this votee
-    #
-    # @param [Hash] options a hash containings:
-    #   - :voter_id: the voter document id
-    #   - :value: vote :up or vote :down
-    #   - :revote: change from vote up to vote down
-    #   - :unvote: unvote the vote value (:up or :down)
-    def vote(options)
-      options[:votee_id] = id
-      options[:votee] = self
-      options[:voter_id] ||= options[:voter].id
-
-      if options[:unvote]
-        options[:value] ||= vote_value(options[:voter_id])
-      else
-        options[:revote] ||= vote_value(options[:voter_id]).present?
-      end
+    module InstanceMethods
+      # Make a vote on this votee
+      #
+      # @param [Hash] options a hash containings:
+      #   - :voter_id: the voter document id
+      #   - :value: vote :up or vote :down
+      #   - :revote: change from vote up to vote down
+      #   - :unvote: unvote the vote value (:up or :down)
+      def vote(options)
+        options[:votee_id] = id
+        options[:votee] = self
+        options[:voter_id] ||= options[:voter].id
 
-      self.class.vote(options)
-    end
+        if options[:unvote]
+          options[:value] ||= vote_value(options[:voter_id])
+        else
+          options[:revote] ||= vote_value(options[:voter_id]).present?
+        end
 
-    # Get a voted value on this votee
-    #
-    # @param [Mongoid Object, BSON::ObjectId] voter is Mongoid object or the id of the voter who made the vote
-    def vote_value(voter)
-      voter_id = voter.is_a?(BSON::ObjectId) ? voter : voter.id
-      return :up if up_voter_ids.include?(voter_id)
-      return :down if down_voter_ids.include?(voter_id)
-    end
+        self.class.vote(options)
+      end
     
-    def voted_by?(voter)
-      !!vote_value(voter)
-    end
+      # Get a voted value on this votee
+      #
+      # @param [Mongoid Object, BSON::ObjectId] voter is Mongoid object or the id of the voter who made the vote
+      def vote_value(voter)
+        voter_id = voter.is_a?(BSON::ObjectId) ? voter : voter.id
+        return :up if up_voter_ids.include?(voter_id)
+        return :down if down_voter_ids.include?(voter_id)
+      end
+    
+      def voted_by?(voter)
+        !!vote_value(voter)
+      end
 
-    # Array of up voter ids
-    def up_voter_ids
-      votes.try(:[], 'up') || []
-    end
+      # Array of up voter ids
+      def up_voter_ids
+        votes.try(:[], 'up') || []
+      end
 
-    # Array of down voter ids
-    def down_voter_ids
-      votes.try(:[], 'down') || []
-    end
+      # Array of down voter ids
+      def down_voter_ids
+        votes.try(:[], 'down') || []
+      end
 
-    # Get the number of up votes
-    def up_votes_count
-      votes.try(:[], 'up_count') || 0
-    end
+      # Get the number of up votes
+      def up_votes_count
+        votes.try(:[], 'up_count') || 0
+      end
   
-    # Get the number of down votes
-    def down_votes_count
-      votes.try(:[], 'down_count') || 0
-    end
+      # Get the number of down votes
+      def down_votes_count
+        votes.try(:[], 'down_count') || 0
+      end
   
-    # Get the number of votes
-    def votes_count
-      votes.try(:[], 'count') || 0
-    end
+      # Get the number of votes
+      def votes_count
+        votes.try(:[], 'count') || 0
+      end
   
-    # Get the votes point
-    def votes_point
-      votes.try(:[], 'point') || 0
+      # Get the votes point
+      def votes_point
+        votes.try(:[], 'point') || 0
+      end
     end
     
   end

data/lib/voteable_mongoid/voter.rb

@@ -1,86 +1,89 @@
 module Mongoid
   module Voter
     extend ActiveSupport::Concern
-
-    # Check to see if this voter voted on the votee or not
-    #
-    # @param [Hash, Object] options the hash containing the votee, or the votee itself
-    # @return [true, false] true if voted, false otherwise
-    def voted?(options)
-      unless options.is_a?(Hash)
-        votee_class = options.class
-        votee_id = options.id
-      else
-        votee = options[:votee]
-        if votee
-          votee_class = votee.class
-          votee_id = votee.id
+    
+    module InstanceMethods
+      # Check to see if this voter voted on the votee or not
+      #
+      # @param [Hash, Object] options the hash containing the votee, or the votee itself
+      # @return [true, false] true if voted, false otherwise
+      def voted?(options)
+        unless options.is_a?(Hash)
+          votee_class = options.class
+          votee_id = options.id
         else
-          votee_class = options[:votee_type].classify.constantize
-          votee_id = options[:votee_id]
+          votee = options[:votee]
+          if votee
+            votee_class = votee.class
+            votee_id = votee.id
+          else
+            votee_class = options[:votee_type].classify.constantize
+            votee_id = options[:votee_id]
+          end
         end
-      end
       
-      votee_class.voted_by(self).where(:_id => votee_id).count == 1
-    end
+        votee_class.voted?(:voter_id => id, :votee_id => votee_id)
+      end
 
-    # Get the voted value on a votee
-    #
-    # @param (see #voted?)
-    # @return [Symbol, nil] :up or :down or nil if not voted
-    def vote_value(options)
-      votee = unless options.is_a?(Hash)
-        options
-      else
-        options[:votee] || options[:votee_type].classify.constantize.only(:votes).where(
-          :_id => options[:votee_id]
-        ).first
+      # Get the voted value on a votee
+      #
+      # @param (see #voted?)
+      # @return [Symbol, nil] :up or :down or nil if not voted
+      def vote_value(options)
+        votee = unless options.is_a?(Hash)
+          options
+        else
+          options[:votee] || options[:votee_type].classify.constantize.only(:votes).where(
+            :_id => options[:votee_id]
+          ).first
+        end
+        votee.vote_value(_id)
       end
-      votee.vote_value(_id)
-    end
     
-    # Cancel the vote on a votee
-    #
-    # @param [Object] votee the votee to be unvoted
-    def unvote(options)
-      unless options.is_a?(Hash)
-        options = { :votee => options }
+      # Cancel the vote on a votee
+      #
+      # @param [Object] votee the votee to be unvoted
+      def unvote(options)
+        unless options.is_a?(Hash)
+          options = { :votee => options }
+        end
+        options[:unvote] = true
+        options[:revote] = false
+        vote(options)
       end
-      options[:unvote] = true
-      options[:revote] = false
-      vote(options)
-    end
 
-    # Vote on a votee
-    #
-    # @param (see #voted?)
-    # @param [:up, :down] vote_value vote up or vote down, nil to unvote
-    def vote(options, value = nil)
-      if options.is_a?(Hash)
-        votee = options[:votee]
-      else
-        votee = options
-        options = { :votee => votee, :value => value }
-      end
+      # Vote on a votee
+      #
+      # @param (see #voted?)
+      # @param [:up, :down] vote_value vote up or vote down, nil to unvote
+      def vote(options, value = nil)
+        if options.is_a?(Hash)
+          votee = options[:votee]
+        else
+          votee = options
+          options = { :votee => votee, :value => value }
+        end
 
-      if votee
-        options[:votee_id] = votee.id
-        votee_class = votee.class
-      else
-        votee_class = options[:votee_type].classify.constantize
-      end
+        if votee
+          options[:votee_id] = votee.id
+          votee_class = votee.class
+        else
+          votee_class = options[:votee_type].classify.constantize
+        end
       
-      if options[:value].nil?
-        options[:unvote] = true
-        options[:value] = vote_value(options)
-      else
-        options[:revote] = options.has_key?(:revote) ? !options[:revote].blank? : voted?(options)
-      end
+        if options[:value].nil?
+          options[:unvote] = true
+          options[:value] = vote_value(options)
+        else
+          options[:revote] = options.has_key?(:revote) ? !options[:revote].blank? : voted?(options)
+        end
       
-      options[:voter] = self
-      options[:voter_id] = id
+        options[:voter] = self
+        options[:voter_id] = id
 
-      ( votee || votee_class ).vote(options)
+        ( votee || votee_class ).vote(options)
+      end
     end
+    
   end
 end

data/spec/models/category.rb

@@ -0,0 +1,8 @@
+class Category
+  include Mongoid::Document
+  include Mongoid::Voteable
+
+  field :name  
+
+  has_and_belongs_to_many :posts
+end

data/spec/models/comment.rb

@@ -1,11 +1,13 @@
 require 'post'
 
 class Comment
-  include Mongoid::Document
   include Mongoid::Voteable
-  
-  referenced_in :post
+  include Mongoid::Document
+
+  field :content
+
+  belongs_to :post
   
   voteable self, :up => +1, :down => -3
-  voteable Post, :up => +2, :down => -1 #, :not_update_counters => true
+  voteable Post, :up => +2, :down => -1
 end

data/spec/models/post.rb

@@ -2,7 +2,12 @@ class Post
   include Mongoid::Document
   include Mongoid::Voteable
 
-  voteable self, :up => +1, :down => -1
+  field :title
+  field :content
   
-  references_many :comments  
+  has_and_belongs_to_many :categories
+  has_many :comments
+
+  voteable self, :up => +1, :down => -1
+  voteable Category, :up => +3, :down => -5, :update_counters => false
 end

data/spec/spec_helper.rb

@@ -29,3 +29,4 @@ Dir[ File.join(MODELS, "*.rb") ].sort.each { |file| require File.basename(file)
 User.collection.drop
 Post.collection.drop
 Comment.collection.drop
+Category.collection.drop

data/spec/voteable_mongoid/tasks_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Mongoid::Voteable::Tasks do
+  describe 'Mongoid::Voteable::Tasks.init_stats' do
+    before :all do
+      @post1 = Post.create!
+      @post2 = Post.create!
+    end
+
+    it 'after create votes has default value' do
+      @post1.votes.should == Mongoid::Voteable::Votes::DEFAULT_ATTRIBUTES
+      @post2.votes.should == Mongoid::Voteable::Votes::DEFAULT_ATTRIBUTES
+    end
+    
+    it 'reset votes data' do
+      @post1.votes = nil
+      @post1.save
+
+      @post2.votes = nil
+      @post2.save
+    end
+    
+    it 'init_stats recover votes default value' do
+      Mongoid::Voteable::Tasks.init_stats
+
+      @post1.reload
+      @post2.reload
+    
+      @post1.votes.should == Mongoid::Voteable::Votes::DEFAULT_ATTRIBUTES
+      @post2.votes.should == Mongoid::Voteable::Votes::DEFAULT_ATTRIBUTES
+    end
+  end
+end

data/spec/voteable_mongoid/voteable_spec.rb

@@ -1,17 +1,34 @@
-require "spec_helper"
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Mongoid::Voteable do
   before :all do
+    @category1 = Category.create!(:name => 'xyz')
+    @category2 = Category.create!(:name => 'abc')
+    
     @post1 = Post.create!
     @post2 = Post.create!
     
+    @post1.categories << @category1
+    @category2.posts << @post1
+    
     @comment = @post2.comments.create!
+    
     @user1 = User.create!
     @user2 = User.create!
   end
   
   context "just created" do
-    it 'voteable votes_count, votes_point should be zero' do
+    it 'votes_count, up_votes_count, down_votes_count, votes_point should be zero' do
+      @category1.up_votes_count.should == 0
+      @category1.down_votes_count.should == 0
+      @category1.votes_count.should == 0
+      @category1.votes_point.should == 0
+
+      @category2.up_votes_count.should == 0
+      @category2.down_votes_count.should == 0
+      @category2.votes_count.should == 0
+      @category2.votes_point.should == 0
+
       @post1.up_votes_count.should == 0
       @post1.down_votes_count.should == 0
       @post1.votes_count.should == 0
@@ -21,49 +38,51 @@ describe Mongoid::Voteable do
       @post2.down_votes_count.should == 0
       @post2.votes_count.should == 0
       @post2.votes_point.should == 0
+
+      @comment.up_votes_count.should == 0
+      @comment.down_votes_count.should == 0
+      @comment.votes_count.should == 0
+      @comment.votes_point.should == 0
     end
     
-    it 'voteable up_voter_ids, down_voter_ids should be empty' do
+    it 'up_voter_ids, down_voter_ids should be empty' do
+      @category1.up_voter_ids.should be_empty
+      @category1.down_voter_ids.should be_empty
+
+      @category2.up_voter_ids.should be_empty
+      @category2.down_voter_ids.should be_empty
+
       @post1.up_voter_ids.should be_empty
       @post1.down_voter_ids.should be_empty
 
       @post2.up_voter_ids.should be_empty
       @post2.down_voter_ids.should be_empty
+
+      @comment.up_voter_ids.should be_empty
+      @comment.down_voter_ids.should be_empty
     end
     
-    it 'posts voted voter should be empty' do
+    it 'voted by voter should be empty' do
+      Category.voted_by(@user1).should be_empty
+      Category.voted_by(@user2).should be_empty
+
       Post.voted_by(@user1).should be_empty
       Post.voted_by(@user2).should be_empty
-    end
-    
-    it 'test init stats' do
-      @post1.votes.should == Mongoid::Voteable::Votes::DEFAULT_ATTRIBUTES
-      @post2.votes.should == Mongoid::Voteable::Votes::DEFAULT_ATTRIBUTES
-      
-      @post1.votes = nil
-      @post1.save
-
-      @post2.votes = nil
-      @post2.save
       
-      Mongoid::Voteable::Tasks.init_stats
-
-      @post1.reload
-      @post2.reload
-      
-      @post1.votes.should == Mongoid::Voteable::Votes::DEFAULT_ATTRIBUTES
-      @post2.votes.should == Mongoid::Voteable::Votes::DEFAULT_ATTRIBUTES
+      Comment.voted_by(@user1).should be_empty
+      Comment.voted_by(@user2).should be_empty
     end
-    
-    it 'revote has no effect' do
+        
+    it 'revote post1 has no effect' do
       @post1.vote(:revote => true, :voter => @user1, :value => 'up')
-      @post1.reload
 
       @post1.up_votes_count.should == 0
       @post1.down_votes_count.should == 0
       @post1.votes_count.should == 0
       @post1.votes_point.should == 0
-      
+    end
+    
+    it 'revote post2 has no effect' do
       Post.vote(:revote => true, :votee_id => @post2.id, :voter_id => @user2.id, :value => :down)
       @post2.reload
       
@@ -76,10 +95,24 @@ describe Mongoid::Voteable do
   
   context 'user1 vote up post1 the first time' do
     before :all do    
-      Post.vote(:votee => @post1, :voter_id => @user1.id, :value => :up)
+      @return = @post1.vote(:voter_id => @user1.id, :value => :up, :return_votee => true)
     end
     
-    it '' do
+    it 'validates return post' do
+      @return.votes.should == {
+        'up' => [@user1.id],
+        'down' => [],
+        'up_count' => 1,
+        'down_count' => 0,
+        'count' => 1,
+        'point' => 1
+      }
+
+      @return.should_not be_new_record
+      @return.should be_is_a(Post)
+    end
+    
+    it 'validates' do
       @post1.up_votes_count.should == 1
       @post1.down_votes_count.should == 0
       @post1.votes_count.should == 1
@@ -92,6 +125,18 @@ describe Mongoid::Voteable do
 
       Post.voted_by(@user1).to_a.should == [ @post1 ]
       Post.voted_by(@user2).to_a.should be_empty
+      
+      @category1.reload
+      @category1.up_votes_count.should == 0
+      @category1.down_votes_count.should == 0
+      @category1.votes_count.should == 0
+      @category1.votes_point.should == 3
+
+      @category2.reload
+      @category2.up_votes_count.should == 0
+      @category2.down_votes_count.should == 0
+      @category2.votes_count.should == 0
+      @category2.votes_point.should == 3
     end
     
     it 'user1 vote post1 has no effect' do
@@ -113,18 +158,39 @@ describe Mongoid::Voteable do
       @post1.reload
     end
     
-    it '' do
+    it 'post1 up_votes_count is the same' do
       @post1.up_votes_count.should == 1
+    end
+    
+    it 'post1 vote_value on user1 is the same' do
+      @post1.vote_value(@user1.id).should == :up
+    end
+    
+    it 'down_votes_count, votes_count, and votes_point changed' do
       @post1.down_votes_count.should == 1
       @post1.votes_count.should == 2
       @post1.votes_point.should == 0
-      
-      @post1.vote_value(@user1.id).should == :up
       @post1.vote_value(@user2.id).should == :down
-
+    end
+    
+    it 'posts voted_by user1, user2 is post1 only' do
       Post.voted_by(@user1).to_a.should == [ @post1 ]
       Post.voted_by(@user2).to_a.should == [ @post1 ]
     end
+    
+    it 'categories votes' do
+      @category1.reload
+      @category1.up_votes_count.should == 0
+      @category1.down_votes_count.should == 0
+      @category1.votes_count.should == 0
+      @category1.votes_point.should == -2
+
+      @category2.reload
+      @category2.up_votes_count.should == 0
+      @category2.down_votes_count.should == 0
+      @category2.votes_count.should == 0
+      @category2.votes_point.should == -2
+    end
   end
   
   context 'user1 change vote on post1 from up to down' do
@@ -134,7 +200,7 @@ describe Mongoid::Voteable do
       @post1.reload
     end
     
-    it '' do
+    it 'validates' do
       @post1.up_votes_count.should == 0
       @post1.down_votes_count.should == 2
       @post1.votes_count.should == 2
@@ -153,7 +219,7 @@ describe Mongoid::Voteable do
       @post2.vote(:voter_id => @user1.id, :value => :down)
     end
     
-    it '' do
+    it 'validates' do
       @post2.up_votes_count.should == 0
       @post2.down_votes_count.should == 1
       @post2.votes_count.should == 1
@@ -173,7 +239,7 @@ describe Mongoid::Voteable do
       @post2.reload
     end
     
-    it '' do
+    it 'validates' do
       @post2.up_votes_count.should == 1
       @post2.down_votes_count.should == 0
       @post2.votes_count.should == 1
@@ -194,7 +260,7 @@ describe Mongoid::Voteable do
       @post2.reload
     end
     
-    it '' do
+    it 'validates' do
       @post2.up_votes_count.should == 2
       @post2.down_votes_count.should == 0
       @post2.votes_count.should == 2
@@ -215,7 +281,7 @@ describe Mongoid::Voteable do
       @post2.reload
     end
     
-    it '' do
+    it 'validates' do
       @post2.up_votes_count.should == 1
       @post2.down_votes_count.should == 1
       @post2.votes_count.should == 2
@@ -249,7 +315,7 @@ describe Mongoid::Voteable do
       @post1.reload
     end
     
-    it "" do
+    it 'validates' do
       @post1.up_votes_count.should == 0
       @post1.down_votes_count.should == 1
       @post1.votes_count.should == 1

data/spec/voteable_mongoid/voter_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Mongoid::Voter do
   before :all do
@@ -10,7 +10,7 @@ describe Mongoid::Voter do
   end
   
   context "just created" do
-    it '' do
+    it 'validates' do
       Post.voted_by(@user1).should be_empty
       Post.up_voted_by(@user1).should be_empty
       Post.down_voted_by(@user1).should be_empty
@@ -39,7 +39,7 @@ describe Mongoid::Voter do
       @post1.reload
     end
     
-    it '' do
+    it 'validates' do
       @post1.votes_count.should == 1
       @post1.votes_point.should == 1
 
@@ -72,7 +72,7 @@ describe Mongoid::Voter do
       @post1.reload
     end
     
-    it '' do
+    it 'validates' do
       @post1.votes_count.should == 2
       @post1.votes_point.should == 0
       
@@ -92,7 +92,7 @@ describe Mongoid::Voter do
       @post1.reload
     end
     
-    it '' do
+    it 'validates' do
       @post1.votes_count.should == 2
       @post1.votes_point.should == -2
 
@@ -110,7 +110,7 @@ describe Mongoid::Voter do
       @post2.reload
     end
     
-    it '' do
+    it 'validates' do
       @post2.votes_count.should == 1
       @post2.votes_point.should == -1
       
@@ -127,7 +127,7 @@ describe Mongoid::Voter do
       @post2.reload
     end
     
-    it '' do
+    it 'validates' do
       @post2.votes_count.should == 1
       @post2.votes_point.should == 1
       

data/voteable_mongoid.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'mongoid', '~> 2.0.0'
   
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'bson_ext'
 
   s.rubyforge_project = "voteable_mongoid"
 

metadata

@@ -2,7 +2,7 @@
 name: voteable_mongoid
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Alex Nguyen
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 +08:00
-default_executable: 
+date: 2011-04-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongoid
@@ -35,6 +34,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Add Up / Down Voting for Mongoid (built for speed by using one Mongodb update-in-place for each collection when provided enough information)
 email: 
 - alex@vinova.sg
@@ -46,6 +56,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rvmrc
 - .watchr
 - CHANGELOG.rdoc
 - Gemfile
@@ -62,14 +73,15 @@ files:
 - lib/voteable_mongoid/voteable/voting.rb
 - lib/voteable_mongoid/voter.rb
 - spec/.rspec
+- spec/models/category.rb
 - spec/models/comment.rb
 - spec/models/post.rb
 - spec/models/user.rb
 - spec/spec_helper.rb
+- spec/voteable_mongoid/tasks_spec.rb
 - spec/voteable_mongoid/voteable_spec.rb
 - spec/voteable_mongoid/voter_spec.rb
 - voteable_mongoid.gemspec
-has_rdoc: true
 homepage: https://github.com/vinova/voteable_mongoid
 licenses: []
 
@@ -93,14 +105,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: voteable_mongoid
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Add Up / Down Voting for Mongoid
 test_files: 
+- spec/models/category.rb
 - spec/models/comment.rb
 - spec/models/post.rb
 - spec/models/user.rb
 - spec/spec_helper.rb
+- spec/voteable_mongoid/tasks_spec.rb
 - spec/voteable_mongoid/voteable_spec.rb
 - spec/voteable_mongoid/voter_spec.rb