mongoid_rateable 0.3.3 → 0.4.1

data/mongoid_rateable.gemspec

@@ -2,80 +2,76 @@
 # 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.1 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.1"
 
-  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 = ["Petr Savichev (proton)".freeze]
+  s.date = "2023-03-07"
+  s.description = "Provides fields and methods for the rating manipulation on Mongoid documents.".freeze
+  s.email = "psavichev@gmail.com".freeze
   s.extra_rdoc_files = [
+    "CHANGELOG.md",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "TODO"
   ]
   s.files = [
+    ".github/FUNDING.yml",
     ".rspec",
-    ".rvmrc",
+    ".ruby-version",
     ".travis.yml",
+    "Appraisals",
     "CHANGELOG.md",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "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",
+    "gemfiles/mongoid_7.gemfile",
+    "gemfiles/mongoid_7.gemfile.lock",
+    "gemfiles/mongoid_8.gemfile",
+    "gemfiles/mongoid_8.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 = "3.4.6".freeze
+  s.summary = "Rating functionality for Mongoid documents".freeze
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  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"])
-    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"])
-    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"])
-  end
+  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-mongoid>.freeze, ["~> 2.0", ">= 2.0.1"])
 end
 

data/spec/models/post.rb

@@ -1,6 +1,7 @@
 class Post
   include Mongoid::Document
   include Mongoid::Rateable
+  include Mongoid::Attributes::Dynamic if Mongoid::VERSION>='4'
   
   embeds_many :comments
 end

data/spec/models/user.rb

@@ -1,6 +1,7 @@
 class User
   include Mongoid::Document
 
+  field :id
   field :name
 
 end

data/spec/rateable_spec.rb

@@ -12,7 +12,7 @@ describe Post do
 
 	it "should have Mongoid::Rateable module" do
 		#TODO: Refactor this
-		@post.class.const_get("Mongoid").const_get("Rateable").should be_true
+		@post.class.const_get("Mongoid").const_get("Rateable").should_not be nil
 	end
 
 	subject { @post }
@@ -29,6 +29,7 @@ describe Post do
 	it { should respond_to :unweighted_rating }
 	it { should respond_to :rating_marks }
 	it { should respond_to :user_mark }
+	it { should respond_to :user_marks }
 
 	describe "#rating_marks" do
 		it "should be proper Mongoid field" do
@@ -75,17 +76,17 @@ describe Post do
 
 		describe "#rated?" do
 			describe "for anyone" do
-				specify { @post.rated?().should be_true }
+				specify { @post.rated?().should be true }
 			end
 			describe "for anyone" do
-				specify { @article.rated?().should be_false }
+				specify { @article.rated?().should be false }
 			end
 
 			describe "for Bob" do
-				specify { @post.rated_by?(@bob).should be_true }
+				specify { @post.rated_by?(@bob).should be true }
 			end
 			describe "for Bob" do
-				specify { @article.rated_by?(@bob).should be_false }
+				specify { @article.rated_by?(@bob).should be false }
 			end
 
 			describe "when rated by someone else" do
@@ -94,13 +95,13 @@ describe Post do
 				end
 
 				describe "for Alice" do
-					specify { @post.rated_by?(@alice).should be_true }
+					specify { @post.rated_by?(@alice).should be true }
 				end
 			end
 
 			describe "when not rated by someone else" do
 				describe "for Sally" do
-					specify { @post.rated_by?(@sally).should be_false }
+					specify { @post.rated_by?(@sally).should be false }
 				end
 			end
 		end
@@ -117,7 +118,7 @@ describe Post do
 			end
 
 			it "should be unrated" do
-				@post.rated?.should be_false
+				@post.rated?.should be false
 			end
 		end
 
@@ -184,6 +185,9 @@ describe Post do
 			describe "should give nil" do
 				specify { @post.user_mark(@alice).should be_nil}
 			end
+			describe "should give marks" do
+				specify { @post.user_marks([@bob, @alice]).should eq Hash[@bob.id,1] }
+			end
 		end
 	end
 
@@ -233,15 +237,15 @@ describe Post do
 
 		describe "#rated_by?" do
 			describe "for Bob" do
-				specify { @f_post.rated_by?(@bob).should be_true }
+				specify { @f_post.rated_by?(@bob).should be true }
 			end
 
 			describe "for Sally" do
-				specify { @f_post.rated_by?(@sally).should be_true }
+				specify { @f_post.rated_by?(@sally).should be true }
 			end
 
 			describe "for Alice" do
-				specify { @f_post.rated_by?(@alice).should be_false}
+				specify { @f_post.rated_by?(@alice).should be false}
 			end
 		end
 
@@ -283,15 +287,15 @@ describe Post do
 
 		describe "#rated?" do
 			it "should be #rated? by Bob" do
-				@f_post.rated_by?(@bob).should be_true
+				@f_post.rated_by?(@bob).should be true
 			end
 
 			it "should be #rated? by Sally" do
-				@f_post.rated_by?(@sally).should be_true
+				@f_post.rated_by?(@sally).should be true
 			end
 
 			it "should be not #rated? by Alice" do
-				@f_post.rated_by?(@alice).should be_false
+				@f_post.rated_by?(@alice).should be false
 			end
 		end
 
@@ -331,15 +335,15 @@ describe Post do
 
 			describe "#rated?" do
 				it "should be #rated? by Sally" do
-					@f_post.rated_by?(@sally).should be_true
+					@f_post.rated_by?(@sally).should be true
 				end
 
 				it "should be not #rated? by Bob" do
-					@f_post.rated_by?(@bob).should be_false
+					@f_post.rated_by?(@bob).should be false
 				end
 
 				it "should be #rated?" do
-					@f_post.rated?.should be_true
+					@f_post.rated?.should be true
 				end
 			end
 
@@ -464,7 +468,7 @@ describe Comment do
 
 	it "should have Mongoid::Rateable module" do
 		#TODO: Refactor this
-		@comment1.class.const_get("Mongoid").const_get("Rateable").should be_true
+		@comment1.class.const_get("Mongoid").const_get("Rateable").should_not be nil
 	end
 
 	subject { @comment1 }
@@ -512,7 +516,7 @@ describe Comment do
 			context "when rate_value in rating range" do
 				it { expect { @comment1.rate 1, @sally }.not_to raise_error }
 			end
-			
+
 			context "when rate_value not in rating range" do
 				it { expect { @comment1.rate 9, @sally }.to raise_error(ArgumentError) }
 			end
@@ -527,17 +531,17 @@ describe Comment do
 
 		describe "#rated?" do
 			describe "for anyone" do
-				specify { @comment1.rated?().should be_true }
+				specify { @comment1.rated?().should be true }
 			end
 			describe "for anyone" do
-				specify { @comment2.rated?().should be_false }
+				specify { @comment2.rated?().should be false }
 			end
 
 			describe "for Bob" do
-				specify { @comment1.rated_by?(@bob).should be_true }
+				specify { @comment1.rated_by?(@bob).should be true }
 			end
 			describe "for Bob" do
-				specify { @comment2.rated_by?(@bob).should be_false }
+				specify { @comment2.rated_by?(@bob).should be false }
 			end
 
 			describe "when rated by someone else" do
@@ -546,13 +550,13 @@ describe Comment do
 				end
 
 				describe "for Alice" do
-					specify { @comment1.rated_by?(@alice).should be_true }
+					specify { @comment1.rated_by?(@alice).should be true }
 				end
 			end
 
 			describe "when not rated by someone else" do
 				describe "for Sally" do
-					specify { @comment1.rated_by?(@sally).should be_false }
+					specify { @comment1.rated_by?(@sally).should be false }
 				end
 			end
 		end
@@ -569,7 +573,7 @@ describe Comment do
 			end
 
 			it "should be unrated" do
-				@comment1.rated?.should be_false
+				@comment1.rated?.should be false
 			end
 		end
 
@@ -686,15 +690,15 @@ describe Comment do
 
 		describe "#rated_by?" do
 			describe "for Bob" do
-				specify { @f_comment.rated_by?(@bob).should be_true }
+				specify { @f_comment.rated_by?(@bob).should be true }
 			end
 
 			describe "for Sally" do
-				specify { @f_comment.rated_by?(@sally).should be_true }
+				specify { @f_comment.rated_by?(@sally).should be true }
 			end
 
 			describe "for Alice" do
-				specify { @f_comment.rated_by?(@alice).should be_false}
+				specify { @f_comment.rated_by?(@alice).should be false}
 			end
 		end
 
@@ -733,15 +737,15 @@ describe Comment do
 
 		describe "#rated?" do
 			it "should be #rated? by Bob" do
-				@f_comment.rated_by?(@bob).should be_true
+				@f_comment.rated_by?(@bob).should be true
 			end
 
 			it "should be #rated? by Sally" do
-				@f_comment.rated_by?(@sally).should be_true
+				@f_comment.rated_by?(@sally).should be true
 			end
 
 			it "should be not #rated? by Alice" do
-				@f_comment.rated_by?(@alice).should be_false
+				@f_comment.rated_by?(@alice).should be false
 			end
 		end
 
@@ -782,15 +786,15 @@ describe Comment do
 
 			describe "#rated?" do
 				it "should be #rated? by Sally" do
-					@f_comment.rated_by?(@sally).should be_true
+					@f_comment.rated_by?(@sally).should be true
 				end
 
 				it "should be not #rated? by Bob" do
-					@f_comment.rated_by?(@bob).should be_false
+					@f_comment.rated_by?(@bob).should be false
 				end
 
 				it "should be #rated?" do
-					@f_comment.rated?.should be_true
+					@f_comment.rated?.should be true
 				end
 			end
 
@@ -901,4 +905,4 @@ describe Comment do
 			# end
 		end
 	end
-end
+end

data/spec/spec_helper.rb

@@ -1,35 +1,43 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-MODELS = File.join(File.dirname(__FILE__), "models")
+MODELS = File.join(File.dirname(__FILE__), 'models')
 
-require "rubygems"
-require "mongoid"
-require "mongoid_rateable"
-require "database_cleaner"
-require "simplecov"
+require 'rubygems'
+require 'mongoid'
+require 'mongoid_rateable'
+require 'simplecov'
+require 'database_cleaner/mongoid'
+require 'coveralls'
 
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+])
 SimpleCov.start
 
-Dir["#{MODELS}/*.rb"].each { |f| require f }
-
 Mongoid.configure do |config|
   config.connect_to "mongoid_rateable_test"
 end
+
 Mongoid.logger = Logger.new($stdout)
 
-DatabaseCleaner.orm = "mongoid"
+if Mongoid::VERSION>'5'
+  Mongo::Logger.logger.level = ::Logger::FATAL
+end
+
+Dir["#{MODELS}/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.before(:all) do
-    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner[:mongoid].strategy = :deletion
   end
 
   config.before(:each) do
-    DatabaseCleaner.start
+    DatabaseCleaner[:mongoid].start
   end
 
   config.after(:each) do
-    DatabaseCleaner.clean
+    DatabaseCleaner[:mongoid].clean
   end
 end

data/spec/support/database_cleaner.rb

@@ -0,0 +1,36 @@
+class DatabaseCleaner
+  class << self
+    def clean
+      new.clean
+    end
+  end
+
+  def clean
+    if mongoid4?
+      collections.each { |c| database[c].find.remove_all }
+    else
+      collections.each { |c| database[c].find.delete_many }
+    end
+  end
+
+  private
+
+  def mongoid4?
+    Mongoid::VERSION.start_with? '4'
+  end
+
+  def database
+    if mongoid4?
+      Mongoid.default_session
+    else
+      Mongoid::Clients.default
+    end
+  end
+
+  def collections
+    database['system.namespaces'].find(name: { '$not' => /\.system\.|\$/ }).to_a.map do |collection|
+      _, name = collection['name'].split('.', 2)
+      name
+    end
+  end
+end