mongoid_atomic_votes 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dab2d4f9b64027bc3f6b295dfc2e4ae393c92e55
-  data.tar.gz: 0e193882d6d60226fbb6c73e0eec82acb1d75248
+  metadata.gz: c011039cca7f56e8f6da3de59f97510592784434
+  data.tar.gz: 6724540bc0728cc2da34b6b450f0ee3fa8e91653
 SHA512:
-  metadata.gz: 59babe4137d182f0f7d2956646423ae0ca473c076fc592ecbe8001fd0b998b491423359c1fceb93083a3956d18a780bb415f4ba84728edea614acc7e6271d559
-  data.tar.gz: 875c55107133aa43fcfd71f211193c6fa8f3fc41e3cc638d63d41657ca1f148c09d307bc97045d6af2b2b4740ffbd62c515d6daccaae62b941a93c7298f5043a
+  metadata.gz: 27e37c374f7b11244dae7a7e77bcc1700204db22ac6257d6831f5a296c9ceb82381b3605af14f689effa3b19e90f8e14d29627b5f7a9fc882d3ecac5e2499027
+  data.tar.gz: 11d7461bfec82ae8d1b19a76dff29cc5c54660f24ca793999b0d0ee955a87e9c092aa22824cdb6409b8afeef2aefe277907adc44547fe046b165e42eb2975879

data/README.md

@@ -1,6 +1,6 @@
 # MongoidAtomicVotes
 
-[![Build Status](https://travis-ci.org/hck/mongoid_atomic_votes.png)](https://travis-ci.org/hck/mongoid_atomic_votes)
+[![Build Status](https://travis-ci.org/hck/mongoid_atomic_votes.png)](https://travis-ci.org/hck/mongoid_atomic_votes) [![Code Climate](https://codeclimate.com/github/hck/mongoid_atomic_votes.png)](https://codeclimate.com/github/hck/mongoid_atomic_votes)
 
 mongoid_atomic_votes adds possibility to vote on mongoid documents.
 Each vote mark goes to db by one atomic query that increments vote count, sets vote_value (overall document vote score) and pulls vote mark (embedded document with additional info about voter) to db.

data/lib/mongoid_atomic_votes/atomic_votes.rb

@@ -1,48 +1,42 @@
 module Mongoid
   module AtomicVotes
-    def self.included(base)
-      base.field :vote_count, type: Integer, default: 0
-      base.field :vote_value, type: Float,   default: nil
-
-      base.embeds_many :votes, class_name: 'Mongoid::AtomicVotes::Vote', as: :atomic_voteable
+    class << self
+      def included(base)
+        define_relations(base)
+        define_scopes(base)
+        base.extend ClassMethods
+      end
 
-      base.scope :not_voted,     base.where(:vote_value.exists => false)
-      base.scope :voted,         base.where(:vote_value.exists => true)
-      base.scope :voted_by,      ->(resource) { base.where('votes.voted_by_id' => resource.id, 'votes.voter_type' => resource.class.name) }
-      base.scope :vote_value_in, ->(range)    { base.where(:vote_value.gte => range.begin, :vote_value.lte => range.end) }
-      base.scope :highest_voted, ->(limit=10) { base.order_by(:vote_value.desc).limit(limit) }
+      private
+      def define_relations(base)
+        base.field :vote_count, type: Integer, default: 0
+        base.field :vote_value, type: Float,   default: nil
+        base.embeds_many :votes, class_name: 'Mongoid::AtomicVotes::Vote', as: :atomic_voteable
+      end
 
-      base.extend ClassMethods
+      def define_scopes(base)
+        base.scope :not_voted, base.where(:vote_value.exists => false)
+        base.scope :voted, base.where(:vote_value.exists => true)
+        base.scope :voted_by, ->(resource) do
+          base.where('votes.voted_by_id' => resource.id, 'votes.voter_type' => resource.class.name)
+        end
+        base.scope :vote_value_in, ->(range) do
+          base.where(:vote_value.gte => range.begin, :vote_value.lte => range.end)
+        end
+        base.scope :highest_voted, ->(limit=10) { base.order_by(:vote_value.desc).limit(limit) }
+      end
     end
 
     def vote(value, voted_by)
       mark = Vote.new(value: value, voted_by_id: voted_by.id, voter_type: voted_by.class.name)
       return false unless mark.valid?
-
-      _assigning do
-        self.votes << mark
-        self.vote_value = (self.vote_count * (self.vote_value || 0) + value).to_f / (self.vote_count + 1)
-        self.vote_count += 1
-      end
-
-      self.collection.
-        find({_id: self.id}).
-        update('$inc' => {vote_count: 1}, '$set' => {vote_value: self.vote_value}, '$push' => {votes: mark.as_json}).nil?
+      add_vote_mark(mark)
     end
 
     def retract(voted_by)
       mark = self.votes.find_by(voted_by_id: voted_by.id)
       return false unless mark
-
-      _assigning do
-        self.votes.reject!{|v| v.id == mark.id}
-        self.vote_value = self.vote_count == 1 ? 0 : (self.vote_value * self.vote_count - mark.value) / (self.vote_count - 1)
-        self.vote_count -= 1
-      end
-
-      self.collection.
-        find({_id: self.id}).
-        update('$inc' => {vote_count: -1}, '$set' => {vote_value: vote_value}, '$pull' => {votes: {_id: mark.id}}).nil?
+      remove_vote_mark(mark)
     end
 
     def has_votes?
@@ -61,5 +55,47 @@ module Mongoid
         Vote.send(__method__, val)
       end
     end
+
+    private
+    def update_votes(mark, retract=false)
+      opts = {
+        '$inc' => {vote_count: retract ? -1 : 1},
+        '$set' => {vote_value: self.vote_value}
+      }
+
+      if retract
+        opts['$pull'] = {votes: {_id: mark.id}}
+      else
+        opts['$push'] = {votes: mark.as_json}
+      end
+
+      self.collection.find(_id: self.id).update(opts).nil?
+    end
+
+    def update_vote_value(mark, retract=false)
+      value, vote_count_diff = [mark.value, 1].map{|v| v * (retract ? -1 : 1)}
+      self.vote_value = if self.vote_count == 1 && retract
+                          nil
+                        else
+                          (self.vote_count * self.vote_value.to_f + value) / (self.vote_count + vote_count_diff)
+                        end
+      self.vote_count += vote_count_diff
+    end
+
+    def add_vote_mark(mark)
+      _assigning do
+        self.votes << mark
+        update_vote_value(mark)
+      end
+      update_votes(mark)
+    end
+
+    def remove_vote_mark(mark)
+      _assigning do
+        self.votes.reject!{|v| v.id == mark.id}
+        update_vote_value(mark, true)
+      end
+      update_votes(mark, true)
+    end
   end
-end
+end

data/lib/mongoid_atomic_votes/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module AtomicVotes
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/mongoid_atomic_votes/vote.rb

@@ -24,4 +24,4 @@ class Mongoid::AtomicVotes::Vote
       @@vote_range
     end
   end
-end
+end

data/spec/atomic_votes_spec.rb

@@ -128,7 +128,7 @@ describe Post do
         @post.retract(u).should be_true
         cnt -= 1
 
-        vote_value = @post.votes.size == 0 ? 0 : @post.votes.map(&:value).sum.to_f/@post.votes.size
+        vote_value = @post.votes.size == 0 ? nil : @post.votes.map(&:value).sum.to_f/@post.votes.size
 
         @post.vote_value.should == vote_value
         @post.vote_count.should == @post.votes.size
@@ -157,4 +157,4 @@ describe Post do
       @vote.errors.messages[:value].first.should =~ /included in the list/
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_atomic_votes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Hck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid