search_flip 3.0.0.beta2 → 3.0.0

data/spec/search_flip/criteria_spec.rb

@@ -1198,9 +1198,12 @@ RSpec.describe SearchFlip::Criteria do
 
       query = ProductIndex.criteria.tap(&:records)
 
+      expect(query.instance_variable_get(:@request)).not_to be_nil
       expect(query.instance_variable_get(:@response)).not_to be_nil
 
       expect(query.object_id).not_to eq(query.fresh.object_id)
+
+      expect(query.fresh.instance_variable_get(:@request)).to be_nil
       expect(query.fresh.instance_variable_get(:@response)).to be_nil
     end
   end
@@ -1234,10 +1237,49 @@ RSpec.describe SearchFlip::Criteria do
     end
   end
 
+  describe "#execute" do
+    around do |example|
+      default_instrumenter = SearchFlip::Config[:instrumenter]
+
+      SearchFlip::Config[:instrumenter] = ActiveSupport::Notifications.instrumenter
+
+      begin
+        example.run
+      ensure
+        SearchFlip::Config[:instrumenter] = default_instrumenter
+      end
+    end
+
+    let(:notifications) { [] }
+
+    let!(:subscriber) do
+      ActiveSupport::Notifications.subscribe("request.search_flip") do |*args|
+        notifications << args
+      end
+    end
+
+    after { ActiveSupport::Notifications.unsubscribe(subscriber) }
+
+    it "instruments the request" do
+      ProductIndex.match_all.execute
+
+      expect(notifications).to be_present
+    end
+
+    it "passes the index, request and response" do
+      ProductIndex.match_all.execute
+
+      expect(notifications.first[4][:index]).to eq(ProductIndex)
+      expect(notifications.first[4][:request]).to be_present
+      expect(notifications.first[4][:response]).to be_present
+    end
+  end
+
   describe "#track_total_hits" do
     it "is added to the request" do
       if ProductIndex.connection.version.to_i >= 7
         query = ProductIndex.track_total_hits(false)
+
         expect(query.request[:track_total_hits]).to eq(false)
         expect { query.execute }.not_to raise_error
       end

data/spec/search_flip/null_instrumenter_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path("../spec_helper", __dir__)
+
+RSpec.describe SearchFlip::NullInstrumenter do
+  subject { described_class.new }
+
+  describe "#instrument" do
+    it "calls start" do
+      allow(subject).to receive(:start)
+
+      subject.instrument("name", { key: "value" }) {}
+
+      expect(subject).to have_received(:start)
+    end
+
+    it "calls finish" do
+      allow(subject).to receive(:finish)
+
+      subject.instrument("name", { key: "value" }) {}
+
+      expect(subject).to have_received(:finish)
+    end
+
+    it "yields and passes the payload" do
+      yielded_payload = nil
+
+      subject.instrument("name", { key: "value" }) { |payload| yielded_payload = payload }
+
+      expect(yielded_payload).to eq(key: "value")
+    end
+  end
+
+  describe "#start" do
+    it "returns true" do
+      expect(subject.start("name", { key: "value" })).to eq(true)
+    end
+  end
+
+  describe "#finish" do
+    it "returns true" do
+      expect(subject.finish("name", { key: "value" })).to eq(true)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta2
+  version: 3.0.0
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Full-Featured Elasticsearch Ruby Client with a Chainable DSL
 email:
 - vetter@flakks.com
@@ -202,16 +216,23 @@ files:
 - lib/search_flip/config.rb
 - lib/search_flip/connection.rb
 - lib/search_flip/criteria.rb
+- lib/search_flip/customable.rb
 - lib/search_flip/exceptions.rb
+- lib/search_flip/explainable.rb
 - lib/search_flip/filterable.rb
 - lib/search_flip/helper.rb
+- lib/search_flip/highlightable.rb
 - lib/search_flip/http_client.rb
 - lib/search_flip/index.rb
 - lib/search_flip/json.rb
 - lib/search_flip/model.rb
+- lib/search_flip/null_instrumenter.rb
+- lib/search_flip/paginatable.rb
 - lib/search_flip/post_filterable.rb
 - lib/search_flip/response.rb
 - lib/search_flip/result.rb
+- lib/search_flip/sortable.rb
+- lib/search_flip/sourceable.rb
 - lib/search_flip/to_json.rb
 - lib/search_flip/version.rb
 - search_flip.gemspec
@@ -223,6 +244,7 @@ files:
 - spec/search_flip/http_client_spec.rb
 - spec/search_flip/index_spec.rb
 - spec/search_flip/model_spec.rb
+- spec/search_flip/null_instrumenter_spec.rb
 - spec/search_flip/response_spec.rb
 - spec/search_flip/result_spec.rb
 - spec/search_flip/to_json_spec.rb
@@ -233,7 +255,7 @@ licenses:
 metadata: {}
 post_install_message: |
   Thanks for using search_flip!
-  When upgrading from 1.x to 2.x, please check out
+  When upgrading to 3.x, please check out
   https://github.com/mrkamel/search_flip/blob/master/UPDATING.md
 rdoc_options: []
 require_paths:
@@ -245,9 +267,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 
@@ -262,6 +284,7 @@ test_files:
 - spec/search_flip/http_client_spec.rb
 - spec/search_flip/index_spec.rb
 - spec/search_flip/model_spec.rb
+- spec/search_flip/null_instrumenter_spec.rb
 - spec/search_flip/response_spec.rb
 - spec/search_flip/result_spec.rb
 - spec/search_flip/to_json_spec.rb