chef-zero 1.5.4 → 1.5.5

data/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

data/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]
@@ -142,7 +148,7 @@ module ChefZero
           right = next_token
           parse_error(right, "Expected left term in range query") if !right
           end_range = next_token
-          parse_error(right, "Expected end range '#{expected_end_range}") if !['{', '['].include?(end_range)
+          parse_error(right, "Expected end range '#{end_range}") if !['}', ']'].include?(end_range)
           Query::RangeQuery.new(left, right, token == '[', end_range == ']')
 
         elsif token == '('

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '1.5.4'
+  VERSION = '1.5.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -193,7 +193,8 @@ files:
 - !binary |-
   YmluL2NoZWYtemVybw==
 homepage: http://www.opscode.com
-licenses: []
+licenses:
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 require_paths: