0
@@ -1,5 +1,7 @@
0
 * SVN *
0
 
0
+* Ignore drafts and articles published in the future when searching.
0
+
0
 * sanitize posted comments
0
 
0
 * Fix bug where atom feed content from textile was double encoded

0
@@ -19,7 +19,7 @@ class MephistoController < ApplicationController
0
   end
0
 
0
   def search
0
-    conditions     = ['published_at <= :now AND title LIKE :q OR excerpt LIKE :q OR body LIKE :q', 
0
+    conditions     = ['(published_at IS NOT NULL AND published_at <= :now) AND (title LIKE :q OR excerpt LIKE :q OR body LIKE :q)', 
0
                      { :now => Time.now.utc, :q => "%#{params[:q]}%" }]
0
     search_count   = site.articles.count(conditions)
0
     @article_pages = Paginator.new self, search_count, site.articles_per_page, params[:page]

0
@@ -23,7 +23,7 @@
0
         ] %>
0
       </select>
0
       <select name="section" id="sectionlist">
0
-        <option value="0">&mdash;Select a section&mdash;</option>
0
+        <option value="0">&mdash;All Sections&mdash;</option>
0
         <%= options_from_collection_for_select @sections, :id, :name, params[:section].to_i %>
0
       </select>
0
     </li>

0
@@ -26,9 +26,9 @@ site_map_about:
0
   article_id: 7
0
   section_id: 2
0
   position: 3
0
-unpublished_home:
0
+future_home:
0
   id: 6
0
-  article_id: 4
0
+  article_id: 5
0
   section_id: 1
0
   position: 1
0
 cupcake_welcome_home:

0
@@ -19,7 +19,7 @@ class Admin::SectionsControllerTest < Test::Unit::TestCase
0
     assert_equal sites(:first), assigns(:site)
0
     assert_equal sections(:home), assigns(:home)
0
     assert_equal 2, assigns(:sections).length, "Sections: #{assigns(:sections).inspect}"
0
-    assert_equal 2, assigns(:article_count)['1']
0
+    assert_equal 3, assigns(:article_count)['1']
0
     assert_equal 3, assigns(:article_count)['2']
0
   end
0
 

0
@@ -139,6 +139,22 @@ class MephistoControllerTest < Test::Unit::TestCase
0
     assert_template_type      :search
0
   end
0
 
0
+  def test_should_search_and_not_find_draft
0
+    get :search, :q => 'draft'
0
+    assert_equal [], assigns(:articles)
0
+    assert_preferred_template :search
0
+    assert_layout_template    :layout
0
+    assert_template_type      :search
0
+  end
0
+
0
+  def test_should_search_and_not_find_future
0
+    get :search, :q => 'future'
0
+    assert_equal [], assigns(:articles)
0
+    assert_preferred_template :search
0
+    assert_layout_template    :layout
0
+    assert_template_type      :search
0
+  end
0
+
0
   def test_should_show_entry
0
     date = 3.days.ago
0
     get :show, :year => date.year, :month => date.month, :day => date.day, :permalink => 'welcome-to-mephisto'