co-elastic-query 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb06a0255fd72056eede70e58e97638b3b0187ff
-  data.tar.gz: 07e712c603aa04b0a4dc94dc4a424bbd86bb4729
+  metadata.gz: 29167287ed81d7deb378c47079d78638cbb981b3
+  data.tar.gz: 9b45192f4c28d0e875c99a9c2d11dc084e01d13c
 SHA512:
-  metadata.gz: 366a55f2a4f06023536220dec23610ab01107f46b2d11399848424b489f8ad725c2bd3c00cbff527cc909e2eccee15829a1e77bc3654fecc9f53d6948080e558
-  data.tar.gz: 1b1d8c3dc6d5ec94b02af7aa859ac17eba936596f5a3203e4c9e864aec5c4302d4dbb7f1d1bad4025913bb7bd4c6bababd2b77548fabd1315f090e5a1f2477fd
+  metadata.gz: 47c03c8bcddb3dac6e7a9752809e0ca059f5ac66db64dfeb59fd4876031eab3db3f37a164e8e89d374b7cf2c96eda71a17f5835bdae0e46af9fb5bbc4462164e
+  data.tar.gz: 1cee889bfd71aa06492c2ac2259aa1350fa17bf776ba8c17cd9d0be916158c8864a4efe920478b34e9b5f38381d7984611c14e91152c098580cbfdf055f99a0d

data/lib/co-elastic-query.rb

@@ -6,11 +6,11 @@ class Elastic
             query = params ? params.permit(:q, :limit, :offset) : {}
 
             @filters = nil
-            @search = query[:q]
+            @search = "#{query[:q]}*"
 
             @limit = query[:limit] || 20
             @limit = @limit.to_i
-            @limit = 50 if @limit > 50
+            @limit = 500 if @limit > 500
 
             @offset = query[:offset] || 0
             @offset = offset.to_i
@@ -23,7 +23,9 @@ class Elastic
         attr_accessor :sort
 
         def raw_filter(filter)
-            @raw_filter = filter
+            @raw_filter ||= []
+            @raw_filter << filter
+            self
         end
 
 
@@ -32,12 +34,14 @@ class Elastic
         def filter(filters)
             @filters ||= {}
             @filters.merge!(filters)
+            self
         end
 
         # Like filter however all keys are OR's instead of AND's
         def or_filter(filters)
             @orFilter ||= {}
             @orFilter.merge!(filters)
+            self
         end
 
         # Applys the query to child objects
@@ -52,6 +56,7 @@ class Elastic
         def range(filter)
             @rangeFilter ||= []
             @rangeFilter << filter
+            self
         end
 
         # Call to add fields that should be missing
@@ -59,14 +64,23 @@ class Elastic
         def missing(*fields)
             @missing ||= Set.new
             @missing.merge(fields)
+            self
         end
 
         # The opposite of filter
         def not(filters)
             @nots ||= {}
             @nots.merge!(filters)
+            self
         end
 
+        def exists(*fields)
+            @exists ||= Set.new
+            @exists.merge(fields)
+            self
+        end
+
+
         def build
             if @filters
                 fieldfilters = []
@@ -126,17 +140,24 @@ class Elastic
                 end
             end
 
+            if @exists
+                fieldfilters ||= []
+
+                @exists.each do |field|
+                    fieldfilters.push({
+                        exists: { field: field }
+                    })
+                end
+            end
+
             if @raw_filter
-                fieldfilters = @raw_filter
+                fieldfilters += @raw_filter
             end
 
-            if @search.present?
+            if @search.length > 1
                 # Break the terms up purely on whitespace
                 query_obj = nil
 
-                # update search string
-                @search << '*'
-
                 if @hasChild || @hasParent
                     should = [{
                             simple_query_string: {
@@ -293,18 +314,10 @@ class Elastic
         query[:body].delete(:size)
         query[:body].delete(:sort)
 
-        # if a formatter block is supplied, each loaded record is passed to it
-        # allowing annotation/conversion of records using data from the model
-        # and current request (e.g groups are annotated with 'admin' if the
-        # currently logged in user is an admin of the group). nils are removed
-        # from the list.
         Elastic.count(query)[COUNT]
     end
     
     
-    protected
-    
-    
     def generate_body(builder)
         opt = builder.build
 

data/lib/co-elastic-query/version.rb

@@ -1,3 +1,3 @@
 module CoElasticQuery
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: co-elastic-query
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Stephen von Takach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler