voteable_mongoid 0.2.2 → 0.2.3

data/lib/mongoid/voteable.rb

@@ -19,6 +19,8 @@ module Mongoid
       # In this case, validation can be skip to maximize performance
 
       def self.vote(options)
+        options.symbolize_keys!
+        
         votee_id = options[:votee_id]
         voter_id = options[:voter_id]
         value = options[:value]
@@ -27,7 +29,7 @@ module Mongoid
         voter_id = BSON::ObjectID(voter_id) if voter_id.is_a?(String)
 
         if options[:revote]
-          if value == :up
+          if value.to_sym == :up
             push_field = :up_voter_ids
             pull_field = :down_voter_ids
             point_delta = +2
@@ -50,7 +52,7 @@ module Mongoid
           })
 
         else # new vote
-          if value == :up
+          if value.to_sym == :up
             push_field = :up_voter_ids
             point_delta = +1
           else
@@ -73,7 +75,16 @@ module Mongoid
       end
     end
   
-    def vote_value(voter_id)
+    def vote_value(x)
+      voter_id = case x
+      when String
+        BSON::ObjectID(x)
+      when BSON::ObjectID
+        x
+      else
+        x.id
+      end
+
       return :up if up_voter_ids.try(:include?, voter_id)
       return :down if down_voter_ids.try(:include?, voter_id)
     end

data/lib/mongoid/voter.rb

@@ -40,6 +40,8 @@ module Mongoid
     
   
     def vote(options, vote_value = nil)
+      options.symbolize_keys!
+
       if options.is_a?(Hash) 
         votee = options[:votee]
       else
@@ -54,8 +56,10 @@ module Mongoid
         votee_class = options[:votee_type].constantize
       end
       
-      unless options.has_key?(:revote)
-        options[:revote] = voted?(options)
+      options[:revote] = if options.has_key?(:revote)
+        !options[:revote].blank?
+      else
+        options.has_key?(:new) ? options[:new].blank? : voted?(options)
       end
       
       options[:voter_id] = _id

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: voteable_mongoid
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Alex Nguyen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +07:00
+date: 2010-09-03 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency