0
@@ -75,8 +75,16 @@ class MephistoController < ApplicationController
0
     end
0
 
0
     def dispatch_archives
0
-      @articles = @section.articles.find_all_in_month(@dispatch_path.shift, @dispatch_path.shift, :include => :user)
0
-      render_liquid_template_for(:archive, 'articles' => @articles, 'archive_date' => (@articles.first.published_at rescue nil))
0
+      year  = @dispatch_path.shift
0
+      month = @dispatch_path.shift
0
+      if year
0
+        month ||= '1'
0
+      else
0
+        year  = Time.now.utc.year
0
+        month = Time.now.utc.month
0
+      end
0
+      @articles = @section.articles.find_all_in_month(year, month, :include => :user)
0
+      render_liquid_template_for(:archive, 'articles' => @articles, 'archive_date' => Time.utc(year, month))
0
     end
0
 
0
     def dispatch_search

0
@@ -66,12 +66,6 @@ class Article < Content
0
 
0
   class << self
0
     def find_all_in_month(year, month, options = {})
0
-      if year
0
-        month ||= '1'
0
-      else
0
-        year  = Time.now.utc.year
0
-        month = Time.now.utc.month
0
-      end
0
       find(:all, options.merge(:order => 'contents.published_at DESC', :conditions => ["contents.published_at <= ? AND contents.published_at BETWEEN ? AND ?", 
0
         Time.now.utc, *Time.delta(year.to_i, month.to_i)]))
0
     end

0
@@ -11,7 +11,7 @@ module Mephisto
0
         @source         = source
0
         @current        = current
0
         @section_liquid = [:id, :name, :path].inject({}) { |h, k| h.update k.to_s => @source.send(k) }
0
-        @section_liquid[:articles_count] = @source.send(:read_attribute, :articles_count)
0
+        @section_liquid['articles_count'] = @source.send(:read_attribute, :articles_count)
0
       end
0
 
0
       def before_method(method)

0
@@ -242,7 +242,7 @@ class MephistoControllerTest < Test::Unit::TestCase
0
   def test_should_show_monthly_entries
0
     date = Time.now.utc - 4.days
0
     dispatch "archives/#{date.year}/#{date.month}"
0
-    assert_models_equal [contents(:welcome), contents(:about), contents(:site_map), contents(:another)], assigns(:articles)
0
+    assert_models_equal [contents(:welcome), contents(:another)], assigns(:articles)
0
   end
0
   
0
   protected

0
@@ -13,9 +13,11 @@ class SectionDropTest < Test::Unit::TestCase
0
   end
0
 
0
   def test_should_expose_section_fields
0
-    [:id, :name, :path, :articles_count].each do |attr|
0
+    [:id, :name, :path].each do |attr|
0
       assert_equal sections(:home).send(attr), Mephisto::Liquid::SectionDrop.new(sections(:home)).before_method(attr)
0
     end
0
+
0
+    assert_equal sections(:home).send(:read_attribute, :articles_count), Mephisto::Liquid::SectionDrop.new(sections(:home)).before_method(:articles_count)
0
   end
0
   
0
   def test_should_report_section_types