@@ -379,6 +379,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader # Reload the router to regenerate all routes. def reload_router! if File.file?(router_file = Merb.dir_for(:router) / Merb.glob_for(:router)) + Merb::Router.reset! reload router_file end end lib/merb-core/bootloader.rb @@ -31,6 +31,11 @@ module Merb cattr_accessor :routes, :named_routes class << self + + # Clear all routes. + def reset! + self.routes, self.named_routes = [], {} + end # Appends the generated routes to the current routes. # @@ -66,6 +71,18 @@ module Merb compile end + # Capture any new routes that have been added within the block. + # + # This utility method lets you track routes that have been added; + # it doesn't affect how/which routes are added. + # + # &block:: A context in which routes are generated. + def capture(&block) + routes_before, named_route_keys_before = self.routes.dup, self.named_routes.keys + yield + [self.routes - routes_before, self.named_routes.except(*named_route_keys_before)] + end + # ==== Returns # String:: A routing lambda statement generated from the routes. def compiled_statement lib/merb-core/dispatch/router.rb @@ -14,6 +14,10 @@ describe Merb::Router::Route, "initially" do @r5 = Merb::Router.routes[4] end + after :each do + Merb::Router.reset! + end + it "has reader for conditions" do @r1.conditions end @@ -47,7 +51,6 @@ describe Merb::Router::Route, "initially" do end end - describe Merb::Router::Route, "#fixatable" do predicate_matchers[:allow_fixation] = :allow_fixation? @@ -60,6 +63,10 @@ describe Merb::Router::Route, "#fixatable" do @route = Merb::Router.routes[4] end + + after :each do + Merb::Router.reset! + end it "allows fixation when called with true" do @route.fixatable(true) @@ -94,6 +101,10 @@ describe Merb::Router::Route, "#to_s" do @route = Merb::Router.routes[4] end + + after :each do + Merb::Router.reset! + end it "concatenates route segments" do @route.stub!(:segments).and_return(["continents/", "new"]) @@ -118,6 +129,10 @@ describe Merb::Router::Route, "#register" do @route = Merb::Router.routes[4] end + + after :each do + Merb::Router.reset! + end it "adds route to Merb routes set" do Merb::Router.routes = [] @@ -153,7 +168,7 @@ describe Merb::Router::Route, "#symbol_segments" do end after :each do - Merb::Router.routes = [] + Merb::Router.reset! end it "cherrypicks segments that are Symbols" do @@ -176,7 +191,7 @@ describe Merb::Router::Route, "#segments_from_path" do end after :each do - Merb::Router.routes = [] + Merb::Router.reset! end it "turns path into string and symbol segments" do @@ -200,7 +215,7 @@ describe Merb::Router::Route, "#name" do end after :each do - Merb::Router.routes = [] + Merb::Router.reset! end it "places the route into named routes collection" do @@ -212,10 +227,10 @@ describe Merb::Router::Route, "#name" do it "only accepts Symbols" do lambda { @route.name("home") }.should raise_error(ArgumentError) end + end - describe Merb::Router::Route, "#regexp?" do before :each do Merb::Router.prepare do |r| @@ -251,7 +266,7 @@ describe Merb::Router::Route, "#regexp?" do end after :each do - Merb::Router.routes = [] + Merb::Router.reset! end end @@ -267,6 +282,10 @@ describe Merb::Router::Route, "#generate" do @regexp_route = Merb::Router.named_routes[:regexpy] @non_regexp_route = Merb::Router.named_routes[:non_regexpy] end + + after :each do + Merb::Router.reset! + end it "does not work for regexp routes" do lambda { @regexp_route.generate({ :token => "apitoken" }) }.should raise_error(RuntimeError, /regexp/) @@ -304,6 +323,10 @@ describe Merb::Router::Route, "#if_conditions" do @non_regexp_route = Merb::Router.named_routes[:non_regexpy] @two_symbol_route = Merb::Router.named_routes[:two_symbol_segments] end + + after :each do + Merb::Router.reset! + end it "returns array with =~ statements" do # just to show you what it looks like @@ -328,8 +351,6 @@ describe Merb::Router::Route, "#if_conditions" do end end - - describe Merb::Router::Route, "#if_conditions" do before :each do Merb::Router.prepare do |r| @@ -342,6 +363,10 @@ describe Merb::Router::Route, "#if_conditions" do @non_regexp_route = Merb::Router.named_routes[:non_regexpy] @two_symbol_route = Merb::Router.named_routes[:two_symbol_segments] end + + after :each do + Merb::Router.reset! + end it "uses if in compiled statement when argument is false" do @regexp_route.compile(false).should =~ /\s*elsif/ @@ -355,3 +380,35 @@ describe Merb::Router::Route, "#if_conditions" do @regexp_route.compile.should =~ /\s*elsif/ end end + +describe "Merb::Router::Route.capture" do + + after :each do + Merb::Router.reset! + end + + it "should capture routes that have been added in the block context" do + routes, named, route = [], {}, nil + Merb::Router.prepare do |r| + routes, named = Merb::Router.capture do + route = r.match("/overview").to(:controller => "home", :action => 'overview') + end + r.match("/").to(:controller => "home").name(:home) + end + routes.should include(route) + named.should_not include(route) + end + + it "should capture named routes that have been added in the block context" do + routes, named, route = [], {}, nil + Merb::Router.prepare do |r| + r.match("/overview").to(:controller => "home", :action => 'overview') + routes, named = Merb::Router.capture do + route = r.match("/").to(:controller => "home").name(:home) + end + end + routes.should include(route) + named[:home].should == route + end + +end spec/private/router/route_spec.rb 74d24639f8d7158d4b5ba2457596fbc3dad90c56 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/e8c05531659c45f918f17b7627886bf3e9a40556 e8c05531659c45f918f17b7627886bf3e9a40556 2008-06-09T01:40:33-07:00 2008-06-09T01:40:33-07:00 Added Merb::Router.reset! and Merb::Router.capture 58d06c4e3d2611057804ffea0fb3562a38d8057b Fabien Franzen info@atelierfabien.be