app-routes 0.1.7 → 0.1.8

data/lib/app-routes.rb

@@ -13,33 +13,32 @@ module AppRoutes
 
     result = nil
 
-    @route.each do |key, block|
+    route = @route.detect {|key, block| request.match(key) }
+    
+    if route then
+      key, block = route
       match = request.match(key)
 
-      if match then
-        args = match.captures
-        @params[:captures] = *args
-
-        if @route[key][:s] then
-          raw_params = @route[key][:s].gsub(':','').match(key).captures
-          splat, raw_params2 = raw_params.each_with_index.partition {|x,i| x == '/*'}
-          @params[:splat] = splat.map {|x,i| v = args[i]; args.delete_at(i); v}
-          @params.merge!(Hash[raw_params2.map{|x,i| x.to_sym}.zip(args)])
-        end 
+      args = match.captures
+      @params[:captures] = *args
 
-        begin
-          result = @route[key][:block].call *args
-        rescue Exception => e  
+      if @route[key][:s] then
+        raw_params = @route[key][:s].gsub(':','').match(key).captures
+        splat, raw_params2 = raw_params.each_with_index.partition {|x,i| x == '/*'}
+        @params[:splat] = splat.map {|x,i| v = args[i]; args.delete_at(i); v}
+        @params.merge!(Hash[raw_params2.map{|x,i| x.to_sym}.zip(args)])
+      end 
 
-          err_label = e.message + " :: \n" + e.backtrace.join("\n")      
-          puts err_label      
-          "app-routes error: " + ($!).to_s
-        end
+      begin
+        result = @route[key][:block].call *args
+      rescue Exception => e  
 
-        break
+        err_label = e.message + " :: \n" + e.backtrace.join("\n")      
+        puts err_label      
+        "app-routes error: " + ($!).to_s
       end
+
     end
-    
     result
   end
 

metadata

@@ -2,15 +2,15 @@
 name: app-routes
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
-authors: []
-
+authors: 
+- James Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 +01:00
+date: 2012-02-21 00:00:00 +00:00
 default_executable: 
 dependencies: []