lib/usher/route.rb in joshbuddy-usher-0.2.2 vs lib/usher/route.rb in joshbuddy-usher-0.3.0
- old
+ new
@@ -1,9 +1,8 @@
$:.unshift File.dirname(__FILE__)
require 'route/path'
-require 'route/splitter'
require 'route/variable'
require 'route/request_method'
class Usher
class Route
@@ -13,10 +12,10 @@
@original_path = original_path
@router = router
@requirements = options.delete(:requirements)
@conditions = options.delete(:conditions)
@transformers = options.delete(:transformers)
- @paths = Splitter.new(@original_path, @requirements, @transformers).paths.collect {|path| Path.new(self, path)}
+ @paths = @router.splitter.split(@original_path, @requirements, @transformers).collect {|path| Path.new(self, path)}
@primary_path = @paths.first
end
# Sets +options+ on a route. Returns +self+.