summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2016-07-19 18:37:33 +0100
committerGitHub <noreply@github.com>2016-07-19 18:37:33 +0100
commit4c8bf05a397a2954db2ec519299097e6dbd73d3e (patch)
treec583110d264fffb143648eb257b8234700d42c10
parent9d235fd19641592ec987f1c66c88841f23dfd11d (diff)
parent06d3898d307168145130a3603a2121be6b4e19b3 (diff)
downloadchef-zero-4c8bf05a397a2954db2ec519299097e6dbd73d3e.tar.gz
Merge pull request #175 from andrewdotn/master
Fix attempted fall-through in case statement.
-rw-r--r--lib/chef_zero/solr/query/unary_operator.rb6
-rw-r--r--spec/search_spec.rb4
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/chef_zero/solr/query/unary_operator.rb b/lib/chef_zero/solr/query/unary_operator.rb
index fc46c0d..a873932 100644
--- a/lib/chef_zero/solr/query/unary_operator.rb
+++ b/lib/chef_zero/solr/query/unary_operator.rb
@@ -16,8 +16,7 @@ module ChefZero
def matches_doc?(doc)
case @operator
- when '-'
- when 'NOT'
+ when '-', 'NOT'
!operand.matches_doc?(doc)
when '+'
# TODO This operator uses relevance to eliminate other, unrelated
@@ -28,8 +27,7 @@ module ChefZero
def matches_values?(values)
case @operator
- when '-'
- when 'NOT'
+ when '-', 'NOT'
!operand.matches_values?(values)
when '+'
# TODO This operator uses relevance to eliminate other, unrelated
diff --git a/spec/search_spec.rb b/spec/search_spec.rb
index df0522c..54392a6 100644
--- a/spec/search_spec.rb
+++ b/spec/search_spec.rb
@@ -24,6 +24,10 @@ describe ChefZero::Solr::SolrParser do
search_for('foo:[a TO c]').size.should eq(1)
end
+ it "handles -" do
+ search_for('-foo:a').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)