Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename User module to UserstampUser #32

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Mongoid::Userstamp does the following:
# Example user class
class MyUser
include Mongoid::Document
include Mongoid::Userstamp::User
include Mongoid::Userstamp::UserstampUser

# optional class-level config override
# mongoid_userstamp_user reader: :current_my_user
Expand Down Expand Up @@ -127,14 +127,14 @@ Please note that each model may subscribe to only one user type for its userstam
```ruby
class Admin
include Mongoid::Document
include Mongoid::Userstamp::User
include Mongoid::Userstamp::UserstampUser

mongoid_userstamp_user reader: :current_admin
end

class Customer
include Mongoid::Document
include Mongoid::Userstamp::User
include Mongoid::Userstamp::UserstampUser

mongoid_userstamp_user reader: :current_customer
end
Expand Down
2 changes: 1 addition & 1 deletion lib/mongoid/userstamp/config/gem_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def initialize(&block)

# @deprecated
def user_model=(value)
warn 'Mongoid::Userstamp `user_model` config is removed as of v0.4.0. If using a model named other than `User`, please include `Mongoid::Userstamp::User` in your user model instead.'
warn 'Mongoid::Userstamp `user_model` config is removed as of v0.4.0. If using a model named other than `User`, please include `Mongoid::Userstamp::UserstampUser` in your user model instead.'
end

# @deprecated
Expand Down
2 changes: 1 addition & 1 deletion lib/mongoid/userstamp/mixins/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Mongoid
module Userstamp

module User
module UserstampUser

extend ActiveSupport::Concern

Expand Down
6 changes: 3 additions & 3 deletions lib/mongoid/userstamp/railtie.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ module Userstamp

class Railtie < Rails::Railtie

# Include Mongoid::Userstamp::User into User class, if not already done
# Include Mongoid::Userstamp::UserstampUser into User class, if not already done
config.to_prepare do
Mongoid::Userstamp.user_classes.each do |user_class|
unless user_class.included_modules.include?(Mongoid::Userstamp::User)
user_class.send(:include, Mongoid::Userstamp::User)
unless user_class.included_modules.include?(Mongoid::Userstamp::UserstampUser)
user_class.send(:include, Mongoid::Userstamp::UserstampUser)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/support/admin.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- encoding : utf-8 -*-
class Admin
include Mongoid::Document
include Mongoid::Userstamp::User
include Mongoid::Userstamp::UserstampUser

field :name
end
2 changes: 1 addition & 1 deletion spec/support/user.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- encoding : utf-8 -*-
class User
include Mongoid::Document
include Mongoid::Userstamp::User
include Mongoid::Userstamp::UserstampUser

field :name
end
2 changes: 1 addition & 1 deletion spec/unit/user_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- encoding : utf-8 -*-
require 'spec_helper'

describe Mongoid::Userstamp::User do
describe Mongoid::Userstamp::UserstampUser do

subject(:book) { Book.new(name: 'Crafting Rails Applications') }
subject(:post) { Post.new(title: 'Understanding Rails') }
Expand Down