Applied patch for bind variables in conditions (http://code.google.co…

…m/p/acts-as-tsearch/issues/detail?id=10)

lib/acts_as_tsearch.rb

@@ -182,8 +182,10 @@ def find_by_tsearch(search_string, options = nil, tsearch_options = nil, page =
 
           #add vector condition
           where_part = "#{table_name}.#{tsearch_options[:vector]} @@ tsearch_query"
-          if options[:conditions]
+          if options[:conditions] and options[:conditions].is_a? String
             options[:conditions] << " and #{where_part}"
+          elsif options[:conditions] and options[:conditions].is_a? Array
+            options[:conditions].first << " and #{where_part}"
           else
             options[:conditions] = where_part
           end

test/acts_as_tsearch_test.rb

@@ -335,4 +335,15 @@ def test_find_using_include_option
       assert_equal 2, c.size
       assert_equal 'Bob eats lunch', c[0].blog_entry.title
   end
+
+  def test_find_using_conditions
+      BlogComment.acts_as_tsearch :fields => %w{name}
+      BlogComment.update_vectors
+
+      c = BlogComment.find_by_tsearch('jim', :include => :blog_entry, :conditions => "email = '[email protected]'")
+      assert_equal 2, c.size
+
+      c = BlogComment.find_by_tsearch('jim', :include => :blog_entry, :conditions => ["email = ?", '[email protected]'])
+      assert_equal 2, c.size
+  end
 end