waistband 0.2.2 → 0.2.3

data/lib/waistband/query.rb

@@ -16,6 +16,7 @@ module Waistband
       @ranges         = []
       @sorts          = []
       @terms          = {}
+      @exclude_terms  = {}
       @optional_terms = {}
       @page           = (options[:page] || 1).to_i
       @page_size      = (options[:page_size] || 20).to_i
@@ -73,6 +74,14 @@ module Waistband
     end
     alias :add_term :add_terms
 
+    def add_exclude_terms(key, words)
+      @exclude_terms[key] ||= {
+        keywords: []
+      }
+      @exclude_terms[key][:keywords] += prep_words_uniquely(words)
+    end
+    alias :add_exclude_term :add_exclude_terms
+
     def add_optional_terms(key, words)
       @optional_terms[key] ||= {
         keywords: []
@@ -103,7 +112,7 @@ module Waistband
           query: {
             bool: {
               must:     must_to_hash,
-              must_not: [],
+              must_not: must_not_to_hash,
               should:   should_to_hash
             }
           },
@@ -160,35 +169,23 @@ module Waistband
           }
         } if @match.present?
 
-        terms.each do |term|
+        prep_term_hash(@terms).each do |term|
           must << term
         end
 
         must
       end
 
-      def should_to_hash
-        should = []
-
-        optional_terms.each do |term|
-          should << term
-        end
-
-        should
+      def must_not_to_hash
+        prep_term_hash(@exclude_terms).map { |term| term }
       end
 
-      def terms
-        @terms.map do |key, term|
-          {
-            terms: {
-              key.to_sym => term[:keywords]
-            }
-          }
-        end
+      def should_to_hash
+        prep_term_hash(@optional_terms).map { |term| term }
       end
 
-      def optional_terms
-        @optional_terms.map do |key, term|
+      def prep_term_hash(terms)
+        terms.map do |key, term|
           {
             terms: {
               key.to_sym => term[:keywords]

data/lib/waistband/version.rb

@@ -1,3 +1,3 @@
 module Waistband
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/lib/query_spec.rb

@@ -50,6 +50,26 @@ describe Waistband::Query do
       hit['_source']['description'].should eql 'pick me up some eggs'
     end
 
+    it "excludes results" do
+      query = index.query('shopping ikea')
+      query.add_field('name')
+      query.add_exclude_term('internal', 'true')
+
+      json = query.send(:execute!)
+
+      json['hits']['hits'].size.should eql 1
+
+      hit = json['hits']['hits'].first
+
+      hit['_id'].should match(/^task_.*/)
+      hit['_source'].should be_a Hash
+      hit['_source']['id'].should eql 123123
+      hit['_source']['name'].should eql 'some shopping in ikea'
+      hit['_source']['user_id'].should eql 999
+      hit['_source']['description'].should eql 'i need you to pick up some stuff in ikea'
+      hit['_source']['internal'].should be_false
+    end
+
   end
 
   describe '#add_sort' do
@@ -101,6 +121,20 @@ describe Waistband::Query do
 
   end
 
+  describe '#add_exclude_term' do
+
+    it "adds the term on the key" do
+      query.add_exclude_term('metro', 'boston')
+      query.instance_variable_get('@exclude_terms')['metro'][:keywords].should eql ['boston']
+    end
+
+    it "adds several terms on multiple words" do
+      query.add_exclude_term('metro', 'sf bay area')
+      query.instance_variable_get('@exclude_terms')['metro'][:keywords].should eql ['sf', 'bay', 'area']
+    end
+
+  end
+
   describe '#add_optional_term' do
 
     it "adds the term on the key" do
@@ -115,60 +149,34 @@ describe Waistband::Query do
 
   end
 
-  describe '#terms' do
+  describe '#must_to_hash' do
 
-    it "builds an array of all terms" do
+    it "creates an array of the must of the query" do
       query.add_term('metro', 'sf bay area')
-      query.send(:terms).should eql([
+      query.add_field('name')
+      query.send(:must_to_hash).should eql([
         {
-          terms: {
-            metro: ['sf', 'bay', 'area']
+          multi_match: {
+            query: "shopping ikea",
+            fields: ['name']
           }
-        }
-      ])
-    end
-
-    it "builds an array of single terms" do
-      query.add_term('metro', 'boston')
-      query.send(:terms).should eql([
+        },
         {
           terms: {
-            metro: ['boston']
+            metro: ["sf", "bay", "area"]
           }
         }
       ])
     end
 
-    it "constructs correctly with multiple terms" do
-      query.add_term('metro', 'sf bay area')
-      query.add_term('geography', 'San Francisco')
-      query.send(:terms).should eql([
-        {
-          terms: {
-            metro: ["sf", "bay", "area"]}
-          },
-          {
-            terms: {
-              geography: ["San", "Francisco"]
-            }
-          }
-      ])
-    end
-
   end
 
-  describe '#must_to_hash' do
+  describe '#must_not_to_hash' do
 
     it "creates an array of the must of the query" do
-      query.add_term('metro', 'sf bay area')
-      query.add_field('name')
-      query.send(:must_to_hash).should eql([
-        {
-          multi_match: {
-            query: "shopping ikea",
-            fields: ['name']
-          }
-        },
+      query.add_exclude_term('metro', 'sf bay area')
+
+      query.send(:must_not_to_hash).should eql([
         {
           terms: {
             metro: ["sf", "bay", "area"]
@@ -248,6 +256,7 @@ describe Waistband::Query do
       query.add_term('metro', 'sf bay area')
       query.add_term('geography', 'San Francisco')
       query.add_optional_term('internal', 'true')
+      query.add_exclude_term('user_id', '999')
       query.add_field('name')
       query.add_field('description')
       
@@ -272,7 +281,13 @@ describe Waistband::Query do
                 }
               }
             ],
-            must_not: [],
+            must_not: [
+              {
+                terms: {
+                  user_id: ['999']
+                }
+              }
+            ],
             should: [
               {
                 terms: {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waistband
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors: