search_flip 3.0.0.beta → 3.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f16c0308f14d764aab7fa477c8ba4169bf7d493e774cd8f435d8fa0ecd9ce991
-  data.tar.gz: 7a91d1a23b846eb17466369d82ec5583b6346d237037cd12c0cd8e036df2498d
+  metadata.gz: 3ed1af68a35f862ad7a429b646afeab420d78161b29e8833daf3a2e37048cb26
+  data.tar.gz: 499dfeffd4abd5b21fc966b6d04b61130fe6bf1ffb771b3d97f92e4473592701
 SHA512:
-  metadata.gz: e5ccd27acffd9cd2e91a66c3b4e99c9fb09d30d8c720785cedaf233ba314e28d2317c331fc7d63a29ef29d9951bd071d8ed849ffd0e3486e6890d428b3c94317
-  data.tar.gz: a7f5b2f4969d7daa6aa578f4a31588b263f44f7e48aa4729bc820032923b804254cb0ad941dc961b8f36c508f07b27ef2ac7198802b02db2385cd1487b32cdc8
+  metadata.gz: 0c1a401732c4ee47aa7e23e750496afa445e274c7fed20f28c27dbf136e2f795123cb805bc9f3513c26be1f2330ed6a0f82da145a4110e8c35858c951d3a8297
+  data.tar.gz: 61ffd4396bb2e3c4372fd5389ffdff0b695dbc80a74c1439855cb7e8fb7f8fe4c6d1aab127d22bc789485427d43f5dad0835c8325c575c295d82a4de5235893d

data/lib/search_flip/filterable.rb

@@ -151,14 +151,23 @@ module SearchFlip
     #   CommentIndex.where(state: "new").search("text").to_query
     #   # => {:bool=>{:filter=>[{:term=>{:state=>"new"}}], :must=>[{:query_string=>{:query=>"text", ...}}]}}
     #
+    #   CommentIndex.must(term: { state: "new" }).to_query
+    #   # => {:term=>{:state=>"new"}}
+    #
     # @return [Hash] The raw query
 
     def to_query
+      must_clauses = must_values.to_a
+      must_not_clauses = must_not_values.to_a + post_must_not_values.to_a
+      filter_clauses = post_must_values.to_a + filter_values.to_a + post_filter_values.to_a
+
+      return must_clauses.first if must_clauses.size == 1 && must_not_clauses.empty? && filter_clauses.empty?
+
       {
         bool: {
-          must: must_values.to_a,
-          must_not: must_not_values.to_a + post_must_not_values.to_a,
-          filter: post_must_values.to_a + filter_values.to_a + post_filter_values.to_a
+          must: must_clauses,
+          must_not: must_not_clauses,
+          filter: filter_clauses
         }.reject { |_, value| value.empty? }
       }
     end

data/lib/search_flip/version.rb

@@ -1,3 +1,3 @@
 module SearchFlip
-  VERSION = "3.0.0.beta"
+  VERSION = "3.0.0.beta1"
 end

data/spec/search_flip/criteria_spec.rb

@@ -35,6 +35,12 @@ RSpec.describe SearchFlip::Criteria do
       )
     end
 
+    it "returns only the must clause, if there is only a single must clause" do
+      query = ProductIndex.must(term: { category: "category" })
+
+      expect(query.to_query).to eq(term: { category: "category" })
+    end
+
     it "generates an executable query for must, filter and must_not clauses" do
       query =
         ProductIndex

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord