3 files changed, 22 insertions, 26 deletions
diff --git a/actionpack/lib/action_dispatch/journey/formatter.rb b/actionpack/lib/action_dispatch/journey/formatter.rb
index 4a344f71af..cf755bfbeb 100644
--- a/actionpack/lib/action_dispatch/journey/formatter.rb
+++ b/actionpack/lib/action_dispatch/journey/formatter.rb
@@ -37,19 +37,16 @@ module ActionDispatch
       private
 
         def extract_parameterized_parts(route, options, recall, parameterize = nil)
-          constraints = recall.merge(options)
-          data = constraints.dup
+          parameterized_parts = recall.merge(options)
 
           keys_to_keep = route.parts.reverse.drop_while { |part|
             !options.key?(part) || (options[part] || recall[part]).nil?
           } | route.required_parts
 
-          (data.keys - keys_to_keep).each do |bad_key|
-            data.delete(bad_key)
+          (parameterized_parts.keys - keys_to_keep).each do |bad_key|
+            parameterized_parts.delete(bad_key)
           end
 
-          parameterized_parts = data.dup
-
           if parameterize
             parameterized_parts.each do |k, v|
               parameterized_parts[k] = parameterize.call(k, v)
diff --git a/actionpack/lib/action_dispatch/journey/route.rb b/actionpack/lib/action_dispatch/journey/route.rb
index d18efd863a..d3988cf31e 100644
--- a/actionpack/lib/action_dispatch/journey/route.rb
+++ b/actionpack/lib/action_dispatch/journey/route.rb
@@ -30,11 +30,11 @@ module ActionDispatch
       end
 
       def ast
-        return @decorated_ast if @decorated_ast
-
-        @decorated_ast = path.ast
-        @decorated_ast.grep(Nodes::Terminal).each { |n| n.memo = self }
-        @decorated_ast
+        @decorated_ast ||= begin
+          decorated_ast = path.ast
+          decorated_ast.grep(Nodes::Terminal).each { |n| n.memo = self }
+          decorated_ast
+        end
       end
 
       def requirements # :nodoc:
@@ -45,7 +45,7 @@ module ActionDispatch
       end
 
       def segments
-        @path.names
+        path.names
       end
 
       def required_keys
diff --git a/actionpack/lib/action_dispatch/journey/routes.rb b/actionpack/lib/action_dispatch/journey/routes.rb
index 32829a1f20..a99d6d0d6a 100644
--- a/actionpack/lib/action_dispatch/journey/routes.rb
+++ b/actionpack/lib/action_dispatch/journey/routes.rb
@@ -16,12 +16,12 @@ module ActionDispatch
       end
 
       def length
-        @routes.length
+        routes.length
       end
       alias :size :length
 
       def last
-        @routes.last
+        routes.last
       end
 
       def each(&block)
@@ -33,24 +33,23 @@ module ActionDispatch
       end
 
       def partitioned_routes
-        @partitioned_routes ||= routes.partition { |r|
-          r.path.anchored && r.ast.grep(Nodes::Symbol).all? { |n| n.default_regexp?  }
-        }
+        @partitioned_routes ||= routes.partition do |r|
+          r.path.anchored && r.ast.grep(Nodes::Symbol).all?(&:default_regexp?)
+        end
       end
 
       def ast
-        return @ast if @ast
-        return if partitioned_routes.first.empty?
-
-        asts = partitioned_routes.first.map { |r| r.ast }
-        @ast = Nodes::Or.new(asts)
+        @ast ||= begin
+          asts = partitioned_routes.first.map(&:ast)
+          Nodes::Or.new(asts) unless asts.empty?
+        end
       end
 
       def simulator
-        return @simulator if @simulator
-
-        gtg = GTG::Builder.new(ast).transition_table
-        @simulator = GTG::Simulator.new(gtg)
+        @simulator ||= begin
+          gtg = GTG::Builder.new(ast).transition_table
+          GTG::Simulator.new(gtg)
+        end
       end
 
       # Add a route to the routing table.