@@ -41,7 +41,8 @@ need to know to make your own page better. <ul> <r:search:results:each> - <li><r:link/> - <r:author/> - <r:date/></li> + <li><r:link/><br/> + <r:search:highlight><r:content/></r:search:highlight></li> </r:search:results:each> </ul> </r:search:results> README @@ -114,7 +114,8 @@ class Page label = tag.attr['label'].nil? ? "" : "<label for=\"q\">#{tag.attr['label']}</label> " submit = "<input value=\"#{tag.attr['submit'] || "Search"}\" type=\"submit\" />" url = tag.attr['url'].nil? ? self.url.chop : tag.attr['url'] - content = %{<form action="#{url}" method="get" id="search_form"><p>#{label}<input type="text" id="q" name="q" value="#{query ||= ""}" size="15" /> #{submit}</p></form>} + @query ||= "" + content = %{<form action="#{url}" method="get" id="search_form"><p>#{label}<input type="text" id="q" name="q" value="#{@query}" size="15" /> #{submit}</p></form>} content << "\n" end app/models/search_page.rb @@ -20,25 +20,32 @@ class SearchTagsTest < Test::Unit::TestCase test_helper :pages, :render fixtures :pages - def test_search_works_for_regular_page + def test_search_form_works_for_regular_page @page = pages(:documentation) form = "<form action=\"/documentation\" method=\"get\" id=\"search_form\"><p><input type=\"text\" id=\"q\" name=\"q\" value=\"\" size=\"15\" /> <input value=\"Search\" type=\"submit\" /></p></form>\n" assert_renders form,'<r:search:form />' end - def test_search_with_url - @page = pages(:search) + def test_search_form_with_query + @page = pages(:search) + @page.query = 'test' + form = "<form action=\"/search\" method=\"get\" id=\"search_form\"><p><input type=\"text\" id=\"q\" name=\"q\" value=\"test\" size=\"15\" /> <input value=\"Search\" type=\"submit\" /></p></form>\n" + assert_renders form, '<r:search:form />' + end + + def test_search_form_with_url + @page = pages(:search) form = "<form action=\"/other_url\" method=\"get\" id=\"search_form\"><p><input type=\"text\" id=\"q\" name=\"q\" value=\"\" size=\"15\" /> <input value=\"Search\" type=\"submit\" /></p></form>\n" assert_renders form, '<r:search:form url="/other_url" />' end - def test_search_with_label + def test_search_form_with_label @page = pages(:search) form = "<form action=\"/search\" method=\"get\" id=\"search_form\"><p><label for=\"q\">Search:</label> <input type=\"text\" id=\"q\" name=\"q\" value=\"\" size=\"15\" /> <input value=\"Search\" type=\"submit\" /></p></form>\n" assert_renders form, '<r:search:form label="Search:" />' end - def test_search_with_submit + def test_search_form_with_submit @page = pages(:search) form = "<form action=\"/search\" method=\"get\" id=\"search_form\"><p><input type=\"text\" id=\"q\" name=\"q\" value=\"\" size=\"15\" /> <input value=\"Go!\" type=\"submit\" /></p></form>\n" assert_renders form, '<r:search:form submit="Go!" />' test/functional/search_extension_test.rb 5ad26d1ed6a0b261864c5db68fcc80a153fcc067 Petrik petrik@deheus.net http://github.com/radiant/radiant-search-extension/commit/8161d69644cf47a2c5cfa8ab0842b1cdf9fa4e65 8161d69644cf47a2c5cfa8ab0842b1cdf9fa4e65 2008-12-04T11:07:15-08:00 2008-12-04T11:07:15-08:00 Fixed show value in search box. Added highlight example to README. 70da4a039ad9d5deba71f403dc0ed7e2feed7b41 Petrik petrik@deheus.net