Skip to content

Commit 33d6e3b

Browse files
committed
drop || test for cases that do not need it
1 parent 67f815a commit 33d6e3b

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

actionpack/lib/action_dispatch/routing/mapper.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,11 +580,13 @@ def define_generate_prefix(app, name)
580580
app.routes.define_mounted_helper(name)
581581
app.routes.extend Module.new {
582582
def mounted?; true; end
583-
define_method :_generate_prefix do |options|
583+
define_method :find_script_name do |options|
584+
super(options) || begin
584585
prefix_options = options.slice(*_route.segment_keys)
585586
# we must actually delete prefix segment keys to avoid passing them to next url_for
586587
_route.segment_keys.each { |k| options.delete(k) }
587588
_routes.url_helpers.send("#{name}_path", prefix_options)
589+
end
588590
end
589591
}
590592
end

actionpack/lib/action_dispatch/routing/route_set.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -641,8 +641,8 @@ def optimize_routes_generation?
641641
!mounted? && default_url_options.empty?
642642
end
643643

644-
def _generate_prefix(options)
645-
nil
644+
def find_script_name(options)
645+
options.delete :script_name
646646
end
647647

648648
# The +options+ argument must be a hash whose keys are *symbols*.
@@ -659,7 +659,7 @@ def url_for(options)
659659
recall = options.delete(:_recall)
660660

661661
original_script_name = options.delete(:original_script_name)
662-
script_name = options.delete(:script_name) || _generate_prefix(options)
662+
script_name = find_script_name options
663663

664664
if script_name && original_script_name
665665
script_name = original_script_name + script_name

0 commit comments

Comments
 (0)