0
@@ -1,22 +1,4 @@
0
 ActionController::Routing::Routes.draw do |map|
0
-  map.feed    'feed/*sections', :controller => 'feed', :action => 'feed'
0
-
0
-  map.with_options :controller => 'assets', :action => 'show' do |m|
0
-    m.connect ':dir/:path.:ext',       :dir => /stylesheets|javascripts|images/
0
-    m.css    'stylesheets/:path.:ext', :dir => 'stylesheets'
0
-    m.js     'javascripts/:path.:ext', :dir => 'javascripts'
0
-    m.images 'images/:path.:ext',      :dir => 'images'
0
-  end
0
-  
0
-  map.overview 'admin/overview.xml', :controller => 'admin/overview', :action => 'feed'
0
-  map.admin    'admin', :controller => 'admin/overview', :action => 'index'
0
-  map.resources :assets, :path_prefix => '/admin', :controller => 'admin/assets', :member => { :add_bucket => :post },
0
-    :collection => { :latest => :post, :search => :post, :upload => :post, :clear_bucket => :post }
0
-  
0
-  map.connect 'xmlrpc', :controller => 'backend', :action => 'xmlrpc' 
0
-  
0
-  map.connect ':controller/:action/:id/:version', :version => nil, :controller => /routing_navigator|account|(admin\/\w+)/
0
-  
0
-  map.dispatch '*path', :controller => 'mephisto', :action => 'dispatch'
0
+  Mephisto::Routing.connect_with map
0
 end

0
@@ -19,7 +19,7 @@
0
       end
0
       
0
       def link_to_section(section)
0
-        content_tag :a, section['name'], :href => section['url']
0
+        content_tag :a, section['name'], :href => section.url
0
       end
0
 
0
       def page_title(page)

0
@@ -1 +1,26 @@
0
+module Mephisto
0
+  class Routing
0
+    def self.connect_with(map)
0
+      map.feed    'feed/*sections', :controller => 'feed', :action => 'feed'
0
+      
0
+      map.with_options :controller => 'assets', :action => 'show' do |m|
0
+        m.connect ':dir/:path.:ext',       :dir => /stylesheets|javascripts|images/
0
+        m.css    'stylesheets/:path.:ext', :dir => 'stylesheets'
0
+        m.js     'javascripts/:path.:ext', :dir => 'javascripts'
0
+        m.images 'images/:path.:ext',      :dir => 'images'
0
+      end
0
+      
0
+      map.overview 'admin/overview.xml', :controller => 'admin/overview', :action => 'feed'
0
+      map.admin    'admin', :controller => 'admin/overview', :action => 'index'
0
+      map.resources :assets, :path_prefix => '/admin', :controller => 'admin/assets', :member => { :add_bucket => :post },
0
+        :collection => { :latest => :post, :search => :post, :upload => :post, :clear_bucket => :post }
0
+      
0
+      map.connect 'xmlrpc', :controller => 'backend', :action => 'xmlrpc' 
0
+      
0
+      map.connect ':controller/:action/:id/:version', :version => nil, :controller => /routing_navigator|account|(admin\/\w+)/
0
+      
0
+      map.dispatch '*path', :controller => 'mephisto', :action => 'dispatch'
0
+    end
0
+  end
0
+end

0
@@ -190,7 +190,7 @@
0
                :children => { :count => 3, :only => { :tag => 'li' } }
0
     assert_tag 'ul', :attributes => { :id => 'nav' },
0
                :descendant => { :tag => 'a', :attributes => { :class => 'selected' } }
0
-    assert_tag 'a',  :attributes => { :class => 'selected' }, :content => 'Home'
0
+    assert_tag 'a',  :attributes => { :class => 'selected' }, :content => 'Welcome to Mephisto'
0
   end
0
 
0
   def test_should_set_home_page_on_paged_sections
0
0
@@ -203,14 +203,14 @@
0
 
0
   def test_should_set_paged_permalinks
0
     dispatch 'about'
0
-    assert_tag 'a', :attributes => { :href => '/about', :class => 'selected' }, :content => 'Home'
0
+    assert_tag 'a', :attributes => { :href => '/about', :class => 'selected' }, :content => 'Welcome to Mephisto'
0
     assert_tag 'a', :attributes => { :href => '/about/about-this-page'       }, :content => 'About'
0
     assert_tag 'a', :attributes => { :href => '/about/the-site-map'          }, :content => 'The Site Map'
0
   end
0
 
0
   def test_should_set_paged_permalinks
0
     dispatch 'about/the-site-map'
0
-    assert_tag 'a', :attributes => { :href => '/about'                                    }, :content => 'Home'
0
+    assert_tag 'a', :attributes => { :href => '/about'                                    }, :content => 'Welcome to Mephisto'
0
     assert_tag 'a', :attributes => { :href => '/about/about-this-page'                    }, :content => 'About'
0
     assert_tag 'a', :attributes => { :href => '/about/the-site-map', :class => 'selected' }, :content => 'The Site Map'
0
   end
0
@@ -228,7 +228,7 @@
0
     date = 3.days.ago
0
     dispatch "#{date.year}/#{date.month}/#{date.day}/welcome-to-mephisto"
0
     assert_dispatch_action :single
0
-    assert_tag 'form', :attributes => { :id => 'comment-form', :action => "#{contents(:welcome).full_permalink}/comment#comment-form"}
0
+    assert_tag 'form', :attributes => { :id => 'comment-form', :action => "#{contents(:welcome).full_permalink}/comments#comment-form"}
0
     assert_tag :tag => 'form',     :descendant => { 
0
                :tag => 'input',    :attributes => { :type => 'text', :id => 'comment_author',       :name => 'comment[author]'       } }
0
     assert_tag :tag => 'form',     :descendant => {                                                                                  

0
@@ -21,16 +21,16 @@
0
   end
0
   
0
   def test_should_report_section_types
0
-    assert Mephisto::Liquid::SectionDrop.new(sections(:home)).is_blog
0
-    [:about, :cupcake_home, :cupcake_about].each { |s| assert Mephisto::Liquid::SectionDrop.new(sections(s)).is_paged }
0
+    assert Mephisto::Liquid::SectionDrop.new(sections(:home))['is_blog']
0
+    [:about, :cupcake_home, :cupcake_about].each { |s| assert Mephisto::Liquid::SectionDrop.new(sections(s))['is_paged'] }
0
   end
0
   
0
   def test_should_get_earliest_article_published_date
0
-    assert_equal contents(:welcome).published_at.beginning_of_month.to_date, Mephisto::Liquid::SectionDrop.new(sections(:home)).earliest_month
0
+    assert_equal contents(:welcome).published_at.beginning_of_month.to_date, Mephisto::Liquid::SectionDrop.new(sections(:home))['earliest_month']
0
   end
0
   
0
   def test_should_get_month_array
0
-    assert_equal [contents(:welcome).published_at.beginning_of_month.to_date], Mephisto::Liquid::SectionDrop.new(sections(:home)).months
0
+    assert_equal [contents(:welcome).published_at.beginning_of_month.to_date], Mephisto::Liquid::SectionDrop.new(sections(:home))['months']
0
   end
0
 end