Skip to content

Defer the inclusion until after ActiveRecord has been fully loaded #33

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.

Sign up for GitHub

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

Open
alexsmartens wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −5
Open

Defer the inclusion until after ActiveRecord has been fully loaded #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions lib/userstamp/stampable.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ def stampable(options = {})
class_eval do
belongs_to :creator, :class_name => self.stamper_class_name.to_s.singularize.camelize,
:foreign_key => self.creator_attribute

belongs_to :updater, :class_name => self.stamper_class_name.to_s.singularize.camelize,
:foreign_key => self.updater_attribute

before_save :set_updater_attribute
before_create :set_creator_attribute

if defined?(Caboose::Acts::Paranoid)
belongs_to :deleter, :class_name => self.stamper_class_name.to_s.singularize.camelize,
:foreign_key => self.deleter_attribute
Expand Down Expand Up @@ -148,4 +148,6 @@ def set_deleter_attribute
end
end

ActiveRecord::Base.send(:include, Ddb::Userstamp::Stampable) if defined?(ActiveRecord)
ActiveSupport.on_load(:active_record) do
ActiveRecord::Base.send(:include, Ddb::Userstamp::Stampable)
end
4 changes: 3 additions & 1 deletion lib/userstamp/stamper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,6 @@ def reset_stamper
end
end

ActiveRecord::Base.send(:include, Ddb::Userstamp::Stamper) if defined?(ActiveRecord)
ActiveSupport.on_load(:active_record) do
ActiveRecord::Base.send(:include, Ddb::Userstamp::Stamper)
end