mongoid-userstamps 3.1.3 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fab675ceb96be422d7d026a7942152b48740d6d3
-  data.tar.gz: 7af1bd67f73735fb89a834150359d560c9c0b5fc
+SHA256:
+  metadata.gz: abd89e19a087c09f663588c80c5007cdc781985db52dffbc9af426574c161a76
+  data.tar.gz: fe286c80e6bf99589b02811a90eafa8026ab79d18ea39352f5144606df8236a2
 SHA512:
-  metadata.gz: b3287832a48c42ce38b683cbb709669b0ed5834c648d91c7d3078014e804eea56173d18b9c4c81e2fe96ce516bfea92e0d18985e16576c0d9c2be3012aee7635
-  data.tar.gz: 2ffa155f13651285dae206cd5a9be1fa213e996ef7bde185bcf08016de67f7ab300cc280d550a20fe15fb432b823b50dcb127e9ccab7bffbccd4f39560ac6774
+  metadata.gz: 7018b8e7ad31ff0f96f53a208dba6db14efd4c7e20bf4b9011a8cb66661104b7dfd9ce91038f63f810af8b47386635487d2bda7aaea5042b5f20dad0912dbd33
+  data.tar.gz: 32145a486f3d28690d69bd1d1d4ddfdd2703f760af8d5f7e2882b84853577224aa2cfa4e6bb118261340af6b853046eefd2265dd3271ad8a30688f8182a72200

data/.rubocop.yml

@@ -0,0 +1,9 @@
+inherit_gem:
+  standard: config/base.yml
+
+require:
+  - standard
+  - rubocop-performance
+
+Style/RedundantBegin:
+  Enabled: false

data/.travis.yml

@@ -0,0 +1,16 @@
+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"

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.2.#
+
+* Syntax bugfix for Ruby 2.4 with `rescue` on blocks
+
+## 3.2.0
+
+* Mongoid 7.0 support
+
 ## 3.1.3
 
 * Mongoid 6.2 support

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,7 +1,5 @@
-# -*- 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
@@ -30,23 +28,20 @@ module Mongoid
           model_classes << klass
         end
 
-        def created_name=(value)
-          @created_name = value
-        end
+        attr_writer :created_name
+
         def created_name
           @created_name ||= DEFAULT_CREATED_NAME
         end
 
-        def updated_name=(value)
-          @updated_name = value
-        end
+        attr_writer :updated_name
+
         def updated_name
           @updated_name ||= DEFAULT_UPDATED_NAME
         end
 
-        def deleted_name=(value)
-          @deleted_name = value
-        end
+        attr_writer :deleted_name
+
         def deleted_name
           @deleted_name ||= DEFAULT_DELETED_NAME
         end
@@ -60,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
@@ -79,4 +74,3 @@ module Mongoid
     end
   end
 end
-

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

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 module Mongoid
   module Userstamps
     module Config
@@ -23,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,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 module Mongoid
   module Userstamps
     class Railtie < Rails::Railtie
@@ -17,4 +15,3 @@ module Mongoid
     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.3'
+    VERSION = "3.2.1"
   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.exist?('UPGRADING')
+  s.post_install_message = File.read("UPGRADING") if File.exist?("UPGRADING")
 
-  s.add_dependency 'mongoid',       '>= 5.0.0', '< 6.3.0'
-  s.add_dependency 'activesupport', '>= 4.2.0', '< 5.2.0'
+  s.add_dependency "mongoid", ">= 5.0.0", "< 7.1.0"
+  s.add_dependency "activesupport", ">= 4.2.0", "< 5.2.0"
 end
-

data/spec/spec_helper.rb

@@ -1,24 +1,23 @@
-# -*- encoding : utf-8 -*-
-require 'rubygems'
-require 'ostruct'
+require "rubygems"
+require "ostruct"
 
-$:.push File.expand_path('../../lib', __FILE__)
+$:.push File.expand_path("../../lib", __FILE__)
 
-require 'active_support/all'
-require 'mongoid'
-require 'mongoid_userstamp'
+require "active_support/all"
+require "mongoid"
+require "mongoid_userstamp"
 
-%w(admin user book post).each do |file_name|
+%w[admin user book post].each do |file_name|
   require "support/#{file_name}"
 end
 
 Mongoid.configure do |config|
-  config.connect_to 'mongoid_userstamp_test'
+  config.connect_to "mongoid_userstamp_test"
 end
 
 RSpec.configure do |config|
   config.mock_with :rspec
-  
+
   config.after :suite do
     Mongoid.purge!
   end