mongoid-userstamps 3.1.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d1dac6e0316bd40bb00fee04954197bf457d7186
-  data.tar.gz: 13b38ba6f7a730291c988016f7dc74768488b87b
+SHA256:
+  metadata.gz: 85b23de4375ea2e8b1ac086aba81768247140873a94326df70d1c70c6d1084a8
+  data.tar.gz: 9aa08d63999497c7960f942dd50a8b47bddf0101a1e656d89cc686c4f79258c1
 SHA512:
-  metadata.gz: 4ebf29e9719ebdef6df480d1d4232de2ca739e9866bd653eca4a20caa4ccb00f6494c085886356369fa9ebb623d9b68c31df046db3240c6ed06aa405d764c4d7
-  data.tar.gz: eadea41c16f9b433a5befd23e89edfb192ed879666a7a73bf56c55258287a69db312b18976e725f4482f8bd3c87077180537e1f40f64978d7e8106f92cb2f11c
+  metadata.gz: a44d56d797831d102fcc6bf11b64a28c3310321182f85984a0164fe2aef318efe5d1aa04a4eba4856687c73dd92673e5c59a1cb3261e07787fb4a2cbd8763d91
+  data.tar.gz: 8a3c2f14885f76b5155700036e157d25226ff340fb5232440b4587e9615bbdcc17fd1fb322d00635c99078dca330be7c94c2b5bfd6960b075d2a7a6c795b32c8

data/.rubocop.yml

@@ -0,0 +1,6 @@
+inherit_gem:
+  standard: config/base.yml
+
+require:
+  - standard
+  - rubocop-performance

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+cache: bundler
+rvm:
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
+before_install:
+  - gem install bundler
+install: bundle update --jobs=3 --retry=3
+services:
+  - mongodb
+env:
+  - "MONGOID_VERSION=6.2.0"
+  - "MONGOID_VERSION=6.3.0"
+  - "MONGOID_VERSION=6.4.0"
+  - "MONGOID_VERSION=7.0.0"
+  - "MONGOID_VERSION=7.1.0"

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## 3.2.0
+
+* Mongoid 7.0 support
+
+## 3.1.3
+
+* Mongoid 6.2 support
+* Rails 5.1 support
+
+## 3.1.2
+
+* Mongoid 6.1 support
+
+## 3.1.1
+
+* Remove rails 5 warnings
+
+## 3.1.0
+
+* Mongoid 6 support
+
+## 3.0.0.alpha1
+
+* Mongoid 5 support
+
+## 2.0.0
+
+Gem has been imported and rewrote.
+
 ## [0.4.1](https://github.com/tbpro/mongoid_userstamp/releases/tag/v0.4.1) - 2014-08-21
 
 * Improvement

data/Gemfile

@@ -1,9 +1,17 @@
-source 'http://rubygems.org'
+source "http://rubygems.org"
 
 gemspec
 
-gem 'request_store', require: false
+mongoid_version = ENV["MONGOID_VERSION"] || "7.0.0"
 
-gem 'simplecov', :require => false
-gem 'pry-nav', '~> 0.2.4'
+gem "rake"
+gem "mongoid", "~> #{mongoid_version}"
+gem "request_store", require: false
 
+group :development do
+  gem "simplecov", require: false
+  gem "pry-nav", "~> 0.2.4"
+  gem "standard", "~> 0.1.0"
+  gem "rubocop"
+  gem "rubocop-performance"
+end

data/Rakefile

@@ -1,15 +1,14 @@
 #!/usr/bin/env rake
-require 'bundler/gem_tasks'
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
-desc 'Default: run unit tests'
-task :default => :test
+desc "Default: run unit tests"
+task default: :test
 
-desc 'Run tests'
+desc "Run tests"
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+  t.libs << "lib"
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+  t.warning = false
 end
-

data/init.rb

@@ -1,2 +1 @@
-# -*- encoding : utf-8 -*-
-require 'mongoid_userstamp'
+require "mongoid_userstamp"

data/lib/mongoid-userstamps.rb

@@ -1,4 +1 @@
-# -*- encoding : utf-8 -*-
-
-require 'mongoid/userstamps'
-
+require "mongoid/userstamps"

data/lib/mongoid/userstamps.rb

@@ -1,13 +1,11 @@
-# -*- encoding : utf-8 -*-
-
-require 'mongoid/userstamps/version'
-require 'mongoid/userstamps/config'
-require 'mongoid/userstamps/user'
-require 'mongoid/userstamps/model'
-require 'mongoid/userstamps/created'
-require 'mongoid/userstamps/updated'
-require 'mongoid/userstamps/deleted'
-require 'mongoid/userstamps/railtie' if defined? Rails
+require "mongoid/userstamps/version"
+require "mongoid/userstamps/config"
+require "mongoid/userstamps/user"
+require "mongoid/userstamps/model"
+require "mongoid/userstamps/created"
+require "mongoid/userstamps/updated"
+require "mongoid/userstamps/deleted"
+require "mongoid/userstamps/railtie" if defined? Rails
 
 module Mongoid
   module Userstamps
@@ -27,4 +25,3 @@ module Mongoid
     end
   end
 end
-

data/lib/mongoid/userstamps/config.rb

@@ -1,16 +1,10 @@
-# -*- encoding : utf-8 -*-
-
-require 'mongoid/userstamps/config/model'
-require 'mongoid/userstamps/config/user'
+require "mongoid/userstamps/config/model"
+require "mongoid/userstamps/config/user"
 
 module Mongoid
   module Userstamps
     module Config
       class << self
-        attr_accessor :created_name
-        attr_accessor :updated_name
-        attr_accessor :deleted_name
-
         DEFAULT_CREATED_NAME = :created_by
         DEFAULT_UPDATED_NAME = :updated_by
         DEFAULT_DELETED_NAME = :deleted_by
@@ -34,14 +28,20 @@ module Mongoid
           model_classes << klass
         end
 
+        attr_writer :created_name
+
         def created_name
           @created_name ||= DEFAULT_CREATED_NAME
         end
 
+        attr_writer :updated_name
+
         def updated_name
           @updated_name ||= DEFAULT_UPDATED_NAME
         end
 
+        attr_writer :deleted_name
+
         def deleted_name
           @deleted_name ||= DEFAULT_DELETED_NAME
         end
@@ -55,7 +55,7 @@ module Mongoid
         end
 
         def store(model, value = false)
-          return if !model
+          return unless model
           key = "mongoid-userstamps/#{model.to_s.underscore}".to_sym
           store = defined?(RequestStore) ? RequestStore.store : Thread.current
           if value == false
@@ -74,4 +74,3 @@ module Mongoid
     end
   end
 end
-

data/lib/mongoid/userstamps/config/model.rb

@@ -1,13 +1,10 @@
-# -*- encoding : utf-8 -*-
-
 module Mongoid
   module Userstamps
     module Config
       class Model
-        attr_accessor :user_model
-
         def initialize(model)
           @model = model
+          @user_model = nil
         end
 
         def config
@@ -24,12 +21,20 @@ module Mongoid
         end
 
         def set_user_model!
-          @model.relations[config.created_name.to_s].try(:[]=, :class_name, user_model)
-          @model.relations[config.updated_name.to_s].try(:[]=, :class_name, user_model)
-          @model.relations[config.deleted_name.to_s].try(:[]=, :class_name, user_model)
+          if Mongoid::VERSION.to_f < 7.0
+            %i[created_name updated_name deleted_name].each do |attr|
+              @model.relations[config.send(attr).to_s].try(:[]=, :class_name, user_model)
+            end
+          else
+            %i[created_name updated_name deleted_name].each do |attr|
+              if @model.relations[config.send(attr).to_s]
+                @model.relations[config.send(attr).to_s].instance_variable_set :@class_name, user_model
+                @model.relations[config.send(attr).to_s].options[:class_name] = user_model
+              end
+            end
+          end
         end
       end
     end
   end
 end
-

data/lib/mongoid/userstamps/config/user.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 module Mongoid
   module Userstamps
     module Config
@@ -13,4 +11,3 @@ module Mongoid
     end
   end
 end
-

data/lib/mongoid/userstamps/created.rb

@@ -1,19 +1,17 @@
-# -*- encoding : utf-8 -*-
-
 module Mongoid
   module Userstamps
     module Created
       extend ActiveSupport::Concern
 
       included do
-        if !self.included_modules.include?(Mongoid::Userstamps::Model)
+        unless included_modules.include?(Mongoid::Userstamps::Model)
           include Mongoid::Userstamps::Model
         end
 
         belongs_to userstamps_config.created_name, {
           class_name: userstamps_model.user_model,
           inverse_of: nil,
-          optional: true
+          optional: true,
         }
 
         set_callback :create, :before, :set_created_by
@@ -21,10 +19,9 @@ module Mongoid
 
       def set_created_by
         user = self.class.current_user
-        return if !user || self.public_send(userstamps_config.created_name)
-        self.public_send("#{userstamps_config.created_name}=", user)
+        return if !user || public_send(userstamps_config.created_name)
+        public_send("#{userstamps_config.created_name}=", user)
       end
     end
   end
 end
-

data/lib/mongoid/userstamps/deleted.rb

@@ -1,19 +1,17 @@
-# -*- encoding : utf-8 -*-
-
 module Mongoid
   module Userstamps
     module Deleted
       extend ActiveSupport::Concern
 
       included do
-        if !self.included_modules.include?(Mongoid::Userstamps::Model)
+        unless included_modules.include?(Mongoid::Userstamps::Model)
           include Mongoid::Userstamps::Model
         end
 
         belongs_to userstamps_config.deleted_name, {
           class_name: userstamps_model.user_model,
           inverse_of: nil,
-          optional: true
+          optional: true,
         }
 
         set_callback :destroy, :before, :set_deleted_by
@@ -21,10 +19,9 @@ module Mongoid
 
       def set_deleted_by
         user = self.class.current_user
-        return if !user || self.public_send("#{userstamps_config.deleted_name}_id_changed?")
-        self.public_send("#{userstamps_config.deleted_name}=", user)
+        return if !user || public_send("#{userstamps_config.deleted_name}_id_changed?")
+        public_send("#{userstamps_config.deleted_name}=", user)
       end
     end
   end
 end
-

data/lib/mongoid/userstamps/model.rb

@@ -27,4 +27,3 @@ module Mongoid
     end
   end
 end
-

data/lib/mongoid/userstamps/railtie.rb

@@ -1,20 +1,15 @@
-# -*- encoding : utf-8 -*-
-
 module Mongoid
   module Userstamps
     class Railtie < Rails::Railtie
       # Set current_user from controller reader method
       ActiveSupport.on_load :action_controller do
-        before_filter do |c|
+        before_action do |c|
           Mongoid::Userstamps::Config.user_classes.each do |user_class|
-            begin
-              user_class.current = c.public_send(user_class.userstamps_user.reader)
-            rescue
-            end
+            user_class.current = c.public_send(user_class.userstamps_user.reader)
+          rescue
           end
         end
       end
     end
   end
 end
-

data/lib/mongoid/userstamps/updated.rb

@@ -1,19 +1,17 @@
-# -*- encoding : utf-8 -*-
-
 module Mongoid
   module Userstamps
     module Updated
       extend ActiveSupport::Concern
 
       included do
-        if !self.included_modules.include?(Mongoid::Userstamps::Model)
+        unless included_modules.include?(Mongoid::Userstamps::Model)
           include Mongoid::Userstamps::Model
         end
 
         belongs_to userstamps_config.updated_name, {
           class_name: userstamps_model.user_model,
           inverse_of: nil,
-          optional: true
+          optional: true,
         }
 
         set_callback :save, :before, :set_updated_by
@@ -21,10 +19,9 @@ module Mongoid
 
       def set_updated_by
         user = self.class.current_user
-        return if !user || self.public_send("#{userstamps_config.updated_name}_id_changed?")
-        self.public_send("#{userstamps_config.updated_name}=", user)
+        return if !user || public_send("#{userstamps_config.updated_name}_id_changed?")
+        public_send("#{userstamps_config.updated_name}=", user)
       end
     end
   end
 end
-

data/lib/mongoid/userstamps/user.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Mongoid
   module Userstamps
     module User
@@ -9,7 +8,7 @@ module Mongoid
       end
 
       def current?
-        self.id == self.class.current.try(:id)
+        id == self.class.current.try(:id)
       end
 
       class_methods do
@@ -22,7 +21,7 @@ module Mongoid
         end
 
         def sudo(user)
-          old = self.current
+          old = current
           self.current = user
           yield
         ensure
@@ -36,4 +35,3 @@ module Mongoid
     end
   end
 end
-

data/lib/mongoid/userstamps/version.rb

@@ -1,8 +1,5 @@
-# -*- encoding : utf-8 -*-
-
 module Mongoid
   module Userstamps
-    VERSION = '3.1.0'
+    VERSION = "3.3.0"
   end
 end
-

data/mongoid-userstamps.gemspec

@@ -1,26 +1,24 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+$:.push File.expand_path("../lib", __FILE__)
 
-require 'mongoid/userstamps/version'
+require "mongoid/userstamps/version"
 
 Gem::Specification.new do |s|
-  s.name        = 'mongoid-userstamps'
-  s.version     = Mongoid::Userstamps::VERSION
-  s.authors     = ['Geoffroy Planquart', 'Thomas Boerger', 'Johnny Shields', 'Bharat Gupta']
-  s.homepage    = 'https://github.com/tbpro/mongoid_userstamp'
-  s.license     = 'MIT'
-  s.summary     = 'Userstamps for Mongoid'
-  s.description = 'Userstamps for creator and updater fields using Mongoid'
-  s.email       = ['geoffroy@planquart.fr', 'tboerger@tbpro.de']
+  s.name = "mongoid-userstamps"
+  s.version = Mongoid::Userstamps::VERSION
+  s.authors = ["Geoffroy Planquart", "Thomas Boerger", "Johnny Shields", "Bharat Gupta"]
+  s.homepage = "https://github.com/tbpro/mongoid_userstamp"
+  s.license = "MIT"
+  s.summary = "Userstamps for Mongoid"
+  s.description = "Userstamps for creator and updater fields using Mongoid"
+  s.email = ["geoffroy@planquart.fr", "tboerger@tbpro.de"]
 
-  s.files         = `git ls-files`.split($/)
-  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ['lib']
+  s.files = `git ls-files`.split($/)
+  s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ["lib"]
 
-  s.post_install_message = File.read('UPGRADING') if File.exists?('UPGRADING')
+  s.post_install_message = File.read("UPGRADING") if File.exist?("UPGRADING")
 
-  s.add_dependency 'mongoid',       '>= 5.0.0', '< 6.1.0'
-  s.add_dependency 'activesupport', '>= 4.2.0', '< 5.1.0'
+  s.add_dependency "mongoid", ">= 5.0.0", "< 7.2.0"
+  s.add_dependency "activesupport", ">= 4.2.0", "< 6.1.0"
 end
-