mongoid_rating 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72536149cfcd00af58a019ae87fd58ff6ef7df12
-  data.tar.gz: 71e4a9e92c6fadb02837169e164210e6e0ce9f39
+  metadata.gz: c46a533fed5f93903eea6cb5af5d45ad034fd14c
+  data.tar.gz: 0ebcd0ae9aea25aca80ad0d9712035cc7dc593bb
 SHA512:
-  metadata.gz: e626fef6faa5f24f34aaece3536875a5342f365b3772a5e6010ae177dddaf33f76c433b7612cc7c3c3349437fe16fa8d69eba9d0a84acbac815018c4bb806bbc
-  data.tar.gz: b10bba1aeaaf6c92dc291d4407548e1a804dfa5f05d2d3144d4a1a241c12afe56eb6b935919de7f808b53e7832968423364ce1d22f4881c13b31b48fec545998
+  metadata.gz: 1e0a902185c5a8115b8f879bcf5bac2f10b3a08d3a3bfd4b127fce5e4db402d9398a67974d0c5dfe366cfdd299e0f96a23a3f18bc0667142aa44603b19c09bf7
+  data.tar.gz: ee70c1b36395f47eec03e008c8252a7a291289f8622f292b422c102833a4aeef46f54ff247e6f2862478f9b4e0b9c04125cd6a672f8f1a61887557a4bb41bcec

data/README.md

@@ -11,7 +11,6 @@
 
   - Multiple rating fields per model
   - Float rating marks (users can give 4.5 stars)
-  - Accurate concurrent rating updates with db.eval
 
 ## Installation
 

data/lib/mongoid_rating/model.rb

@@ -9,17 +9,15 @@ module Mongoid
         # @param [Hash] options a hash containings:
         # 
         # rateable :overall, range: -5..5
-        #
-        # Disable atomic eval (in case it's disabled on the database side)
-        # rateable :design, range: -5..5, average: false
         # 
         # Disable average completely
+        # rateable :design, range: -5..5, average: false
+        #
         # rateable :quality, range: -5..5, average: true
         def rateable(field, options = {})
           options = {
             range: 1..5,
             rerate: true,
-            eval: true,
             counters: true,
             float: true
           }.merge(options)
@@ -61,44 +59,11 @@ module Mongoid
                 raise "bad vote value"
               end
               raise "can't rate" unless can_#{field}?(rater)
-              if #{options[:eval]}
-                #{field}_data.where(rater_id: rater.id).destroy_all
+              un#{field}!(rater)
+              atomically do
+                inc("#{field}_count" => 1, "#{field}_sum" => value)
                 #{field}_data.create!(rater: rater, value: value)
-                collection.database.session.cluster.with_primary do
-                  doc = collection.database.command({
-                    eval: 'function(id) { 
-                      var oid = ObjectId(id);
-                      var doc = db.' + collection.name + '.findOne( { _id : oid } );
-                      if (doc) {
-                        doc.#{field}_count = 0
-                        doc.#{field}_sum = 0;
-                        doc.#{field}_data.forEach(function(fd) {
-                          doc.#{field}_sum += fd.value;
-                          doc.#{field}_count += 1;
-                        })
-                        doc.#{field}_average = doc.#{field}_sum /doc.#{field}_count;
-                        db.' + collection.name + '.save(doc);
-                        return doc;
-                      } else {
-                        return false;
-                      }
-                    }',
-                    args: [ id.to_s ]
-                  })
-                  self.#{field}_count = doc[:retval]["#{field}_count"]
-                  self.#{field}_sum = doc[:retval]["#{field}_sum"]
-                  self.#{field}_average = doc[:retval]["#{field}_average"]
-                  remove_change(:#{field}_count)
-                  remove_change(:#{field}_sum)
-                  remove_change(:#{field}_average)
-                end
-              else
-                un#{field}!(rater)
-                atomically do
-                  inc("#{field}_count" => 1, "#{field}_sum" => value)
-                  #{field}_data.create!(rater: rater, value: value)
-                  set("#{field}_average" => calc_#{field}_avg)
-                end
+                set("#{field}_average" => calc_#{field}_avg)
               end
             end
             def calc_#{field}_avg

data/lib/mongoid_rating/version.rb

@@ -1,3 +1,3 @@
 module MongoidRating
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/article_spec.rb

@@ -39,7 +39,7 @@ describe Article do
 
       describe "#overall" do
         it "should track #overall properly" do
-          @article.overall! 1, @sally
+          @article.overall!(1, @sally)
           @article.overall_count.should eql 2
           @article.overall.should eql 1.0
         end
@@ -51,17 +51,17 @@ describe Article do
         end
 
         it "should limit #overalls by user properly" do
-          @article.overall! 5, @bob
+          @article.overall!(5, @bob)
           @article.overall.should eql 5.0
         end
 
         context "when overall_value in rating range" do
-          it { expect { @article.overall 1, @sally }.not_to raise_error }
+          it { expect { @article.overall(1, @sally) }.not_to raise_error }
         end
 
         context "when overall_value not in rating range" do
-          it { expect { @article.overall 17, @sally }.to raise_error() }
-          it { expect { @article.overall -17, @sally }.to raise_error() }
+          it { expect { @article.overall(17, @sally) }.to raise_error() }
+          it { expect { @article.overall(-17, @sally) }.to raise_error() }
         end
 
         describe "when using positive values" do
@@ -133,7 +133,7 @@ describe Article do
         end
 
         it "should calculate the average overall if the result is zero" do
-          @article.overall -1, @sally
+          @article.overall(-1, @sally)
           @article.overall.should eq 0.0
         end
       end
@@ -165,26 +165,26 @@ describe Article do
 
     context "when saving the collection" do
       before (:each) do
-        @article.overall 3, @bob
-        @article.overall -5, @sally
+        @article.overall(3, @bob)
+        @article.overall(-5, @sally)
         @article.save
         @f_article = Article.where(:name => "Article").first
       end
 
       it "disallows incorrect rates" do
-        expect { @article.overall 8, @bob }.to raise_error
-        expect { @article.overall -10, @sally }.to raise_error
+        expect { @article.overall(8, @bob) }.to raise_error
+        expect { @article.overall(-10, @sally) }.to raise_error
       end
 
       describe "#overall_by?" do
         describe "for Bob" do
           specify { @f_article.overall_by?(@bob).should be_true }
-          specify { @f_article.overall_by(@bob).should eq 3 }
+          specify { @f_article.overall_by(@bob).should eq(3) }
         end
 
         describe "for Sally" do
           specify { @f_article.overall_by?(@sally).should be_true }
-          specify { @f_article.overall_by(@sally).should eq -5 }
+          specify { @f_article.overall_by(@sally).should eq(-5) }
         end
 
         describe "for Alice" do
@@ -194,11 +194,11 @@ describe Article do
       end
 
       describe "#overall" do
-        specify { @f_article.overall.should eql -1.0 }
+        specify { @f_article.overall.should eq(-1.0) }
       end
 
       describe "#overall_count" do
-        specify { @f_article.overall_count.should eql 2 }
+        specify { @f_article.overall_count.should eq(2) }
       end
     end
   end
@@ -268,14 +268,12 @@ describe Article do
       describe '#by_overall' do
         it "should return proper count of articles" do
           Article.by_overall.limit(10).count(true).should eq 5
-          Article.by_overall.to_a.should eq [@article3, @article1, @article2, @article4, @article5]
         end
 
         it 'returns articles in proper order' do
-
+          Article.by_overall.to_a.should eq [@article3, @article1, @article2, @article4, @article5]
         end
       end
     end
-
   end
 end

data/spec/post_spec.rb

@@ -178,12 +178,16 @@ describe Post do
       @post3 = Post.create(:name => "Post 3")
       @post4 = Post.create(:name => "Post 4")
       @post5 = Post.create(:name => "Post 5")
-      @post1.rate 5, @sally
-      @post1.rate 3, @bob
-      @post4.rate 1, @sally
     end
 
+    
     describe "#rate_by scope" do
+      before :each do
+        @post1.rate 5, @sally
+        @post1.rate 3, @bob
+        @post4.rate 1, @sally
+      end
+
       it "should return proper count of posts rated by Bob" do
         Post.rate_by(@bob).size.should eql 1
       end
@@ -193,7 +197,7 @@ describe Post do
       end
     end
 
-    describe "#with_rating" do
+    context 'rates' do
       before (:each) do
         @post1.rate 4, @alice
         @post2.rate 2, @alice
@@ -201,6 +205,11 @@ describe Post do
         @post4.rate 2, @alice
       end
 
+      it '#highest_rate' do
+        Post.highest_rate.count.should eq 4
+        Post.highest_rate.first.id.should eq @post3.id
+      end
+
       it "should return proper count of posts with rating 4..5" do
         Post.rate_in(4..5).size.should eql 2
       end
@@ -212,25 +221,24 @@ describe Post do
       it "should return proper count of posts with rating 0..5" do
         Post.rate_in(0..5).size.should eql 4
       end
-    end
 
-    describe "#highest_rated" do
-      it "should return proper count of posts" do
-        #mongoid has problems with returning count of documents (https://github.com/mongoid/mongoid/issues/817)
-        posts_count = 0
-        Post.highest_rate.limit(1).each {|x| posts_count+=1 }
-        posts_count.should eql 1
+      describe "#highest_rate" do
+        it "should return proper document" do
+          Post.highest_rate.limit(1).first.name.should eql "Post 3"
+        end
       end
 
-      it "should return proper count of posts" do
-        #mongoid has problems with returning count of documents (https://github.com/mongoid/mongoid/issues/817)
-        posts_count = 0
-        Post.highest_rate.limit(10).each {|x| posts_count+=1 }
-        posts_count.should eql 2
-      end
+      describe '#by_rate' do
+        it "should return proper count of posts" do
+          Post.by_rate.limit(10).count(true).should eq 5
+        end
 
-      it "should return proper document" do
-        Post.highest_rate.limit(1).first.name.should eql "Post 1"
+        it 'returns articles in proper order' do
+          @post5.rate.should be_nil
+          @post5[:rate_average].should be_nil
+
+          Post.by_rate.to_a.should eq [@post3, @post1, @post2, @post4, @post5]
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_rating
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Star rating for Mongoid