Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Use run_callbacks; the generated _run_<name>_callbacks method is not …

…a public interface.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
  • Loading branch information...
commit 57bc25c5f8129f57b08a2dc7c319b86778dd8a40 1 parent 9666b6a
@jfirebaugh jfirebaugh authored spastorino committed
View
2  actionpack/lib/action_dispatch/middleware/callbacks.rb
@@ -25,7 +25,7 @@ def initialize(app, unused = nil)
end
def call(env)
- _run_call_callbacks do
+ run_callbacks :call do
@app.call(env)
end
end
View
8 actionpack/lib/action_dispatch/middleware/reloader.rb
@@ -43,12 +43,12 @@ def self.to_cleanup(*args, &block)
# Execute all prepare callbacks.
def self.prepare!
- new(nil).send(:_run_prepare_callbacks)
+ new(nil).run_callbacks :prepare
end
# Execute all cleanup callbacks.
def self.cleanup!
- new(nil).send(:_run_cleanup_callbacks)
+ new(nil).run_callbacks :cleanup
end
def initialize(app)
@@ -64,12 +64,12 @@ def close
end
def call(env)
- _run_prepare_callbacks
+ run_callbacks :prepare
response = @app.call(env)
response[2].extend(CleanupOnClose)
response
rescue Exception
- _run_cleanup_callbacks
+ run_callbacks :cleanup
raise
end
end
View
2  activemodel/README.rdoc
@@ -41,7 +41,7 @@ modules:
define_model_callbacks :create
def create
- _run_create_callbacks do
+ run_callbacks :create do
# Your create action methods here
end
end
View
5 activemodel/lib/active_model/callbacks.rb
@@ -24,14 +24,11 @@ module ActiveModel
# you want callbacks on in a block so that the callbacks get a chance to fire:
#
# def create
- # _run_create_callbacks do
+ # run_callbacks :create do
# # Your create action methods here
# end
# end
#
- # The _run_<method_name>_callbacks methods are dynamically created when you extend
- # the <tt>ActiveModel::Callbacks</tt> module.
- #
# Then in your class, you can use the +before_create+, +after_create+ and +around_create+
# methods, just as you would in an Active Record module.
#
View
2  activemodel/lib/active_model/validations.rb
@@ -207,7 +207,7 @@ def invalid?(context = nil)
protected
def run_validations!
- _run_validate_callbacks
+ run_callbacks :validate
errors.empty?
end
end
View
2  activemodel/lib/active_model/validations/callbacks.rb
@@ -50,7 +50,7 @@ def after_validation(*args, &block)
# Overwrite run validations to include callbacks.
def run_validations!
- _run_validation_callbacks { super }
+ run_callbacks(:validation) { super }
end
end
end
View
4 activemodel/test/cases/callbacks_test.rb
@@ -37,7 +37,7 @@ def before_create
end
def create
- _run_create_callbacks do
+ run_callbacks :create do
@callbacks << :create
@valid
end
@@ -92,7 +92,7 @@ def initialize
def callback1; self.history << 'callback1'; end
def callback2; self.history << 'callback2'; end
def create
- _run_create_callbacks {}
+ run_callbacks(:create) {}
self
end
end
View
6 activerecord/lib/active_record/base.rb
@@ -1400,7 +1400,7 @@ def initialize(attributes = nil)
self.attributes = attributes unless attributes.nil?
result = yield self if block_given?
- _run_initialize_callbacks
+ run_callbacks :initialize
result
end
@@ -1437,8 +1437,8 @@ def init_with(coder)
@aggregation_cache = {}
@readonly = @destroyed = @marked_for_destruction = false
@new_record = false
- _run_find_callbacks
- _run_initialize_callbacks
+ run_callbacks :find
+ run_callbacks :initialize
end
# Specifies how the record is dumped by +Marshal+.
View
10 activerecord/lib/active_record/callbacks.rb
@@ -237,25 +237,25 @@ module Callbacks
end
def destroy #:nodoc:
- _run_destroy_callbacks { super }
+ run_callbacks(:destroy) { super }
end
def touch(*) #:nodoc:
- _run_touch_callbacks { super }
+ run_callbacks(:touch) { super }
end
private
def create_or_update #:nodoc:
- _run_save_callbacks { super }
+ run_callbacks(:save) { super }
end
def create #:nodoc:
- _run_create_callbacks { super }
+ run_callbacks(:create) { super }
end
def update(*) #:nodoc:
- _run_update_callbacks { super }
+ run_callbacks(:update) { super }
end
end
end
View
2  activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -212,7 +212,7 @@ def checkout
# calling +checkout+ on this pool.
def checkin(conn)
@connection_mutex.synchronize do
- conn.send(:_run_checkin_callbacks) do
+ conn.run_callbacks :checkin do
@checked_out.delete conn
@queue.signal
end
View
4 activerecord/lib/active_record/transactions.rb
@@ -259,7 +259,7 @@ def rollback_active_record_state!
# Call the after_commit callbacks
def committed! #:nodoc:
- _run_commit_callbacks
+ run_callbacks :commit
ensure
clear_transaction_record_state
end
@@ -267,7 +267,7 @@ def committed! #:nodoc:
# Call the after rollback callbacks. The restore_state argument indicates if the record
# state should be rolled back to the beginning or just to the last savepoint.
def rolledback!(force_restore_state = false) #:nodoc:
- _run_rollback_callbacks
+ run_callbacks :rollback
ensure
restore_transaction_record_state(force_restore_state)
end
View
8 activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -31,14 +31,14 @@ module ForMiniTest
def run(runner)
result = '.'
begin
- _run_setup_callbacks do
+ run_callbacks :setup do
result = super
end
rescue Exception => e
result = runner.puke(self.class, method_name, e)
ensure
begin
- _run_teardown_callbacks
+ run_callbacks :teardown
rescue Exception => e
result = runner.puke(self.class, method_name, e)
end
@@ -62,7 +62,7 @@ def run(result)
begin
begin
- _run_setup_callbacks do
+ run_callbacks :setup do
setup
__send__(@method_name)
mocha_verify(mocha_counter) if mocha_counter
@@ -77,7 +77,7 @@ def run(result)
ensure
begin
teardown
- _run_teardown_callbacks
+ run_callbacks :teardown
rescue Test::Unit::AssertionFailedError => e
add_failure(e.message, e.backtrace)
rescue Exception => e
View
2  activesupport/test/callback_inheritance_test.rb
@@ -70,7 +70,7 @@ def perform!
end
def dispatch
- _run_dispatch_callbacks
+ run_callbacks :dispatch
self
end
end
View
2  activesupport/test/callbacks_test.rb
@@ -14,7 +14,7 @@ def before_save1; self.history << :before; end
def after_save1; self.history << :after; end
def save
- self.send(:_run_save_callbacks) do
+ run_callbacks :save do
raise 'boom'
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.