oscardelben-routes 0.0.1 → 0.0.2

data/README.rdoc

@@ -1,30 +1,34 @@
 = Routes
-== A routes library for ruby
+
+A routes library for ruby
 
 USAGE:
 
-		Routes::Building.draw do
-		  map '/posts', :controller => 'posts', :action => 'index'
-		  map '/posts/:id', :controller => 'posts'
-		  map '/controller/:action', {}
-		  map '/:controller/:action/:id', {}
-		  map '/cool', lambda { |path| "This is #{path}" }
-		  map /.*/, :action => 'anything'
-		end
+	Routes::Building.draw do
+	  map '/posts', :controller => 'posts', :action => 'index'
+	  map '/posts/:id', :controller => 'posts'
+	  map '/controller/:action', {}
+	  map '/:controller/:action/:id', {}
+	  map '/cool', lambda { |path| "This is #{path}" }
+	  map /.*/, :action => 'anything'
+	end
+
 
+	Routes::Recognition.new('/posts').recognize # => { :controller => 'posts', :action => 'index' }
 
-		Routes::Recognition.new('/posts').recognize # => { :controller => 'posts', :action => 'index' }
+	Routes::Recognition.new('/posts/1').recognize # => { :controller => 'posts', :id => '1' }
 
-		Routes::Recognition.new('/posts/1').recognize # => { :controller => 'posts', :id => '1' }
+	Routes::Recognition.new('/controller/new').recognize # => { :action => 'new' }
 
-		Routes::Recognition.new('/controller/new').recognize # => { :action => 'new' }
+	Routes::Recognition.new('/posts/show/1').recognize # => { :controller => 'posts', :action => 'show', :id => '1' }
 
-		Routes::Recognition.new('/posts/show/1').recognize # => { :controller => 'posts', :action => 'show', :id => '1' }
+	Routes::Recognition.new('/something').recognize # => { :action => 'anything' }
 
-		Routes::Recognition.new('/something').recognize # => { :action => 'anything' }
+	Routes::Recognition.new('/cool').recognize.call('/cool') # => "This is /cool"
 
-		Routes::Recognition.new('/cool').recognize # => "This is /cool"
 
+Note that the library will not execute lambdas itself, so it's your responsibility to test the result returned. This allow more flexibility in my opinion because you can pass additional parameters to it like the env object.
 		
 CONTRIBUTIONS
+
 I'm open to contributions and suggestions. Drop me an email at info@oscardelben.com

data/lib/recognition.rb

@@ -15,39 +15,15 @@ module Routes
       
         filter_route!
       
-        return give_back_result if @result
+        return result if result
       end
     
       # Nothing matched
-      give_back_result
+      result
     end
   
     private
-  
-    def segments_from_string(path)
-      path[1..-1].split('/')
-    end
-  
-    def give_back_result
-      if result.respond_to?(:call)
-        result.call(path)
-      else
-        result
-      end
-    end
-  
-    def update_result(key, value)
-      @result.merge!(key => value)
-    end
-  
-    def route_segments
-      segments_from_string(route_pattern)
-    end
-  
-    def path_segments
-      segments_from_string(path)
-    end
-  
+    
     def filter_route!
       if route_pattern.is_a? String
         match_with_string
@@ -55,23 +31,39 @@ module Routes
         match_with_regexp
       end
     end
-  
+    
     def match_with_string
       if compatible_segments?     
         match_segments
       else
-        @result = nil
+        self.result = nil
       end
     end
   
     def match_with_regexp
       if route_pattern =~ path
-        return give_back_result
+        return result
       else
-        result = nil
+        self.result = nil
       end
     end
   
+    def segments_from_string(path)
+      path[1..-1].split('/')
+    end
+  
+    def update_result(key, value)
+      self.result.merge!(key => value)
+    end
+  
+    def route_segments
+      segments_from_string(route_pattern)
+    end
+  
+    def path_segments
+      segments_from_string(path)
+    end
+  
     # TODO: path_segments is calculated 2 times
     def compatible_segments?
       route_segments.size == path_segments.size
@@ -84,7 +76,7 @@ module Routes
         if route_segment[0] == ?:
           update_result(eval(route_segment), path_segment)
         elsif path_segment != route_segment
-          @result = nil
+          self.result = nil
           break
         end
       end

data/spec/spec/routes_spec.rb

@@ -83,8 +83,9 @@ describe Routes do
       Routes::Recognition.new('/something').recognize.should == { :action => 'anything' }
     end
         
-    it "should directly execute lambda routes" do
-      Routes::Recognition.new('/cool').recognize.should == "This is /cool"
+    it "should return lambda routes" do
+      route = Routes::Recognition.new('/cool').recognize
+      route.call('/cool').should == "This is /cool"
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oscardelben-routes
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Oscar Del Ben