mongoid-simple-userstamps 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7123312aed4696e240e1e23468c2454b841ba67d
-  data.tar.gz: 819baa4411adafdf3357a4b56a46daaadc3a3e36
+SHA256:
+  metadata.gz: 81b8a57413bd388e7166eafb49105d1ea7c7e37b7ce952e99a06532af6d41522
+  data.tar.gz: 4e52b4597c4be8f096cb67b6f31b2c14708e5edf57ef035657d1bc20b8a7a0da
 SHA512:
-  metadata.gz: e3a8461955bc75e1e2d26ba54d5a9962ded5913a718b351157af9a33fa95f443ea984e8b3a0842da4daf769e0adbb5e74ebd338edca5ad65e799558d58bef0a4
-  data.tar.gz: 6dd9aff620666f58b06249aa042a279cc4877f8ee85904640e117ccf422b6a33216d5a41c02aa4992e5abfe46dcf4a9c3cd28a21558f3e4d0292db2818dacc98
+  metadata.gz: 939f8d2fce4291e8f77823df64d19f81f238519d6b7886eabb066747d16c08f55803f9832d026de4e5744eade39d7225a86e2422d5e3f0e1f351c831da14fe3c
+  data.tar.gz: 5401425c074473d84f67df1dcd5a38a5a529a93c537e7f65030a20706cd2eb4905764ff8789e18c9d52ec8f7445471b976bb46406157d6bdfa9fdaf80d19aad5

data/.travis.yml

@@ -0,0 +1,21 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.5.1
+before_install: gem install bundler -v 1.16.1
+
+gemfile:
+  - Gemfile
+  - gemfiles/mongoid-5.0.gemfile
+  - gemfiles/mongoid-6.0.gemfile
+  - gemfiles/mongoid-7.0.gemfile
+
+services:
+  - mongodb
+
+addons:
+  apt:
+    sources:
+      - mongodb-3.4-precise
+    packages:
+      - mongodb-org-server

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mongoid-normalize-strings.gemspec
 gemspec
+
+gem 'rake'

data/README.md

@@ -4,7 +4,7 @@ Adds stamps relations to mongoid models.
 
 ## Version Support
 
-Mongoid 5.x, 6.x
+`5.x, 6.x and 7.x`
 
 ## Installation
 
@@ -22,14 +22,12 @@ Or install it yourself as:
 
 ## Usage
 
-* Include `Mongoid::Userstamps::User` in your 'User' model.
-* Include `Mongoid::Userstamps::Model` in your models you want user stamps.
-* Define current user.
+-   Include `Mongoid::Userstamps::Model` in your models you want user stamps.
+-   Define current user throught `Mongoid::Userstamps::User.current`.
 
 ```ruby
   class User
     include Mongoid::Document
-    include Mongoid::Userstamps::User
   end
 
   class Post
@@ -40,7 +38,7 @@ Or install it yourself as:
   end
 
   user = User.create
-  Mongoid::Userstamps::Config.set_current(user)
+  Mongoid::Userstamps::User.current = user
 
   pòst = Post.create
   post.created_by # <User _id: 57305c268675c32e1c70a17e >
@@ -53,25 +51,36 @@ Or install it yourself as:
 
 ### Rails
 
-* Define current user in your `application_controller.rb`
+-   Define current user in your `application_controller.rb`
 
 ```ruby
   class ApplicationController < ActionController::Base
+    before_action :authenticate!
     before_action :define_userstamps_current
 
     protected
 
     def define_userstamps_current
-      Mongoid::Userstamps::Config.set_current(current_user)
+      Mongoid::Userstamps::User.current = current_user
     end
   end
 ```
 
+### Warden
+
+* Define current user in [warden callback](https://github.com/hassox/warden/wiki/Callbacks)
+
+```ruby
+Warden::Manager.after_set_user do |user, auth, opts|
+  Mongoid::Userstamps::Config.set_current(record)
+end
+```
+
 ## Contributing
 
-1. Fork it (
-   http://github.com/<my-github-username>/mongoid-simple-userstamps/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+1.  Fork it (
+    <http://github.com/><my-github-username>/mongoid-simple-userstamps/fork )
+2.  Create your feature branch (`git checkout -b my-new-feature`)
+3.  Commit your changes (`git commit -am 'Add some feature'`)
+4.  Push to the branch (`git push origin my-new-feature`)
+5.  Create new Pull Request

data/Rakefile

@@ -1 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/gemfiles/mongoid-5.0.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in mongoid-normalize-strings.gemspec
+gemspec path: '../'
+
+gem 'rake'
+gem 'mongoid', '~> 5.0'

data/gemfiles/mongoid-6.0.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in mongoid-normalize-strings.gemspec
+gemspec path: '../'
+
+gem 'rake'
+gem 'mongoid', '~> 6.0'

data/gemfiles/mongoid-7.0.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in mongoid-normalize-strings.gemspec
+gemspec path: '../'
+
+gem 'rake'
+gem 'mongoid', '~> 7.0'

data/lib/mongoid-simple-userstamps.rb

@@ -1,4 +1,3 @@
-require "mongoid-simple-userstamps/version"
-require "mongoid-simple-userstamps/config"
-require "mongoid-simple-userstamps/user"
-require "mongoid-simple-userstamps/model"
+require 'mongoid-simple-userstamps/version'
+require 'mongoid-simple-userstamps/user'
+require 'mongoid-simple-userstamps/model'

data/lib/mongoid-simple-userstamps/model.rb

@@ -5,18 +5,21 @@ module Mongoid
   module Userstamps
     module Model
       def self.included(base)
-        base.send(:belongs_to, :created_by, polymorphic: true, optional: true)
-        base.send(:belongs_to, :updated_by, polymorphic: true, optional: true)
+        base.class_eval do
+          if Mongoid::VERSION.to_f < 6
+            belongs_to :created_by, polymorphic: true
+            belongs_to :updated_by, polymorphic: true
+          else
+            belongs_to :created_by, polymorphic: true, optional: true
+            belongs_to :updated_by, polymorphic: true, optional: true
+          end
 
-        base.send(:before_create) do
-          if Mongoid::Userstamps::Config.current && !self.created_by
-            self.created_by = Mongoid::Userstamps::Config.current
+          before_create do
+            self.created_by = Mongoid::Userstamps::User.current unless created_by
           end
-        end
 
-        base.send(:before_update) do
-          if Mongoid::Userstamps::Config.current
-            self.updated_by = Mongoid::Userstamps::Config.current
+          before_update do
+            self.updated_by = Mongoid::Userstamps::User.current
           end
         end
       end

data/lib/mongoid-simple-userstamps/user.rb

@@ -4,8 +4,12 @@
 module Mongoid
   module Userstamps
     module User
-      def self.included(base)
-        Mongoid::Userstamps::Config.set_model(self)
+      def self.current
+        Thread.current[:current_user]
+      end
+
+      def self.current=(current)
+        Thread.current[:current_user] = current
       end
     end
   end

data/lib/mongoid-simple-userstamps/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Userstamps
-    VERSION = "0.2.0"
+    VERSION = '1.0.0'
   end
 end

data/mongoid-simple-userstamps.gemspec

@@ -1,24 +1,25 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mongoid-simple-userstamps/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "mongoid-simple-userstamps"
+  spec.name          = 'mongoid-simple-userstamps'
   spec.version       = Mongoid::Userstamps::VERSION
-  spec.authors       = ["Rafael Jurado"]
-  spec.email         = ["rjurado@nosolosoftware.es"]
-  spec.summary       = %q{Simple way to add user stamps to your models.}
-  spec.description   = %q{Simple way to add user stamps to your models.}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.authors       = ['Rafael Jurado']
+  spec.email         = ['rjurado@nosolosoftware.es']
+  spec.summary       = 'Simple way to add user stamps to your models.'
+  spec.description   = 'Simple way to add user stamps to your models.'
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rspec'
-  spec.add_dependency 'mongoid', ">= 5.0.0"
+  spec.add_dependency 'mongoid', '>= 5.0.0'
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'mongoid'
 require 'mongoid-simple-userstamps'
 
-Mongoid.load!("spec/support/mongoid.yml", :test)
+Mongoid.load!('spec/support/mongoid.yml', :test)
 
 Mongoid.logger.level = Logger::ERROR
 Mongo::Logger.logger.level = Logger::ERROR

data/spec/userstamps_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe 'Mongoid::Userstamp' do
   class User
     include Mongoid::Document
-    include Mongoid::Userstamps::User
   end
 
   class Post
@@ -16,7 +15,7 @@ describe 'Mongoid::Userstamp' do
   context 'when current is defined' do
     before :all do
       @user = User.create
-      Mongoid::Userstamps::Config.set_current(@user)
+      Mongoid::Userstamps::User.current = @user
     end
 
     context 'when include Mongoid::Userstamps::Model' do
@@ -48,24 +47,52 @@ describe 'Mongoid::Userstamp' do
         expect(post.updated_by).to eq(@user)
       end
     end
+
+    context 'when check thread safe' do
+      it 'works' do
+        Post.destroy_all
+        user1 = User.create
+        user2 = User.create
+
+        Thread.start do
+          Mongoid::Userstamps::User.current = user1
+          sleep 0.2
+          Post.create
+        end
+
+        Thread.start do
+          sleep 0.1
+          Mongoid::Userstamps::User.current = user2
+        end
+
+        sleep 0.3
+        expect(Post.first.created_by).to eq(user1)
+      end
+    end
   end
 
   context 'when current is not defined' do
     before :all do
-      Mongoid::Userstamps::Config.set_current(nil)
+      Mongoid::Userstamps::User.current = nil
     end
 
     it 'should not set created_by' do
-      user = User.create
-      post = Post.create!(created_by: user)
-      expect(post.created_by).to eq(user)
+      post = Post.create
+      expect(post.created_by).to be_nil
     end
 
     it 'should not set updated_by' do
-      user = User.create
-      post = Post.create!
-      post.update_attributes(title: 'title', updated_by: user)
-      expect(post.updated_by).to eq(user)
+      post = Post.create
+      post.update_attributes(title: 'title')
+      expect(post.updated_by).to be_nil
+    end
+
+    context 'when set manually created_by' do
+      it 'should respect it' do
+        user = User.create
+        post = Post.create(created_by: user)
+        expect(post.created_by).to eq(user)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-simple-userstamps
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Rafael Jurado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -60,12 +60,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/mongoid-5.0.gemfile
+- gemfiles/mongoid-6.0.gemfile
+- gemfiles/mongoid-7.0.gemfile
 - lib/mongoid-simple-userstamps.rb
-- lib/mongoid-simple-userstamps/config.rb
 - lib/mongoid-simple-userstamps/model.rb
 - lib/mongoid-simple-userstamps/user.rb
 - lib/mongoid-simple-userstamps/version.rb
@@ -93,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Simple way to add user stamps to your models.
@@ -101,4 +104,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/mongoid.yml
 - spec/userstamps_spec.rb
-has_rdoc: 

data/lib/mongoid-simple-userstamps/config.rb

@@ -1,27 +0,0 @@
-##
-# This module store Userstamps config
-#
-module Mongoid
-  module Userstamps
-    module Config
-      @@model = nil
-      @@current = nil
-
-      def self.current
-        @@current
-      end
-
-      def self.model
-        @@model
-      end
-
-      def self.set_current(current)
-        @@current = current
-      end
-
-      def self.set_model(user_class)
-        @@user_class = user_class
-      end
-    end
-  end
-end