@@ -236,8 +236,40 @@ module Merb
route.generate(params, defaults)
end
- private
-
+ # Add functionality to the router. This can be in the form of
+ # including a new module or directly defining new methods.
+ #
+ # ==== Parameters
+ # &block<Block>::
+ # A block of code used to extend the route builder with. This
+ # can be including a module or directly defining some new methods
+ # that should be available to building routes.
+ #
+ # ==== Example
+ # Merb::Router.extensions do
+ # def domain(name, domain, options={}, &block)
+ # match(:domain => domain).namespace(name, :path => nil, &block)
+ # end
+ # end
+ #
+ # In this case, a method 'domain' will be available to the route builder
+ # which will create namespaces around domains instead of path prefixes.
+ #
+ # This can then be used as follows.
+ #
+ # Merb::Router.prepare do
+ # domain(:admin, "my-admin.com") do
+ # # ... routes come here ...
+ # end
+ # end
+ # ---
+ # @api public
+ def extensions(&block)
+ Router::Behavior.class_eval(&block)
+ end
+
+ private
+
# Compiles the routes and creates the +match+ method.
#
# @api private
lib/merb-core/dispatch/router.rb
@@ -272,11 +272,7 @@ module Merb
end
end # Resources
-
- class Behavior
- include Resources
- end
-
+
# Adding the collection and member methods to behavior
class ResourceBehavior < Behavior #:nodoc:
@@ -301,5 +297,9 @@ module Merb
end
end
+
+ class Behavior
+ include Resources
+ end
end
end
\ No newline at end of file
lib/merb-core/dispatch/router/resources.rb
@@ -145,7 +145,7 @@ describe Merb::Router do
end
it "should not be able to match routes anymore" do
- lambda { route_for("/users") }
+ lambda { route_for("/users") }.should raise_error(Merb::Router::NotCompiledError)
end
end
@@ -157,5 +157,21 @@ describe Merb::Router do
end
end
+
+ describe "#extensions" do
+ it "should be able to extend the router" do
+ Merb::Router.extensions do
+ def hello_world
+ match("/hello").to(:controller => "world")
+ end
+ end
+
+ Merb::Router.prepare do
+ hello_world
+ end
+
+ route_for("/hello").should have_route(:controller => "world")
+ end
+ end
end
\ No newline at end of file
spec/public/router/router_spec.rb
209ca502a6e44f3115042f90b90caec6f82580ed
Carl Lerche
carllerche@mac.com
http://github.com/wycats/merb-core/commit/72f7c7ef3a2ce6a0a0f409b2092e64da7d0795cf
72f7c7ef3a2ce6a0a0f409b2092e64da7d0795cf
2008-10-12T16:22:08-07:00
2008-10-12T16:15:22-07:00
Added Merb::Router.extensions as an official API.
Merb::Router.extensions is now the official way to add functionality
to the router.
b5434d3139a1401454adc3a68868e3a15d5159e6
Carl Lerche
carllerche@mac.com