voteable_mongo 0.8.1 → 0.9.0

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.9.0
+  * Add MongoMapper support
+  * Simplify voting algorithm
+  * vote / revote / unvote always return voteable object (votee)
+  * Tasks module bug fixes
+  
 == 0.8.1
   * Fix gem release bug
   

data/README.rdoc

@@ -1,6 +1,6 @@
 = Voteable Mongo
 
-voteable_mongo allows you to make your Mongoid::Document (mongo_mapper support coming soon) objects voteable (up or down) and tabulate votes count and votes point for you. For instance, in a forum, a user can vote up (or down) on a post or a comment.
+voteable_mongo allows you to make your Mongoid::Document or MongoMapper::Document objects voteable (up or down) and tabulate votes count and votes point for you. For instance, in a forum, a user can vote up (or down) on a post or a comment.
 
 voteable_mongo is built for speed. It uses only one database request per collection to validate data, update data, and get updated data. Initial idea is based on http://cookbook.mongodb.org/patterns/votes
 
@@ -27,6 +27,7 @@ After that, remember to run "bundle install"
 
 === Make Post and Comment voteable, User become the voter
 
+== Mongoid
 post.rb
 
     class Post
@@ -62,6 +63,42 @@ user.rb
       include Mongo::Voter
     end
 
+
+== MongoMapper
+post.rb
+
+    class Post
+      include MongoMapper::Document
+      include Mongo::Voteable
+
+      # set points for each vote
+      voteable self, :up => +1, :down => -1
+
+      many :comments
+    end
+
+comment.rb
+
+    require 'post'
+
+    class Comment
+      include MongoMapper::Document
+      include Mongo::Voteable
+
+      belongs_to :post
+
+      voteable self, :up => +1, :down => -3
+      voteable Post, :up => +2, :down => -1
+    end
+
+user.rb
+
+    class User
+      include MongoMapper::Document
+      include Mongo::Voter
+    end
+
+
 === Make a vote
 
     @user.vote(@post, :up)
@@ -89,9 +126,8 @@ Re-vote
 
 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)
+
+Note: vote function always return updated votee object
 
 === Get vote_value
     

data/Rakefile

@@ -1,10 +1,10 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require "rspec"
-require "rspec/core/rake_task"
+require 'rspec'
+require 'rspec/core/rake_task'
 Rspec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = "spec/**/*_spec.rb"
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
-task :default => ["spec"]
+task :default => ['spec']

data/TODO

@@ -1,3 +1,8 @@
+* Use mongo_ruby_driver as much as possible
+* Move mongoid dependency to a separate module
+* Learn from other gems how they manage and support multiple adaptors
+  - https://github.com/pluginaweek/state_machine/tree/master/lib/state_machine/integrations
+  - https://github.com/ianwhite/orm_adapter
 * Add support for mongo_mapper
 * Add options hash validations
 * Refactor specs

data/lib/voteable_mongo.rb

@@ -1,10 +1,9 @@
 require 'mongoid'
+
 require 'voteable_mongo/voteable'
 require 'voteable_mongo/voter'
+require 'voteable_mongo/tasks'
 
-require 'voteable_mongo/voteable/tasks'
-
-# Add railtie
 if defined?(Rails)
   require 'voteable_mongo/railtie'
 end

data/lib/voteable_mongo/integrations/mongo_mapper.rb

@@ -0,0 +1,28 @@
+module Mongo
+  module Voteable
+    module Integrations
+      module MongoMapper
+        extend ActiveSupport::Concern
+
+        included do
+          key :votes, Hash, :default => DEFAULT_VOTES
+          
+          class << self
+            alias_method :voteable_index, :ensure_index
+            alias_method :voteable_collection, :collection
+          end
+        end
+
+        module ClassMethods
+          def voteable_relation(class_name)
+            associations.find{ |x, r| r.class_name == class_name }.try(:last)
+          end
+          
+          def voteable_foreign_key(metadata)
+            (metadata.options[:in] || "#{metadata.name}_id").to_s
+          end
+        end
+      end
+    end
+  end
+end

data/lib/voteable_mongo/integrations/mongoid.rb

@@ -0,0 +1,31 @@
+module Mongo
+  module Voteable
+    module Integrations
+      module Mongoid
+        extend ActiveSupport::Concern
+
+        included do
+          field :votes, :type => Hash, :default => DEFAULT_VOTES
+
+          class << self
+            alias_method :voteable_index, :index
+          end
+        end
+        
+        module ClassMethods
+          def voteable_relation(class_name)
+            relations.find{ |x, r| r.class_name == class_name }.try(:last)
+          end
+
+          def voteable_collection
+            collection.master.collection
+          end
+
+          def voteable_foreign_key(metadata)
+            metadata.foreign_key.to_s
+          end
+        end
+      end
+    end
+  end
+end

data/lib/voteable_mongo/{voteable/tasks.rb → tasks.rb}

@@ -10,7 +10,7 @@ module Mongo
           klass_voteable = voteable[class_name]
           puts "Init stats for #{class_name}" if log
           klass.collection.update({:votes => nil}, {
-            '$set' => { :votes => Votes::DEFAULT_ATTRIBUTES }
+            '$set' => { :votes => DEFAULT_VOTES }
           }, {
             :safe => true,
             :multi => true
@@ -68,12 +68,6 @@ module Mongo
               'votes_count' => true,
               'votes_point' => true,
               'voteable' => true
-              # 'votes.u' => true,
-              # 'votes.d' => true,
-              # 'votes.uc' => true,
-              # 'votes.dc' => true,
-              # 'votes.c' => true,
-              # 'votes.p' => true
             }
           }, { :safe => true })
         end
@@ -95,12 +89,15 @@ module Mongo
       def self.remake_stats_for(doc, voteable)
         up_count = doc.up_voter_ids.length
         down_count = doc.down_voter_ids.length
-    
         doc.update_attributes(
-          'votes.up_count' => up_count,
-          'votes.down_count' => down_count,
-          'votes.count' => up_count + down_count,
-          'votes.point' => voteable[:up].to_i*up_count + voteable[:down].to_i*down_count
+          'votes' => {
+            'up' => doc.up_voter_ids,
+            'down' => doc.down_voter_ids,
+            'up_count' => up_count,
+            'down_count' => down_count,
+            'count' => up_count + down_count,
+            'point' => voteable[:up].to_i*up_count + voteable[:down].to_i*down_count
+          }
         )
       end
 
@@ -109,10 +106,10 @@ module Mongo
         VOTEABLE.each do |class_name, voteable|
           klass = class_name.constantize
           voteable.each do |parent_class_name, parent_voteable|
-            relation_metadata = klass.relations[parent_class_name.underscore]
-            if relation_metadata
+            metadata = klass.voteable_relation(parent_class_name)
+            if metadata
               parent_class = parent_class_name.constantize
-              foreign_key = relation_metadata.foreign_key
+              foreign_key = klass.voteable_foreign_key(metadata)
               puts "Updating stats for #{class_name} > #{parent_class_name}" if log
               klass.all.each{ |doc|
                 update_parent_stats_for(doc, parent_class, foreign_key, parent_voteable)
@@ -142,9 +139,11 @@ module Mongo
               'votes.down_count' => down_count
             )
           end
-      
+
+          parent_ids = parent_id.is_a?(Array) ? parent_id : [ parent_id ]
+          
           parent_class.collection.update(
-            { '_id' => parent_id }, 
+            { '_id' => { '$in' => parent_ids } }, 
             { '$inc' =>  inc_options },
             { :safe => true }
           )

data/lib/voteable_mongo/version.rb

@@ -1,3 +1,3 @@
 module VoteableMongo
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
 end

data/lib/voteable_mongo/voteable.rb

@@ -1,36 +1,45 @@
-require 'voteable_mongo/voteable/votes'
-require 'voteable_mongo/voteable/voting'
+require 'voteable_mongo/voting'
+require 'voteable_mongo/integrations/mongoid'
+require 'voteable_mongo/integrations/mongo_mapper'
 
 module Mongo
   module Voteable
     extend ActiveSupport::Concern
 
+    DEFAULT_VOTES = {
+      'up' => [],
+      'down' => [],
+      'up_count' => 0,
+      'down_count' => 0,
+      'count' => 0,
+      'point' => 0
+    }
+
     included do
       include ::Mongo::Voteable::Voting
-      
-      field :votes, :type => Votes
 
-      before_create do
-        # Init votes so that counters and point have numeric values (0)
-        self.votes = Votes::DEFAULT_ATTRIBUTES
+      if defined?(Mongoid) && defined?(field)
+        include ::Mongo::Voteable::Integrations::Mongoid
+      elsif defined?(MongoMapper)
+        include ::Mongo::Voteable::Integrations::MongoMapper
       end
       
       scope :voted_by, lambda { |voter|
-        voter_id = voter.is_a?(BSON::ObjectId) ? voter : voter.id
-        any_of({ 'votes.up' => voter_id }, { 'votes.down' => voter_id })
+        voter_id = voter.is_a?(::BSON::ObjectId) ? voter : voter.id
+        where('$or' => [{ 'votes.up' => voter_id }, { 'votes.down' => voter_id }])
       }
-      
+
       scope :up_voted_by, lambda { |voter|
-        voter_id = voter.is_a?(BSON::ObjectId) ? voter : voter.id
-        where( 'votes.up' => voter_id )
+        voter_id = voter.is_a?(::BSON::ObjectId) ? voter : voter.id
+        where('votes.up' => voter_id)
       }
-      
+
       scope :down_voted_by, lambda { |voter|
-        voter_id = voter.is_a?(BSON::ObjectId) ? voter : voter.id
-        where( 'votes.down' => voter_id )
+        voter_id = voter.is_a?(::BSON::ObjectId) ? voter : voter.id
+        where('votes.down' => voter_id)
       }
-    end # include
-    
+    end
+
     # How many points should be assigned for each up or down vote and other options
     # This hash should manipulated using voteable method
     VOTEABLE = {}
@@ -89,24 +98,21 @@ module Mongo
         validate_and_normalize_vote_options(options)
         down_voted_by(options[:voter_id]).where(:_id => options[:votee_id]).count == 1
       end
-      
-      private
+
       def create_voteable_indexes
-        class_eval do
-          # Compound index _id and voters.up, _id and voters.down
-          # to make up_voted_by, down_voted_by, voted_by scopes and voting faster
-          # Should run in background since it introduce new index value and
-          # while waiting to build, the system can use _id for voting
-          # http://www.mongodb.org/display/DOCS/Indexing+as+a+Background+Operation
-          index [['votes.up', 1], ['_id', 1]], :unique => true
-          index [['votes.down', 1], ['_id', 1]], :unique => true
-
-          # Index counters and point for desc ordering
-          index [['votes.up_count', -1]]
-          index [['votes.down_count', -1]]
-          index [['votes.count', -1]]
-          index [['votes.point', -1]]
-        end
+        # Compound index _id and voters.up, _id and voters.down
+        # to make up_voted_by, down_voted_by, voted_by scopes and voting faster
+        # Should run in background since it introduce new index value and
+        # while waiting to build, the system can use _id for voting
+        # http://www.mongodb.org/display/DOCS/Indexing+as+a+Background+Operation
+        voteable_index [['votes.up', 1], ['_id', 1]], :unique => true
+        voteable_index [['votes.down', 1], ['_id', 1]], :unique => true
+
+        # Index counters and point for desc ordering
+        voteable_index [['votes.up_count', -1]]
+        voteable_index [['votes.down_count', -1]]
+        voteable_index [['votes.count', -1]]
+        voteable_index [['votes.point', -1]]
       end
     end
     

data/lib/voteable_mongo/voter.rb

@@ -3,8 +3,6 @@ module Mongo
     extend ActiveSupport::Concern
 
     included do
-      include ::Mongoid::Document
-
       scope :up_voted_for, lambda { |votee| where(:_id => { '$in' =>  votee.up_voter_ids }) }
       scope :down_voted_for, lambda { |votee| where(:_id => { '$in' =>  votee.down_voter_ids }) }
       scope :voted_for, lambda { |votee| where(:_id => { '$in' =>  votee.voter_ids }) }
@@ -41,7 +39,7 @@ module Mongo
         votee = unless options.is_a?(Hash)
           options
         else
-          options[:votee] || options[:votee_type].classify.constantize.only(:votes).where(
+          options[:votee] || options[:votee_type].classify.constantize.where(
             :_id => options[:votee_id]
           ).first
         end

data/lib/voteable_mongo/{voteable/voting.rb → voting.rb}

@@ -12,9 +12,8 @@ module Mongo
         #   - :value: :up or :down
         #   - :revote: if true change vote vote from :up to :down and vise versa
         #   - :unvote: if true undo the voting
-        #   - :return_votee: if true always return updated voteable object
         # 
-        # @return [votes, false, nil]
+        # @return [votee, false]
         def vote(options)
           validate_and_normalize_vote_options(options)
           options[:voteable] = VOTEABLE[name][name]
@@ -28,27 +27,21 @@ module Mongo
               new_vote_query_and_update(options)
             end
 
-            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
-                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 options[:voteable][:update_parents]
-                return options[:votee] || new(doc)
-              rescue Exception => e
-                # $stderr.puts "Mongo error: #{e.inspect}" # DEBUG
-                # Don't update parents if operation fail or no matched object found
-                return false
-              end
+            # If votee exits or need to update parent
+            # use Collection#find_and_modify to retrieve updated votes data and parent_ids
+            doc = voteable_collection.find_and_modify(
+              :query => query,
+              :update => update,
+              :new => true
+            )
+
+            if doc
+              update_parent_votes(doc, options) if options[:voteable][:update_parents]
+              # Update new votes data
+              options[:votee].write_attribute('votes', doc['votes']) if options[:votee]
+              options[:votee] || new(doc)
             else
-              # Just update and don't care the result
-              collection.update(query, update)
+              false
             end
           end
         end
@@ -155,25 +148,15 @@ module Mongo
 
           def update_parent_votes(doc, options)
             VOTEABLE[name].each do |class_name, voteable|
-              # 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?
-
-              # 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 }
-                )
+              if metadata = voteable_relation(class_name)
+                if parent_id = doc[voteable_foreign_key(metadata)]
+                  parent_ids = parent_id.is_a?(Array) ? parent_id : [ parent_id ]
+                  class_name.constantize.collection.update( 
+                    { '_id' => { '$in' => parent_ids } },
+                    { '$inc' => parent_inc_options(voteable, options) },
+                    { :multi => true }
+                  )
+                end
               end
             end
           end

data/spec/mongo_mapper/models/category.rb

@@ -0,0 +1,11 @@
+class Category
+  include MongoMapper::Document
+  include Mongo::Voteable
+
+  key :name, String
+
+  key :post_ids, Array
+  many :posts, :in => :post_ids
+  
+  voteable self, :index => true
+end

data/spec/mongo_mapper/models/comment.rb

@@ -0,0 +1,13 @@
+require File.join(File.dirname(__FILE__), 'post')
+
+class Comment
+  include MongoMapper::Document
+  include Mongo::Voteable
+
+  key :content, String
+
+  belongs_to :post
+  
+  voteable self, :up => +1, :down => -3
+  voteable Post, :up => +2, :down => -1
+end

data/spec/mongo_mapper/models/post.rb

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), 'category')
+
+class Post
+  include MongoMapper::Document
+  include Mongo::Voteable
+
+  key :title, String
+  key :content, String
+  
+  key :category_ids, Array
+  many :categories, :in => :category_ids
+
+  many :comments
+
+  voteable self, :up => +1, :down => -1, :index => true
+  voteable Category, :up => +3, :down => -5, :update_counters => false
+end

data/spec/mongo_mapper/models/user.rb

@@ -0,0 +1,4 @@
+class User
+  include MongoMapper::Document
+  include Mongo::Voter
+end

data/spec/{models → mongoid/models}/comment.rb

@@ -1,4 +1,4 @@
-require 'post'
+require File.join(File.dirname(__FILE__), 'post')
 
 class Comment
   include Mongoid::Document

data/spec/{models → mongoid/models}/post.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), 'category')
+
 class Post
   include Mongoid::Document
   include Mongo::Voteable

data/spec/spec_helper.rb

@@ -3,29 +3,35 @@ require 'bundler'
 Bundler.setup
 
 
+if rand > 0.6
+  puts 'Mongoid'
+  require 'mongoid'
+  models_folder = File.join(File.dirname(__FILE__), 'mongoid/models')
+  Mongoid.configure do |config|
+    name = 'voteable_mongo_test'
+    host = 'localhost'
+    config.master = Mongo::Connection.new.db(name)
+    config.autocreate_indexes = true
+  end
+else
+  puts 'MongoMapper'
+  require 'mongo_mapper'
+  models_folder = File.join(File.dirname(__FILE__), 'mongo_mapper/models')
+  MongoMapper.database = 'voteable_mongo_test'
+end
+
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-MODELS = File.join(File.dirname(__FILE__), "models")
-$LOAD_PATH.unshift(MODELS)
 
-
-require 'mongoid'
 require 'voteable_mongo'
 require 'rspec'
 require 'rspec/autorun'
 
-
-Mongoid.configure do |config|
-  name = "voteable_mongo_test"
-  host = "localhost"
-  config.master = Mongo::Connection.new.db(name)
-end
-
-
-Dir[ File.join(MODELS, "*.rb") ].sort.each { |file| require File.basename(file) }
-
-User.collection.drop
-Post.collection.drop
-Comment.collection.drop
-Category.collection.drop
+Dir[ File.join(models_folder, '*.rb') ].each { |file|
+  require file
+  file_name = File.basename(file).sub('.rb', '')
+  klass = file_name.classify.constantize
+  # klass.collection.drop
+}

data/spec/voteable_mongo/tasks_spec.rb

@@ -8,8 +8,8 @@ describe Mongo::Voteable::Tasks do
     end
 
     it 'after create votes has default value' do
-      @post1.votes.should == Mongo::Voteable::Votes::DEFAULT_ATTRIBUTES
-      @post2.votes.should == Mongo::Voteable::Votes::DEFAULT_ATTRIBUTES
+      @post1.votes.should == ::Mongo::Voteable::DEFAULT_VOTES
+      @post2.votes.should == ::Mongo::Voteable::DEFAULT_VOTES
     end
     
     it 'reset votes data' do
@@ -21,13 +21,14 @@ describe Mongo::Voteable::Tasks do
     end
     
     it 'init_stats recover votes default value' do
-      Mongo::Voteable::Tasks.init_stats
+      ::Mongo::Voteable::Tasks.init_stats
+      ::Mongo::Voteable::Tasks.migrate_old_votes
 
       @post1.reload
       @post2.reload
-    
-      @post1.votes.should == Mongo::Voteable::Votes::DEFAULT_ATTRIBUTES
-      @post2.votes.should == Mongo::Voteable::Votes::DEFAULT_ATTRIBUTES
+
+      @post1.votes.should == ::Mongo::Voteable::DEFAULT_VOTES
+      @post2.votes.should == ::Mongo::Voteable::DEFAULT_VOTES
     end
   end
 end

data/spec/voteable_mongo/voteable_spec.rb

@@ -6,18 +6,20 @@ describe Mongo::Voteable do
     before do
       Post.collection.drop_indexes
       Category.collection.drop_indexes
+      
+      Post.create_voteable_indexes
+      Category.create_voteable_indexes
     end
-
+  
     it 'defines indexes' do
       [Post, Category].each do |klass|
-        klass.create_indexes
         [ 'votes.up_1__id_1',
           'votes.down_1__id_1'
         ].each { |index_key|
           klass.collection.index_information.should have_key index_key
           klass.collection.index_information[index_key]['unique'].should be_true
         }
-
+  
         [ 'votes.count_-1',
           'votes.up_count_-1',
           'votes.down_count_-1',
@@ -33,12 +35,9 @@ describe Mongo::Voteable do
     @category1 = Category.create!(:name => 'xyz')
     @category2 = Category.create!(:name => 'abc')
     
-    @post1 = Post.create!
+    @post1 = Post.create!(:category_ids => [@category1.id, @category2.id])
     @post2 = Post.create!
-    
-    @post1.categories << @category1
-    @category2.posts << @post1
-    
+        
     @comment = @post2.comments.create!
     
     @user1 = User.create!
@@ -123,7 +122,7 @@ describe Mongo::Voteable do
   
   context 'user1 vote up post1 the first time' do
     before :all do
-      @post = @post1.vote(:voter_id => @user1.id, :value => :up, :return_votee => true)
+      @post = @post1.vote(:voter_id => @user1.id, :value => :up)
     end
     
     it 'validates return post' do
@@ -151,8 +150,8 @@ describe Mongo::Voteable do
       @post1.vote_value(@user2.id).should be_nil
       @post1.should_not be_voted_by(@user2.id)
 
-      @post1.up_voters(User).should == [ @user1 ]
-      @post1.voters(User).should == [ @user1 ]
+      @post1.up_voters(User).to_a.should == [ @user1 ]
+      @post1.voters(User).to_a.should == [ @user1 ]
       @post1.down_voters(User).should be_empty
 
       Post.voted_by(@user1).to_a.should == [ @post1 ]
@@ -206,9 +205,9 @@ describe Mongo::Voteable do
     end
     
     it 'post1 get voters' do
-      @post1.up_voters(User).should == [ @user1 ]
-      @post1.down_voters(User).should == [ @user2 ]
-      @post1.voters(User).should == [ @user1, @user2 ]
+      @post1.up_voters(User).to_a.should == [ @user1 ]
+      @post1.down_voters(User).to_a.should == [ @user2 ]
+      @post1.voters(User).to_a.should == [ @user1, @user2 ]
     end
     
     it 'posts voted_by user1, user2 is post1 only' do
@@ -286,7 +285,9 @@ describe Mongo::Voteable do
       @post2.vote_value(@user1.id).should == :up
       @post2.vote_value(@user2.id).should be_nil
 
-      Post.voted_by(@user1).sort.should == [ @post1, @post2 ].sort
+      Post.voted_by(@user1).size.should == 2
+      Post.voted_by(@user1).should be_include @post1
+      Post.voted_by(@user1).should be_include @post2
     end
   end
   

data/spec/voteable_mongo/voter_spec.rb

@@ -54,9 +54,9 @@ describe Mongo::Voter do
       Post.down_voted_by(@user1).to_a.should be_empty
       Post.voted_by(@user2).to_a.should be_empty
       
-      User.up_voted_for(@post1).should == [ @user1 ]
-      User.down_voted_for(@post1).should be_empty
-      User.voted_for(@post1).should == [ @user1 ]
+      User.up_voted_for(@post1).to_a.should == [ @user1 ]
+      User.down_voted_for(@post1).to_a.should be_empty
+      User.voted_for(@post1).to_a.should == [ @user1 ]
     end
     
     it 'user1 vote post1 has no effect' do
@@ -88,9 +88,9 @@ describe Mongo::Voter do
       Post.up_voted_by(@user2).to_a.should be_empty
       Post.down_voted_by(@user2).to_a.should == [ @post1 ]
 
-      User.up_voted_for(@post1).should == [ @user1 ]
-      User.down_voted_for(@post1).should == [ @user2 ]
-      User.voted_for(@post1).should == [ @user1, @user2 ]
+      User.up_voted_for(@post1).to_a.should == [ @user1 ]
+      User.down_voted_for(@post1).to_a.should == [ @user2 ]
+      User.voted_for(@post1).to_a.should == [ @user1, @user2 ]
     end
   end
   
@@ -142,7 +142,9 @@ describe Mongo::Voter do
       @user1.vote_value(@post2).should == :up
       @user2.vote_value(@post2).should be_nil
 
-      Post.voted_by(@user1).sort.should == [ @post1, @post2 ].sort
+      Post.voted_by(@user1).size.should == 2
+      Post.voted_by(@user1).should be_include @post1
+      Post.voted_by(@user1).should be_include @post2
     end
   end  
 end

data/voteable_mongo.gemspec

@@ -10,12 +10,12 @@ Gem::Specification.new do |s|
   s.email       = ['alex@vinova.sg']
   s.homepage    = 'https://github.com/vinova/voteable_mongo'
   s.summary     = %q{Add Up / Down Voting for Mongoid and MongoMapper}
-  s.description = %q{Up / Down Voting for Mongoid (MongoMapper support coming soon). Built for speed by using only one database request per collection to validate data, update data, and get updated data.}
+  s.description = %q{Built for speed by using only one database request per collection to validate, update, and retrieve updated data}
 
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', '~> 2.5.0'
   s.add_development_dependency 'mongoid', '~> 2.0.0'
-  s.add_development_dependency 'mongo_mapper'
-  s.add_development_dependency 'bson_ext'
+  s.add_development_dependency 'mongo_mapper', '~> 0.9.0'
+  s.add_development_dependency 'bson_ext', '~> 1.3.0'
 
   s.rubyforge_project = 'voteable_mongo'
 

metadata

@@ -2,7 +2,7 @@
 name: voteable_mongo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors: 
 - Alex Nguyen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 Z
+date: 2011-05-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -18,9 +18,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.5.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,9 +40,9 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -51,12 +51,12 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.0
   type: :development
   version_requirements: *id004
-description: Up / Down Voting for Mongoid (MongoMapper support coming soon). Built for speed by using only one database request per collection to validate data, update data, and get updated data.
+description: Built for speed by using only one database request per collection to validate, update, and retrieve updated data
 email: 
 - alex@vinova.sg
 executables: []
@@ -75,19 +75,24 @@ files:
 - Rakefile
 - TODO
 - lib/voteable_mongo.rb
+- lib/voteable_mongo/integrations/mongo_mapper.rb
+- lib/voteable_mongo/integrations/mongoid.rb
 - lib/voteable_mongo/railtie.rb
 - lib/voteable_mongo/railties/database.rake
+- lib/voteable_mongo/tasks.rb
 - lib/voteable_mongo/version.rb
 - lib/voteable_mongo/voteable.rb
-- lib/voteable_mongo/voteable/tasks.rb
-- lib/voteable_mongo/voteable/votes.rb
-- lib/voteable_mongo/voteable/voting.rb
 - lib/voteable_mongo/voter.rb
+- lib/voteable_mongo/voting.rb
 - spec/.rspec
-- spec/models/category.rb
-- spec/models/comment.rb
-- spec/models/post.rb
-- spec/models/user.rb
+- spec/mongo_mapper/models/category.rb
+- spec/mongo_mapper/models/comment.rb
+- spec/mongo_mapper/models/post.rb
+- spec/mongo_mapper/models/user.rb
+- spec/mongoid/models/category.rb
+- spec/mongoid/models/comment.rb
+- spec/mongoid/models/post.rb
+- spec/mongoid/models/user.rb
 - spec/spec_helper.rb
 - spec/voteable_mongo/tasks_spec.rb
 - spec/voteable_mongo/voteable_spec.rb
@@ -121,10 +126,14 @@ signing_key:
 specification_version: 3
 summary: Add Up / Down Voting for Mongoid and MongoMapper
 test_files: 
-- spec/models/category.rb
-- spec/models/comment.rb
-- spec/models/post.rb
-- spec/models/user.rb
+- spec/mongo_mapper/models/category.rb
+- spec/mongo_mapper/models/comment.rb
+- spec/mongo_mapper/models/post.rb
+- spec/mongo_mapper/models/user.rb
+- spec/mongoid/models/category.rb
+- spec/mongoid/models/comment.rb
+- spec/mongoid/models/post.rb
+- spec/mongoid/models/user.rb
 - spec/spec_helper.rb
 - spec/voteable_mongo/tasks_spec.rb
 - spec/voteable_mongo/voteable_spec.rb

data/lib/voteable_mongo/voteable/votes.rb

@@ -1,19 +0,0 @@
-module Mongo
-  module Voteable
-    
-    class Votes
-      include Mongoid::Document
-
-      field :up, :type => Array, :default => []
-      field :down, :type => Array, :default => []
-      field :up_count, :type => Integer, :default => 0
-      field :down_count, :type => Integer, :default => 0
-      field :count, :type => Integer, :default => 0
-      field :point, :type => Integer, :default => 0
-
-      DEFAULT_ATTRIBUTES = new.attributes
-      DEFAULT_ATTRIBUTES.delete('_id')
-    end
-    
-  end
-end