search_flip 2.3.2 → 3.0.0.beta

data/spec/search_flip/criteria_spec.rb

@@ -1,4 +1,3 @@
-
 require File.expand_path("../spec_helper", __dir__)
 
 RSpec.describe SearchFlip::Criteria do
@@ -19,6 +18,62 @@ RSpec.describe SearchFlip::Criteria do
     it { should delegate(:connection).to(:target) }
   end
 
+  describe "#to_query" do
+    it "returns the added must, filter and must_not clauses" do
+      query =
+        ProductIndex
+          .must(term: { category: "category1" })
+          .filter(term: { category: "category2" })
+          .must_not(term: { category: "category3" })
+
+      expect(query.to_query).to eq(
+        bool: {
+          must: [{ term: { category: "category1" } }],
+          filter: [{ term: { category: "category2" } }],
+          must_not: [{ term: { category: "category3" } }]
+        }
+      )
+    end
+
+    it "generates an executable query for must, filter and must_not clauses" do
+      query =
+        ProductIndex
+          .must(term: { category: "category1" })
+          .filter(term: { category: "category2" })
+          .must_not(term: { category: "category3" })
+
+      expect { ProductIndex.must(query.to_query).execute }.not_to raise_error
+    end
+
+    it "returns the added post_must, post_filter and post_must_not clauses" do
+      query =
+        ProductIndex
+          .post_must(term: { category: "category1" })
+          .post_filter(term: { category: "category2" })
+          .post_must_not(term: { category: "category3" })
+
+      expect(query.to_query).to eq(
+        bool: {
+          must_not: [{ term: { category: "category3" } }],
+          filter: [
+            { term: { category: "category1" } },
+            { term: { category: "category2" } }
+          ]
+        }
+      )
+    end
+
+    it "generates an executable query for post_must, post_filter and post_must_not clauses" do
+      query =
+        ProductIndex
+          .post_must(term: { category: "category1" })
+          .post_filter(term: { category: "category2" })
+          .post_must_not(term: { category: "category3" })
+
+      expect { ProductIndex.must(query.to_query).execute }.not_to raise_error
+    end
+  end
+
   describe "#merge" do
     it "merges criterias" do
       product1 = create(:product, price: 100, category: "category1")
@@ -54,9 +109,9 @@ RSpec.describe SearchFlip::Criteria do
 
     describe "array concatenations" do
       methods = [
-        :sort_values, :includes_values, :preload_values, :eager_load_values, :search_values,
-        :must_values, :must_not_values, :should_values, :filter_values, :post_search_values,
-        :post_must_values, :post_must_not_values, :post_should_values, :post_filter_values
+        :sort_values, :includes_values, :preload_values, :eager_load_values,
+        :must_values, :must_not_values, :filter_values,
+        :post_must_values, :post_must_not_values, :post_filter_values
       ]
 
       methods.each do |method|
@@ -103,6 +158,14 @@ RSpec.describe SearchFlip::Criteria do
     end
   end
 
+  describe "#all" do
+    it "returns self" do
+      criteria = ProductIndex.criteria
+
+      expect(criteria.all.object_id).to eq(criteria.object_id)
+    end
+  end
+
   describe "#timeout" do
     it "sets the query timeout" do
       query = ProductIndex.timeout("1s")
@@ -299,11 +362,12 @@ RSpec.describe SearchFlip::Criteria do
 
       ProductIndex.import [product1, product2, product3]
 
-      query1 = ProductIndex.should(range: { price: { gte: 100, lt: 200 } })
-      query2 = query1.should(term: { category: "category2" })
+      query = ProductIndex.should([
+        { range: { price: { gte: 100, lt: 200 } } },
+        { term: { category: "category2" } }
+      ])
 
-      expect(query1.records.to_set).to eq([product1].to_set)
-      expect(query2.records.to_set).to eq([product1, product2].to_set)
+      expect(query.records.to_set).to eq([product1, product2].to_set)
     end
   end
 
@@ -442,6 +506,21 @@ RSpec.describe SearchFlip::Criteria do
       aggregations = query.aggregations(:category).each_with_object({}) { |(key, agg), hash| hash[key] = agg.doc_count }
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
+
+    it "works with nil" do
+      expected1 = create(:product, price: nil, category: "category1")
+      expected2 = create(:product, price: nil, category: "category2")
+      rejected = create(:product, price: 300, category: "category1")
+
+      ProductIndex.import [expected1, expected2, rejected]
+
+      query = ProductIndex.aggregate(:category).post_where(price: nil)
+
+      expect(query.records.to_set).to eq([expected1, expected2].to_set)
+
+      aggregations = query.aggregations(:category).each_with_object({}) { |(key, agg), hash| hash[key] = agg.doc_count }
+      expect(aggregations).to eq("category1" => 2, "category2" => 1)
+    end
   end
 
   describe "#post_where_not" do
@@ -494,6 +573,21 @@ RSpec.describe SearchFlip::Criteria do
       aggregations = query.aggregations(:category).each_with_object({}) { |(key, agg), hash| hash[key] = agg.doc_count }
       expect(aggregations).to eq("category1" => 2, "category2" => 1)
     end
+
+    it "works with nils" do
+      expected = create(:product, price: 100, category: "category1")
+      rejected1 = create(:product, price: nil, category: "category2")
+      rejected2 = create(:product, price: nil, category: "category1")
+
+      ProductIndex.import [expected, rejected1, rejected2]
+
+      query = ProductIndex.aggregate(:category).post_where_not(price: nil)
+
+      expect(query.records).to eq([expected])
+
+      aggregations = query.aggregations(:category).each_with_object({}) { |(key, agg), hash| hash[key] = agg.doc_count }
+      expect(aggregations).to eq("category1" => 2, "category2" => 1)
+    end
   end
 
   describe "#post_filter" do
@@ -518,6 +612,80 @@ RSpec.describe SearchFlip::Criteria do
     end
   end
 
+  describe "#post_must" do
+    it "sets up the constraints correctly and is chainable" do
+      product1 = create(:product, price: 100, category: "category1")
+      product2 = create(:product, price: 200, category: "category2")
+      product3 = create(:product, price: 300, category: "category1")
+
+      ProductIndex.import [product1, product2, product3]
+
+      query1 = ProductIndex.aggregate(:category).post_must(range: { price: { gte: 100, lte: 200 } })
+      query2 = query1.post_must(term: { category: "category1" })
+
+      expect(query1.records.to_set).to eq([product1, product2].to_set)
+      expect(query2.records).to eq([product1])
+
+      aggregations = query1.aggregations(:category).each_with_object({}) { |(key, agg), hash| hash[key] = agg.doc_count }
+      expect(aggregations).to eq("category1" => 2, "category2" => 1)
+
+      aggregations = query2.aggregations(:category).each_with_object({}) { |(key, agg), hash| hash[key] = agg.doc_count }
+      expect(aggregations).to eq("category1" => 2, "category2" => 1)
+    end
+  end
+
+  describe "#post_must_not" do
+    it "sets up the constraints correctly and is chainable" do
+      product1 = create(:product, price: 100, category: "category1")
+      product2 = create(:product, price: 200, category: "category2")
+      product3 = create(:product, price: 300, category: "category1")
+
+      ProductIndex.import [product1, product2, product3]
+
+      query1 = ProductIndex.aggregate(:category).post_must_not(range: { price: { gte: 50, lte: 150 } })
+      query2 = query1.post_must_not(term: { category: "category1" })
+
+      expect(query1.records.to_set).to eq([product2, product3].to_set)
+      expect(query2.records).to eq([product2])
+
+      aggregations = query1.aggregations(:category).each_with_object({}) { |(key, agg), hash| hash[key] = agg.doc_count }
+      expect(aggregations).to eq("category1" => 2, "category2" => 1)
+
+      aggregations = query2.aggregations(:category).each_with_object({}) { |(key, agg), hash| hash[key] = agg.doc_count }
+      expect(aggregations).to eq("category1" => 2, "category2" => 1)
+    end
+  end
+
+  describe "#post_should" do
+    it "sets up the constraints correctly and is chainable" do
+      product1 = create(:product, price: 100, category: "category1")
+      product2 = create(:product, price: 200, category: "category3")
+      product3 = create(:product, price: 300, category: "category2")
+      product4 = create(:product, price: 400, category: "category1")
+
+      ProductIndex.import [product1, product2, product3, product4]
+
+      query1 = ProductIndex.aggregate(:category).post_should([
+        { term: { category: "category1" } },
+        { term: { category: "category2" } }
+      ])
+
+      query2 = query1.post_should([
+        { range: { price: { gte: 50, lte: 150 } } },
+        { range: { price: { gte: 250, lte: 350 } } }
+      ])
+
+      expect(query1.records.to_set).to eq([product1, product3, product4].to_set)
+      expect(query2.records.to_set).to eq([product1, product3].to_set)
+
+      aggregations = query1.aggregations(:category).each_with_object({}) { |(key, agg), hash| hash[key] = agg.doc_count }
+      expect(aggregations).to eq("category1" => 2, "category2" => 1, "category3" => 1)
+
+      aggregations = query2.aggregations(:category).each_with_object({}) { |(key, agg), hash| hash[key] = agg.doc_count }
+      expect(aggregations).to eq("category1" => 2, "category2" => 1, "category3" => 1)
+    end
+  end
+
   describe "#post_range" do
     it "sets up the constraints correctly and is chainable" do
       product1 = create(:product, price: 100, category: "category1")
@@ -797,7 +965,7 @@ RSpec.describe SearchFlip::Criteria do
 
       ProductIndex.import [product1, product2, product3, product4]
 
-      expect(ProductIndex.sort({ rank: :desc }, { price: :asc }).records).to eq([product2, product1, product3, product4])
+      expect(ProductIndex.sort({ rank: :desc }, price: :asc).records).to eq([product2, product1, product3, product4])
       expect(ProductIndex.sort(rank: :desc).sort(:price).records).to eq([product2, product1, product3, product4])
       expect(ProductIndex.sort(:price).sort(rank: :desc).records).to eq([product2, product1, product4, product3])
     end
@@ -812,7 +980,7 @@ RSpec.describe SearchFlip::Criteria do
 
       ProductIndex.import [product1, product2, product3, product4]
 
-      expect(ProductIndex.sort(:price).resort({ rank: :desc }, { price: :asc }).records).to eq([product2, product1, product3, product4])
+      expect(ProductIndex.sort(:price).resort({ rank: :desc }, price: :asc).records).to eq([product2, product1, product3, product4])
       expect(ProductIndex.sort(rank: :desc).resort(:price).records).to eq([product2, product1, product4, product3])
     end
   end
@@ -891,19 +1059,6 @@ RSpec.describe SearchFlip::Criteria do
     end
   end
 
-  describe "#unscope" do
-    it "removes the specified constraints and is chainable" do
-      product1 = create(:product, title: "Title1", description: "Description1", price: 10)
-      product2 = create(:product, title: "Title2", description: "Description2", price: 20)
-      product3 = create(:product, title: "Title3", description: "Description2", price: 30)
-
-      ProductIndex.import [product1, product2, product3]
-
-      expect(ProductIndex.search("Title1 OR Title2").search("Title1 OR Title3").records).to eq([product1])
-      expect(ProductIndex.search("Title1 OR Title2").unscope(:search).search("Title1 OR Title3").records.to_set).to eq([product1, product3].to_set)
-    end
-  end
-
   describe "#highlight" do
     it "adds highlighting to the query and is chainable" do
       product1 = create(:product, title: "Title1 highlight", description: "Description1 highlight")
@@ -1127,4 +1282,3 @@ RSpec.describe SearchFlip::Criteria do
     end
   end
 end
-

data/spec/search_flip/http_client_spec.rb

@@ -1,4 +1,3 @@
-
 require File.expand_path("../spec_helper", __dir__)
 
 class HttpTestRequest

data/spec/search_flip/index_spec.rb

@@ -1,4 +1,3 @@
-
 require File.expand_path("../spec_helper", __dir__)
 
 RSpec.describe SearchFlip::Index do
@@ -6,14 +5,14 @@ RSpec.describe SearchFlip::Index do
     subject { ProductIndex }
 
     methods = [
-      :profile, :where, :where_not, :filter, :range, :match_all, :exists,
+      :all, :profile, :where, :where_not, :filter, :range, :match_all, :exists,
       :exists_not, :post_where, :post_where_not, :post_filter, :post_must,
       :post_must_not, :post_should, :post_range, :post_exists, :post_exists_not,
       :aggregate, :scroll, :source, :includes, :eager_load, :preload, :sort, :resort,
       :order, :reorder, :offset, :limit, :paginate, :page, :per, :search,
       :find_in_batches, :highlight, :suggest, :custom, :find_each, :failsafe,
       :total_entries, :total_count, :terminate_after, :timeout, :records, :results,
-      :should, :should_not, :must, :must_not, :find_each_result,
+      :must, :must_not, :should, :find_each_result,
       :find_results_in_batches, :preference, :search_type, :routing,
       :track_total_hits, :explain
     ]
@@ -68,7 +67,7 @@ RSpec.describe SearchFlip::Index do
 
       TestIndex.create_index
 
-      expect(TestIndex.connection).to have_received(:create_index).with("test", { settings: { number_of_shards: 2 } })
+      expect(TestIndex.connection).to have_received(:create_index).with("test", settings: { number_of_shards: 2 })
     end
   end
 
@@ -96,10 +95,8 @@ RSpec.describe SearchFlip::Index do
 
   describe ".close_index" do
     it "delegates to connection" do
-      allow(TestIndex.connection).to receive(:close_index).and_call_original
+      allow(TestIndex.connection).to receive(:close_index)
 
-      TestIndex.create_index
-      sleep(0.1) while TestIndex.connection.cluster_health["status"] == "red"
       TestIndex.close_index
 
       expect(TestIndex.connection).to have_received(:close_index).with("test")
@@ -108,11 +105,7 @@ RSpec.describe SearchFlip::Index do
 
   describe ".open_index" do
     it "delegates to connection" do
-      allow(TestIndex.connection).to receive(:open_index).and_call_original
-
-      TestIndex.create_index
-      sleep(0.1) while TestIndex.connection.cluster_health["status"] == "red"
-      TestIndex.close_index
+      allow(TestIndex.connection).to receive(:open_index)
 
       TestIndex.open_index
 
@@ -120,6 +113,26 @@ RSpec.describe SearchFlip::Index do
     end
   end
 
+  describe ".freeze_index" do
+    it "delegates to connection" do
+      allow(TestIndex.connection).to receive(:freeze_index)
+
+      TestIndex.freeze_index
+
+      expect(TestIndex.connection).to have_received(:freeze_index).with("test")
+    end
+  end
+
+  describe ".unfreeze_index" do
+    it "delegates to connection" do
+      allow(TestIndex.connection).to receive(:unfreeze_index)
+
+      TestIndex.unfreeze_index
+
+      expect(TestIndex.connection).to have_received(:unfreeze_index).with("test")
+    end
+  end
+
   describe ".index_exists?" do
     it "delegates to connection" do
       TestIndex.create_index
@@ -618,4 +631,3 @@ RSpec.describe SearchFlip::Index do
     end
   end
 end
-

data/spec/search_flip/model_spec.rb

@@ -1,4 +1,3 @@
-
 require File.expand_path("../spec_helper", __dir__)
 
 class TestProduct < Product

data/spec/search_flip/response_spec.rb

@@ -1,4 +1,3 @@
-
 require File.expand_path("../spec_helper", __dir__)
 
 RSpec.describe SearchFlip::Response do
@@ -13,8 +12,6 @@ RSpec.describe SearchFlip::Response do
 
   describe "#current_page" do
     it "returns the current page number" do
-      expect(ProductIndex.match_all.current_page).to eq(1)
-
       ProductIndex.import create_list(:product, 3)
 
       expect(ProductIndex.paginate(page: 1, per_page: 2).current_page).to eq(1)
@@ -182,4 +179,3 @@ RSpec.describe SearchFlip::Response do
     end
   end
 end
-

data/spec/search_flip/to_json_spec.rb

@@ -1,4 +1,3 @@
-
 require File.expand_path("../spec_helper", __dir__)
 require "search_flip/to_json"
 

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-
 require "search_flip"
 require "webmock/rspec"
 require "active_record"
@@ -130,7 +129,7 @@ class ProductIndex
         }
       }
     else
-      { }
+      {}
     end
   end
 
@@ -189,4 +188,3 @@ class TestIndex
 end
 
 TestIndex.delete_index if TestIndex.index_exists?
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 3.0.0.beta
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,13 +123,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby2_keywords
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -204,6 +204,7 @@ files:
 - lib/search_flip/criteria.rb
 - lib/search_flip/exceptions.rb
 - lib/search_flip/filterable.rb
+- lib/search_flip/helper.rb
 - lib/search_flip/http_client.rb
 - lib/search_flip/index.rb
 - lib/search_flip/json.rb
@@ -243,11 +244,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Full-Featured Elasticsearch Ruby Client with a Chainable DSL