joshbuddy-usher 0.0.2 → 0.0.3

data/lib/usher/grapher.rb

@@ -12,6 +12,7 @@ class Usher
       @significant_keys = nil
       @orders = Hash.new{|h,k| h[k] = Hash.new{|h2, k2| h2[k2] = []}}
       @key_count = Hash.new(0)
+      @cache = {}
     end
 
     def add_route(route)

data/lib/usher/node.rb

@@ -1,6 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 
-require 'node/lookup'
+require 'fuzzy_hash'
 
 class Usher
 
@@ -14,7 +14,7 @@ class Usher
     def initialize(parent, value)
       @parent = parent
       @value = value
-      @lookup = Lookup.new
+      @lookup = FuzzyHash.new
       @exclusive_type = nil
       @has_globber = find_parent{|p| p.value && p.value.is_a?(Route::Variable)}
     end
@@ -104,6 +104,7 @@ class Usher
     
     def find(request, path = Route::Splitter.url_split(request.path), params = [])
       part = path.shift unless path.size.zero?
+
       if @exclusive_type
         path.unshift part
         [@lookup[request.send(@exclusive_type)], @lookup[nil]].each do |n|
@@ -126,19 +127,21 @@ class Usher
           when Symbol
             part = part.send(t)
           end
-          part = 
           raise "#{part} does not conform to #{next_part.value.validator}" if next_part.value.validator && (not next_part.value.validator === part)
           case next_part.value.type
           when :*
             params << [next_part.value.name, []]
-            params.last.last << part unless next_part.is_a?(Route::Separator)
+            params.last.last << part
           when :':'
             params << [next_part.value.name, part]
+          when:'.:'
+            part.slice!(0)
+            params << [next_part.value.name, part]
           end
         end
         next_part.find(request, path, params)
-      elsif has_globber? && p = find_parent{|p| !p.is_a?(Route::Separator)} && p.value.is_a?(Route::Variable) && p.value.type == :*
-        params.last.last << part unless part.is_a?(Route::Separator)
+      elsif has_globber? && p = find_parent{|p| p.value.is_a?(Route::Variable) && p.value.type == :*}
+        params.last.last << part
         find(request, path, params)
       else
         nil

data/lib/usher/route/splitter.rb

@@ -2,8 +2,8 @@ class Usher
   class Route
     class Splitter
       
-      ScanRegex = /([:\*]?[0-9a-z_]+|\/|\.|\(|\))/
-      UrlScanRegex = /\/|\.|\w+/
+      ScanRegex = /((:|\*||\.:|)[0-9a-z_]+|\/|\(|\))/
+      UrlScanRegex = /\/|\.?\w+/
       
       attr_reader :paths
       
@@ -13,37 +13,27 @@ class Usher
       end
 
       def self.url_split(path)
-        parts = path[0] == ?/ ? [] : [Separator::Slash]
+        parts = []
         ss = StringScanner.new(path)
           while !ss.eos?
-            part = ss.scan(UrlScanRegex)
-            case part[0]
-            when ?.
-              parts << Separator::Dot
-            when ?/
-              parts << Separator::Slash
-            else
-              parts << part
+            if part = ss.scan(UrlScanRegex)
+              parts << part unless part == '/'
             end
           end if path && !path.empty?
         parts
       end
       
       def self.split(path, requirements = {}, transformers = {})
-        parts = path[0] == ?/ ? [] : [Separator::Slash]
+        parts = []
         ss = StringScanner.new(path)
         groups = [parts]
         current_group = parts
         while !ss.eos?
           part = ss.scan(ScanRegex)
           case part[0]
-          when ?*, ?:
-            type = part.slice!(0).chr.to_sym
+          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])
-          when ?.
-            current_group << Separator::Dot
-          when ?/
-            current_group << Separator::Slash
           when ?(
             new_group = []
             groups << new_group
@@ -52,6 +42,7 @@ class Usher
           when ?)
             groups.pop
             current_group = groups.last
+          when ?/
           else
             current_group << part
           end

data/lib/usher/route.rb

@@ -2,7 +2,6 @@ $:.unshift File.dirname(__FILE__)
 
 require 'route/path'
 require 'route/splitter'
-require 'route/separator'
 require 'route/variable'
 require 'route/http'
 

data/lib/usher.rb

@@ -93,22 +93,21 @@ class Usher
       Array(params)
     end
 
-    generated_path = ""
+    generated_path = ''
     
-    sep_p = nil
     path.parts.each do |p|
       case p
       when Route::Variable
         case p.type
         when :*
-          generated_path << sep_p.to_s << param_list.shift * '/'
+          generated_path << '/' << param_list.shift * '/'
+        when :'.:'
+          (dp = param_list.shift) && generated_path << '.' << dp.to_s
         else
-          (dp = param_list.shift) && generated_path << sep_p.to_s << dp.to_s
+          (dp = param_list.shift) && generated_path << '/' << dp.to_s
         end
-      when Route::Separator
-        sep_p = p
       else
-        generated_path << sep_p.to_s << p.to_s
+        generated_path << '/' << p.to_s
       end
     end
     unless params_hash.blank?

data/spec/path_spec.rb

@@ -2,9 +2,6 @@ require 'lib/usher'
 
 route_set = Usher.new
 
-S = Usher::Route::Separator::Slash
-D = Usher::Route::Separator::Dot
-
 describe "Usher route adding" do
 
   before(:each) do
@@ -25,12 +22,12 @@ describe "Usher route adding" do
   it "should add every kind of optional route possible" do
     route_set.add_route('/a/b(/c)(/d(/e))')
     route_set.routes.first.paths.collect{|a| a.parts }.should == [
-      [S, "a", S, "b"],
-      [S, "a", S, "b", S, "c"],
-      [S, "a", S, "b", S, "d"],
-      [S, "a", S, "b", S, "d", S, "e"], 
-      [S, "a", S, "b", S, "c", S, "d"], 
-      [S, "a", S, "b", S, "c", S, "d", S, "e"]
+      ["a", "b"],
+      ["a", "b", "c"],
+      ["a", "b", "d"],
+      ["a", "b", "d", "e"], 
+      ["a", "b", "c", "d"], 
+      ["a", "b", "c", "d", "e"]
     ]
     
   end

data/spec/split_spec.rb

@@ -1,36 +1,33 @@
 require 'lib/usher'
 
-Slash = Usher::Route::Separator::Slash
-Dot = Usher::Route::Separator::Dot
-
 describe "Usher route tokenizing" do
   
   
   it "should split / delimited routes" do
-    Usher::Route::Splitter.new('/test/this/split').paths.first.should == [Slash, 'test', Slash, 'this', Slash, 'split']
+    Usher::Route::Splitter.new('/test/this/split').paths.first.should == ['test', 'this', 'split']
   end
   
   it "should group optional parts with brackets" do
     Usher::Route::Splitter.new('/test/this(/split)').paths.should == [
-      [Slash, 'test', Slash, 'this'],
-      [Slash, 'test', Slash, 'this', Slash, 'split']
+      ['test', 'this'],
+      ['test', 'this', 'split']
     ]
   end
 
   it "should group optional parts with brackets (for non overlapping groups)" do
     Usher::Route::Splitter.new('/test/this(/split)(/split2)').paths == [
-      [Slash, "test", Slash, "this"],
-      [Slash, "test", Slash, "this", Slash, "split"],
-      [Slash, "test", Slash, "this", Slash, "split2"],
-      [Slash, "test", Slash, "this", Slash, "split", Slash, "split2"]
+      ["test", "this"],
+      ["test", "this", "split"],
+      ["test", "this", "split2"],
+      ["test", "this", "split", "split2"]
     ]
   end
 
   it "should group nested-optional parts with brackets" do
     Usher::Route::Splitter.new('/test/this(/split(.:format))').paths == [
-      [Slash, "test", Slash, "this"],
-      [Slash, "test", Slash, "this", Slash, "split"],
-      [Slash, "test", Slash, "this", Slash, "split", Dot, Usher::Route::Variable.new(:':', :format)]
+      ["test", "this"],
+      ["test", "this", "split"],
+      ["test", "this", "split", Usher::Route::Variable.new(:'.:', :format)]
     ]
   end
   

data/usher.gemspec

@@ -2,20 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{usher}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua HullJoshua Hull"]
   s.date = %q{2009-03-01}
   s.email = %q{joshbuddy@gmail.comjoshbuddy@gmail.com}
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "lib/compat.rb", "lib/usher.rb", "lib/usher/exceptions.rb", "lib/usher/grapher.rb", "lib/usher/interface.rb", "lib/usher/interface/merb_interface.rb", "lib/usher/interface/rack_interface.rb", "lib/usher/interface/rack_interface/mapper.rb", "lib/usher/interface/rack_interface/route.rb", "lib/usher/interface/rails2_interface.rb", "lib/usher/interface/rails2_interface/mapper.rb", "lib/usher/node.rb", "lib/usher/node/lookup.rb", "lib/usher/route.rb", "lib/usher/route/http.rb", "lib/usher/route/path.rb", "lib/usher/route/separator.rb", "lib/usher/route/splitter.rb", "lib/usher/route/variable.rb", "rails/init.rb", "spec/generate_spec.rb", "spec/node/lookup_spec.rb", "spec/path_spec.rb", "spec/rack/dispatch_spec.rb", "spec/rails/generate_spec.rb", "spec/rails/path_spec.rb", "spec/rails/recognize_spec.rb", "spec/recognize_spec.rb", "spec/spec.opts", "spec/split_spec.rb", "usher.gemspec"]
+  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "lib/compat.rb", "lib/usher.rb", "lib/usher/exceptions.rb", "lib/usher/grapher.rb", "lib/usher/interface.rb", "lib/usher/interface/merb_interface.rb", "lib/usher/interface/rack_interface.rb", "lib/usher/interface/rack_interface/mapper.rb", "lib/usher/interface/rack_interface/route.rb", "lib/usher/interface/rails2_interface.rb", "lib/usher/interface/rails2_interface/mapper.rb", "lib/usher/node.rb", "lib/usher/node/lookup.rb", "lib/usher/route.rb", "lib/usher/route/http.rb", "lib/usher/route/path.rb", "lib/usher/route/splitter.rb", "lib/usher/route/variable.rb", "rails/init.rb", "spec/generate_spec.rb", "spec/path_spec.rb", "spec/rack/dispatch_spec.rb", "spec/rails/generate_spec.rb", "spec/rails/path_spec.rb", "spec/rails/recognize_spec.rb", "spec/recognize_spec.rb", "spec/spec.opts", "spec/split_spec.rb", "usher.gemspec"]
   s.has_rdoc = true
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{usher}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{Tree-based router}
+  s.add_dependency(%q<fuzzy_hash>)
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joshbuddy-usher
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Joshua HullJoshua Hull
@@ -12,6 +12,16 @@ cert_chain: []
 date: 2009-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: fuzzy_hash
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -52,12 +62,10 @@ files:
 - lib/usher/route.rb
 - lib/usher/route/http.rb
 - lib/usher/route/path.rb
-- lib/usher/route/separator.rb
 - lib/usher/route/splitter.rb
 - lib/usher/route/variable.rb
 - rails/init.rb
 - spec/generate_spec.rb
-- spec/node/lookup_spec.rb
 - spec/path_spec.rb
 - spec/rack/dispatch_spec.rb
 - spec/rails/generate_spec.rb

data/lib/usher/route/separator.rb

@@ -1,21 +0,0 @@
-class Usher
-  class Route
-
-    class Separator
-      private
-      def initialize(sep)
-        @sep = sep
-        @sep_to_s = "#{sep}"
-      end
-
-      public
-      def to_s
-        @sep_to_s
-      end
-
-      Dot = Separator.new(:'.')
-      Slash = Separator.new(:/)
-    end
-
-  end
-end

data/spec/node/lookup_spec.rb

@@ -1,53 +0,0 @@
-require 'lib/usher'
-
-
-describe "String/regexp lookup table" do
-
-  it "should accept strings and retrieve based on them" do
-    l = Usher::Node::Lookup.new
-    l['asd'] = 'qwe'
-    l['asd'].should == 'qwe'
-  end
-  
-  it "should accept regexs too" do
-    l = Usher::Node::Lookup.new
-    l[/asd.*/] = 'qwe'
-    l['asdqweasd'].should == 'qwe'
-  end
-
-  it "should prefer string to regex matches" do
-    l = Usher::Node::Lookup.new
-    l['asd'] = 'qwe2'
-    l[/asd.*/] = 'qwe'
-    l['asd'].should == 'qwe2'
-  end
-
-  it "should allow nil keys" do
-    l = Usher::Node::Lookup.new
-    l[nil] = 'qwe2'
-    l['asd'] = 'qwe'
-    l['asd'].should == 'qwe'
-    l[nil].should == 'qwe2'
-  end
-
-  it "should be able to delete by value for hash" do
-    l = Usher::Node::Lookup.new
-    l[nil] = 'qwe2'
-    l['asd'] = 'qwe'
-    l['asd'].should == 'qwe'
-    l[nil].should == 'qwe2'
-    l.delete_value('qwe2')
-    l[nil].should == nil
-  end
-
-  it "should be able to delete by value for hash" do
-    l = Usher::Node::Lookup.new
-    l[/qwe.*/] = 'qwe2'
-    l['asd'] = 'qwe'
-    l['asd'].should == 'qwe'
-    l['qweasd'].should == 'qwe2'
-    l.delete_value('qwe2')
-    l['qweasd'].should == nil
-  end
-
-end