search_flip 3.0.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa160794662cedbe89066113cb845c84daaee29451ba8c8ba4f9183689b42582
-  data.tar.gz: b55133b0f4f90f61db0b76042c1223a17035f277ba221a00c0f665512e1cb170
+  metadata.gz: fa450fa83c07d1ed7e266ef436c26075a0bd6d8b5fd2904ed98d6b4b3921c6ab
+  data.tar.gz: b7c06e750f4b73d3ad1c8626485526b9389d95591f6c56b954f5f1f6610dec2d
 SHA512:
-  metadata.gz: eb2e1e1fd39d64639b9a1f542997e6a00c6238226144fbd32f45f0023f93aa827a1c54597fb71f993090c9d78bcb8b92bbac3a5185d584f26cbeb2e1c4b1a641
-  data.tar.gz: caea53f0332131113662b24818268bfd5e3cf537ad04b07b853aba600fc4edd417d1783fd3a1d37fd6d848a75df21ec2e3d39c45a8dafab5fdc515d6f8ca43a9
+  metadata.gz: cd8bbc2c91f7b35f5b3d54d225082b7d2c4a0b932b1323c4de836adfa8d3118e89bc70ac6f41b27c6dec3fdf200eafec10a7b7c145f3a73ccbc2a2f7c6eb8581
+  data.tar.gz: 8c6a974604a63b210d6dd8e585549116266db09321745511ffe78cece7fe84284dd1e035c01be685522f3fd118ac21daa714b2fdcb91f00c08d23dbf93adc692

data/.github/workflows/test.yml

@@ -0,0 +1,34 @@
+on: push
+name: test
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        elasticsearch:
+        - plainpicture/elasticsearch:2.4.1_delete-by-query
+        - elasticsearch:5.4
+        - docker.elastic.co/elasticsearch/elasticsearch:6.7.0
+        - docker.elastic.co/elasticsearch/elasticsearch:7.0.0
+        - docker.elastic.co/elasticsearch/elasticsearch:7.11.2
+        ruby:
+        - 2.5
+        - 2.6
+        - 2.7
+    services:
+      elasticsearch:
+        image: ${{ matrix.elasticsearch }}
+        env:
+          discovery.type: single-node
+        ports:
+          - 9200:9200
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - run: bundle
+    - run: sleep 10
+    - run: bundle exec rspec
+    - run: bundle exec rubocop

data/.rubocop.yml

@@ -1,5 +1,15 @@
 AllCops:
   NewCops: enable
+  TargetRubyVersion: 2.4
+
+Layout/EmptyLineBetweenDefs:
+  EmptyLineBetweenClassDefs: false
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+Style/ExplicitBlockArgument:
+  Enabled: false
 
 Style/HashTransformValues:
   Enabled: false

data/CHANGELOG.md

@@ -1,6 +1,29 @@
 
 # CHANGELOG
 
+## v3.2.1
+
+* Fix `refresh` having a empty body breaking in elasticsearch 7.11
+
+## v3.2.0
+
+* Fix `index_scope` not being passed in `each_record` without block
+* Added `SearchFlip::Criteria#match_none`
+
+## v3.1.2
+
+* Fix ignored false value for source when merging criterias
+
+## v3.1.1
+
+* Make `SearchFlip::Result.from_hit` work with the `_source` being disabled
+
+## v3.1.0
+
+* Added plugin support in `SearchFlip::HTTPClient`
+* Added `SearchFlip::AwsSigv4Plugin` to be able to use AWS Elasticsearch with
+  signed requests
+
 ## v3.0.0
 
 * Added `Criteria#to_query`, which returns a raw query including all queries

data/README.md

@@ -419,6 +419,14 @@ Simply matches all documents:
 CommentIndex.match_all
 ```
 
+* `match_none`
+
+Simply matches none documents at all:
+
+```ruby
+CommentIndex.match_none
+```
+
 * `all`
 
 Simply returns the criteria as is or an empty criteria when called on the index
@@ -475,8 +483,8 @@ end
 ```
 
 Generally, aggregation results returned by Elasticsearch are returned as a
-`SearchFlip::Result`, which basically is `Hashie::Mash`such that you can access
-them via:
+`SearchFlip::Result`, which basically is a `Hashie::Mash`, such that you can
+access them via:
 
 ```ruby
 query.aggregations(:username)["mrkamel"].revenue.value
@@ -769,6 +777,41 @@ http_client = http_client.headers(key: "value")
 SearchFlip::Connection.new(base_url: "...", http_client: http_client)
 ```
 
+## AWS Elasticsearch / Signed Requests
+
+To use SearchFlip with AWS Elasticsearch and signed requests, you have to add
+`aws-sdk-core` to your Gemfile and tell SearchFlip to use the
+`SearchFlip::AwsSigv4Plugin`:
+
+```ruby
+require "search_flip/aws_sigv4_plugin"
+
+MyConnection = SearchFlip::Connection.new(
+  base_url: "https://your-elasticsearch-cluster.es.amazonaws.com",
+  http_client: SearchFlip::HTTPClient.new(
+    plugins: [
+      SearchFlip::AwsSigv4Plugin.new(
+        region: "...",
+        access_key_id: "...",
+        secret_access_key: "..."
+      )
+    ]
+  )
+)
+```
+
+Again, in your index you need to specify this connection:
+
+```ruby
+class MyIndex
+  include SearchFlip::Index
+
+  def self.connection
+    MyConnection
+  end
+end
+```
+
 ## Routing and other index-time options
 
 Override `index_options` in case you want to use routing or pass other
@@ -891,6 +934,7 @@ require "search_flip/to_json"
 
 * for Elasticsearch 2.x, the delete-by-query plugin is required to delete
   records via queries
+* `#match_none` is only available with Elasticsearch >= 5
 * `#track_total_hits` is only available with Elasticsearch >= 7
 
 ## Keeping your Models and Indices in Sync
@@ -914,6 +958,10 @@ It uses `after_commit` (if applicable, `after_save`, `after_destroy` and
 `after_touch` otherwise) hooks to synchronously update the index when your
 model changes.
 
+## Semantic Versioning
+
+SearchFlip is using Semantic Versioning: [SemVer](http://semver.org/)
+
 ## Links
 
 * Elasticsearch: [https://www.elastic.co/](https://www.elastic.co/)
@@ -945,5 +993,4 @@ $ rspec
 
 That's it.
 
-
 [Bulk API]: https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html

data/lib/search_flip.rb

@@ -39,6 +39,8 @@ module SearchFlip
     attr_reader :code, :body
 
     def initialize(code:, body:)
+      super
+
       @code = code
       @body = body
     end

data/lib/search_flip/aggregation.rb

@@ -40,7 +40,7 @@ module SearchFlip
         else
           filters = (filter_values || []) + (must_not_values || []).map { |must_not_value| { not: must_not_value } }
           queries = must_values ? { must: must_values } : {}
-          filters_and_queries = filters + (queries.size > 0 ? [bool: queries] : [])
+          filters_and_queries = filters + (queries.size > 0 ? [{ bool: queries }] : [])
 
           res[:filter] = filters_and_queries.size > 1 ? { and: filters_and_queries } : filters_and_queries.first
         end
@@ -101,7 +101,7 @@ module SearchFlip
     end
 
     def respond_to_missing?(name, *args)
-      target.respond_to?(name, *args)
+      target.respond_to?(name, *args) || super
     end
 
     def method_missing(name, *args, &block)

data/lib/search_flip/aws_sigv4_plugin.rb

@@ -0,0 +1,47 @@
+require "aws-sdk-core"
+require "uri"
+
+module SearchFlip
+  # The SearchFlip::AwsSigV4Plugin is a plugin for the SearchFlip::HTTPClient
+  # to be used with AWS Elasticsearch to sign requests, i.e. add signed
+  # headers, before sending the request to Elasticsearch.
+  #
+  # @example
+  #   MyConnection = SearchFlip::Connection.new(
+  #     base_url: "https://your-elasticsearch-cluster.es.amazonaws.com",
+  #     http_client: SearchFlip::HTTPClient.new(
+  #       plugins: [
+  #         SearchFlip::AwsSigv4Plugin.new(
+  #           region: "...",
+  #           access_key_id: "...",
+  #           secret_access_key: "..."
+  #         )
+  #       ]
+  #     )
+  #   )
+
+  class AwsSigv4Plugin
+    attr_accessor :signer
+
+    def initialize(options = {})
+      self.signer = Aws::Sigv4::Signer.new({ service: "es" }.merge(options))
+    end
+
+    def call(request, method, uri, options = {})
+      full_uri = URI.parse(uri)
+      full_uri.query = URI.encode_www_form(options[:params]) if options[:params]
+
+      signature_request = {
+        http_method: method.to_s.upcase,
+        url: full_uri.to_s
+      }
+
+      signature_request[:body] = options[:body] if options.key?(:body)
+      signature_request[:body] = options[:json].respond_to?(:to_str) ? options[:json] : JSON.generate(options[:json]) if options[:json]
+
+      signature = signer.sign_request(signature_request)
+
+      request.headers(signature.headers)
+    end
+  end
+end

data/lib/search_flip/connection.rb

@@ -272,7 +272,7 @@ module SearchFlip
     # @return [Boolean] Returns true or raises SearchFlip::ResponseError
 
     def refresh(index_names = nil)
-      http_client.post("#{index_names ? index_url(Array(index_names).join(",")) : base_url}/_refresh", json: {})
+      http_client.post("#{index_names ? index_url(Array(index_names).join(",")) : base_url}/_refresh")
 
       true
     end

data/lib/search_flip/criteria.rb

@@ -44,35 +44,25 @@ module SearchFlip
       other = other.criteria
 
       fresh.tap do |criteria|
-        criteria.profile_value = other.profile_value unless other.profile_value.nil?
-        criteria.failsafe_value = other.failsafe_value unless other.failsafe_value.nil?
-        criteria.terminate_after_value = other.terminate_after_value unless other.terminate_after_value.nil?
-        criteria.timeout_value = other.timeout_value unless other.timeout_value.nil?
-        criteria.offset_value = other.offset_value if other.offset_value
-        criteria.limit_value = other.limit_value if other.limit_value
-        criteria.scroll_args = other.scroll_args if other.scroll_args
-        criteria.source_value = other.source_value if other.source_value
-        criteria.preference_value = other.preference_value if other.preference_value
-        criteria.search_type_value = other.search_type_value if other.search_type_value
-        criteria.routing_value = other.routing_value if other.routing_value
-        criteria.track_total_hits_value = other.track_total_hits_value unless other.track_total_hits_value.nil?
-        criteria.explain_value = other.explain_value unless other.explain_value.nil?
-
-        criteria.sort_values = (criteria.sort_values || []) + other.sort_values if other.sort_values
-        criteria.includes_values = (criteria.includes_values || []) + other.includes_values if other.includes_values
-        criteria.preload_values = (criteria.preload_values || []) + other.preload_values if other.preload_values
-        criteria.eager_load_values = (criteria.eager_load_values || []) + other.eager_load_values if other.eager_load_values
-        criteria.must_values = (criteria.must_values || []) + other.must_values if other.must_values
-        criteria.must_not_values = (criteria.must_not_values || []) + other.must_not_values if other.must_not_values
-        criteria.filter_values = (criteria.filter_values || []) + other.filter_values if other.filter_values
-        criteria.post_must_values = (criteria.post_must_values || []) + other.post_must_values if other.post_must_values
-        criteria.post_must_not_values = (criteria.post_must_not_values || []) + other.post_must_not_values if other.post_must_not_values
-        criteria.post_filter_values = (criteria.post_filter_values || []) + other.post_filter_values if other.post_filter_values
-
-        criteria.highlight_values = (criteria.highlight_values || {}).merge(other.highlight_values) if other.highlight_values
-        criteria.suggest_values = (criteria.suggest_values || {}).merge(other.suggest_values) if other.suggest_values
-        criteria.custom_value = (criteria.custom_value || {}).merge(other.custom_value) if other.custom_value
-        criteria.aggregation_values = (criteria.aggregation_values || {}).merge(other.aggregation_values) if other.aggregation_values
+        [
+          :profile_value, :failsafe_value, :terminate_after_value, :timeout_value, :offset_value,
+          :limit_value, :scroll_args, :source_value, :preference_value, :search_type_value,
+          :routing_value, :track_total_hits_value, :explain_value
+        ].each do |name|
+          criteria.send(:"#{name}=", other.send(name)) unless other.send(name).nil?
+        end
+
+        [
+          :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
+        ].each do |name|
+          criteria.send(:"#{name}=", (criteria.send(name) || []) + other.send(name)) if other.send(name)
+        end
+
+        [:highlight_values, :suggest_values, :custom_value, :aggregation_values].each do |name|
+          criteria.send(:"#{name}=", (criteria.send(name) || {}).merge(other.send(name))) if other.send(name)
+        end
       end
     end
 
@@ -576,7 +566,7 @@ module SearchFlip
     end
 
     def respond_to_missing?(name, *args)
-      target.respond_to?(name, *args)
+      target.respond_to?(name, *args) || super
     end
 
     def method_missing(name, *args, &block)

data/lib/search_flip/filterable.rb

@@ -235,6 +235,22 @@ module SearchFlip
       filter(match_all: options)
     end
 
+    # Adds a match none filter to the criteria, which simply matches none
+    # documents at all. Check out the Elasticsearch docs for further details.
+    #
+    # @example Basic usage
+    #   CommentIndex.match_none
+    #
+    # @example Filter chaining
+    #   query = CommentIndex.search("...")
+    #   query = query.match_none unless current_user.admin?
+    #
+    # @return [SearchFlip::Criteria] A newly created extended criteria
+
+    def match_none
+      filter(match_none: {})
+    end
+
     # Adds an exists filter to the criteria, which selects all documents for
     # which the specified field has a non-null value.
     #

data/lib/search_flip/highlightable.rb

@@ -34,9 +34,10 @@ module SearchFlip
         criteria.highlight_values = (criteria.highlight_values || {}).merge(options)
 
         hash =
-          if fields.is_a?(Hash)
+          case fields
+          when Hash
             fields
-          elsif fields.is_a?(Array)
+          when Array
             fields.each_with_object({}) { |field, h| h[field] = {} }
           else
             { fields => {} }

data/lib/search_flip/http_client.rb

@@ -1,15 +1,14 @@
 module SearchFlip
-  # @api private
-  #
   # The SearchFlip::HTTPClient class wraps the http gem, is for internal use
   # and responsible for the http request/response handling, ie communicating
   # with Elasticsearch.
 
   class HTTPClient
-    attr_accessor :request
+    attr_accessor :request, :plugins
 
-    def initialize
+    def initialize(plugins: [])
       self.request = HTTP
+      self.plugins = plugins
     end
 
     class << self
@@ -30,17 +29,16 @@ module SearchFlip
     end
 
     [:get, :post, :put, :delete, :head].each do |method|
-      define_method(method) do |*args|
-        execute(method, *args)
+      define_method(method) do |uri, options = {}|
+        execute(method, uri, options)
       end
-
-      ruby2_keywords method
     end
 
     private
 
-    ruby2_keywords def execute(method, *args)
-      response = request.send(method, *args)
+    def execute(method, uri, options = {})
+      final_request = plugins.inject(self) { |res, cur| cur.call(res, method, uri, options) }
+      response = final_request.request.send(method, uri, options)
 
       raise SearchFlip::ResponseError.new(code: response.code, body: response.body.to_s) unless response.status.success?
 

data/lib/search_flip/index.rb

@@ -153,7 +153,7 @@ module SearchFlip
       #   scope to be applied to the scope
 
       def each_record(scope, index_scope: false)
-        return enum_for(:each_record, scope) unless block_given?
+        return enum_for(:each_record, scope, index_scope: index_scope) unless block_given?
 
         if scope.respond_to?(:find_each)
           (index_scope ? self.index_scope(scope) : scope).find_each do |record|
@@ -247,8 +247,8 @@ module SearchFlip
         SearchFlip::Criteria.new(target: self)
       end
 
-      def_delegators :criteria, :all, :profile, :where, :where_not, :filter, :range, :match_all, :exists,
-        :exists_not, :post_where, :post_where_not, :post_range, :post_exists, :post_exists_not,
+      def_delegators :criteria, :all, :profile, :where, :where_not, :filter, :range, :match_all, :match_none,
+        :exists, :exists_not, :post_where, :post_where_not, :post_range, :post_exists, :post_exists_not,
         :post_filter, :post_must, :post_must_not, :post_should, :aggregate, :scroll, :source,
         :includes, :eager_load, :preload, :sort, :resort, :order, :reorder, :offset, :limit, :paginate,
         :page, :per, :search, :highlight, :suggest, :custom, :find_in_batches, :find_results_in_batches,

data/lib/search_flip/result.rb

@@ -17,7 +17,7 @@ module SearchFlip
     #   SearchFlip::Result.from_hit(top_sales_hits.first)
 
     def self.from_hit(hit)
-      raw_result = hit["_source"].dup
+      raw_result = (hit["_source"] || {}).dup
 
       raw_result["_hit"] = hit.each_with_object({}) do |(key, value), hash|
         hash[key] = value if key != "_source"

data/lib/search_flip/version.rb

@@ -1,3 +1,3 @@
 module SearchFlip
-  VERSION = "3.0.0"
+  VERSION = "3.2.1"
 end

data/search_flip.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   MESSAGE
 
   spec.add_development_dependency "activerecord", ">= 3.0"
+  spec.add_development_dependency "aws-sdk-core"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "factory_bot"
   spec.add_development_dependency "rake"

data/spec/search_flip/aws_sigv4_plugin_spec.rb

@@ -0,0 +1,41 @@
+require File.expand_path("../spec_helper", __dir__)
+require "search_flip/aws_sigv4_plugin"
+
+RSpec.describe SearchFlip::AwsSigv4Plugin do
+  describe "#call" do
+    subject(:plugin) do
+      SearchFlip::AwsSigv4Plugin.new(
+        region: "us-east-1",
+        access_key_id: "access key",
+        secret_access_key: "secret access key"
+      )
+    end
+
+    let(:client) { SearchFlip::HTTPClient.new }
+
+    it "adds the signed headers to the request" do
+      Timecop.freeze Time.parse("2020-01-01 12:00:00 UTC") do
+        expect(client).to receive(:headers).with(
+          "host" => "localhost",
+          "authorization" => /.*/,
+          "x-amz-content-sha256" => /.*/,
+          "x-amz-date" => /20200101T120000Z/
+        )
+
+        plugin.call(client, :get, "http://localhost/index")
+      end
+    end
+
+    it "feeds the http method, full url and body to the signer" do
+      signing_request = {
+        http_method: "GET",
+        url: "http://localhost/index?param=value",
+        body: JSON.generate(key: "value")
+      }
+
+      expect(plugin.signer).to receive(:sign_request).with(signing_request).and_call_original
+
+      plugin.call(client, :get, "http://localhost/index", params: { param: "value" }, json: { key: "value" })
+    end
+  end
+end

data/spec/search_flip/connection_spec.rb

@@ -36,10 +36,10 @@ RSpec.describe SearchFlip::Connection do
     it "changes the aliases" do
       connection = SearchFlip::Connection.new
 
-      connection.update_aliases(actions: [add: { index: "products", alias: "alias1" }])
+      connection.update_aliases(actions: [{ add: { index: "products", alias: "alias1" } }])
       expect(connection.get_aliases(alias_name: "alias1").keys).to eq(["products"])
 
-      connection.update_aliases(actions: [remove: { index: "products", alias: "alias1" }])
+      connection.update_aliases(actions: [{ remove: { index: "products", alias: "alias1" } }])
       expect(connection.alias_exists?("alias1")).to eq(false)
     end
   end
@@ -79,11 +79,11 @@ RSpec.describe SearchFlip::Connection do
 
         expect(connection.alias_exists?(:some_alias)).to eq(false)
 
-        connection.update_aliases(actions: [add: { index: "products", alias: "some_alias" }])
+        connection.update_aliases(actions: [{ add: { index: "products", alias: "some_alias" } }])
 
         expect(connection.alias_exists?(:some_alias)).to eq(true)
       ensure
-        connection.update_aliases(actions: [remove: { index: "products", alias: "some_alias" }])
+        connection.update_aliases(actions: [{ remove: { index: "products", alias: "some_alias" } }])
       end
     end
   end

data/spec/search_flip/criteria_spec.rb

@@ -110,6 +110,16 @@ RSpec.describe SearchFlip::Criteria do
 
           expect(criteria1.merge(criteria2).send(method)).to eq("value2")
         end
+
+        it "handles false values correctly" do
+          criteria1 = SearchFlip::Criteria.new(target: TestIndex)
+          criteria1.send("#{method}=", true)
+
+          criteria2 = SearchFlip::Criteria.new(target: TestIndex)
+          criteria2.send("#{method}=", false)
+
+          expect(criteria1.merge(criteria2).send(method)).to eq(false)
+        end
       end
     end
 
@@ -406,6 +416,18 @@ RSpec.describe SearchFlip::Criteria do
     end
   end
 
+  describe "#match_none" do
+    it "does not match any documents" do
+      if ProductIndex.connection.version.to_i >= 5
+        ProductIndex.import create(:product)
+
+        query = ProductIndex.match_none
+
+        expect(query.records).to eq([])
+      end
+    end
+  end
+
   describe "#exists" do
     it "sets up the constraints correctly and is chainable" do
       product1 = create(:product, title: "title1", description: "description1")

data/spec/search_flip/http_client_spec.rb

@@ -39,6 +39,23 @@ RSpec.describe SearchFlip::HTTPClient do
     end
   end
 
+  describe "plugins" do
+    subject do
+      SearchFlip::HTTPClient.new(
+        plugins: [
+          ->(request, _method, _uri, _options = {}) { request.headers("First-Header" => "Value") },
+          ->(request, _method, _uri, _options = {}) { request.headers("Second-Header" => "Value") }
+        ]
+      )
+    end
+
+    it "injects the plugins and uses their result in the request" do
+      stub_request(:get, "http://localhost/path").with(query: { key: "value" }, headers: { "First-Header" => "Value", "Second-Header" => "Value" }).and_return(body: "success")
+
+      expect(subject.get("http://localhost/path", params: { key: "value" }).body.to_s).to eq("success")
+    end
+  end
+
   [:via, :basic_auth, :auth].each do |method|
     describe "##{method}" do
       it "creates a dupped instance" do

data/spec/search_flip/index_spec.rb

@@ -5,8 +5,8 @@ RSpec.describe SearchFlip::Index do
     subject { ProductIndex }
 
     methods = [
-      :all, :profile, :where, :where_not, :filter, :range, :match_all, :exists,
-      :exists_not, :post_where, :post_where_not, :post_filter, :post_must,
+      :all, :profile, :where, :where_not, :filter, :range, :match_all, :match_none,
+      :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,
@@ -211,12 +211,18 @@ RSpec.describe SearchFlip::Index do
         mapping = { properties: { id: { type: "long" } } }
 
         allow(TestIndex).to receive(:mapping).and_return(mapping)
-        allow(TestIndex.connection).to receive(:update_mapping).and_call_original
+        allow(TestIndex.connection).to receive(:update_mapping)
 
         TestIndex.update_mapping
 
         expect(TestIndex.connection).to have_received(:update_mapping).with("test", { "test" => mapping }, type_name: "test")
       end
+
+      it "updates the mapping" do
+        TestIndex.create_index
+
+        expect(TestIndex.update_mapping).to eq(true)
+      end
     end
   end
 
@@ -258,12 +264,19 @@ RSpec.describe SearchFlip::Index do
         TestIndex.create_index
         TestIndex.update_mapping
 
-        allow(TestIndex.connection).to receive(:get_mapping).and_call_original
+        allow(TestIndex.connection).to receive(:get_mapping)
 
         TestIndex.get_mapping
 
         expect(TestIndex.connection).to have_received(:get_mapping).with("test", type_name: "test")
       end
+
+      it "returns the mapping" do
+        TestIndex.create_index
+        TestIndex.update_mapping
+
+        expect(TestIndex.get_mapping).to be_present
+      end
     end
   end
 

data/spec/search_flip/null_instrumenter_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe SearchFlip::NullInstrumenter do
     it "calls start" do
       allow(subject).to receive(:start)
 
-      subject.instrument("name", { key: "value" }) {}
+      subject.instrument("name", { key: "value" }) { true }
 
       expect(subject).to have_received(:start)
     end
@@ -15,7 +15,7 @@ RSpec.describe SearchFlip::NullInstrumenter do
     it "calls finish" do
       allow(subject).to receive(:finish)
 
-      subject.instrument("name", { key: "value" }) {}
+      subject.instrument("name", { key: "value" }) { true }
 
       expect(subject).to have_received(:finish)
     end

data/spec/search_flip/result_spec.rb

@@ -13,5 +13,11 @@ RSpec.describe SearchFlip::Result do
 
       expect(result.key1[0].key2).to eq("value")
     end
+
+    it "works with the _source being disabled" do
+      result = SearchFlip::Result.from_hit("_id" => 1)
+
+      expect(result._hit._id).to eq(1)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2021-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -199,9 +213,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -212,6 +226,7 @@ files:
 - lib/search_flip.rb
 - lib/search_flip/aggregatable.rb
 - lib/search_flip/aggregation.rb
+- lib/search_flip/aws_sigv4_plugin.rb
 - lib/search_flip/bulk.rb
 - lib/search_flip/config.rb
 - lib/search_flip/connection.rb
@@ -238,6 +253,7 @@ files:
 - search_flip.gemspec
 - spec/delegate_matcher.rb
 - spec/search_flip/aggregation_spec.rb
+- spec/search_flip/aws_sigv4_plugin_spec.rb
 - spec/search_flip/bulk_spec.rb
 - spec/search_flip/connection_spec.rb
 - spec/search_flip/criteria_spec.rb
@@ -271,13 +287,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Full-Featured Elasticsearch Ruby Client with a Chainable DSL
 test_files:
 - spec/delegate_matcher.rb
 - spec/search_flip/aggregation_spec.rb
+- spec/search_flip/aws_sigv4_plugin_spec.rb
 - spec/search_flip/bulk_spec.rb
 - spec/search_flip/connection_spec.rb
 - spec/search_flip/criteria_spec.rb

data/.travis.yml

@@ -1,20 +0,0 @@
-sudo: false
-language: ruby
-env:
-  - ES_IMAGE=plainpicture/elasticsearch:2.4.1_delete-by-query
-  - ES_IMAGE=elasticsearch:5.4
-  - ES_IMAGE=docker.elastic.co/elasticsearch/elasticsearch:6.7.0
-  - ES_IMAGE=docker.elastic.co/elasticsearch/elasticsearch:7.0.0
-  - ES_IMAGE=docker.elastic.co/elasticsearch/elasticsearch:7.6.0
-rvm:
-  - ruby-2.5.3
-  - ruby-2.6.2
-  - ruby-2.7.1
-before_install:
-  - docker-compose up -d
-  - sleep 10
-install:
-  - travis_retry bundle install
-script:
- - bundle exec rspec
- - bundle exec rubocop