es-query-builder 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0edb42d41140c53d656101210a9d63faa5266a9e
-  data.tar.gz: 09fe5cc414ec2cc73c22b53248fc7c6b91b9d8e4
+  metadata.gz: f83ec59a43ec2595976f103e18b8a2135a931b41
+  data.tar.gz: bf950eec7d0a7b3a984948b12f31fc6b06074b1e
 SHA512:
-  metadata.gz: 450f93cd9daf96706d47c7df13d581f9bb236912d8bbfc1e1e3f19025df1ff3e46d3e734e274b5785c7f8860e8f67b05c26b40acc96ebbe8d754b654557b40a7
-  data.tar.gz: 4d5d93a631b33bbdd549e5abfa424d15fa1c8b9fbdd149bad8446a956c0cc88a872539f96bfcb561251bcb99ae5e8b486501fbb65c161b143dd012f7065cacbd
+  metadata.gz: 929a33a7427b0392f686bae8aca50bf2a23877b6982c30775047d109336a271c02355985f35bfe037787cff618815eead53f2955e69645d2ee43c54cca0a8e77
+  data.tar.gz: 68b1aa1017822dfa80bb1c60a6829d68393c348efefd9ed6d5c1f625f0ac3ab0ffe9e3e72f7c3c56d221678d4060b243e75dcc87cc3aa1064e8b86c542f0c84f

data/lib/es-query-builder/parser.rb

@@ -136,14 +136,13 @@ class EsQueryBuilder
     # Returns a Hash represents a filter hash.
     def build_filter_hash(filter_tokens)
       return {} if filter_tokens.empty?
-      must, should, must_not = create_bool_filters(filter_tokens)
-      if must.size == 1 && should.empty? && must_not.empty?
+      must, must_not = create_bool_filters(filter_tokens)
+      if must.size == 1 && must_not.empty?
         # Term filter is cached by default.
         must.first
       else
         bool = {}
         bool[:must]     = must     if must.size > 0
-        bool[:should]   = should   if should.size > 0
         bool[:must_not] = must_not if must_not.size > 0
         # Bool filter is not cached by default.
         { bool: bool.merge(_cache: true) }
@@ -232,13 +231,9 @@ class EsQueryBuilder
     #
     # Examples
     #
-    #   # When 'tag:"foo bar"'
-    #   create_bool_filters([...])
-    #   # => [[{ term: { tag: 'foo' }}, { term: { tag: 'bar' }], [], []]
-    #
     #   # When 'tag:foo'
     #   create_bool_filters([...])
-    #   # => [[], [{ term: { tag: 'foo' } }, { prefix: { tag: 'foo/' } }], []]
+    #   # => [[ { bool: { should: [{ term: { tag: 'foo' } }, { prefix: { tag: 'foo/' } }] } }], []]
     #
     #   # When '-tag:foo'
     #   create_bool_filters([...])
@@ -246,21 +241,31 @@ class EsQueryBuilder
     #
     # Returns an Array consists of must, should and must_not filters arrays.
     def create_bool_filters(filter_tokens)
-      must, should, must_not = [], [], []
+      must, must_not = [], []
       filter_tokens.each do |token|
         token.term.split.each do |term|
           if @hierarchy_fields.include?(token.field)
-            cond = token.minus? ? must_not : should
-            cond << { prefix: { token.field => term.downcase + '/' } }
-            # Exactly matches to the tag.
-            cond << { term: { token.field => term.downcase } }
+            if token.minus?
+              must_not << { prefix: { token.field => term.downcase + '/' } }
+              must_not << { term: { token.field => term.downcase } }
+            else
+              must << {
+                bool: {
+                  should: [
+                    { prefix: { token.field => term.downcase + '/' } },
+                    # Exactly matches to the tag.
+                    { term: { token.field => term.downcase } },
+                  ]
+                }
+              }
+            end
           else
             cond = token.minus? ? must_not : must
             cond << { term: { token.field => term.downcase } }
           end
         end
       end
-      [must, should, must_not]
+      [must, must_not]
     end
   end
 end

data/lib/es-query-builder/version.rb

@@ -1,3 +1,3 @@
 class EsQueryBuilder
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/es_query_builder_spec.rb

@@ -536,13 +536,80 @@ describe EsQueryBuilder do
                   should: [
                     { prefix: { hierarchy_field => term + '/' } },
                     { term: { hierarchy_field => term } }
-                  ],
-                  _cache: true
+                  ]
                 }
               }
             }
           )
         end
+
+        context 'and the query starts with a minus char' do
+          let(:query_string) do
+            "-#{hierarchy_field}:#{term}"
+          end
+
+          it 'returns must_not filter' do
+            should eq(
+              filtered: {
+                query: {
+                  match_all: {},
+                },
+                filter: {
+                  bool: {
+                    must_not: [
+                      { prefix: { hierarchy_field => term + '/' } },
+                      { term: { hierarchy_field => term } }
+                    ],
+                    _cache: true
+                  }
+                }
+              }
+            )
+          end
+        end
+
+        context 'and there are multiple filtered query terms' do
+          let(:query_string) do
+            "#{hierarchy_field}:#{term} #{hierarchy_field}:#{term2}"
+          end
+
+          let(:term2) do
+            'world'
+          end
+
+          it 'returns both slash-ending-prefix and term filters' do
+            should eq(
+              filtered: {
+                query: {
+                  match_all: {},
+                },
+                filter: {
+                  bool: {
+                    must: [
+                      {
+                        bool: {
+                          should: [
+                            { prefix: { hierarchy_field => term + '/' } },
+                            { term: { hierarchy_field => term } }
+                          ]
+                        }
+                      },
+                      {
+                        bool: {
+                          should: [
+                            { prefix: { hierarchy_field => term2 + '/' } },
+                            { term: { hierarchy_field => term2 } }
+                          ]
+                        }
+                      },
+                    ],
+                    _cache: true
+                  }
+                }
+              }
+            )
+          end
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es-query-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yuku Takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler