config/routes.rb in spud_blog-0.2.2 vs config/routes.rb in spud_blog-0.4.0

@@ -16,43 +16,73 @@
 
   if Spud::Blog.config.blog_enabled
     scope Spud::Blog.config.blog_path do
 
       # Blog Post Categories
-      get 'category/:category_url_name', :controller => 'blog', :action => 'category', :page => 1, :as => 'blog_category'
-      get 'category/:category_url_name/page/:page', :controller => 'blog', :action => 'category'
-      post 'category', :controller => 'blog', :action => 'category'
+      get 'category/:category_url_name(/page/:page)', 
+        :controller => 'blog', 
+        :action => 'category',  
+        :as => 'blog_category',
+        :defaults => {:page => 1}
+      get 'category/:category_url_name/:archive_date(/page/:page)', 
+        :controller => 'blog', 
+        :action => 'category', 
+        :as => 'blog_category_archive',
+        :defaults => {:page => 1}
 
       # Blog Post Archives
-      get 'archive/:archive_date', :controller => 'blog', :action => 'archive', :page => 1, :as => 'blog_archive'
-      get 'archive/:archive_date/page/:page', :controller => 'blog', :action => 'archive'
-      post 'archive', :controller => 'blog', :action => 'archive'
+      get 'archive/:archive_date(/page/:page)', 
+        :controller => 'blog', 
+        :action => 'archive', 
+        :as => 'blog_archive',
+        :defaults => {:page => 1}
 
+      # Category/Archive filtering
+      post '/', :controller => 'blog', :action => 'filter'
+
       # Blog Posts
-      get '/', :controller => 'blog', :action => 'index', :page => 1, :as => 'blog'
-      get 'page/:page', :controller => 'blog', :action => 'index'
+      get '/(page/:page)', 
+        :controller => 'blog', 
+        :action => 'index',
+        :as => 'blog',
+        :defaults => {:page => 1}
       resources :blog_posts, :path => '/', :controller => 'blog', :only => [:show] do
         post '/', :on => :member, :controller => 'blog', :action => 'create_comment'
       end
     end
   end
 
   if Spud::Blog.config.news_enabled
     scope Spud::Blog.config.news_path do
 
       # News Post Categories
-      get 'category/:category_url_name', :controller => 'news', :action => 'category', :page => 1, :as => 'news_category'
-      get 'category/:category_url_name/page/:page', :controller => 'news', :action => 'category'
-      post 'category', :controller => 'news', :action => 'category'
+      get 'category/:category_url_name(/page/:page)', 
+        :controller => 'news', 
+        :action => 'category',
+        :as => 'news_category',
+        :defaults => {:page => 1}
+      get 'category/:category_url_name/:archive_date(/page/:page)', 
+        :controller => 'news', 
+        :action => 'category', 
+        :as => 'news_category_archive',
+        :defaults => {:page => 1}
       
       # News Post Archives
-      get 'archive/:archive_date', :controller => 'news', :action => 'archive', :page => 1, :as => 'news_archive'
-      get 'archive/:archive_date/page/:page', :controller => 'news', :action => 'archive'
-      post 'archive', :controller => 'news', :action => 'archive'
+      get 'archive/:archive_date(/page/:page)', 
+        :controller => 'news',
+        :action => 'archive', 
+        :as => 'news_archive',
+        :defaults => {:page => 1}
+
+      # Category/Archive filtering
+      post '/', :controller => 'news', :action => 'filter'
       
       # News Posts
-      get '/', :controller => 'news', :action => 'index', :page => 1, :as => 'news'
-      get 'page/:page', :controller => 'news', :action => 'index'
+      get '/(page/:page)', 
+        :controller => 'news', 
+        :action => 'index', 
+        :as => 'news',
+        :defaults => {:page => 1}
       resources :news_posts, :path => '/', :controller => 'news', :only => [:show]
     end
   end
 
 end
\ No newline at end of file