@@ -29,4 +29,5 @@ vendor/**/**/doc/* vendor/plugins/footnotes/* rsa_key* sphinx/* +sphinx_test/* config/ultrasphinx/*.conf \ No newline at end of file .gitignore @@ -7,7 +7,7 @@ class SearchesController < ApplicationController redirect_to(home_url) and return if params[:q].nil? - query = params[:q].strip + query = params[:q].strip.inspect model = strip_admin(params[:model]) page = params[:page] || 1 @@ -38,6 +38,9 @@ class SearchesController < ApplicationController @results.map!{ |person| Person.find(person) } end end + rescue Ultrasphinx::UsageError + flash[:error] = "Invalid search query" + redirect_to searches_url(:q => "", :model => params[:model]) end private app/controllers/searches_controller.rb @@ -30,13 +30,13 @@ searchd # Daemon options # What interface the search daemon should listen on and where to store its logs address = 0.0.0.0 - port = 3312 + port = 3322 seamless_rotate = 1 - log = log/searchd.log - query_log = log/query.log + log = log/searchd_test.log + query_log = log/query_test.log read_timeout = 5 max_children = 300 - pid_file = log/searchd.pid + pid_file = log/searchd_test.pid max_matches = 100000 } @@ -47,7 +47,7 @@ client dictionary_name = ap # How your application connects to the search daemon (not necessarily the same as above) server_host = localhost - server_port = 3312 + server_port = 3322 } source @@ -61,7 +61,7 @@ source index { # Index building options - path = sphinx + path = sphinx_test docinfo = extern # just leave this alone morphology = stem_en stopwords = # /path/to/stopwords.txt config/ultrasphinx/test.base @@ -175,4 +175,13 @@ describe SearchesController do end end + describe "error handling" do + it "should catch Ultrasphinx::UsageError exceptions" do + invalid_query = "foo@bar" + get :index, :q => invalid_query, :model => "Person" + response.should be_redirect + response.should redirect_to(searches_url(:q => "", :model => "Person")) + end + end + end if testing_search? \ No newline at end of file spec/controllers/searches_controller_spec.rb e2e50b81985f960aa4cec05c97a05153bd2ab6f9 Michael Hartl michael@michaelhartl.com http://github.com/yuki/insoshi/commit/af8ee9d43935a0b1f50c5965dd4f1afa6699cd46 af8ee9d43935a0b1f50c5965dd4f1afa6699cd46 2008-10-06T13:50:17-07:00 2008-10-03T17:56:40-07:00 Catching Ultrasphinx::UsageError exception 66eb5a2c9ca9d6d1d9d0c29669defc8ef1fcae71 Michael Hartl michael@michaelhartl.com