voteable_mongoid 0.7.1 → 0.7.2

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 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

data/lib/voteable_mongoid/version.rb

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

data/lib/voteable_mongoid/voteable/voting.rb

@@ -14,28 +14,43 @@ module Mongoid
         #   - :unvote: unvote the vote value (:up or :down)
         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
           options[:voteable] = VOTEABLE[name][name]
           
-          update_parents = true
+          update_parents = options[:voteable][:update_parents]
 
           if options[:voteable]
-            update_result = if options[:revote]
+             query, update = if options[:revote]
               revote(options)
             elsif options[:unvote]
               unvote(options)
             else
               new_vote(options)
             end
-            # Only update parent votes if votee is updated successfully
-            update_parents = ( update_result['err'] == nil and 
-              update_result['updatedExisting'] == true and
-              update_result['n'] == 1 )
-          end
 
-          update_parent_votes(options) if update_parents
+            if options[:votee] || update_parents
+              # If votee exits or need to update parent
+              # use Collection#find_and_modify to retrieve updated votes data and parent_ids
+              begin
+                doc = collection.master.collection.find_and_modify(
+                  :query => query,
+                  :update => update,
+                  :new => true
+                )
+                # Update new votes data
+                options[:votee].write_attribute('votes', doc['votes']) if options[:votee]
+                update_parent_votes(doc, options) if update_parents
+              rescue
+                # Don't update parents if operation fail or no matching object found
+              end
+            else
+              # Just update and don't care the result
+              collection.update(query, update)
+            end
+          end
         end
 
         
@@ -49,7 +64,7 @@ module Mongoid
               positive_votes_count = 'votes.down_count'
             end
 
-            collection.update({ 
+            return {
               # Validate voter_id did not vote for votee_id yet
               :_id => options[:votee_id],
               'votes.up' => { '$ne' => options[:voter_id] },
@@ -61,9 +76,7 @@ module Mongoid
                 'votes.count' => +1,
                 positive_votes_count => +1,
                 'votes.point' => options[:voteable][options[:value]] }
-            }, {
-              :safe => true
-            })
+            }
           end
 
           
@@ -82,7 +95,7 @@ module Mongoid
               point_delta = -options[:voteable][:up] + options[:voteable][:down]
             end
 
-            collection.update({ 
+            return {
               # Validate voter_id did a vote with value for votee_id
               :_id => options[:votee_id],
               positive_voter_ids => { '$ne' => options[:voter_id] },
@@ -96,9 +109,7 @@ module Mongoid
                 negative_votes_count => -1,
                 'votes.point' => point_delta
               }
-            }, {
-              :safe => true
-            })
+            }
           end
           
 
@@ -113,10 +124,9 @@ module Mongoid
               positive_votes_count = 'votes.down_count'
             end
 
-            # Check if voter_id did a vote with value for votee_id
-            update_result = collection.update({ 
-              # Validate voter_id did a vote with value for votee_id
+            return {
               :_id => options[:votee_id],
+              # Validate if voter_id did a vote with value for votee_id
               negative_voter_ids => { '$ne' => options[:voter_id] },
               positive_voter_ids => options[:voter_id]
             }, {
@@ -127,22 +137,19 @@ module Mongoid
                 'votes.count' => -1,
                 'votes.point' => -options[:voteable][options[:value]]
               }
-            }, {
-              :safe => true
-            })
+            }
           end
           
 
-          def update_parent_votes(options)
+          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]
-              votee ||= find(options[:votee_id])
               # If can find current votee foreign_key value for that class
-              next unless foreign_key_value = votee.read_attribute(relation_metadata.foreign_key)
+              next unless foreign_key_value = doc[relation_metadata.foreign_key.to_s]
 
               class_name.constantize.collection.update(
                 { '_id' => foreign_key_value }, 

data/lib/voteable_mongoid/voteable.rb

@@ -44,8 +44,11 @@ module Mongoid
       # voteable self, :up => +1, :down => -3
       # voteable Post, :up => +2, :down => -1, :update_counters => false # skip counter update
       def voteable(klass = self, options = nil)
-        VOTEABLE[self.name] ||= {}
-        VOTEABLE[self.name][klass.name] ||= options
+        VOTEABLE[name] ||= {}
+        VOTEABLE[name][klass.name] ||= options
+        if klass != self
+          VOTEABLE[name][name][:update_parents] = true
+        end
       end
     end
     

data/spec/voteable_mongoid/voteable_spec.rb

@@ -76,8 +76,7 @@ describe Mongoid::Voteable do
   
   context 'user1 vote up post1 the first time' do
     before :all do    
-      Post.vote(:votee_id => @post1.id, :voter_id => @user1.id, :value => :up)
-      @post1.reload
+      Post.vote(:votee => @post1, :voter_id => @user1.id, :value => :up)
     end
     
     it '' do
@@ -151,8 +150,7 @@ describe Mongoid::Voteable do
   
   context 'user1 vote down post2 the first time' do
     before :all do
-      Post.vote(:votee_id => @post2.id, :voter_id => @user1.id, :value => :down)
-      @post2.reload
+      @post2.vote(:voter_id => @user1.id, :value => :down)
     end
     
     it '' do

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: voteable_mongoid
 version: !ruby/object:Gem::Version 
-  hash: 1
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 1
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Alex Nguyen
@@ -15,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 Z
+date: 2011-04-04 00:00:00 +08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongoid
@@ -25,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
   type: :runtime
   version_requirements: *id001
@@ -41,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -81,6 +69,7 @@ files:
 - 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: []
 
@@ -94,23 +83,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: voteable_mongoid
-rubygems_version: 1.7.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Add Up / Down Voting for Mongoid