mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Revert "Replace (slower) block.call with (faster) yield"
This reverts commit 0ab075e75f
.
This commit is contained in:
parent
faf3616d5e
commit
7b71d8cfab
5 changed files with 11 additions and 11 deletions
|
@ -216,11 +216,11 @@ module ActionController #:nodoc:
|
|||
#
|
||||
# Be sure to check the documentation of +respond_with+ and
|
||||
# <tt>ActionController::MimeResponds.respond_to</tt> for more examples.
|
||||
def respond_to(*mimes)
|
||||
def respond_to(*mimes, &block)
|
||||
raise ArgumentError, "respond_to takes either types or a block, never both" if mimes.any? && block_given?
|
||||
|
||||
collector = Collector.new(mimes, request.variant)
|
||||
yield collector if block_given?
|
||||
block.call(collector) if block_given?
|
||||
|
||||
if format = collector.negotiate_format(request)
|
||||
_process_format(format)
|
||||
|
|
|
@ -357,11 +357,11 @@ class MigratorTest < ActiveRecord::TestCase
|
|||
end
|
||||
|
||||
private
|
||||
def m(name, version)
|
||||
def m(name, version, &block)
|
||||
x = Sensor.new name, version
|
||||
x.extend(Module.new {
|
||||
define_method(:up) { yield(:up, x); super() }
|
||||
define_method(:down) { yield(:down, x); super() }
|
||||
define_method(:up) { block.call(:up, x); super() }
|
||||
define_method(:down) { block.call(:down, x); super() }
|
||||
}) if block_given?
|
||||
end
|
||||
|
||||
|
|
|
@ -90,7 +90,7 @@ module ActiveSupport
|
|||
# Time.current # => Wed, 24 Nov 2004 01:04:44 EST -05:00
|
||||
# end
|
||||
# Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
|
||||
def travel_to(date_or_time)
|
||||
def travel_to(date_or_time, &block)
|
||||
if date_or_time.is_a?(Date) && !date_or_time.is_a?(DateTime)
|
||||
now = date_or_time.midnight.to_time
|
||||
else
|
||||
|
@ -102,7 +102,7 @@ module ActiveSupport
|
|||
|
||||
if block_given?
|
||||
begin
|
||||
yield
|
||||
block.call
|
||||
ensure
|
||||
travel_back
|
||||
end
|
||||
|
|
|
@ -85,10 +85,10 @@ module Rails
|
|||
# environment(nil, env: "development") do
|
||||
# "config.autoload_paths += %W(#{config.root}/extras)"
|
||||
# end
|
||||
def environment(data=nil, options={})
|
||||
def environment(data=nil, options={}, &block)
|
||||
sentinel = /class [a-z_:]+ < Rails::Application/i
|
||||
env_file_sentinel = /Rails\.application\.configure do/
|
||||
data = yield if !data && block_given?
|
||||
data = block.call if !data && block_given?
|
||||
|
||||
in_root do
|
||||
if options[:env].nil?
|
||||
|
|
|
@ -39,7 +39,7 @@ module Rails
|
|||
|
||||
protected
|
||||
|
||||
def on_conflict_behavior
|
||||
def on_conflict_behavior(&block)
|
||||
options = base.options.merge(config)
|
||||
if identical?
|
||||
say_status :identical, :blue, relative_existing_migration
|
||||
|
@ -48,7 +48,7 @@ module Rails
|
|||
say_status :create, :green
|
||||
unless pretend?
|
||||
::FileUtils.rm_rf(existing_migration)
|
||||
yield
|
||||
block.call
|
||||
end
|
||||
elsif options[:skip]
|
||||
say_status :skip, :yellow
|
||||
|
|
Loading…
Reference in a new issue