mongoid_rateable 0.3.3 → 0.4.0

data/gemfiles/mongoid_5.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "mongoid", "5.2.0"
+
+group :development do
+  gem "bundler"
+  gem "jeweler", "~> 2.1.1"
+  gem "simplecov", "~> 0.7", :require => false
+  gem "yard"
+  gem "rspec", ">= 3.0.0"
+  gem "appraisal"
+  gem "coveralls", :require => false
+  gem "database_cleaner", ">= 0.8.0"
+end

data/gemfiles/mongoid_5.gemfile.lock

@@ -0,0 +1,126 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    bson (4.2.1)
+    builder (3.2.3)
+    coveralls (0.8.19)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+      tins (~> 1.6)
+    database_cleaner (1.5.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (3.4.6)
+    highline (1.7.8)
+    i18n (0.7.0)
+    jeweler (2.1.2)
+      builder
+      bundler (>= 1.0)
+      git (>= 1.2.5)
+      github_api (~> 0.11.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      rake
+      rdoc
+      semver
+    json (1.8.6)
+    jwt (1.5.6)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    mongo (2.4.1)
+      bson (>= 4.2.1, < 5.0.0)
+    mongoid (5.2.0)
+      activemodel (~> 4.0)
+      mongo (>= 2.4.1, < 3.0.0)
+      origin (~> 2.3)
+      tzinfo (>= 0.3.37)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    oauth2 (1.3.0)
+      faraday (>= 0.8, < 0.11)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    origin (2.3.0)
+    public_suffix (2.0.5)
+    rack (2.0.1)
+    rake (12.0.0)
+    rdoc (5.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    semver (1.0.1)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    term-ansicolor (1.4.0)
+      tins (~> 1.0)
+    thor (0.19.4)
+    thread_safe (0.3.5)
+    tins (1.13.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    yard (0.9.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler
+  coveralls
+  database_cleaner (>= 0.8.0)
+  jeweler (~> 2.1.1)
+  mongoid (= 5.2.0)
+  rspec (>= 3.0.0)
+  simplecov (~> 0.7)
+  yard
+
+BUNDLED WITH
+   1.14.3

data/gemfiles/mongoid_6.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "mongoid", "6.1.0"
+
+group :development do
+  gem "bundler"
+  gem "jeweler", "~> 2.1.1"
+  gem "simplecov", "~> 0.7", :require => false
+  gem "yard"
+  gem "rspec", ">= 3.0.0"
+  gem "appraisal"
+  gem "coveralls", :require => false
+  gem "database_cleaner", ">= 0.8.0"
+end

data/gemfiles/mongoid_6.gemfile.lock

@@ -0,0 +1,122 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (5.0.1)
+      activesupport (= 5.0.1)
+    activesupport (5.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    bson (4.2.1)
+    builder (3.2.3)
+    concurrent-ruby (1.0.4)
+    coveralls (0.8.19)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+      tins (~> 1.6)
+    database_cleaner (1.5.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (3.4.6)
+    highline (1.7.8)
+    i18n (0.7.0)
+    jeweler (2.1.2)
+      builder
+      bundler (>= 1.0)
+      git (>= 1.2.5)
+      github_api (~> 0.11.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      rake
+      rdoc
+      semver
+    json (2.0.3)
+    jwt (1.5.6)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    mongo (2.4.1)
+      bson (>= 4.2.1, < 5.0.0)
+    mongoid (6.1.0)
+      activemodel (~> 5.0)
+      mongo (>= 2.4.1, < 3.0.0)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    oauth2 (1.3.0)
+      faraday (>= 0.8, < 0.11)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    public_suffix (2.0.5)
+    rack (2.0.1)
+    rake (12.0.0)
+    rdoc (5.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    semver (1.0.1)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    term-ansicolor (1.4.0)
+      tins (~> 1.0)
+    thor (0.19.4)
+    thread_safe (0.3.5)
+    tins (1.13.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    yard (0.9.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler
+  coveralls
+  database_cleaner (>= 0.8.0)
+  jeweler (~> 2.1.1)
+  mongoid (= 6.1.0)
+  rspec (>= 3.0.0)
+  simplecov (~> 0.7)
+  yard
+
+BUNDLED WITH
+   1.14.3

data/lib/mongoid_rateable.rb

@@ -1,4 +1,3 @@
-require 'mongoid_rateable/version'
 require 'mongoid_rateable/rateable'
 require 'mongoid_rateable/rating'
 

data/lib/mongoid_rateable/rateable.rb

@@ -7,7 +7,7 @@ module Mongoid
 
       module ClassMethods
         def rateable options = {}
-          class_eval do            
+          class_eval do
             self.send :include, Mongoid::Rateable
             self.rate_config options
           end
@@ -26,8 +26,8 @@ module Mongoid
 
       index({"rating_marks.rater_id" => 1, "rating_marks.rater_class" => 1})
 
-      scope :unrated, where(:rating.exists => false)
-      scope :rated, where(:rating.exists => true)
+      scope :unrated, -> { where(:rating.exists => false) }
+      scope :rated, -> { where(:rating.exists => true) }
       scope :rated_by, ->(rater) { where("rating_marks.rater_id" => rater.id, "rating_marks.rater_class" => rater.class.to_s) }
       scope :with_rating, ->(range) { where(:rating.gte => range.begin, :rating.lte => range.end) }
       scope :highest_rated, ->(limit=10) { order_by([:rating, :desc]).limit(limit) }
@@ -46,7 +46,7 @@ module Mongoid
       def in_rating_range?(value)
         range = rating_range if respond_to?(:rating_range)
         range ? range.include?(value.to_i) : true
-      end      
+      end
 
       # macro to create dynamic :rating_range class method!
       # can now even take an Array and find the range of values!
@@ -95,7 +95,7 @@ module Mongoid
             self.instance_eval(&block)
           end
         else
-          raise ArgumentError, "Must take symbol or block argument" 
+          raise ArgumentError, "Must take symbol or block argument"
         end
       end
     end # class methods
@@ -104,12 +104,12 @@ module Mongoid
       case rater
       when Array
         rater.each{|rater| rate(mark, rater, weight)}
-      else 
+      else
         if !rater
           unless respond_to?(:default_rater)
             raise ArgumentError, "No rater argument and no default_rater specified"
           end
-          rater = default_rater 
+          rater = default_rater
         end
         validate_rater!(rater)
         validate_rating!(mark)
@@ -126,7 +126,7 @@ module Mongoid
       case rater
       when Array
         rater.each{|rater| unrate(mark, rater, weight)}
-      else 
+      else
         unrate_without_rating_update(rater)
         update_rating
       end
@@ -136,7 +136,7 @@ module Mongoid
       case rater
       when Array
         rater.each{|rater| rate_and_save(mark, rater, weight)}
-      else 
+      else
         rate(mark, rater, weight)
         save
       end
@@ -146,7 +146,7 @@ module Mongoid
       case rater
       when Array
         rater.each{|rater| unrate_and_save(mark, rater, weight)}
-      else 
+      else
         unrate(rater)
         save
       end
@@ -160,7 +160,7 @@ module Mongoid
       case rater
       when Array
         rater.each{|rater| rated_by(mark, rater, weight)}
-      else       
+      else
         self.rating_marks.where(:rater_id => rater.id, :rater_class => rater.class.to_s).count == 1
       end
     end
@@ -197,6 +197,15 @@ module Mongoid
       r ? r.mark : nil
     end
 
+    def user_marks(raters)
+      if raters.map{|x| x.class}.uniq.count > 1
+          raise ArgumentError, "Raters all must be of same class."
+          return
+      end
+      r = self.rating_marks.in(:rater_id => raters.map(&:id), :rater_class => raters.first.class.to_s)
+      r ? r.inject(Hash.new(0)) { |h, e| h[e.rater_id] = e.mark ; h } : nil
+    end
+
     protected
 
     def validate_rater!(rater)
@@ -228,7 +237,7 @@ module Mongoid
       rt = (self.rates.to_f / self.weighted_rate_count.to_f) unless self.rating_marks.blank?
       write_attribute(:rating, rt)
       delta = (self.rating && self.previous_rating) ? rating-previous_rating : 0.0
-      write_attribute(:rating_delta, delta)      
+      write_attribute(:rating_delta, delta)
     end
 
     def check_weighted_rate_count

data/lib/mongoid_rateable/rating.rb

@@ -5,6 +5,6 @@ class RatingMark
   embedded_in :rateable, :polymorphic => true
   field :mark, :type => Integer
   field :rater_class, :type => String
-  field :rater_id, :type => Moped::BSON::ObjectId
+  field :rater_id, :type => Mongoid::VERSION.start_with?('3') ? Moped::BSON::ObjectId : BSON::ObjectId
   field :weight, :type => Integer, :default => 1
 end

data/mongoid_rateable.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: mongoid_rateable 0.3.3 ruby lib
+# stub: mongoid_rateable 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "mongoid_rateable"
-  s.version = "0.3.3"
+  s.name = "mongoid_rateable".freeze
+  s.version = "0.4.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Peter Savichev (proton)"]
-  s.date = "2014-06-21"
-  s.description = "Provides fields and methods for the rating manipulation on Mongoid documents."
-  s.email = "psavichev@gmail.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Peter Savichev (proton)".freeze]
+  s.date = "2017-01-28"
+  s.description = "Provides fields and methods for the rating manipulation on Mongoid documents.".freeze
+  s.email = "psavichev@gmail.com".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc",
@@ -21,61 +21,75 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
-    ".rvmrc",
+    ".ruby-version",
     ".travis.yml",
+    "Appraisals",
     "CHANGELOG.md",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
     "TODO",
     "VERSION",
+    "gemfiles/mongoid_3.gemfile",
+    "gemfiles/mongoid_3.gemfile.lock",
+    "gemfiles/mongoid_4.gemfile",
+    "gemfiles/mongoid_4.gemfile.lock",
+    "gemfiles/mongoid_5.gemfile",
+    "gemfiles/mongoid_5.gemfile.lock",
+    "gemfiles/mongoid_6.gemfile",
+    "gemfiles/mongoid_6.gemfile.lock",
     "lib/mongoid_rateable.rb",
     "lib/mongoid_rateable/rateable.rb",
     "lib/mongoid_rateable/rating.rb",
-    "lib/mongoid_rateable/version.rb",
     "mongoid_rateable.gemspec",
     "spec/models/article.rb",
     "spec/models/comment.rb",
     "spec/models/post.rb",
     "spec/models/user.rb",
     "spec/rateable_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/support/database_cleaner.rb"
   ]
-  s.homepage = "http://github.com/proton/mongoid_rateable"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
-  s.summary = "Rating functionality for Mongoid documents"
+  s.homepage = "http://github.com/proton/mongoid_rateable".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.5.2".freeze
+  s.summary = "Rating functionality for Mongoid documents".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, ["~> 3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
-      s.add_development_dependency(%q<simplecov>, ["~> 0.4"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.0"])
-      s.add_development_dependency(%q<database_cleaner>, ["~> 0"])
+      s.add_runtime_dependency(%q<mongoid>.freeze, [">= 3.0"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.1.1"])
+      s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.7"])
+      s.add_development_dependency(%q<yard>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, [">= 3.0.0"])
+      s.add_development_dependency(%q<appraisal>.freeze, [">= 0"])
+      s.add_development_dependency(%q<coveralls>.freeze, [">= 0"])
+      s.add_development_dependency(%q<database_cleaner>.freeze, [">= 0.8.0"])
     else
-      s.add_dependency(%q<mongoid>, ["~> 3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6"])
-      s.add_dependency(%q<simplecov>, ["~> 0.4"])
-      s.add_dependency(%q<rdoc>, ["~> 3"])
-      s.add_dependency(%q<rspec>, ["~> 2.0"])
-      s.add_dependency(%q<database_cleaner>, ["~> 0"])
+      s.add_dependency(%q<mongoid>.freeze, [">= 3.0"])
+      s.add_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, ["~> 2.1.1"])
+      s.add_dependency(%q<simplecov>.freeze, ["~> 0.7"])
+      s.add_dependency(%q<yard>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, [">= 3.0.0"])
+      s.add_dependency(%q<appraisal>.freeze, [">= 0"])
+      s.add_dependency(%q<coveralls>.freeze, [">= 0"])
+      s.add_dependency(%q<database_cleaner>.freeze, [">= 0.8.0"])
     end
   else
-    s.add_dependency(%q<mongoid>, ["~> 3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6"])
-    s.add_dependency(%q<simplecov>, ["~> 0.4"])
-    s.add_dependency(%q<rdoc>, ["~> 3"])
-    s.add_dependency(%q<rspec>, ["~> 2.0"])
-    s.add_dependency(%q<database_cleaner>, ["~> 0"])
+    s.add_dependency(%q<mongoid>.freeze, [">= 3.0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.1.1"])
+    s.add_dependency(%q<simplecov>.freeze, ["~> 0.7"])
+    s.add_dependency(%q<yard>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, [">= 3.0.0"])
+    s.add_dependency(%q<appraisal>.freeze, [">= 0"])
+    s.add_dependency(%q<coveralls>.freeze, [">= 0"])
+    s.add_dependency(%q<database_cleaner>.freeze, [">= 0.8.0"])
   end
 end