Fix #31: Allow - in search terms rather then interpreting it as an operator

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/chef_zero/solr/query/regexpable_query.rb b/lib/chef_zero/solr/query/regexpable_query.rb
index 7435fab..241e675 100644
--- a/lib/chef_zero/solr/query/regexpable_query.rb
+++ b/lib/chef_zero/solr/query/regexpable_query.rb
@@ -20,6 +20,7 @@ module ChefZero
           values.any? { |value| !@regexp.match(value).nil? }
         end
 
+        DEFAULT_FIELD = "text"
         WORD_CHARACTER = "[A-Za-z0-9@._':]"
         NON_WORD_CHARACTER = "[^A-Za-z0-9@._':]"
       end
diff --git a/lib/chef_zero/solr/solr_parser.rb b/lib/chef_zero/solr/solr_parser.rb
index e237025..936ead1 100644
--- a/lib/chef_zero/solr/solr_parser.rb
+++ b/lib/chef_zero/solr/solr_parser.rb
@@ -49,18 +49,24 @@ module ChefZero
               @index+=1
             end
             @index+=1 if !eof?
-          end until eof? || @query_string[@index] =~ /\s/ || peek_operator_token
+          end while !eof? && peek_term_token
           @query_string[start_index..@index-1]
         end
       end
 
       def skip_whitespace
         if @query_string[@index] =~ /\s/
-          whitespace = /\s+/.match(@query_string, @index)
+          whitespace = /\s+/.match(@query_string, @index) || peek
           @index += whitespace[0].length
         end
       end
 
+      def peek_term_token
+        return nil if @query_string[@index] =~ /\s/
+        op = peek_operator_token
+        return !op || op == '-'
+      end
+
       def peek_operator_token
         if ['"', '+', '-', '!', '(', ')', '{', '}', '[', ']', '^', ':'].include?(@query_string[@index])
           return @query_string[@index]