mongoid-userstamps 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f50851182f67227d7ce48d89b444cc6d0404cef2
-  data.tar.gz: 951bff1d14fce51b98ff36e2203d0e7cc42f23ed
+  metadata.gz: e8e66e1d1838ee4cc6b4efd260e6856b297faa0f
+  data.tar.gz: 36f03eb31abe9d279b20c17a26c179df9aa1d155
 SHA512:
-  metadata.gz: 623715ef2edd2124ebb2b2886c7c8e82256a211157c851dec91b11ad6054faaadc069e33f47c4a12156d206bad213a7b470c0f7b191fcb88e7a87ff1a98f168e
-  data.tar.gz: 5c3ed62b39cd302a306956971407a8948883825fae1d963741083f75c6b16a4cfa40c88fbde5f196ba5f78c9387837611af537712762858747820b861c96f85b
+  metadata.gz: cf678c5afb5cc5235c603756e96e739b940b270861e879ad0f1b2ea081328dd559368c2c8fb3f8e5570f5544c44b278ab162520264287f24fbd8849c75f3fb45
+  data.tar.gz: ba327ac8ed816e018f8311256ef066a59163121084a9399750335ceb0d9ebe9ce080f8f29ae268708b713fe8ec5af3cd098c00965318b3a9d80036c77689cc9f

data/.gitignore

@@ -11,3 +11,5 @@
 /.rbenv-version
 /*.gem
 /Gemfile.lock
+
+/coverage

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

@@ -4,37 +4,29 @@ module Mongoid
   module Userstamps
     module Config
       class Model
-        attr_accessor :created_name
-        attr_accessor :updated_name
-        attr_accessor :deleted_name
         attr_accessor :user_model
 
-        def initialize(opts = {})
-          @created_name = opts[:created_name]
-          @updated_name = opts[:updated_name]
-          @user_model   = opts[:user_model]
+        def initialize(model)
+          @model = model
         end
 
-        def created_name
-          @created_name || Mongoid::Userstamps::Config.created_name
-        end
-
-        def updated_name
-          @updated_name || Mongoid::Userstamps::Config.updated_name
-        end
-
-        def deleted_name
-          @deleted_name || Mongoid::Userstamps::Config.deleted_name
+        def config
+          Mongoid::Userstamps::Config
         end
 
         def user_model
-          @user_model || Mongoid::Userstamps::Config.user_classes.first.to_s
+          @user_model || config.user_classes.first.to_s
         end
+
         def user_model=(value)
           @user_model = value.to_s if value
+          set_user_model!
         end
-        def user_model_defined?
-          !!@user_model
+
+        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)
         end
       end
     end

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

@@ -6,12 +6,8 @@ module Mongoid
       class User
         attr_accessor :reader
 
-        def initialize(opts = {})
-          @reader = opts[:reader]
-        end
-
-        def reader
-          @reader || Mongoid::Userstamps::Config.user_reader
+        def initialize(model)
+          @reader = "current_#{model.name.underscore}".to_sym
         end
       end
     end

data/lib/mongoid/userstamps/config.rb

@@ -10,11 +10,10 @@ module Mongoid
         attr_accessor :created_name
         attr_accessor :updated_name
         attr_accessor :deleted_name
-        attr_accessor :user_reader
 
-        def eval
-          instance_eval(&Proc.new)
-        end
+        DEFAULT_CREATED_NAME = :created_by
+        DEFAULT_UPDATED_NAME = :updated_by
+        DEFAULT_DELETED_NAME = :deleted_by
 
         def user_classes
           @user_classes ||= []
@@ -23,10 +22,7 @@ module Mongoid
         def add_user_class(klass)
           user_classes << klass
           model_classes.each do |model|
-            config = model.userstamps_model
-            if !config.user_model_defined?
-              model.relations[config.created_name.to_s].try(:[]=, :class_name, config.user_model)
-            end
+            model.userstamps_model.set_user_model!
           end
         end
 
@@ -39,19 +35,15 @@ module Mongoid
         end
 
         def created_name
-          @created_name ||= :created_by
+          @created_name ||= DEFAULT_CREATED_NAME
         end
 
         def updated_name
-          @updated_name ||= :updated_by
+          @updated_name ||= DEFAULT_UPDATED_NAME
         end
 
         def deleted_name
-          @deleted_name ||= :deleted_by
-        end
-
-        def user_reader
-          @user_reader ||= :current_user
+          @deleted_name ||= DEFAULT_DELETED_NAME
         end
 
         def current_user(user_class)
@@ -72,6 +64,12 @@ module Mongoid
             store[key] = value
           end
         end
+
+        def reset
+          @created_name = DEFAULT_CREATED_NAME
+          @updated_name = DEFAULT_UPDATED_NAME
+          @deleted_name = DEFAULT_DELETED_NAME
+        end
       end
     end
   end

data/lib/mongoid/userstamps/created.rb

@@ -10,7 +10,7 @@ module Mongoid
           include Mongoid::Userstamps::Model
         end
 
-        belongs_to userstamps_model.created_name, {
+        belongs_to userstamps_config.created_name, {
           class_name: userstamps_model.user_model,
           inverse_of: nil
         }
@@ -20,8 +20,8 @@ module Mongoid
 
       def set_created_by
         user = self.class.current_user
-        return if !user || self.public_send(userstamps_model.created_name)
-        self.public_send("#{userstamps_model.created_name}=", user)
+        return if !user || self.public_send(userstamps_config.created_name)
+        self.public_send("#{userstamps_config.created_name}=", user)
       end
     end
   end

data/lib/mongoid/userstamps/deleted.rb

@@ -10,7 +10,7 @@ module Mongoid
           include Mongoid::Userstamps::Model
         end
 
-        belongs_to userstamps_model.deleted_name, {
+        belongs_to userstamps_config.deleted_name, {
           class_name: userstamps_model.user_model,
           inverse_of: nil
         }
@@ -20,8 +20,8 @@ module Mongoid
 
       def set_deleted_by
         user = self.class.current_user
-        return if !user || self.public_send("#{userstamps_model.deleted_name}_id_changed?")
-        self.public_send("#{userstamps_model.deleted_name}=", user)
+        return if !user || self.public_send("#{userstamps_config.deleted_name}_id_changed?")
+        self.public_send("#{userstamps_config.deleted_name}=", user)
       end
     end
   end

data/lib/mongoid/userstamps/model.rb

@@ -7,17 +7,21 @@ module Mongoid
         Mongoid::Userstamps::Config.add_model_class(self)
       end
 
-      def userstamps_model
-        self.class.userstamps_model
+      def userstamps_config
+        self.class.userstamps_config
       end
 
       class_methods do
-        def userstamps_model(opts = {})
-          @userstamps_model ||= Mongoid::Userstamps::Config::Model.new(opts)
+        def userstamps_model
+          @userstamps_model ||= Mongoid::Userstamps::Config::Model.new(self)
         end
 
         def current_user
-          Mongoid::Userstamps::Config.current_user(userstamps_model.user_model)
+          userstamps_config.current_user(userstamps_model.user_model)
+        end
+
+        def userstamps_config
+          Mongoid::Userstamps::Config
         end
       end
     end

data/lib/mongoid/userstamps/updated.rb

@@ -10,7 +10,7 @@ module Mongoid
           include Mongoid::Userstamps::Model
         end
 
-        belongs_to userstamps_model.updated_name, {
+        belongs_to userstamps_config.updated_name, {
           class_name: userstamps_model.user_model,
           inverse_of: nil
         }
@@ -20,8 +20,8 @@ module Mongoid
 
       def set_updated_by
         user = self.class.current_user
-        return if !user || self.public_send("#{userstamps_model.updated_name}_id_changed?")
-        self.public_send("#{userstamps_model.updated_name}=", user)
+        return if !user || self.public_send("#{userstamps_config.updated_name}_id_changed?")
+        self.public_send("#{userstamps_config.updated_name}=", user)
       end
     end
   end

data/lib/mongoid/userstamps/user.rb

@@ -12,10 +12,6 @@ module Mongoid
         self.id == self.class.current.try(:id)
       end
 
-      def userstamps_user
-        self.class.userstamps_user
-      end
-
       class_methods do
         def current
           Mongoid::Userstamps::Config.current_user(self)
@@ -33,8 +29,8 @@ module Mongoid
           self.current = old
         end
 
-        def userstamps_user(opts = {})
-          @userstamps_user ||= Mongoid::Userstamps::Config::User.new(opts)
+        def userstamps_user
+          @userstamps_user ||= Mongoid::Userstamps::Config::User.new(self)
         end
       end
     end

data/lib/mongoid/userstamps/version.rb

@@ -2,7 +2,7 @@
 
 module Mongoid
   module Userstamps
-    VERSION = '1.0.0'
+    VERSION = '2.0.0'
   end
 end
 

data/test/config_test.rb

@@ -1,17 +1,51 @@
 require 'test_helper'
 
 class ConfigTest < BaseTest
+  class ModelClass
+    cattr_accessor :user_model
+
+    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
+  end
+  class UserClass
+  end
+
+  teardown do
+    Mongoid::Userstamps::Config.model_classes.delete(ModelClass)
+    Mongoid::Userstamps::Config.user_classes.delete(UserClass)
+  end
+
   test 'should config using block' do
     Mongoid::Userstamps.config do |c|
       c.created_name = :creator
       c.updated_name = :updater
       c.deleted_name = :deleter
-      c.user_reader = :get_user
     end
     assert_equal :creator, Mongoid::Userstamps::Config.created_name
     assert_equal :updater, Mongoid::Userstamps::Config.updated_name
     assert_equal :deleter, Mongoid::Userstamps::Config.deleted_name
-    assert_equal :get_user, Mongoid::Userstamps::Config.user_reader
+  end
+
+  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
+      Mongoid::Userstamps::Config.add_model_class(ModelClass)
+    end
+  end
+
+  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,12 +1,71 @@
 require 'test_helper'
 
 class ModelTest < BaseTest
-  test 'should set created_by and updated_by on creation' do
+  setup do
     @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..')
+    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')
     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]
+  end
+
+  test 'set_created_by' do
+    @post = Post.new
+    @post.set_created_by
+    assert_equal @user, @post.created_by
+
+    @post = Post.new
+    @post.created_by = @user2
+    @post.set_created_by
+    assert_equal @user2, @post.created_by
+
+    Mongoid::Userstamps::Config.set_current_user(User, nil)
+    @post = Post.new
+    @post.set_created_by
+    assert_equal nil, @post.created_by
+  end
+
+  test 'set_updated_by' do
+    @post = Post.new
+    @post.set_updated_by
+    assert_equal @user, @post.updated_by
+
+    @post = Post.new
+    @post.updated_by = @user2
+    @post.set_updated_by
+    assert_equal @user2, @post.updated_by
+
+    Mongoid::Userstamps::Config.set_current_user(User, nil)
+    @post = Post.new
+    @post.set_updated_by
+    assert_equal nil, @post.updated_by
+  end
+
+  test 'set_deleted_by' do
+    @comment = Comment.new
+    @comment.set_deleted_by
+    assert_equal @person, @comment.deleted_by
+
+    @comment = Comment.new
+    @comment.deleted_by = @person2
+    @comment.set_deleted_by
+    assert_equal @person2, @comment.deleted_by
+
+    Mongoid::Userstamps::Config.set_current_user(Person, nil)
+    @comment = Comment.new
+    @comment.set_deleted_by
+    assert_equal nil, @comment.deleted_by
+  end
 end
 

data/test/models/archive.rb

@@ -0,0 +1,7 @@
+class Archive
+  include Mongoid::Document
+  include Mongoid::Userstamps::Deleted
+
+  field :content
+end
+

data/test/models/comment.rb

@@ -0,0 +1,10 @@
+class Comment
+  include Mongoid::Document
+  include Mongoid::Userstamps::Updated
+  include Mongoid::Userstamps::Deleted
+
+  field :content
+
+  userstamps_model.user_model = 'Person'
+end
+

data/test/models/person.rb

@@ -0,0 +1,7 @@
+class Person
+  include Mongoid::Document
+  include Mongoid::Userstamps::User
+
+  field :name
+end
+

data/test/models/user.rb

@@ -3,5 +3,7 @@ class User
   include Mongoid::Userstamps::User
 
   field :name
+
+  userstamps_user.reader = :current_admin
 end
 

data/test/paranoia_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+module Mongoid::Paranoia
+end
+
+class ParanoiaTest < BaseTest
+  class ModelClass
+    include Mongoid::Document
+    include Mongoid::Paranoia
+    include Mongoid::Userstamps
+  end
+
+  test 'deleted' do
+    assert ModelClass < Mongoid::Userstamps::Deleted
+  end
+end
+

data/test/test_helper.rb

@@ -18,8 +18,9 @@ Dir["#{File.dirname(__FILE__)}/models/*.rb"].each { |f| require f }
 ActiveSupport::TestCase.test_order = :random
 
 class BaseTest < ActiveSupport::TestCase
-  def teardown
+  teardown do
     Mongoid::Sessions.default.use('mongoid_userstamps_test').drop
+    Mongoid::Userstamps::Config.reset
   end
 end
 

data/test/user_test.rb

@@ -5,6 +5,31 @@ class UserTest < BaseTest
     @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')
+    User.current = @user2
+    assert @user2.current?
+    assert_equal @user2, Mongoid::Userstamps::Config.current_user(User)
+  end
+
+  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')
+    User.current = @user
+    post = nil
+    User.sudo @user2 do
+      post = Post.create(title: 'Hello')
+    end
+
+    assert_equal @user, User.current
+    assert_equal @user2, post.created_by
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-userstamps
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Geoffroy Planquart
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -82,9 +82,13 @@ files:
 - spec/unit/userstamp_spec.rb
 - test/config_test.rb
 - test/model_test.rb
+- test/models/archive.rb
+- test/models/comment.rb
+- test/models/person.rb
 - test/models/post.rb
 - test/models/user.rb
 - test/mongoid.yml
+- test/paranoia_test.rb
 - test/test_helper.rb
 - test/user_test.rb
 homepage: https://github.com/tbpro/mongoid_userstamp
@@ -125,9 +129,13 @@ test_files:
 - spec/unit/userstamp_spec.rb
 - test/config_test.rb
 - test/model_test.rb
+- test/models/archive.rb
+- test/models/comment.rb
+- test/models/person.rb
 - test/models/post.rb
 - test/models/user.rb
 - test/mongoid.yml
+- test/paranoia_test.rb
 - test/test_helper.rb
 - test/user_test.rb
 has_rdoc: