public
Fork of halorgium/mephisto
Description: A mirror of the mephisto code-base
Homepage: http://mephistoblog.com/
Clone URL: git://github.com/technoweenie/mephisto.git
Click here to lend your support to: mephisto and make a donation at www.pledgie.com !
removed search routes, rearranged monthly routes so tests pass

git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@1312 
567b1171-46fb-0310-a4c9-b4bef9110e78
technoweenie (author)
Sat Jul 08 11:28:43 -0700 2006
commit  8ff0c5f4fabad50a413c299e90ca4a9830741d6f
tree    543101c229597b06ce912952e03a63f3484cbbae
parent  312d9b6749559148cd0a9e8aea1a94ddb5e04c46
...
82
83
84
85
 
86
87
88
...
82
83
84
 
85
86
87
88
0
@@ -82,7 +82,7 @@ class MephistoController < ApplicationController
0
     end
0
     
0
     def paged_search_url_for(page)
0
- page ? paged_search_url(:q => params[:q], :page => page) : ''
0
+ page ? search_url(:q => params[:q], :page => page) : ''
0
     end
0
     
0
     def paged_monthly_url_for(page)
...
23
24
25
26
27
28
29
30
31
32
 
33
34
 
 
 
 
 
 
35
36
37
 
38
39
40
41
 
 
42
43
...
23
24
25
 
 
 
 
 
 
 
26
27
28
29
30
31
32
33
34
35
36
 
37
38
 
 
 
39
40
41
42
0
@@ -23,21 +23,20 @@ ActionController::Routing::Routes.draw do |map|
0
   map.with_options :controller => 'mephisto' do |m|
0
     m.article ':year/:month/:day/:permalink', :action => 'show',
0
       :year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/
0
-
0
- m.daily ':year/:month/:day', :action => 'day',
0
- :year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/
0
-
0
- m.paged_monthly ':year/:month/page/:page', :action => 'month',
0
- :year => /\d{4}/, :month => /\d{1,2}/, :page => /\d+/
0
-
0
+
0
     m.monthly ':year/:month', :action => 'month',
0
       :year => /\d{4}/, :month => /\d{1,2}/
0
+
0
+ m.paged_monthly ':year/:month/page/:page', :action => 'month',
0
+ :year => /\d{4}/, :month => /\d{1,2}/, :page => /\d+/
0
+
0
+ m.daily ':year/:month/:day', :action => 'day',
0
+ :year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/
0
   
0
     m.yearly ':year', :action => 'yearly',
0
- :year => /\d{4}/
0
+ :year => /\d{4}/
0
   
0
- m.paged_search 'search/:q/page/:page', :action => 'search'
0
- m.search 'search/:q', :action => 'search', :q => nil
0
- m.section '*sections', :action => 'list'
0
+ m.search 'search', :action => 'search'
0
+ m.section '*sections', :action => 'list'
0
   end
0
 end
...
18
19
20
21
22
23
24
...
18
19
20
 
21
22
23
0
@@ -18,7 +18,6 @@ class MephistoControllerTest < Test::Unit::TestCase
0
     with_options :controller => 'mephisto' do |test|
0
       test.assert_routing '', :action => 'list', :sections => []
0
       test.assert_routing 'about', :action => 'list', :sections => %w(about)
0
- test.assert_routing 'search/foo', :action => 'search', :q => 'foo'
0
       test.assert_routing '2006', :action => 'yearly', :year => '2006'
0
       test.assert_routing '2006/01', :action => 'month', :year => '2006', :month => '01'
0
       test.assert_routing '2006/01/page/1', :action => 'month', :year => '2006', :month => '01', :page => '1'

Comments

    No one has commented yet.