glebtv_mongoid_userstamp 0.4.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5d873bed4646aeb401c5a38861a424b2006b8772
-  data.tar.gz: 79534179cd97ff59c8007a72f1fe519f6b1c2eda
+SHA256:
+  metadata.gz: 77649687478def5c2d3b302346acb4aaea31d765a1b67556a0a509f918ef45ab
+  data.tar.gz: be8a0be3f6870fbea333d90c03501be64c4a0839c34a172a7e2749832da41ca4
 SHA512:
-  metadata.gz: 797365acd8a2be727c354256545ca8edc2b8a60f65e86fd6672fa4904a39efc2cc6beed6fcf799106cef63fb5168db708cd91237311a0a0b737e5291684b55a1
-  data.tar.gz: 8ae7c9dec30f9a1eb145989af3469adc9f51bd26bfec9be34a5e5f2ff4a4fc9d2f2617514cb73bdb5d41e5f2665cac013740af46fc6484eb5b271702f3d06cee
+  metadata.gz: aa8911e23c3115c20b1c83054bc6ea0b68703b8f66b1870abd936f3e267d3dd5b3e437b8928ed9de01b65755543cbd3557eaf7ec45e1701dc5391b6a65684088
+  data.tar.gz: b07e80c7a13454f9eb5239074e5dbd2e785a81500d9cde28e23745a8cd294672e121b852649fff7bd0c627ca6ae1bdcb0e7ff28717e265218c5f539d49130a95

data/Gemfile

@@ -1,3 +1,3 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -3,23 +3,26 @@
 This fork is INCOMPATIBLE with upstream due to different default field names
 
 This fork uses actual mongoid belongs_to relations instead of low level work with BSON fields. Primary reason for doing
-this is to support eager loading for creator/updater modifier
+this is to support eager loading for creator/updater relation.
 
-MongoidUserstamp adds stamp columns for created by and updated by
-information within Rails applications using Mongoid ORM.
+Also, this gem uses [RequestStore](https://github.com/steveklabnik/request_store) instead of a thread local variable.
+
+Current user is availiable to you any time via ```RequestStore.store[:user]```
+
+MongoidUserstamp adds stamp columns for created by and updated by information within Rails applications using Mongoid ODM.
 
 ## Version Support
 
 MongoidUserstamp is tested on the following versions:
 
-* Ruby 1.9.3 and 2.0.0
-* Rails 3
-* Mongoid 3
+* Ruby 2.1.2
+* Rails 4
+* Mongoid 4
 
 ## Install
 
 ```ruby
-  gem 'mongoid_userstamp'
+  gem 'glebtv_mongoid_userstamp'
 ```
 
 ## Usage

data/lib/mongoid/userstamp/railtie.rb

@@ -1,9 +1,8 @@
-# -*- encoding : utf-8 -*-
 module Mongoid
   module Userstamp
     class Railtie < Rails::Railtie
       ActiveSupport.on_load :action_controller do
-        before_filter do |c|
+        before_action do |c|
           unless Mongoid::Userstamp.config.user_model.respond_to? :current
             Mongoid::Userstamp.config.user_model.send(
               :include,

data/lib/mongoid/userstamp/user.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Mongoid
   module Userstamp
     module User
@@ -6,17 +5,17 @@ module Mongoid
 
       included do
         def current?
-          !Thread.current[:user].nil? && self._id == Thread.current[:user]._id
+          !RequestStore.store[:user].nil? && self._id == RequestStore.store[:user]._id
         end
       end
 
       module ClassMethods
         def current
-          Thread.current[:user]
+          RequestStore.store[:user]
         end
 
         def current=(value)
-          Thread.current[:user] = value
+          RequestStore.store[:user] = value
         end
 
         def do_as(user, &block)

data/lib/mongoid/userstamp/version.rb

@@ -1,6 +1,5 @@
-# -*- encoding : utf-8 -*-
 module Mongoid
   module Userstamp
-    VERSION = '0.4.0'
+    VERSION = '0.10.0'
   end
 end

data/lib/mongoid/userstamp.rb

@@ -3,11 +3,11 @@ module Mongoid
     extend ActiveSupport::Concern
 
     included do
-      belongs_to Userstamp.config.creator_field, class_name: Userstamp.config.user_model_name
-      belongs_to Userstamp.config.updater_field, class_name: Userstamp.config.user_model_name
+      belongs_to Userstamp.config.creator_field, class_name: Userstamp.config.user_model_name, autosave: false, optional: true
+      belongs_to Userstamp.config.updater_field, class_name: Userstamp.config.user_model_name, autosave: false, optional: true
 
-      before_save :set_updater
-      before_create :set_creator
+      before_validation :set_updater
+      before_validation :set_creator
 
       protected
 

data/lib/mongoid_userstamp.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+require 'request_store'
 require 'mongoid/userstamp'
 require 'mongoid/userstamp/version'
 require 'mongoid/userstamp/config'

data/mongoid_mongoid_userstamp.gemspec

@@ -16,12 +16,11 @@ Gem::Specification.new do |s|
   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', ['>= 6.0.0', '< 9.0']
+  s.add_runtime_dependency 'request_store'
 
-  s.add_runtime_dependency 'mongoid', '~> 4.0.0.beta1'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'gem-release'
 end
-

data/spec/mongoid/userstamp_spec.rb

@@ -130,6 +130,18 @@ describe Mongoid::Userstamp do
     end
     subject { Novel.new(name: 'Ethyl the Aardvark goes Quantity Surveying') }
 
+    context 'when created without user' do
+      before do
+        User.current = nil
+        subject.save!
+      end
+
+      it { expect(subject.c_by_id).to eq(nil) }
+      it { expect(subject.c_by).to eq(nil) }
+      it { expect(subject.u_by_id).to eq(nil) }
+      it { expect(subject.u_by).to eq(nil) }
+    end
+
     context 'when created by a user' do
       before do
         User.current = user_1

data/spec/mongoid.yml

@@ -0,0 +1,11 @@
+test:
+  clients:
+    default:
+      database: mongoid_nested_set_test
+      hosts:
+        - localhost:27018
+      options:
+        user: 'admin'
+        password: 'rs123456'
+        auth_source: admin
+

data/spec/spec_helper.rb

@@ -7,19 +7,20 @@ require 'active_support/all'
 require 'mongoid'
 require 'mongoid_userstamp'
 
-Mongoid.configure do |config|
-  config.connect_to(
-    'mongoid_userstamp_test'
-  )
-end
+Mongoid.load!("#{File.dirname(__FILE__)}/mongoid.yml", :test)
 
-Object.send :remove_const, :Config
+begin
+  Object.send :remove_const, :Config
+rescue Exception => e
+end
 Config = RbConfig
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |f|
   require f
 end
 
+Mongo::Logger.logger.level = ::Logger::FATAL
+
 RSpec.configure do |config|
   config.mock_with :rspec
   

metadata

@@ -1,53 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: glebtv_mongoid_userstamp
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.10.0
 platform: ruby
 authors:
 - GlebTv
 - Thomas Boerger
 - Johnny Shields
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: 6.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: request_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -55,7 +47,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,7 +61,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -104,6 +96,7 @@ files:
 - lib/mongoid/userstamp/version.rb
 - lib/mongoid_userstamp.rb
 - mongoid_mongoid_userstamp.gemspec
+- spec/mongoid.yml
 - spec/mongoid/userstamp_spec.rb
 - spec/spec_helper.rb
 - spec/support/book.rb
@@ -112,7 +105,7 @@ homepage: https://github.com/glebtv/mongoid_userstamp
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,14 +120,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Userstamp for Mongoid
 test_files:
+- spec/mongoid.yml
 - spec/mongoid/userstamp_spec.rb
 - spec/spec_helper.rb
 - spec/support/book.rb
 - spec/support/user.rb
-has_rdoc: