fix(query): remove deprecated _all for fields term

shard.yml

@@ -1,5 +1,5 @@
 name: neuroplastic
-version: 1.3.2
+version: 1.3.3
 
 authors:
   - Caspian Baska <[email protected]>

spec/query_spec.cr

@@ -34,26 +34,26 @@ describe Neuroplastic::Query do
       teeth = [1, 3, 5, 7, 11]
 
       query.should({"teeth" => teeth})
-      filter_field = query.build[:filter]
+      filter_field = query.build[:filter].not_nil!
 
       expected = teeth.map { |t| ({:term => {"teeth" => t}}) }
-      filter_field.dig(:bool, :should).should eq expected
+      filter_field.dig(:filter, :bool, :should).should eq expected
     end
 
     it "#must" do
       query = Goat.elastic.query({"q" => "stands on mountain"})
       query.must({"name" => ["billy"]})
-      filter_field = query.build[:filter]
+      filter_field = query.build[:filter].not_nil!
 
-      filter_field.dig(:bool, :must).should eq [{:term => {"name" => "billy"}}]
+      filter_field.dig(:filter, :bool, :must).should eq [{:term => {"name" => "billy"}}]
     end
 
     it "#must_not" do
       query = Goat.elastic.query({"q" => "makes good cheese"})
       query.must_not({"name" => ["gruff"]})
-      filter_field = query.build[:filter]
+      filter_field = query.build[:filter].not_nil!
 
-      filter_field.dig(:bool, :must_not).should eq [{:term => {"name" => "gruff"}}]
+      filter_field.dig(:filter, :bool, :must_not).should eq [{:term => {"name" => "gruff"}}]
     end
 
     it "#range" do
@@ -63,8 +63,8 @@ describe Neuroplastic::Query do
           :lte => 5,
         },
       })
-      filter_field = query.build[:filter]
-      filter_field.dig(:bool, :filter).should eq [{range: {"teeth" => {:lte => 5}}}]
+      filter_field = query.build[:filter].not_nil!
+      filter_field.dig(:filter, :bool, :filter).should eq [{range: {"teeth" => {:lte => 5}}}]
     end
   end
 end

src/neuroplastic/elastic.cr

@@ -112,9 +112,9 @@ class Neuroplastic::Elastic(T)
     filter = opt[:filter]
     sort = (opt[:sort]? || [] of Array(String)) + SCORE
 
-    # Only merge in filter if it contains fields
     query_context = {
-      bool: filter ? query.merge({filter: filter}) : query,
+      # Only merge in filter if it contains fields
+      bool: filter ? query.merge(filter) : query,
     }
 
     {

src/neuroplastic/query.cr

@@ -6,17 +6,18 @@ module Neuroplastic
     alias FilterValue = Array(Int32) | Array(Float32) | Array(Bool) | Array(String) | Nil
     alias Filter = Hash(String, FilterValue)
 
-    property :offset, :limit, :sort, :fields, :query_settings
+    property :offset, :limit, :sort, :fields, :query_settings, :search
 
     @query_settings : Hash(String, String)?
     @sort = [] of Sort
 
     def initialize(params : HTTP::Params | Hash(String, String) | Hash(Symbol, String) = {} of String => String)
       params = params.transform_keys(&.to_s) if params.is_a?(Hash(Symbol, String))
-      @fields = ["_all"]
+      @fields = [] of String
       @filters = Filter.new
 
-      @search = "#{params["q"]?}*"
+      query = params["q"]? || "*"
+      @search = query.ends_with?('*') ? query : "#{query}*"
 
       @limit = params["limit"]?.try(&.to_i) || 20
       @limit = 500 if @limit > 500
@@ -145,7 +146,7 @@ module Neuroplastic
     # Generates a bool field in the query context
     protected def build_query
       # Query all documents if no search term
-      return {must: {match_all: {} of Symbol => String}} unless @search.size > 1
+      return {must: {match_all: {} of Nil => Nil}} unless @search.size > 1
 
       base_query = {
         :simple_query_string => {
@@ -225,7 +226,7 @@ module Neuroplastic
         :should   => should,
       }.compact
 
-      {bool: bool}
+      {filter: {bool: bool}} unless bool.empty?
     end
 
     # Generate filter field