1 files changed, 20 insertions, 21 deletions

diff --git a/actionpack/lib/action_dispatch/journey/routes.rb b/actionpack/lib/action_dispatch/journey/routes.rb
index c0966dd794..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,29 +33,27 @@ 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.
-      def add_route app, path, conditions, defaults, name = nil
+      def add_route(app, path, conditions, defaults, name = nil)
         route = Route.new(name, app, path, conditions, defaults)
 
         route.precedence = routes.length
@@ -66,11 +64,12 @@ module ActionDispatch
       end
 
       private
-      def clear_cache!
-        @ast                = nil
-        @partitioned_routes = nil
-        @simulator          = nil
-      end
+
+        def clear_cache!
+          @ast                = nil
+          @partitioned_routes = nil
+          @simulator          = nil
+        end
     end
   end
 end