mongoid_rating 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3619dc0eda67a2cfd21622ac78b7100d788be907
-  data.tar.gz: 3c000c1c31a4cefba53f948934fdcf568cb73326
+  metadata.gz: 72536149cfcd00af58a019ae87fd58ff6ef7df12
+  data.tar.gz: 71e4a9e92c6fadb02837169e164210e6e0ce9f39
 SHA512:
-  metadata.gz: edfbbd674d7a882ba979593ffb53d7e4d6d5a31636f0a268cc0c527ecd67edd14735b22802d346738063335e700387ba0e09d37223d0df296b85bfa49f784e8c
-  data.tar.gz: de68bfcc7cac056ae41782164acecbe61439359a08c0d4784b10a8f50c2bbac3743955cd59c0e66f75eb7aa8f1cb63121fb9bd4865e82c69e0bf328e621c88ec
+  metadata.gz: e626fef6faa5f24f34aaece3536875a5342f365b3772a5e6010ae177dddaf33f76c433b7612cc7c3c3349437fe16fa8d69eba9d0a84acbac815018c4bb806bbc
+  data.tar.gz: b10bba1aeaaf6c92dc291d4407548e1a804dfa5f05d2d3144d4a1a241c12afe56eb6b935919de7f808b53e7832968423364ce1d22f4881c13b31b48fec545998

data/.travis.yml

@@ -8,15 +8,8 @@ rvm:
   - 1.9.3
   - 2.0.0
   - jruby-19mode
-  - rbx-19mode
 
 gemfile:
   - Gemfile
-  - gemfiles/mongoid-3.0.gemfile
-  - gemfiles/mongoid-3.1.gemfile
   - gemfiles/mongoid-4.0.gemfile
 
-matrix:
-  exclude:
-    - rvm: rbx-19mode
-      gemfile: gemfiles/mongoid-4.0.gemfile

data/README.md

@@ -34,6 +34,8 @@ make model rateable:
     class Post
       include Mongoid::Document
       rateable :rate
+      # needed if you use rails_admin so it would not complain
+      accepts_nested_attributes_for :rate_data
     end
     ps = Post.create()
     user = User.create()
@@ -57,6 +59,7 @@ Check if user rated:
 
 Scopes: 
 
+    Post.highest_rate
     Post.rate_in(2..5)
     Post.rate_in(2..5).first
     => #<Post rate_count: 1, rate_sum: 5.0, rate_average: 5.0> 
@@ -73,7 +76,7 @@ Posts rated by user:
 (c) 2013 glebtv, MIT license
 
 Partially based on
-(mongoid-rateable)[https://github.com/proton/mongoid_rateable]
+[mongoid-rateable](https://github.com/proton/mongoid_rateable)
 which is Copyright (c) 2011 Peter Savichev (proton), MIT license
 
 ## Contributing

data/lib/mongoid_rating/model.rb

@@ -47,6 +47,10 @@ module Mongoid
             scope :#{field}_in, ->(range) {
               where(#{savg}.gte => range.begin, #{savg}.lte => range.end)
             }
+
+            scope :by_#{field}, -> {
+              order_by([#{savg}, :desc])
+            }
             scope :highest_#{field}, -> {
               where(#{savg}.ne => nil).order_by([#{savg}, :desc])
             }

data/lib/mongoid_rating/version.rb

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

data/spec/article_spec.rb

@@ -6,212 +6,218 @@ describe Article do
     @bob = User.create :name => "Bob"
     @sally = User.create :name => "Sally"
     @alice = User.create :name => "Alice"
-    @article = Article.create :name => "Article"
-    @article1 = Article.create :name => "Article 1"
-    @article2 = Article.create :name => "Article 2"
   end
 
-  subject { @article }
-  it { should respond_to :overall }
-  it { should respond_to :overall! }
-  it { should respond_to :unoverall! }
-  it { should respond_to :did_overall? }
-  it { should respond_to :overall_average }
-  it { should respond_to :overall_data }
-  it { should respond_to :overall_by }
-
-  describe "#overall_values" do
-    it "should be an array with overall values" do
-      @article.overall_values.should be_an_instance_of Array
-      @article.overall! 1, @bob
-      @article.overall_values.should eq [1]
+  context 'basic' do
+    before(:each) do
+      @article = Article.create :name => "Article"
+      @article1 = Article.create :name => "Article 1"
+      @article2 = Article.create :name => "Article 2"
     end
-  end
 
-  context "when overall" do
-    before (:each) do
-      @article.overall! 1, @bob
+    subject { @article }
+    it { should respond_to :overall }
+    it { should respond_to :overall! }
+    it { should respond_to :unoverall! }
+    it { should respond_to :did_overall? }
+    it { should respond_to :overall_average }
+    it { should respond_to :overall_data }
+    it { should respond_to :overall_by }
+
+    describe "#overall_values" do
+      it "should be an array with overall values" do
+        @article.overall_values.should be_an_instance_of Array
+        @article.overall! 1, @bob
+        @article.overall_values.should eq [1]
+      end
     end
 
-    describe "#overall" do
-      it "should track #overall properly" do
-        @article.overall! 1, @sally
-        @article.overall_count.should eql 2
-        @article.overall.should eql 1.0
+    context "when overall" do
+      before (:each) do
+        @article.overall! 1, @bob
       end
 
-      it "should not mark fields as dirty" do
-        @article.overall_count_changed?.should be_false
-        @article.overall_sum_changed?.should be_false
-        @article.overall_average_changed?.should be_false
-      end
+      describe "#overall" do
+        it "should track #overall properly" do
+          @article.overall! 1, @sally
+          @article.overall_count.should eql 2
+          @article.overall.should eql 1.0
+        end
 
-      it "should limit #overalls by user properly" do
-        @article.overall! 5, @bob
-        @article.overall.should eql 5.0
-      end
+        it "should not mark fields as dirty" do
+          @article.overall_count_changed?.should be_false
+          @article.overall_sum_changed?.should be_false
+          @article.overall_average_changed?.should be_false
+        end
 
-      context "when overall_value in rating range" do
-        it { expect { @article.overall 1, @sally }.not_to raise_error }
-      end
+        it "should limit #overalls by user properly" do
+          @article.overall! 5, @bob
+          @article.overall.should eql 5.0
+        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() }
-      end
+        context "when overall_value in rating range" do
+          it { expect { @article.overall 1, @sally }.not_to raise_error }
+        end
 
-      describe "when using positive values" do
-        let(:num) { rand(1..5) }
-        let(:exp) { ((num + 1) / 2.0) - 1 }
-        it { expect { @article.overall num, @sally }.to change { @article.overall }.by(exp) }
-      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() }
+        end
 
-      describe "when using negative values" do
-        let(:num) { -rand(1..5) }
-        let(:exp) { ((num + 1) / 2.0) - 1 }
-        it { expect { @article.overall num, @sally }.to change { @article.overall }.by(exp) }
-      end
-    end
+        describe "when using positive values" do
+          let(:num) { rand(1..5) }
+          let(:exp) { ((num + 1) / 2.0) - 1 }
+          it { expect { @article.overall num, @sally }.to change { @article.overall }.by(exp) }
+        end
 
-    describe "#overall_by?" do
-      describe "for Bob" do
-        specify { @article.overall_by?(@bob).should be_true }
-      end
-      describe "for Bob" do
-        specify { @article1.overall_by?(@bob).should be_false }
-        specify { @article.overall_by?(@alice).should be_false }
+        describe "when using negative values" do
+          let(:num) { -rand(1..5) }
+          let(:exp) { ((num + 1) / 2.0) - 1 }
+          it { expect { @article.overall num, @sally }.to change { @article.overall }.by(exp) }
+        end
       end
 
-      describe "when overall by someone else" do
-        before do
-          @article.overall 1, @alice
+      describe "#overall_by?" do
+        describe "for Bob" do
+          specify { @article.overall_by?(@bob).should be_true }
+        end
+        describe "for Bob" do
+          specify { @article1.overall_by?(@bob).should be_false }
+          specify { @article.overall_by?(@alice).should be_false }
         end
 
-        describe "for Alice" do
-          specify { @article.overall_by?(@alice).should be_true }
+        describe "when overall by someone else" do
+          before do
+            @article.overall 1, @alice
+          end
+
+          describe "for Alice" do
+            specify { @article.overall_by?(@alice).should be_true }
+          end
         end
-      end
 
-      describe "when not overall by someone else" do
-        describe "for Sally" do
-          specify { @article.overall_by?(@sally).should be_false }
+        describe "when not overall by someone else" do
+          describe "for Sally" do
+            specify { @article.overall_by?(@sally).should be_false }
+          end
         end
       end
-    end
 
-    describe "#unoverall" do
-      before { @article.unoverall @bob }
+      describe "#unoverall" do
+        before { @article.unoverall @bob }
 
-      it "should have null #overall_count" do
-        @article.overall_count.should eql 0
-      end
+        it "should have null #overall_count" do
+          @article.overall_count.should eql 0
+        end
+
+        it "should have null #overall" do
+          @article.overall.should be_nil
+        end
 
-      it "should have null #overall" do
-        @article.overall.should be_nil
+        it "#overall_by?(@bob) should be false after unoverall" do
+          @article.overall_by?(@bob).should be_false
+        end
       end
 
-      it "#overall_by?(@bob) should be false after unoverall" do
-        @article.overall_by?(@bob).should be_false
+      describe "#overall_count" do
+        it "should know how many overalls have been cast" do
+          @article.overall 1, @sally
+          @article.overall_count.should eql 2
+        end
       end
-    end
 
-    describe "#overall_count" do
-      it "should know how many overalls have been cast" do
-        @article.overall 1, @sally
-        @article.overall_count.should eql 2
+      describe "#rating" do
+        it "should calculate the average overall" do
+          @article.overall 4, @sally
+          @article.overall.should eq 2.5
+        end
+
+        it "should calculate the average overall if the result is zero" do
+          @article.overall -1, @sally
+          @article.overall.should eq 0.0
+        end
       end
     end
 
-    describe "#rating" do
-      it "should calculate the average overall" do
-        @article.overall 4, @sally
-        @article.overall.should eq 2.5
+    context "when not overall" do
+      describe "#overalls" do
+        specify { @article.overall_count.should eql 0 }
       end
 
-      it "should calculate the average overall if the result is zero" do
-        @article.overall -1, @sally
-        @article.overall.should eq 0.0
+      describe "#rating" do
+        specify { @article.overall.should be_nil }
       end
-    end
-  end
 
-  context "when not overall" do
-    describe "#overalls" do
-      specify { @article.overall_count.should eql 0 }
-    end
+      describe "#unoverall" do
+        before do
+          @article.unoverall @sally
+        end
 
-    describe "#rating" do
-      specify { @article.overall.should be_nil }
-    end
+        it "should have null #overall_count" do
+          @article.overall_count.should eql 0
+        end
 
-    describe "#unoverall" do
-      before do
-        @article.unoverall @sally
+        it "should have null #overalls" do
+          @article.overall.should be_nil
+        end
       end
+    end
 
-      it "should have null #overall_count" do
-        @article.overall_count.should eql 0
+    context "when saving the collection" do
+      before (:each) do
+        @article.overall 3, @bob
+        @article.overall -5, @sally
+        @article.save
+        @f_article = Article.where(:name => "Article").first
       end
 
-      it "should have null #overalls" do
-        @article.overall.should be_nil
+      it "disallows incorrect rates" do
+        expect { @article.overall 8, @bob }.to raise_error
+        expect { @article.overall -10, @sally }.to raise_error
       end
-    end
-  end
 
-  context "when saving the collection" do
-    before (:each) do
-      @article.overall 3, @bob
-      @article.overall -5, @sally
-      @article.save
-      @f_article = Article.where(:name => "Article").first
-    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 }
+        end
 
-    it "disallows incorrect rates" do
-      expect { @article.overall 8, @bob }.to raise_error
-      expect { @article.overall -10, @sally }.to raise_error
-    end
+        describe "for Sally" do
+          specify { @f_article.overall_by?(@sally).should be_true }
+          specify { @f_article.overall_by(@sally).should eq -5 }
+        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 }
+        describe "for Alice" do
+          specify { @f_article.overall_by?(@alice).should be_false}
+          specify { @f_article.overall_by(@alice).should be_nil }
+        end
       end
 
-      describe "for Sally" do
-        specify { @f_article.overall_by?(@sally).should be_true }
-        specify { @f_article.overall_by(@sally).should eq -5 }
+      describe "#overall" do
+        specify { @f_article.overall.should eql -1.0 }
       end
 
-      describe "for Alice" do
-        specify { @f_article.overall_by?(@alice).should be_false}
-        specify { @f_article.overall_by(@alice).should be_nil }
+      describe "#overall_count" do
+        specify { @f_article.overall_count.should eql 2 }
       end
     end
-
-    describe "#overall" do
-      specify { @f_article.overall.should eql -1.0 }
-    end
-
-    describe "#overall_count" do
-      specify { @f_article.overall_count.should eql 2 }
-    end
   end
 
   describe "#scopes" do
-    before (:each) do
-      @article.delete
+    before :each do
       @article1 = Article.create(:name => "Article 1")
       @article2 = Article.create(:name => "Article 2")
       @article3 = Article.create(:name => "Article 3")
       @article4 = Article.create(:name => "Article 4")
       @article5 = Article.create(:name => "Article 5")
-      @article1.overall 5, @sally
-      @article1.overall 3, @bob
-      @article4.overall 1, @sally
     end
 
     describe "#overall_by" do
+      before :each do
+        @article1.overall 5, @sally
+        @article1.overall 3, @bob
+        @article4.overall 1, @sally
+      end
       it "should return proper count of articles overall by Bob" do
         Article.overall_by(@bob).size.should eql 1
       end
@@ -221,39 +227,55 @@ describe Article do
       end
     end
 
-    describe "#overall_in" do
+    context 'rates' do
       before (:each) do
         @article1.overall 4, @alice
         @article2.overall 2, @alice
         @article3.overall 5, @alice
-        @article4.overall 2, @alice
+        @article4.overall 1, @alice
       end
+      describe "#overall_in" do
+        it "should return proper count of articles with rating 4..5" do
+          Article.overall_in(4..5).to_a.length.should eql 2
+        end
 
-      it "should return proper count of articles with rating 4..5" do
-        Article.overall_in(4..5).to_a.length.should eql 2
-      end
+        it "should return proper count of articles with rating 0..2" do
+          Article.overall_in(0..2).to_a.length.should eql 2
+        end
 
-      it "should return proper count of articles with rating 0..2" do
-        Article.overall_in(0..2).to_a.length.should eql 2
+        it "should return proper count of articles with rating 0..5" do
+          Article.overall_in(0..5).to_a.length.should eql 4
+        end
       end
 
-      it "should return proper count of articles with rating 0..5" do
-        Article.overall_in(0..5).to_a.length.should eql 4
-      end
-    end
+      describe "#highest_overall" do
+        it "should return proper count of articles" do
+          Article.highest_overall.limit(1).count(true).should eq 1
+        end
 
-    describe "#highest_overall" do
-      it "should return proper count of articles" do
-        Article.highest_overall.limit(1).count(true).should eq 1
-      end
+        it "should return proper count of articles" do
+          Article.highest_overall.limit(10).count(true).should eq 4
+        end
 
-      it "should return proper count of articles" do
-        Article.highest_overall.limit(10).count(true).should eq 2
+        it "should return proper document" do
+          Article.highest_overall.limit(1).first.name.should eql "Article 3"
+        end
+        it 'returns articles in proper order' do
+          Article.highest_overall.to_a.should eq [@article3, @article1, @article2, @article4]
+        end
       end
 
-      it "should return proper document" do
-        Article.highest_overall.limit(1).first.name.should eql "Article 1"
+      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
+
+        end
       end
     end
+
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
@@ -7,16 +10,12 @@ require "rubygems"
 require "rspec"
 require "mongoid"
 require "database_cleaner"
-
-require 'coveralls'
-Coveralls.wear!
-
 require "mongoid_rating"
 
 Dir["#{MODELS}/*.rb"].each { |f| require f }
 
 Mongoid.configure do |config|
-  config.connect_to "mongoid_rateable_test"
+  config.connect_to "mongoid_rating_test"
 end
 Mongoid.logger = Logger.new($stdout)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_rating
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid