joshbuddy-usher 0.2.2 → 0.3.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 2
-:patch: 2
 :major: 0
+:minor: 3
+:patch: 0

data/lib/usher.rb

@@ -4,10 +4,11 @@ require 'usher/node'
 require 'usher/route'
 require 'usher/grapher'
 require 'usher/interface'
+require 'usher/splitter'
 require 'usher/exceptions'
 
 class Usher
-  attr_reader :tree, :named_routes, :route_count, :routes
+  attr_reader :tree, :named_routes, :route_count, :routes, :splitter
   
   SymbolArraySorter = proc {|a,b| a.hash <=> b.hash} #:nodoc:
   
@@ -38,7 +39,8 @@ class Usher
   alias clear! reset!
   
   # Creates a route set
-  def initialize
+  def initialize(delimiter = '/')
+    @splitter = Splitter.delimiter(delimiter)
     reset!
   end
 
@@ -130,7 +132,7 @@ class Usher
   #   route = set.add_route('/test')
   #   set.recognize(Request.new('/test')).path.route == route => true
   def recognize(request)
-    @tree.find(request)
+    @tree.find(request, @splitter.url_split(request.path))
   end
 
   # Recognizes a set of +parameters+ and gets the closest matching Usher::Route::Path or +nil+ if no route exists.

data/lib/usher/exceptions.rb

@@ -1,7 +1,5 @@
 class Usher
   class UnrecognizedException < RuntimeError; end
-  class ValidationException < RuntimeError
-    
-  end
+  class ValidationException < RuntimeError; end
   class MissingParameterException < RuntimeError; end
 end

data/lib/usher/node.rb

@@ -21,14 +21,7 @@ class Usher
     end
 
     def depth
-      unless @depth
-        @depth = 0
-        p = self
-        while (p = p.parent) && p.is_a?(Node)
-          @depth += 1
-        end
-      end
-      @depth
+      @depth ||= @parent && @parent.is_a?(Node) ? @parent.depth + 1 : 0
     end
     
     def self.root(route_set)
@@ -103,7 +96,7 @@ class Usher
       route
     end
     
-    def find(request, path = Route::Splitter.url_split(request.path), params = [])
+    def find(request, path, params = [])
       part = path.shift unless path.size.zero?
 
       if @exclusive_type

data/lib/usher/route.rb

@@ -1,7 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'route/path'
-require 'route/splitter'
 require 'route/variable'
 require 'route/request_method'
 
@@ -15,7 +14,7 @@ class Usher
       @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
     

data/lib/usher/{route/splitter.rb → splitter.rb}

@@ -1,47 +1,53 @@
 require 'strscan'
 
 class Usher
-  class Route
-    class Splitter
-      
-      ScanRegex = /((:|\*||\.:|\.)[0-9A-Za-z\$\-_\+!\*',]+|\/|\(|\)|\|)/
-      UrlScanRegex = /\/|\.?[0-9A-Za-z\$\-_\+!\*',]+/
-      
-      attr_reader :paths
+  class Splitter
+    
+    def self.delimiter(delimiter = '/')
+      SplitterInstance.new(
+        delimiter,
+        Regexp.new('((:|\*||\.:|\.)[0-9A-Za-z\$\-_\+!\*\',]+|' + Regexp.quote(delimiter) + '|\(|\)|\|)'),
+        Regexp.new(Regexp.quote(delimiter) + '|\.?[0-9A-Za-z\$\-_\+!\*\',]+')
+      )
+    end
+    
+    attr_reader :paths
+
+    class SplitterInstance
       
-      def initialize(path, requirements = {}, transformers = {})
-        @parts = Splitter.split(path, requirements, transformers)
-        @paths = calc_paths(@parts)
-        @paths
+      def initialize(delimiter, split_regex, url_split_regex)
+        @delimiter = delimiter
+        @split_regex = split_regex
+        @url_split_regex = url_split_regex
       end
-
-      def self.url_split(path)
+      
+      def url_split(path)
         parts = []
         ss = StringScanner.new(path)
           while !ss.eos?
-            if part = ss.scan(UrlScanRegex)
-              parts << part unless part == '/'
+            if part = ss.scan(@url_split_regex)
+              parts << part unless part == @delimiter
             end
           end if path && !path.empty?
         parts
       end
-      
-      def self.split(path, requirements = {}, transformers = {})
+
+      def split(path, requirements = {}, transformers = {})
         parts = Group.new(:all, nil)
         ss = StringScanner.new(path)
         current_group = parts
         while !ss.eos?
-          part = ss.scan(ScanRegex)
+          part = ss.scan(@split_regex)
           case part[0]
           when ?*, ?:, ?.
             type = (part[1] == ?: ? part.slice!(0,2) : part.slice!(0).chr).to_sym
-            current_group << Variable.new(type, part, :validator => requirements[part.to_sym], :transformer => transformers[part.to_sym])
+            current_group << Usher::Route::Variable.new(type, part, :validator => requirements[part.to_sym], :transformer => transformers[part.to_sym])
           when ?(
             new_group = Group.new(:any, current_group)
             current_group << new_group
             current_group = new_group
-          when ?)            
-            current_group = current_group.parent
+          when ?)
+            current_group = current_group.parent.type == :one ? current_group.parent.parent : current_group.parent
           when ?|
             unless current_group.parent.type == :one
               detached_group = current_group.parent.pop
@@ -53,16 +59,16 @@ class Usher
             end
             current_group.parent << Group.new(:all, current_group.parent)
             current_group = current_group.parent.last
-          when ?/
+          when @delimiter[0]
           else
             current_group << part
           end
         end unless !path || path.empty?
-        parts
+        calc_paths(parts)
       end
-      
+
       private
-      
+
       def cartesian_product!(lval, rval)
         product = []
         (lval.size * rval.size).times do |index|
@@ -73,7 +79,7 @@ class Usher
         end
         lval.replace(product)
       end
-      
+
       def calc_paths(parts)
         if parts.is_a?(Group)
           paths = [[]]
@@ -97,23 +103,23 @@ class Usher
         else
           [[parts]]
         end
-        
+
       end
+    end
+    
+    class Group < Array
+      attr_accessor :type
+      attr_accessor :parent
       
-      class Group < Array
-        attr_accessor :type
-        attr_accessor :parent
-        
-        def inspect
-          "#{type}->#{super}"
-        end
-        
-        def initialize(type, parent)
-          @type = type
-          @parent = parent
-        end
+      def inspect
+        "#{type}->#{super}"
       end
       
+      def initialize(type, parent)
+        @type = type
+        @parent = parent
+      end
     end
+    
   end
 end

data/spec/split_spec.rb

@@ -4,25 +4,33 @@ describe "Usher route tokenizing" do
   
   
   it "should split / delimited routes" do
-    Usher::Route::Splitter.new('/test/this/split').paths.first.should == ['test', 'this', 'split']
+    Usher::Splitter.delimiter('/').split('/test/this/split').should == [['test', 'this', 'split']]
+  end
+  
+  it "should split on ' ' delimited routes as well" do
+    Usher::Splitter.delimiter(' ').split('test this split').should == [['test', 'this', 'split']]
+  end
+  
+  it "should split on ' ' delimited routes for more complex routes as well" do
+    Usher::Splitter.delimiter(' ').split('(test|this) split').should == [['test', 'split'], ['this', 'split']]
   end
   
   it "should group optional parts with brackets" do
-    Usher::Route::Splitter.new('/test/this(/split)').paths.should == [
+    Usher::Splitter.delimiter('/').split('/test/this(/split)').should == [
       ['test', 'this'],
       ['test', 'this', 'split']
     ]
   end
 
   it "should group exclusive optional parts with brackets and pipes" do
-    Usher::Route::Splitter.new('/test/this(/split|/split2)').paths.should == [
+    Usher::Splitter.delimiter('/').split('/test/this(/split|/split2)').should == [
       ['test', 'this', 'split'],
       ['test', 'this', 'split2']
     ]
   end
 
   it "should group exclusive optional-optional parts with brackets and pipes" do
-    Usher::Route::Splitter.new('/test/this((/split|/split2))').paths.should == [
+    Usher::Splitter.delimiter('/').split('/test/this((/split|/split2))').should == [
       ['test', 'this'],
       ['test', 'this', 'split'],
       ['test', 'this', 'split2']
@@ -30,7 +38,7 @@ describe "Usher route tokenizing" do
   end
 
   it "should group optional parts with brackets (for non overlapping groups)" do
-    Usher::Route::Splitter.new('/test/this(/split)(/split2)').paths == [
+    Usher::Splitter.delimiter('/').split('/test/this(/split)(/split2)') == [
       ["test", "this"],
       ["test", "this", "split"],
       ["test", "this", "split2"],
@@ -39,7 +47,7 @@ describe "Usher route tokenizing" do
   end
 
   it "should group nested-optional parts with brackets" do
-    Usher::Route::Splitter.new('/test/this(/split(.:format))').paths == [
+    Usher::Splitter.delimiter('/').split('/test/this(/split(.:format))') == [
       ["test", "this"],
       ["test", "this", "split"],
       ["test", "this", "split", Usher::Route::Variable.new(:'.:', :format)]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joshbuddy-usher
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-02 00:00:00 -07:00
+date: 2009-04-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,9 +53,9 @@ files:
 - lib/usher/route
 - lib/usher/route/path.rb
 - lib/usher/route/request_method.rb
-- lib/usher/route/splitter.rb
 - lib/usher/route/variable.rb
 - lib/usher/route.rb
+- lib/usher/splitter.rb
 - lib/usher.rb
 - spec/generate_spec.rb
 - spec/grapher_spec.rb