Permalink
Browse files

refactor Journey::Routes

* prefer do-end for multiline blocks
* prefer or-equals over returns with checks
  • Loading branch information...
1 parent 807e176 commit 2467ec8b5ce1be8481283943e830c56d0c827040 @goshakkk goshakkk committed Jan 6, 2013
Showing with 11 additions and 12 deletions.
  1. +11 −12 actionpack/lib/action_dispatch/journey/routes.rb
@@ -33,24 +33,23 @@ def clear
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.

0 comments on commit 2467ec8

Please sign in to comment.