http_router 0.3.9 → 0.3.10

data/README.rdoc

@@ -10,7 +10,7 @@ This is very new code. Lots of stuff probably doesn't work right. I will likely
 
 == Features
 
-* Supports variables, and globbing.
+* Supports variables, and globbing, both named and unnamed.
 * Regex support for variables.
 * Request condition support.
 * Partial matches.

data/examples/unnamed_variable.ru

@@ -0,0 +1,9 @@
+require 'http_router'
+
+run HttpRouter.new {
+  get('/:').to { |env| [200, {'Content-type' => 'text/plain'}, ["my variables are\n#{env['router.params'].inspect}\n"]]}
+}
+
+# crapbook-pro:~ joshua$ curl http://127.0.0.1:3000/heyguys
+# my variables are
+# {:$1=>"heyguys"}

data/lib/http_router/path.rb

@@ -1,8 +1,8 @@
 class HttpRouter
   class Path
-    attr_reader :parts, :route
-    def initialize(route, path, parts)
-      @route, @path, @parts = route, path, parts
+    attr_reader :parts, :route, :splitting_indexes
+    def initialize(route, path, parts, splitting_indexes)
+      @route, @path, @parts, @splitting_indexes = route, path, parts, splitting_indexes
       if duplicate_variable_names = variable_names.dup.uniq!
         raise AmbiguousVariableException.new("You have duplicate variable name present: #{duplicate_variable_names.join(', ')}")
       end

data/lib/http_router/response.rb

@@ -21,6 +21,7 @@ class HttpRouter
       def initialize(path, params, matched_path, remaining_path = nil)
         raise if matched_path.nil?
         super
+        path.splitting_indexes and path.splitting_indexes.each{|i| params[i] = params[i].split('/')}
         @params_as_hash = path.variable_names.zip(params).inject({}) {|h, (k,v)| h[k] = v; h }
       end
 

data/lib/http_router/route.rb

@@ -293,25 +293,46 @@ class HttpRouter
       path[-2, 2] == '/?' && path.slice!(-2, 2)
     end
 
+    def anonymous_variable(pos)
+      "$#{pos}"
+    end
+
     def compile_paths
       paths = HttpRouter::OptionalCompiler.new(@path).paths
       paths.map do |path|
+        splitting_indexes = []
+        variable_counter = 0
+        counter = 0
         original_path = path.dup
         split_path = router.split(path)
+        index = 0
         new_path = split_path.map do |part|
-          case part
-          when /^:([a-zA-Z_0-9]+)$/
-            v_name = $1.to_sym
+          r = case part
+          when /^:([a-zA-Z_0-9]*)$/
+            v_name = ($1.empty? ? anonymous_variable(counter += 1) : $1).to_sym
             router.variable(v_name, @matches_with[v_name])
-          when /^\*([a-zA-Z_0-9]+)$/
-            v_name = $1.to_sym
-            router.glob(v_name, @matches_with[v_name])
+          when /^\*([a-zA-Z_0-9]*)$/
+            if index != split_path.size - 1
+              v_name = ($1.empty? ? anonymous_variable(counter += 1) : $1).to_sym
+              splitting_indexes << variable_counter
+              remaining_path_parts = split_path[index + 1, split_path.size]
+              look_ahead_variable = remaining_path_parts.find{|p| p[0] == ?: || p[0] == ?*}
+              remaining_matcher = split_path[index + 1, look_ahead_variable ? remaining_path_parts.index(look_ahead_variable) : split_path.size].join('/')
+              remaining_path_parts.index(look_ahead_variable) if look_ahead_variable
+              router.variable(v_name, /^(#{@matches_with[v_name] || '[^\/]*?'}\/)+(?=#{Regexp.quote(remaining_matcher)})/)
+            else
+              v_name = ($1.empty? ? anonymous_variable(counter += 1) : $1).to_sym
+              router.glob(v_name, @matches_with[v_name])
+            end
           else
             generate_interstitial_parts(part)
           end
+          variable_counter += Array(r).select{|part| part.is_a?(Variable)}.size
+          index += 1
+          r
         end
         new_path.flatten!
-        Path.new(self, original_path, new_path)
+        Path.new(self, original_path, new_path, splitting_indexes.empty? ? nil : splitting_indexes)
       end
     end
 

data/lib/http_router/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 class HttpRouter #:nodoc
-  VERSION = '0.3.9'
+  VERSION = '0.3.10'
 end

data/spec/recognize_spec.rb

@@ -209,6 +209,19 @@ describe "HttpRouter#recognize" do
       @router.recognize(Rack::MockRequest.env_for('/foo/id')).dest.should == :test2
     end
 
+    it "should recognize /foo/: and map it to $1" do
+      @router.add("/foo/:").to(:test2)
+      @router.recognize(Rack::MockRequest.env_for('/foo/id')).dest.should == :test2
+      @router.recognize(Rack::MockRequest.env_for('/foo/id')).params_as_hash[:$1].should == 'id'
+    end
+
+    it "should recognize /foo/:/: and map it to $1 and $2" do
+      @router.add("/foo/:/:").to(:test2)
+      @router.recognize(Rack::MockRequest.env_for('/foo/id/what')).dest.should == :test2
+      @router.recognize(Rack::MockRequest.env_for('/foo/id/what')).params_as_hash[:$1].should == 'id'
+      @router.recognize(Rack::MockRequest.env_for('/foo/id/what')).params_as_hash[:$2].should == 'what'
+    end
+
     it "should recognize '/:variable'" do
       route = @router.add('/:variable').to(:test)
       response = @router.recognize(Rack::MockRequest.env_for('/%E6%AE%BA%E3%81%99'))
@@ -290,6 +303,13 @@ describe "HttpRouter#recognize" do
         response.params.should == [['one', 'two', 'three']]
       end
 
+      it "should recognize" do
+        route = @router.add('/test/*variable/test').to(:test)
+        response = @router.recognize(Rack::MockRequest.env_for('/test/one/two/three/test'))
+        response.route.should == route
+        response.params.should == [['one', 'two', 'three']]
+      end
+
       it "should recognize with a regexp" do
         route = @router.add('/test/*variable/anymore').matching(:variable => /\d+/).to(:test)
         response = @router.recognize(Rack::MockRequest.env_for('/test/123/345/567/anymore'))
@@ -298,6 +318,19 @@ describe "HttpRouter#recognize" do
         response = @router.recognize(Rack::MockRequest.env_for('/test/123/345/567'))
         response.should be_nil
       end
+
+      it "should recognize /foo/*/test and map it to $1" do
+        @router.add("/foo/*/test").to(:test2)
+        @router.recognize(Rack::MockRequest.env_for('/foo/id1/id2/test')).dest.should == :test2
+        @router.recognize(Rack::MockRequest.env_for('/foo/id1/id2/test')).params_as_hash[:$1].should == ['id1', 'id2']
+      end
+
+      it "should recognize /foo/*/what/: and map it to $1 and $2" do
+        @router.add("/foo/*/what/:").to(:test2)
+        @router.recognize(Rack::MockRequest.env_for('/foo/id1/id2/what/more')).dest.should == :test2
+        @router.recognize(Rack::MockRequest.env_for('/foo/id1/id2/what/more')).params_as_hash[:$1].should == ['id1', 'id2']
+        @router.recognize(Rack::MockRequest.env_for('/foo/id1/id2/what/more')).params_as_hash[:$2].should == 'more'
+      end
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 3
-  - 9
-  version: 0.3.9
+  - 10
+  version: 0.3.10
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 -07:00
+date: 2010-08-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,6 +151,7 @@ files:
 - examples/static/images/cat1.jpg
 - examples/static/images/cat2.jpg
 - examples/static/images/cat3.jpg
+- examples/unnamed_variable.ru
 - examples/variable.ru
 - examples/variable_with_regex.ru
 - ext/gem_rake.rb