TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Get rid of unnecessary meta programming

Browse Source 
Each stacked operation is a Proc object instead of operation name since fedde239dcee256b417dc9bcfe5fef603bf0d952,
and so we can now simply inline the target method for each operation
This commit is contained in:
Akira Matsuda 2020-10-07 04:58:46 +09:00
parent 87dfa8617c
commit a412e4da64
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
railties/lib/rails/configuration.rb
View File

@ -50,43 +50,43 @@ def initialize(operations = [], delete_operations = [])
end
def insert_before(*args, &block)
@operations << -> middleware { middleware.send(__method__, *args, &block) }
@operations << -> middleware { middleware.insert_before(*args, &block) }
end
ruby2_keywords(:insert_before) if respond_to?(:ruby2_keywords, true)
alias :insert :insert_before
def insert_after(*args, &block)
@operations << -> middleware { middleware.send(__method__, *args, &block) }
@operations << -> middleware { middleware.insert_after(*args, &block) }
end
ruby2_keywords(:insert_after) if respond_to?(:ruby2_keywords, true)
def swap(*args, &block)
@operations << -> middleware { middleware.send(__method__, *args, &block) }
@operations << -> middleware { middleware.swap(*args, &block) }
end
ruby2_keywords(:swap) if respond_to?(:ruby2_keywords, true)
def use(*args, &block)
@operations << -> middleware { middleware.send(__method__, *args, &block) }
@operations << -> middleware { middleware.use(*args, &block) }
end
ruby2_keywords(:use) if respond_to?(:ruby2_keywords, true)
def delete(*args, &block)
@delete_operations << -> middleware { middleware.send(__method__, *args, &block) }
@delete_operations << -> middleware { middleware.delete(*args, &block) }
end
def move_before(*args, &block)
@delete_operations << -> middleware { middleware.send(__method__, *args, &block) }
@delete_operations << -> middleware { middleware.move_before(*args, &block) }
end
alias :move :move_before
def move_after(*args, &block)
@delete_operations << -> middleware { middleware.send(__method__, *args, &block) }
@delete_operations << -> middleware { middleware.move_after(*args, &block) }
end
def unshift(*args, &block)
@operations << -> middleware { middleware.send(__method__, *args, &block) }
@operations << -> middleware { middleware.unshift(*args, &block) }
end
ruby2_keywords(:unshift) if respond_to?(:ruby2_keywords, true)

6
railties/test/configuration/middleware_stack_proxy_test.rb
View File

@ -63,8 +63,8 @@ def test_order
@stack.delete :foo
mock = Minitest::Mock.new
mock.expect :send, nil, [:swap, :foo]
mock.expect :send, nil, [:delete, :foo]
mock.expect :swap, nil, [:foo]
mock.expect :delete, nil, [:foo]
@stack.merge_into mock
mock.verify
@ -73,7 +73,7 @@ def test_order
private
def assert_playback(msg_name, args)
mock = Minitest::Mock.new
mock.expect :send, nil, [msg_name, args]
mock.expect msg_name, nil, [args]
@stack.merge_into(mock)
mock.verify
end