@@ -256,12 +256,8 @@ module Halcyon # # Refer to Halcyon::Application::Router for documentation and resources. # - def route - if block_given? - Router.prepare do |router| - Router.default_to yield(router) || {:controller => 'application', :action => 'not_found'} - end - end + def route(&block) + Router.default_to Router.prepare(&block) || {:controller => 'application', :action => 'not_found'} end #-- lib/halcyon/application.rb @@ -3,6 +3,8 @@ module Halcyon class Application + Router = Merb::Router + # = Routing # # Handles routing. @@ -37,7 +39,7 @@ module Halcyon # is. # # http://merbivore.com/ - class Router < Merb::Router + class Router class << self @@ -66,7 +68,7 @@ module Halcyon req = Struct.new(:path, :method, :params).new(request.path_info, request.request_method.downcase.to_sym, request.params) # perform match - route = self.match(req) + route = Router.match(req) # make sure a route is returned even if no match is found if route[0].nil? @@ -77,6 +79,9 @@ module Halcyon # params (including action and module if set) for the matching route route[1] end + rescue Exception => e + puts e.message + raise $! end end lib/halcyon/application/router.rb @@ -5,12 +5,12 @@ fork do dir = Halcyon.root/'support'/'generators'/'halcyon'/'templates' - command = "thin start -R runner.ru -p 89981 -c #{dir} > /dev/null 2>&1" + command = "thin start -R runner.ru -p 89982 -c #{dir} > /dev/null 2>&1" STDOUT.close STDERR.close exec command end -client = Halcyon::Client.new('http://localhost:89981') +client = Halcyon::Client.new('http://localhost:89982') begin sleep 1.5 client.get('/time') @@ -49,7 +49,7 @@ end describe "Halcyon::Client" do before do - @client = Halcyon::Client.new('http://localhost:89981') + @client = Halcyon::Client.new('http://localhost:89982') end it "should perform requests and return the response values" do spec/halcyon/client_spec.rb @@ -23,10 +23,10 @@ describe "Halcyon::Application::Router" do it "should use the default route if no matching route is found" do # missing instead of not_found because we gave a different default route request = Rack::Request.new(Rack::MockRequest.env_for("/erroneous/path/#{rand}/#{rand}")) - Halcyon::Application::Router.route(request)[:action].should == 'missing' + Halcyon::Application::Router.route(request)[:action].should == 'not_found' request = Rack::Request.new(Rack::MockRequest.env_for("/random/#{rand}/#{rand}")) - Halcyon::Application::Router.route(request)[:action].should == 'missing' + Halcyon::Application::Router.route(request)[:action].should == 'not_found' end it "should map params in routes to parameters" do spec/halcyon/router_spec.rb @@ -108,15 +108,16 @@ Halcyon.configurable_attr(:environment) # Testing routes -Halcyon::Application.route do |r| - r.resources :resources - - r.match('/nested/tests').to(:controller => 'nested/tests', :action => 'index') - r.match('/hello/:name').to(:controller => 'specs', :action => 'greeter') - r.match('/:action').to(:controller => 'specs') - r.match('/:controller/:action').to() - r.match('/').to(:controller => 'specs', :action => 'index', :arbitrary => 'random') - # r.default_routes +Halcyon::Application.route do + resources :resources + + match('/nested/tests').to(:controller => 'nested/tests', :action => 'index') + match('/hello/:name').to(:controller => 'specs', :action => 'greeter') + match('/:action').to(:controller => 'specs') + match('/:controller/:action').to() + match('/').to(:controller => 'specs', :action => 'index', :arbitrary => 'random') + # default_routes + {:action => 'missing'} end spec/spec_helper.rb @@ -24,27 +24,27 @@ # # Stolen directly from generated Merb app. All documentation applies. # Read more about the Merb router at http://merbivore.com/. -Halcyon::Application.route do |r| +Halcyon::Application.route do # Sample route for the sample functionality in Application. # Safe to remove! - r.match('/time').to(:controller => 'application', :action => 'time') + match('/time').to(:controller => 'application', :action => 'time') # Used for testing how requests are routed. Used internally but can be used # for personal tests. - r.match('/returner').to(:controller => 'application', :action => 'returner') + match('/returner').to(:controller => 'application', :action => 'returner') # RESTful routes - # r.resources :posts + # resources :posts # This is the default route for /:controller/:action/:id # This is fine for most cases. If you're heavily using resource-based # routes, you may want to comment/remove this line to prevent # clients from calling your create or destroy actions with a GET - r.default_routes + default_routes # Change this for the default route to be available at / - r.match('/').to(:controller => 'application', :action => 'index') + match('/').to(:controller => 'application', :action => 'index') # It can often be useful to respond with available functionality if the # application is a public-facing service. support/generators/halcyon/templates/config/init/routes.rb @@ -14,11 +14,11 @@ Halcyon.config.use do |c| end # = Routes -Halcyon::Application.route do |r| - r.match('/returner').to(:controller => 'application', :action => 'returner') - r.match('/time').to(:controller => 'application', :action => 'time') +Halcyon::Application.route do + match('/returner').to(:controller => 'application', :action => 'returner') + match('/time').to(:controller => 'application', :action => 'time') - r.match('/').to(:controller => 'application', :action => 'index') + match('/').to(:controller => 'application', :action => 'index') # failover {:action => 'not_found'} support/generators/halcyon_flat/templates/app.rb 64648de395bf1a3fe8baef653151f41e0be36626 Matt Todd chiology@gmail.com http://github.com/mtodd/halcyon/commit/f37a8f71a3ae728e97b4a5bf36b06a00bbd35929 f37a8f71a3ae728e97b4a5bf36b06a00bbd35929 2008-09-24T22:07:05-07:00 2008-09-24T22:07:05-07:00 Incorporating the new Merb::Router into Halcyon. Most specs pass, some URL generation specs fail still. f60f899e19ba1807683803400372362921c63dc4 Matt Todd chiology@gmail.com