Skip to content

Commit 97b87dc

Browse files
byrootbyroot
authored
Merge pull request rails#41907 from Shopify/remove-ruby2-keywords-check
Stop checking if ruby2_keywords is defined
2 parents 2b1b75e + 3f59640 commit 97b87dc

File tree

22 files changed

+39
-65
lines changed

22 files changed

+39
-65
lines changed

‎actionmailer/lib/action_mailer/base.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,14 +582,13 @@ def set_payload_for_mail(payload, mail)
582582
payload[:perform_deliveries] = mail.perform_deliveries
583583
end
584584

585-
def method_missing(method_name, *args)
585+
ruby2_keywords def method_missing(method_name, *args)
586586
if action_methods.include?(method_name.to_s)
587587
MessageDelivery.new(self, method_name, *args)
588588
else
589589
super
590590
end
591591
end
592-
ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
593592

594593
def respond_to_missing?(method, include_all = false)
595594
action_methods.include?(method.to_s) || super

‎actionmailer/lib/action_mailer/delivery_job.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ class DeliveryJob < ActiveJob::Base # :nodoc:
2020
MSG
2121
end
2222

23-
def perform(mailer, mail_method, delivery_method, *args) #:nodoc:
23+
ruby2_keywords def perform(mailer, mail_method, delivery_method, *args) #:nodoc:
2424
mailer.constantize.public_send(mail_method, *args).send(delivery_method)
2525
end
26-
ruby2_keywords(:perform) if respond_to?(:ruby2_keywords, true)
2726

2827
private
2928
# "Deserialize" the mailer class name by hand in case another argument

‎actionmailer/lib/action_mailer/message_delivery.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@ module ActionMailer
1515
# Notifier.welcome(User.first).deliver_later # enqueue email delivery as a job through Active Job
1616
# Notifier.welcome(User.first).message # a Mail::Message object
1717
class MessageDelivery < Delegator
18-
def initialize(mailer_class, action, *args) #:nodoc:
18+
ruby2_keywords def initialize(mailer_class, action, *args) #:nodoc:
1919
@mailer_class, @action, @args = mailer_class, action, args
2020

2121
# The mail is only processed if we try to call any methods on it.
2222
# Typical usage will leave it unloaded and call deliver_later.
2323
@processed_mailer = nil
2424
@mail_message = nil
2525
end
26-
ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
2726

2827
# Method calls are delegated to the Mail::Message that's ready to deliver.
2928
def __getobj__ #:nodoc:

‎actionmailer/lib/action_mailer/parameterized.rb

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,33 +108,30 @@ def initialize(mailer, params)
108108
end
109109

110110
private
111-
def method_missing(method_name, *args)
111+
ruby2_keywords def method_missing(method_name, *args)
112112
if @mailer.action_methods.include?(method_name.to_s)
113113
ActionMailer::Parameterized::MessageDelivery.new(@mailer, method_name, @params, *args)
114114
else
115115
super
116116
end
117117
end
118-
ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
119118

120119
def respond_to_missing?(method, include_all = false)
121120
@mailer.respond_to?(method, include_all)
122121
end
123122
end
124123

125124
class DeliveryJob < ActionMailer::DeliveryJob # :nodoc:
126-
def perform(mailer, mail_method, delivery_method, params, *args)
125+
ruby2_keywords def perform(mailer, mail_method, delivery_method, params, *args)
127126
mailer.constantize.with(params).public_send(mail_method, *args).send(delivery_method)
128127
end
129-
ruby2_keywords(:perform) if respond_to?(:ruby2_keywords, true)
130128
end
131129

132130
class MessageDelivery < ActionMailer::MessageDelivery # :nodoc:
133-
def initialize(mailer_class, action, params, *args)
131+
ruby2_keywords def initialize(mailer_class, action, params, *args)
134132
super(mailer_class, action, *args)
135133
@params = params
136134
end
137-
ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
138135

139136
private
140137
def processed_mailer

‎actionpack/lib/abstract_controller/helpers.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,10 @@ def helper_method(*methods)
8383
file, line = location.path, location.lineno
8484

8585
methods.each do |method|
86-
_helpers_for_modification.class_eval <<-ruby_eval, file, line
87-
def #{method}(*args, &block) # def current_user(*args, &block)
86+
_helpers_for_modification.class_eval <<~ruby_eval, file, line
87+
ruby2_keywords def #{method}(*args, &block) # ruby2_keywords def current_user(*args, &block)
8888
controller.send(:'#{method}', *args, &block) # controller.send(:'current_user', *args, &block)
8989
end # end
90-
ruby2_keywords(:'#{method}') if respond_to?(:ruby2_keywords, true)
9190
ruby_eval
9291
end
9392
end

‎actionpack/lib/action_dispatch/middleware/stack.rb

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,35 +88,31 @@ def [](i)
8888
middlewares[i]
8989
end
9090

91-
def unshift(klass, *args, &block)
91+
ruby2_keywords def unshift(klass, *args, &block)
9292
middlewares.unshift(build_middleware(klass, args, block))
9393
end
94-
ruby2_keywords(:unshift) if respond_to?(:ruby2_keywords, true)
9594

9695
def initialize_copy(other)
9796
self.middlewares = other.middlewares.dup
9897
end
9998

100-
def insert(index, klass, *args, &block)
99+
ruby2_keywords def insert(index, klass, *args, &block)
101100
index = assert_index(index, :before)
102101
middlewares.insert(index, build_middleware(klass, args, block))
103102
end
104-
ruby2_keywords(:insert) if respond_to?(:ruby2_keywords, true)
105103

106104
alias_method :insert_before, :insert
107105

108-
def insert_after(index, *args, &block)
106+
ruby2_keywords def insert_after(index, *args, &block)
109107
index = assert_index(index, :after)
110108
insert(index + 1, *args, &block)
111109
end
112-
ruby2_keywords(:insert_after) if respond_to?(:ruby2_keywords, true)
113110

114-
def swap(target, *args, &block)
111+
ruby2_keywords def swap(target, *args, &block)
115112
index = assert_index(target, :before)
116113
insert(index, *args, &block)
117114
middlewares.delete_at(index + 1)
118115
end
119-
ruby2_keywords(:swap) if respond_to?(:ruby2_keywords, true)
120116

121117
def delete(target)
122118
middlewares.delete_if { |m| m.klass == target }
@@ -140,10 +136,9 @@ def move_after(target, source)
140136
middlewares.insert(target_index + 1, source_middleware)
141137
end
142138

143-
def use(klass, *args, &block)
139+
ruby2_keywords def use(klass, *args, &block)
144140
middlewares.push(build_middleware(klass, args, block))
145141
end
146-
ruby2_keywords(:use) if respond_to?(:ruby2_keywords, true)
147142

148143
def build(app = nil, &block)
149144
instrumenting = ActiveSupport::Notifications.notifier.listening?(InstrumentationProxy::EVENT_NAME)

‎actionpack/lib/action_dispatch/testing/integration.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ def respond_to_missing?(method, _)
422422
end
423423

424424
# Delegate unhandled messages to the current session instance.
425-
def method_missing(method, *args, &block)
425+
ruby2_keywords def method_missing(method, *args, &block)
426426
if integration_session.respond_to?(method)
427427
integration_session.public_send(method, *args, &block).tap do
428428
copy_session_variables!
@@ -431,7 +431,6 @@ def method_missing(method, *args, &block)
431431
super
432432
end
433433
end
434-
ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
435434
end
436435
end
437436

‎actionview/lib/action_view/test_case.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,10 @@ def determine_default_helper_class(name)
7474
def helper_method(*methods)
7575
# Almost a duplicate from ActionController::Helpers
7676
methods.flatten.each do |method|
77-
_helpers_for_modification.module_eval <<-end_eval, __FILE__, __LINE__ + 1
78-
def #{method}(*args, &block) # def current_user(*args, &block)
77+
_helpers_for_modification.module_eval <<~end_eval, __FILE__, __LINE__ + 1
78+
ruby2_keywords def #{method}(*args, &block) # ruby2_keywords def current_user(*args, &block)
7979
_test_case.send(:'#{method}', *args, &block) # _test_case.send(:'current_user', *args, &block)
8080
end # end
81-
ruby2_keywords(:'#{method}') if respond_to?(:ruby2_keywords, true)
8281
end_eval
8382
end
8483
end

‎actionview/test/template/form_helper/form_with_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2120,7 +2120,7 @@ def #{selector}(field, *args, &proc)
21202120
end
21212121
RUBY_EVAL
21222122
end
2123-
ruby2_keywords(:fields) if respond_to?(:ruby2_keywords, true)
2123+
ruby2_keywords(:fields)
21242124
end
21252125

21262126
def test_form_with_with_labelled_builder

‎activejob/lib/active_job/arguments.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ def ruby2_keywords_hash(hash)
8181
_ruby2_keywords_hash(**hash)
8282
end
8383

84-
private def _ruby2_keywords_hash(*args)
85-
args.last
86-
end
87-
ruby2_keywords(:_ruby2_keywords_hash) if respond_to?(:ruby2_keywords, true)
84+
private
85+
ruby2_keywords def _ruby2_keywords_hash(*args)
86+
args.last
87+
end
8888
end
8989
end
9090
}

0 commit comments

Comments
 (0)