diff options
author | John Keiser <john@johnkeiser.com> | 2013-10-11 10:44:56 -0700 |
---|---|---|
committer | John Keiser <john@johnkeiser.com> | 2013-10-11 10:44:56 -0700 |
commit | 9da75f9fff9814ef86224155add844fb68f7d7ba (patch) | |
tree | 5e88134c7fe06aa5aa5ed440661e62f5f70ce2de | |
parent | 23ab1444189e2b6617d78b305e873f3d0cc1a8f8 (diff) | |
parent | 49f6be7fcd62cdf8f2f6acd4c343c88789ecee1a (diff) | |
download | chef-zero-9da75f9fff9814ef86224155add844fb68f7d7ba.tar.gz |
Merge pull request #35 from mattgleeson/range_queries
Range queries with smoke test
-rw-r--r-- | lib/chef_zero/solr/query/range_query.rb | 40 | ||||
-rw-r--r-- | spec/search_spec.rb | 32 |
2 files changed, 58 insertions, 14 deletions
diff --git a/lib/chef_zero/solr/query/range_query.rb b/lib/chef_zero/solr/query/range_query.rb index db92548..625c0bb 100644 --- a/lib/chef_zero/solr/query/range_query.rb +++ b/lib/chef_zero/solr/query/range_query.rb @@ -10,24 +10,36 @@ module ChefZero end def to_s - "#{@from_inclusive ? '[' : '{'}#{@from} TO #{@to}#{@to_inclusive ? '[' : '{'}" + "#{@from_inclusive ? '[' : '{'}#{@from} TO #{@to}#{@to_inclusive ? ']' : '}'}" end - def matches?(key, value) - case @from <=> value - when -1 - return false - when 0 - return false if !@from_inclusive + def matches_values?(values) + values.any? do |value| + unless @from == '*' + case @from <=> value + when -1 + return false + when 0 + return false if !@from_inclusive + end + end + unless @to == '*' + case value <=> @to + when 1 + return false + when 0 + return false if !@to_inclusive + end + end + return true end - case @to <=> value - when 1 - return false - when 0 - return false if !@to_inclusive - end - return true end + + def matches_doc?(doc) + matches_values?(doc[DEFAULT_FIELD]) + end + + DEFAULT_FIELD = "text" end end end diff --git a/spec/search_spec.rb b/spec/search_spec.rb new file mode 100644 index 0000000..df0522c --- /dev/null +++ b/spec/search_spec.rb @@ -0,0 +1,32 @@ +require 'chef_zero/solr/solr_parser' +require 'chef_zero/solr/solr_doc' + +describe ChefZero::Solr::SolrParser do + let (:all_docs) do + docs = [] + [{'foo' => 'a'}, + {'foo' => 'd'}].each_with_index do |h, i| + docs.push ChefZero::Solr::SolrDoc.new(h, i) + end + docs + end + + def search_for(query) + q = ChefZero::Solr::SolrParser.new(query).parse + all_docs.select {|doc| q.matches_doc?(doc) } + end + + it "handles terms" do + search_for('foo:d').size.should eq(1) + end + + it "handles ranges" do + search_for('foo:[a TO c]').size.should eq(1) + end + + it "handles wildcard ranges" do + search_for('foo:[* TO c]').size.should eq(1) + search_for('foo:[c TO *]').size.should eq(1) + search_for('foo:[* TO *]').size.should eq(2) + end +end |