[karmi#289] Improvements to the "term" query type

This is a combination of 3 commits:

* little improvement of term api
* fixing term tests after api changing
* unit tests for term query with an option hash

lib/tire/search/query.rb

@@ -7,8 +7,11 @@ def initialize(&block)
         block.arity < 1 ? self.instance_eval(&block) : block.call(self) if block_given?
       end
 
-      def term(field, value)
-        @value = { :term => { field => value } }
+      def term(field, value, options={})
+        query = { field => { :term => value } }
+        query[field].update(options)
+        @value = { :term => query }
+      end
 
       def fuzzy(field, value, options={})
         query = { field => { :term => value } }

test/unit/search_query_test.rb

@@ -12,17 +12,21 @@ class QueryTest < Test::Unit::TestCase
 
       should "return itself as a Hash" do
         assert_respond_to Query.new, :to_hash
-        assert_equal( { :term => { :foo => 'bar' } }, Query.new.term(:foo, 'bar').to_hash )
+        assert_equal( { :term => { :foo => { :term => 'bar' } } }, Query.new.term(:foo, 'bar').to_hash )
       end
 
       should "allow a block to be given" do
-        assert_equal( { :term => { :foo => 'bar' } }.to_json, Query.new do
+        assert_equal( { :term => { :foo => { :term => 'bar' } } }.to_json, Query.new do
           term(:foo, 'bar')
         end.to_json)
       end
 
       should "allow search for single term" do
-        assert_equal( { :term => { :foo => 'bar' } }, Query.new.term(:foo, 'bar') )
+        assert_equal( { :term => { :foo => { :term => 'bar' } } }, Query.new.term(:foo, 'bar') )
+      end
+
+      should "allow search for single term passing an options hash" do
+        assert_equal( { :term => { :foo => { :term => 'bar', :boost => 2.0 } } }, Query.new.term(:foo, 'bar', :boost => 2.0) )
       end
 
       should "allow search for multiple terms" do
@@ -185,7 +189,7 @@ class QueryTest < Test::Unit::TestCase
         end
 
         query[:filtered].tap do |f|
-          assert_equal( { :term => { :foo => 'bar' } }, f[:query].to_hash )
+          assert_equal( { :term => { :foo => { :term => 'bar' } } }, f[:query].to_hash )
           assert_equal( { :tags => ['ruby'] }, f[:filter][:and].first[:terms] )
         end
       end
@@ -214,7 +218,7 @@ class QueryTest < Test::Unit::TestCase
         end
 
         query[:filtered].tap do |f|
-          assert_equal( { :term => { :foo => 'bar' } }, f[:query].to_hash )
+          assert_equal( { :term => { :foo => { :term => 'bar' } } }, f[:query].to_hash )
           assert_equal( { :tags => ['ruby'] }, f[:filter][:and].first[:terms] )
         end
       end