diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-06 04:49:44 -0800 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-06 04:49:44 -0800 |
commit | 706fb0184dd51f74b792046c5d5f75ae1a9e917f (patch) | |
tree | 7344d980030882931a37a6e4f8e5b29afe5586a3 /actionpack/lib/action_dispatch/journey/route.rb | |
parent | a46e5ff7935bba842601b50e7873b1eb1a55aa0e (diff) | |
parent | c730bef3d8574e48a72f5960f6d3d36ed96ca8a6 (diff) | |
download | rails-706fb0184dd51f74b792046c5d5f75ae1a9e917f.tar.gz rails-706fb0184dd51f74b792046c5d5f75ae1a9e917f.tar.bz2 rails-706fb0184dd51f74b792046c5d5f75ae1a9e917f.zip |
Merge pull request #8779 from goshakkk/refactor-route-ast
Refactor Route#ast to use or-equals and block, instead of return with a check
Diffstat (limited to 'actionpack/lib/action_dispatch/journey/route.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/journey/route.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/journey/route.rb b/actionpack/lib/action_dispatch/journey/route.rb index d18efd863a..41351bade4 100644 --- a/actionpack/lib/action_dispatch/journey/route.rb +++ b/actionpack/lib/action_dispatch/journey/route.rb @@ -30,11 +30,10 @@ 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 + path.ast.grep(Nodes::Terminal).each { |n| n.memo = self } + path.ast + end end def requirements # :nodoc: |