http_router 0.3.15 → 0.3.16

data/.gitignore

@@ -3,3 +3,4 @@ pkg
 .bundle
 rdoc
 Gemfile.lock
+.rvmrc

data/lib/http_router/node.rb

@@ -134,6 +134,11 @@ class HttpRouter
       current_nodes
     end
 
+    def escape_val(val)
+      val.is_a?(Array) ? val.each{|v| HttpRouter.uri_unescape!(v)} : HttpRouter.uri_unescape!(val)
+      val
+    end
+
     def find_on_parts(request, parts, params)
       if parts and !parts.empty?
         if potential = potential_match(request, parts, params)
@@ -147,7 +152,7 @@ class HttpRouter
             if tester.respond_to?(:matches?) and match = tester.matches?(parts)
               dupped_parts = parts.dup
               dupped_params = params.dup
-              dupped_params.push((val = tester.consume(match, dupped_parts) and val.is_a?(Array)) ? val.map{|v| HttpRouter.uri_unescape(v)} : HttpRouter.uri_unescape(val))
+              dupped_params << escape_val(tester.consume(match, dupped_parts))
               parts.replace(dupped_parts) if response = node.find_on_parts(request, dupped_parts, dupped_params)
             elsif tester.respond_to?(:match) and match = tester.match(parts.whole_path) and match.begin(0) == 0
               dupped_parts = router.split(parts.whole_path[match[0].size, parts.whole_path.size])
@@ -171,7 +176,7 @@ class HttpRouter
           end
         end
         if @catchall
-          params.push((val = @catchall.variable.consume(nil, parts) and val.is_a?(Array)) ? val.map{|v| HttpRouter.uri_unescape(v)} : HttpRouter.uri_unescape(val))
+          params << escape_val(@catchall.variable.consume(nil, parts))
           return @catchall.find_on_parts(request, parts, params)
         end
       end

data/lib/http_router/route.rb

@@ -336,6 +336,10 @@ class HttpRouter
       end
     end
 
+    def significant_variable_names
+      @significant_variable_names ||= @path.scan(/(^|[^\\])[:\*]([a-zA-Z0-9_]+)/).map{|p| p.last.to_sym}
+    end
+
     def generate_interstitial_parts(part)
       part_segments = part.scan(/:[a-zA-Z_0-9]+|[^:]+/)
       if part_segments.size > 1
@@ -366,13 +370,5 @@ class HttpRouter
       raise AlreadyCompiledException if compiled?
     end
 
-    def significant_variable_names
-      unless @significant_variable_names
-        @significant_variable_names = @paths.map { |p| p.variable_names }
-        @significant_variable_names.flatten!
-        @significant_variable_names.uniq!
-      end
-      @significant_variable_names
-    end
   end
 end

data/lib/http_router/version.rb

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

data/lib/http_router.rb

@@ -259,8 +259,8 @@ class HttpRouter
     s.to_s.gsub!(/([^:\/?\[\]\-_~\.!\$&'\(\)\*\+,;=@a-zA-Z0-9]+)/n) { "%#{$1.unpack('H2'*$1.size).join('%').upcase}" }
   end
 
-  def self.uri_unescape(s)
-    s.to_s.gsub(/((?:%[0-9a-fA-F]{2})+)/n){ [$1.delete('%')].pack('H*') }
+  def self.uri_unescape!(s)
+    s.to_s.gsub!(/((?:%[0-9a-fA-F]{2})+)/n){ [$1.delete('%')].pack('H*') }
   end
 
   private

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 3
-  - 15
-  version: 0.3.15
+  - 16
+  version: 0.3.16
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 -04:00
+date: 2010-09-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency