Quote reserved keywords in boolean queries

[sunspot#88 state:resolved]

sunspot/lib/sunspot/query/restriction.rb

@@ -40,6 +40,8 @@ class Base #:nodoc:
         include Filter
         include RSolr::Char
 
+        RESERVED_WORDS = Set['AND', 'OR', 'NOT']
+
         def initialize(field, value, negated = false)
           @field, @value, @negated = field, value, negated
         end
@@ -133,6 +135,11 @@ def negate
         #
         def solr_value(value = @value)
           solr_value = escape(@field.to_indexed(value))
+          if RESERVED_WORDS.include?(solr_value)
+            %Q("#{solr_value}")
+          else
+            solr_value
+          end
         end
       end
 

sunspot/spec/api/query/scope_spec.rb

@@ -15,6 +15,13 @@
     connection.should have_last_search_including(:fq, 'title_ss:My\ Pet\ Post')
   end
 
+  it 'scopes by exact match with a special string' do
+    session.search Post do
+      with :title, 'OR'
+    end
+    connection.should have_last_search_including(:fq, 'title_ss:"OR"')
+  end
+
   it 'scopes by exact match with time' do
     time = Time.parse('1983-07-08 05:00:00 -0400')
     session.search Post do

sunspot/spec/integration/scoped_search_spec.rb

@@ -119,6 +119,15 @@ def self.test_field_type(name, attribute, field, *values)
     end
   end
 
+  describe 'reserved words' do
+    %w(AND OR NOT TO).each do |word|
+      it "should successfully search for #{word.inspect}" do
+        Sunspot.index!(post = Post.new(:title => word))
+        Sunspot.search(Post) { with(:title, word) }.results.should == [post]
+      end
+    end
+  end
+
   describe 'passing nil value to equal' do
     before :all do
       Sunspot.remove_all