mongoid-userstamps 3.1.0 → 3.3.0

data/spec/unit/userstamp_spec.rb

@@ -1,27 +1,24 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
+require "spec_helper"
 
 describe Mongoid::Userstamp do
+  subject { Mongoid::Userstamp }
 
-  subject{ Mongoid::Userstamp }
-
-  let(:user_1){ User.create!(name: 'Edmund Wells') }
-  let(:user_2){ User.create!(name: 'Charles Dikkens') }
-  let(:admin_1){ Admin.create!(name: 'JK Rowling') }
-
-  describe '#config' do
+  let(:user_1) { User.create!(name: "Edmund Wells") }
+  let(:user_2) { User.create!(name: "Charles Dikkens") }
+  let(:admin_1) { Admin.create!(name: "JK Rowling") }
 
+  describe "#config" do
     before { Mongoid::Userstamp.instance_variable_set(:'@config', nil) }
 
-    context 'without block' do
-      subject{ Mongoid::Userstamp.config }
+    context "without block" do
+      subject { Mongoid::Userstamp.config }
       it { should be_a Mongoid::Userstamp::GemConfig }
       it { subject.created_name.should eq :created_by }
       it { subject.updated_name.should eq :updated_by }
       it { subject.user_reader.should eq :current_user }
     end
 
-    context 'with block' do
+    context "with block" do
       subject do
         Mongoid::Userstamp.config do |u|
           u.created_name = :c_by
@@ -35,87 +32,87 @@ describe Mongoid::Userstamp do
       it { subject.user_reader.should eq :foo }
     end
 
-    context 'deprecated method' do
-      subject{ Mongoid::Userstamp.configure }
+    context "deprecated method" do
+      subject { Mongoid::Userstamp.configure }
       it { should be_a Mongoid::Userstamp::GemConfig }
     end
   end
 
-  describe '#current_user' do
+  describe "#current_user" do
     before do
       Mongoid::Userstamp.set_current_user(user_1)
       Mongoid::Userstamp.set_current_user(admin_1)
     end
-    context 'when user_class is User' do
-      subject{ Mongoid::Userstamp.current_user('User') }
-      it{ should eq user_1 }
+    context "when user_class is User" do
+      subject { Mongoid::Userstamp.current_user("User") }
+      it { should eq user_1 }
     end
-    context 'when user_class is Admin' do
-      subject{ Mongoid::Userstamp.current_user('Admin') }
-      it{ should eq admin_1 }
+    context "when user_class is Admin" do
+      subject { Mongoid::Userstamp.current_user("Admin") }
+      it { should eq admin_1 }
     end
-    context 'when user_class is other' do
-      subject{ Mongoid::Userstamp.current_user('foobar') }
-      it{ should be_nil }
+    context "when user_class is other" do
+      subject { Mongoid::Userstamp.current_user("foobar") }
+      it { should be_nil }
     end
-    context 'when user_class is not given' do
-      subject{ Mongoid::Userstamp.current_user }
-      it 'should use the default user_class' do
+    context "when user_class is not given" do
+      subject { Mongoid::Userstamp.current_user }
+      it "should use the default user_class" do
         should eq admin_1
       end
     end
   end
 
-  describe '#model_classes' do
+  describe "#model_classes" do
     before { Mongoid::Userstamp.instance_variable_set(:'@model_classes', nil) }
-    context 'default value' do
+    context "default value" do
       it { subject.model_classes.should eq [] }
     end
-    context 'setting values' do
+    context "setting values" do
       before do
-        subject.add_model_class 'Book'
-        subject.add_model_class 'Post'
+        subject.add_model_class "Book"
+        subject.add_model_class "Post"
       end
       it { subject.model_classes.should eq [Book, Post] }
     end
   end
 
-  describe '#user_classes' do
+  describe "#user_classes" do
     before { Mongoid::Userstamp.instance_variable_set(:'@user_classes', nil) }
-    context 'default value' do
+    context "default value" do
       it { subject.user_classes.should eq [] }
     end
-    context 'setting values' do
+    context "setting values" do
       before do
-        subject.add_user_class 'Book'
-        subject.add_user_class 'Post'
+        subject.add_user_class "Book"
+        subject.add_user_class "Post"
       end
       it { subject.user_classes.should eq [Book, Post] }
     end
   end
 
-  describe '#store' do
-    context 'when RequestStore is defined' do
+  describe "#store" do
+    context "when RequestStore is defined" do
       before do
-        stub_const('RequestStore', Object.new)
-        RequestStore.stub('store').and_return('foobar')
+        stub_const("RequestStore", Object.new)
+        RequestStore.stub("store").and_return("foobar")
       end
       it { subject.store.should eq RequestStore.store }
     end
-    context 'when RequestStore is not defined' do
-      before{ hide_const('RequestStore') }
+    context "when RequestStore is not defined" do
+      before { hide_const("RequestStore") }
       it { subject.store.should eq Thread.current }
     end
   end
 
-  describe '#userstamp_key' do
-    context 'when model is a Class' do
-      subject{ Mongoid::Userstamp.userstamp_key(User) }
-      it{ should eq :"mongoid_userstamp/user" }
-    end
-    context 'when model is a String' do
-      subject{ Mongoid::Userstamp.userstamp_key('MyNamespace::User') }
-      it{ should eq :"mongoid_userstamp/my_namespace/user" }
+  describe "#userstamp_key" do
+    context "when model is a Class" do
+      subject { Mongoid::Userstamp.userstamp_key(User) }
+      it { should eq :"mongoid_userstamp/user" }
+    end
+    context "when model is a String" do
+      subject { Mongoid::Userstamp.userstamp_key("MyNamespace::User") }
+      it { should eq :"mongoid_userstamp/my_namespace/user" }
     end
   end
 end

data/test/config_test.rb

@@ -1,13 +1,15 @@
-require 'test_helper'
+require "test_helper"
 
 class ConfigTest < BaseTest
   class ModelClass
-    cattr_accessor :user_model
+    def self.userstamps_model
+      self
+    end
 
-    def self.userstamps_model; self; end
     def self.user_model
       Mongoid::Userstamps::Config.user_classes.last
     end
+
     def self.set_user_model!
       @@user_model = user_model
     end
@@ -20,7 +22,7 @@ class ConfigTest < BaseTest
     Mongoid::Userstamps::Config.user_classes.delete(UserClass)
   end
 
-  test 'should config using block' do
+  test "should config using block" do
     Mongoid::Userstamps.config do |c|
       c.created_name = :creator
       c.updated_name = :updater
@@ -31,21 +33,20 @@ class ConfigTest < BaseTest
     assert_equal :deleter, Mongoid::Userstamps::Config.deleted_name
   end
 
-  test 'current_user' do
-    Mongoid::Userstamps::Config.set_current_user(Mongoid, 'test')
-    assert_equal 'test', Mongoid::Userstamps::Config.current_user(Mongoid)
+  test "current_user" do
+    Mongoid::Userstamps::Config.set_current_user(Mongoid, "test")
+    assert_equal "test", Mongoid::Userstamps::Config.current_user(Mongoid)
   end
 
-  test 'add_model_class' do
-    assert_difference(->{Mongoid::Userstamps::Config.model_classes.count}) do
+  test "add_model_class" do
+    assert_difference(-> { Mongoid::Userstamps::Config.model_classes.count }) do
       Mongoid::Userstamps::Config.add_model_class(ModelClass)
     end
   end
 
-  test 'add_user_class' do
+  test "add_user_class" do
     Mongoid::Userstamps::Config.add_model_class(ModelClass)
     Mongoid::Userstamps::Config.add_user_class(UserClass)
     assert_equal UserClass, ModelClass.user_model
   end
 end
-

data/test/model_test.rb

@@ -1,26 +1,26 @@
-require 'test_helper'
+require "test_helper"
 
 class ModelTest < BaseTest
   setup do
-    @user = User.create(name: 'John')
-    @user2 = User.create(name: 'Johnny')
+    @user = User.create(name: "John")
+    @user2 = User.create(name: "Johnny")
     Mongoid::Userstamps::Config.set_current_user(User, @user)
-    @person = Person.create(name: 'Doe')
-    @person2 = Person.create(name: 'Doe..')
+    @person = Person.create(name: "Doe")
+    @person2 = Person.create(name: "Doe..")
     Mongoid::Userstamps::Config.set_current_user(Person, @person)
   end
 
-  test 'should set created_by and updated_by on creation' do
-    @post = Post.create(title: 'Hello')
+  test "should set created_by and updated_by on creation" do
+    @post = Post.create(title: "Hello")
     assert_equal @user, @post.created_by
     assert_equal @user, @post.updated_by
   end
 
-  test 'model with user_model' do
-    assert_equal 'Person', Comment.relations['updated_by'][:class_name]
+  test "model with user_model" do
+    assert_equal "Person", Comment.relations["updated_by"].class_name
   end
 
-  test 'set_created_by' do
+  test "set_created_by" do
     @post = Post.new
     @post.set_created_by
     assert_equal @user, @post.created_by
@@ -36,7 +36,7 @@ class ModelTest < BaseTest
     assert_nil @post.created_by
   end
 
-  test 'set_updated_by' do
+  test "set_updated_by" do
     @post = Post.new
     @post.set_updated_by
     assert_equal @user, @post.updated_by
@@ -52,7 +52,7 @@ class ModelTest < BaseTest
     assert_nil @post.updated_by
   end
 
-  test 'set_deleted_by' do
+  test "set_deleted_by" do
     @comment = Comment.new
     @comment.set_deleted_by
     assert_equal @person, @comment.deleted_by
@@ -68,4 +68,3 @@ class ModelTest < BaseTest
     assert_nil @comment.deleted_by
   end
 end
-

data/test/models/archive.rb

@@ -4,4 +4,3 @@ class Archive
 
   field :content
 end
-

data/test/models/comment.rb

@@ -5,6 +5,5 @@ class Comment
 
   field :content
 
-  userstamps_model.user_model = 'Person'
+  userstamps_model.user_model = "Person"
 end
-

data/test/models/person.rb

@@ -4,4 +4,3 @@ class Person
 
   field :name
 end
-

data/test/models/post.rb

@@ -2,6 +2,7 @@ class Post
   include Mongoid::Document
   include Mongoid::Userstamps
 
+  userstamps_model.user_model = "User"
+
   field :title
 end
-

data/test/models/user.rb

@@ -6,4 +6,3 @@ class User
 
   userstamps_user.reader = :current_admin
 end
-

data/test/paranoia_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module Mongoid::Paranoia
 end
@@ -10,8 +10,7 @@ class ParanoiaTest < BaseTest
     include Mongoid::Userstamps
   end
 
-  test 'deleted' do
+  test "deleted" do
     assert ModelClass < Mongoid::Userstamps::Deleted
   end
 end
-

data/test/test_helper.rb

@@ -1,13 +1,13 @@
-require 'bundler/setup'
-require 'simplecov'
+require "bundler/setup"
+require "simplecov"
 SimpleCov.configure do
-  add_filter '/test/'
+  add_filter "/test/"
 end
-SimpleCov.start if ENV['COVERAGE']
+SimpleCov.start if ENV["COVERAGE"]
 
-require 'minitest/autorun'
-require 'mongoid'
-require 'pry'
+require "minitest/autorun"
+require "mongoid"
+require "pry"
 
 require File.expand_path("../../lib/mongoid-userstamps", __FILE__)
 
@@ -19,8 +19,9 @@ ActiveSupport::TestCase.test_order = :random
 
 class BaseTest < ActiveSupport::TestCase
   teardown do
-    Mongoid.default_client.use('mongoid_userstamps_test').database.drop
+    Mongoid.default_client.use("mongoid_userstamps_test").database.drop
     Mongoid::Userstamps::Config.reset
   end
 end
 
+puts "Testing against mongoid: #{Mongoid::VERSION}"

data/test/user_test.rb

@@ -1,35 +1,34 @@
-require 'test_helper'
+require "test_helper"
 
 class UserTest < BaseTest
-  test 'should set as current' do
-    @user = User.create(name: 'John')
+  test "should set as current" do
+    @user = User.create(name: "John")
     Mongoid::Userstamps::Config.set_current_user(User, @user)
     assert_equal @user, Mongoid::Userstamps::Config.current_user(User)
     assert @user.current?
     assert_equal @user, User.current
 
-    @user2 = User.create(name: 'Johnny')
+    @user2 = User.create(name: "Johnny")
     User.current = @user2
     assert @user2.current?
     assert_equal @user2, Mongoid::Userstamps::Config.current_user(User)
   end
 
-  test 'reader' do
+  test "reader" do
     assert_equal :current_person, Person.userstamps_user.reader
     assert_equal :current_admin, User.userstamps_user.reader
   end
 
-  test 'sudo' do
-    @user = User.create(name: 'John')
-    @user2 = User.create(name: 'Johnny')
+  test "sudo" do
+    @user = User.create(name: "John")
+    @user2 = User.create(name: "Johnny")
     User.current = @user
     post = nil
     User.sudo @user2 do
-      post = Post.create(title: 'Hello')
+      post = Post.create(title: "Hello")
     end
 
     assert_equal @user, User.current
     assert_equal @user2, post.created_by
   end
 end
-

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-userstamps
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Geoffroy Planquart
 - Thomas Boerger
 - Johnny Shields
 - Bharat Gupta
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2020-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -22,7 +22,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 6.1.0
 description: Userstamps for creator and updater fields using Mongoid
 email:
 - geoffroy@planquart.fr
@@ -62,6 +62,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -107,7 +109,7 @@ homepage: https://github.com/tbpro/mongoid_userstamp
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,9 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Userstamps for Mongoid
 test_files: