@@ -1,5 +1,7 @@ Merb.logger.info("Compiling routes...") Merb::Router.prepare do + resources :softwares + resources :hardwares # general routes. @@ -22,14 +24,19 @@ Merb::Router.prepare do # for browsing via a letter/number. match("/people/:character", :character => /^[A-Za-z0-9]$/).to(:controller => 'people', :action => 'index_by_character') - match("/setup/wares/:character", :character => /^[A-Za-z0-9]$/).to(:controller => 'companies', :action => 'index_by_character') # resource routes. identify Company => [:slug] do - resources(:companies, :path => 'setup/wares') do |c| - c.match("/:wares_slug").to(:controller => 'wares', :action => 'show') - end + resources(:companies, :path => 'setup/companies') + end + + identify Hardware => [:slug] do + resources(:hardwares, :path => 'setup/hardware') + end + + identify Software => [:slug] do + resources(:softwares, :path => 'setup/software') end identify Interview => [:created_year, :created_month, :created_day, :slug] do @@ -45,8 +52,8 @@ Merb::Router.prepare do identify Person => :username do resources(:people) end - - identify Post => [:created_year, :created_month, :created_day, :slug] do + + identify Post => [:created_year, :created_month, :created_day, :slug] do resources(:posts) do |p| p.resources(:comments) end config/router.rb 5c69b263725ea62eb026cf67da587096992199e8 Daniel Bogan github.com@waferbaby.com http://github.com/waferbaby/waferbaby/commit/a94dddffe49a19c28e58cedecba229dd52571f0b a94dddffe49a19c28e58cedecba229dd52571f0b 2009-04-06T05:38:50-07:00 2009-04-06T05:38:50-07:00 Ditched the old wares slug matching under companies. Added hardware and software resources. 8d00a4088bf35ce41167c7c7b373c6c0ecd98211 Daniel Bogan github.com@waferbaby.com