elastic_record 5.5.0 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea174acd40e5c2ec841c31085fea2a2994e0d05a705042d5ddf044e8c8962376
-  data.tar.gz: 1adb61c8170f1e966a7acb0c7c68ac95cc5f93181a81d6118f166de0cdf45a6a
+  metadata.gz: 0c916b053e2c2a228b4da081dad0b380dfcd7aea05c3f970134d25f68b9c9a72
+  data.tar.gz: 7fa353180b59dcc3fafa81a1e4d6def1d1873b1748079c1d676d38458ea7ba78
 SHA512:
-  metadata.gz: 741a6d678b18f9c373e7bc6412e98ab7ec5b97241af2fde09c84fb5b5baebac69d5236a893886c88ed73c37d81f4e426d4182f5818659cb5f675e820494e5d06
-  data.tar.gz: 848de3cb5054a6997aa8022721bf7dff2c40740921a127611033ec87dcda6e862945697ef19414c775b7b8c970671e19f251d6812cd193ad3eb797c52c9e95b8
+  metadata.gz: aadbe8c69f0a39e70d0cafc2bc77785cfabb1ffec23b5480eb6269cfd7cac955ff6761a2c3d375f68f0d1b625c4e09de89d7913ac84a347161fac3895d4242f1
+  data.tar.gz: 642e51f60c39f3102a4c716b60e3c0ec84c89b5d75ed5828c06f73934c61eebb9a0e19892a0ffa12bdc966b7c0b46608f2337ec522b333929d3ba574d0b49678

data/.travis.yml

@@ -3,19 +3,19 @@ cache: bundler
 dist: xenial
 
 before_install:
-- wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
-- tar -xzf elasticsearch-${ES_VERSION}.tar.gz
+- wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz
+- tar -xzf elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz
 - ./elasticsearch-${ES_VERSION}/bin/elasticsearch -d
 
 before_script:
 - cp test/dummy/.env.example test/dummy/.env
-- wget --quiet --waitretry=1 --retry-connrefused --timeout=20 -O - http://127.0.0.1:9200
+- for i in 1 2 3 ; do wget --quiet --waitretry=1 --retry-connrefused --timeout=30 -O - http://127.0.0.1:9200 && break ; done
 - bundle exec rake app:db:setup
 - bundle exec rake app:index:reset
 
 env:
   global:
-  - ES_VERSION=6.4.3
+  - ES_VERSION=7.1.1
 
 services:
 - postgresql

data/README.md

@@ -2,7 +2,7 @@
 [![Build Status](https://secure.travis-ci.org/data-axle/elastic_record.png?rvm=2.0.0)](http://travis-ci.org/data-axle/elastic_record)
 [![Code Climate](https://codeclimate.com/github/data-axle/elastic_record.png)](https://codeclimate.com/github/data-axle/elastic_record)
 
-ElasticRecord is an Elasticsearch 6.x ORM.
+ElasticRecord is an Elasticsearch 6.x and 7.x ORM.
 
 ## Setup ##
 

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '5.5.0'
+  s.version = '5.6.0'
   s.summary = 'An Elasticsearch querying ORM'
   s.description = 'Find your records with Elasticsearch'
 

data/lib/elastic_record/as_document.rb

@@ -10,42 +10,38 @@ module ElasticRecord
       end
     end
 
-    def as_partial_update_document
-      mapping_properties = elastic_index.mapping[:properties]
+    def as_partial_update_document(mapping_properties = elastic_index.mapping[:properties])
       changed_fields = respond_to?(:saved_changes) ? saved_changes.keys : changed
 
       changed_fields.each_with_object({}) do |field, result|
         if field_mapping = mapping_properties[field]
-          result[field] = value_for_elastic_search field, field_mapping, mapping_properties
+          result[field] = value_for_elastic_search(field, field_mapping, mapping_properties, partial: true)
         end
       end
     end
 
-    def value_for_elastic_search(field, mapping, mapping_properties)
-      value = try field
-      return if value.nil?
-
-      value =
-        case mapping[:type]&.to_sym
-        when :object
-          object_mapping_properties = mapping_properties.dig(field, :properties)
-          value_for_elastic_search_object(value, object_mapping_properties)
-        when :nested
-          object_mapping_properties = mapping_properties.dig(field, :properties)
-          value.map { |entry| value_for_elastic_search_object(entry, object_mapping_properties) }
-        when :integer_range, :float_range, :long_range, :double_range, :date_range
-          value_for_elastic_search_range(value)
-        else
-          value
-        end
-
-      if value.present? || value == false
-        value
+    def value_for_elastic_search(field, mapping, mapping_properties, partial: false)
+      return if (value = try(field)).nil?
+
+      case mapping[:type]&.to_sym
+      when :object
+        object_mapping_properties = mapping_properties.dig(field, :properties)
+        value_for_elastic_search_object(value, object_mapping_properties, partial: partial)
+      when :nested
+        return nil if value.empty?
+
+        object_mapping_properties = mapping_properties.dig(field, :properties)
+        value.map { |entry| value_for_elastic_search_object(entry, object_mapping_properties) }
+      when :integer_range, :float_range, :long_range, :double_range, :date_range
+        value_for_elastic_search_range(value)
+      else
+        value if value.present? || value == false
       end
     end
 
-    def value_for_elastic_search_object(object, nested_mapping)
-      object.respond_to?(:as_search_document) ? object.as_search_document(nested_mapping) : object
+    def value_for_elastic_search_object(object, nested_mapping, partial: false)
+      method = partial ? :as_partial_update_document : :as_search_document
+      object.respond_to?(method) ? object.public_send(method, nested_mapping) : object
     end
 
     def value_for_elastic_search_range(range)

data/lib/elastic_record/index.rb

@@ -3,6 +3,7 @@ require 'elastic_record/index/deferred'
 require 'elastic_record/index/documents'
 require 'elastic_record/index/manage'
 require 'elastic_record/index/mapping'
+require 'elastic_record/index/search'
 require 'elastic_record/index/settings'
 require 'elastic_record/index/mapping_type'
 
@@ -27,7 +28,7 @@ module ElasticRecord
   # [update_mapping]
   #   Update elastic search's mapping
   class Index
-    include Documents
+    include Documents, Search
     include Manage
     include Mapping, Settings
     include Analyze

data/lib/elastic_record/index/deferred.rb

@@ -40,7 +40,7 @@ module ElasticRecord
 
             if READ_METHODS.include?(method)
               flush_deferred_actions!
-              if method == :json_get && args.first =~ /^\/(.*)\/_search/
+              if method == :json_get && args.first =~ /^\/(.*)\/_m?search/
                 index.real_connection.json_post("/#{$1.partition('/').first}/_refresh")
               end
 

data/lib/elastic_record/index/documents.rb

@@ -2,62 +2,6 @@ require 'active_support/core_ext/object/to_query'
 
 module ElasticRecord
   class Index
-    class ScrollEnumerator
-      attr_reader :keep_alive, :batch_size, :scroll_id
-      def initialize(elastic_index, search: nil, scroll_id: nil, keep_alive:, batch_size:)
-        @elastic_index = elastic_index
-        @search        = search
-        @scroll_id     = scroll_id
-        @keep_alive    = keep_alive
-        @batch_size    = batch_size
-      end
-
-      def each_slice(&block)
-        while (hits = request_more_hits.hits).any?
-          hits.each_slice(batch_size, &block)
-        end
-
-        @elastic_index.delete_scroll(scroll_id)
-      end
-
-      def request_more_ids
-        request_more_hits.to_ids
-      end
-
-      def request_more_hits
-        SearchHits.from_response(@elastic_index.model, request_next_scroll)
-      end
-
-      def request_next_scroll
-        if scroll_id
-          response = @elastic_index.scroll(scroll_id, keep_alive)
-
-          if response['_scroll_id'] != scroll_id
-            @elastic_index.delete_scroll(scroll_id)
-          end
-        else
-          response = initial_search_response
-        end
-
-        @scroll_id =  response['_scroll_id']
-
-        response
-      end
-
-      def total_hits
-        initial_search_response['hits']['total']
-      end
-
-      def initial_search_response
-        @initial_search_response ||= begin
-          search_options = { size: batch_size, scroll: keep_alive }
-          elastic_query = @search.reverse_merge('sort' => '_doc')
-
-          @elastic_index.search(elastic_query, search_options)
-        end
-      end
-    end
-
     module Documents
       def index_record(record, index_name: alias_name)
         unless disabled
@@ -142,42 +86,6 @@ module ElasticRecord
         end
       end
 
-      def record_exists?(id)
-        get(id)['found']
-      end
-
-      def search(elastic_query, options = {})
-        url = "_search"
-        if options.any?
-          url += "?#{options.to_query}"
-        end
-
-        get url, elastic_query.update('_source' => load_from_source)
-      end
-
-      def explain(id, elastic_query)
-        get "_explain", elastic_query
-      end
-
-      def build_scroll_enumerator(search: nil, scroll_id: nil, batch_size: 100, keep_alive: ElasticRecord::Config.scroll_keep_alive)
-        ScrollEnumerator.new(self, search: search, scroll_id: scroll_id, batch_size: batch_size, keep_alive: keep_alive)
-      end
-
-      def scroll(scroll_id, scroll_keep_alive)
-        options = {scroll_id: scroll_id, scroll: scroll_keep_alive}
-        connection.json_get("/_search/scroll?#{options.to_query}")
-      rescue ElasticRecord::ConnectionError => e
-        case e.status_code
-        when '400' then raise ElasticRecord::InvalidScrollError, e.message
-        when '404' then raise ElasticRecord::ExpiredScrollError, e.message
-        else raise e
-        end
-      end
-
-      def delete_scroll(scroll_id)
-        connection.json_delete('/_search/scroll', { scroll_id: scroll_id })
-      end
-
       def bulk(options = {}, &block)
         if current_bulk_batch
           yield

data/lib/elastic_record/index/manage.rb

@@ -8,12 +8,13 @@ module ElasticRecord
       end
 
       def create(index_name = new_index_name, setting_overrides: {})
-        connection.json_put "/#{index_name}", {
-          "mappings" => {
-            mapping_type => mapping
-          },
+        mapping_params = {
+          "mappings" => (custom_mapping_type_name? ? { mapping_type => mapping } : mapping),
           "settings" => settings.merge(setting_overrides)
         }
+
+        # TODO: Remove include_type_name when ES8 support is added
+        connection.json_put "/#{index_name}?include_type_name=#{custom_mapping_type_name?}", mapping_params
         index_name
       end
 

data/lib/elastic_record/index/mapping.rb

@@ -16,11 +16,11 @@ module ElasticRecord
       end
 
       def update_mapping(index_name = alias_name)
-        connection.json_put "/#{index_name}/_mapping/#{mapping_type}", mapping
+        connection.json_put "/#{index_name}/_mapping?include_type_name=false", mapping
       end
 
       def get_mapping(index_name = alias_name)
-        json = connection.json_get "/#{index_name}/_mapping/#{mapping_type}"
+        json = connection.json_get "/#{index_name}/_mapping?include_type_name=false"
 
         unless json.empty?
           json.values.first['mappings']

data/lib/elastic_record/index/mapping_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ElasticRecord
   class Index
     # This module facilitates the removal of multiple mapping types from ElasticSearch.
@@ -6,10 +8,16 @@ module ElasticRecord
     #   * 6.x - Type defaults to _doc, but any type can be specified
     #   * 7.x - Only _doc will be supported, effectively removing the type concept.
     module MappingType
-      attr_accessor :mapping_type
+      attr_writer :mapping_type
+
+      DEFAULT_MAPPING_TYPE = '_doc'
 
       def mapping_type
-        @mapping_type || '_doc'
+        @mapping_type || DEFAULT_MAPPING_TYPE
+      end
+
+      def custom_mapping_type_name?
+        mapping_type != MappingType::DEFAULT_MAPPING_TYPE
       end
     end
   end

data/lib/elastic_record/index/search.rb

@@ -0,0 +1,103 @@
+require 'active_support/core_ext/object/to_query'
+
+module ElasticRecord
+  class Index
+    class ScrollEnumerator
+      attr_reader :keep_alive, :batch_size, :scroll_id
+      def initialize(elastic_index, search: nil, scroll_id: nil, keep_alive:, batch_size:)
+        @elastic_index = elastic_index
+        @search        = search
+        @scroll_id     = scroll_id
+        @keep_alive    = keep_alive
+        @batch_size    = batch_size
+      end
+
+      def each_slice(&block)
+        while (hits = request_more_hits.hits).any?
+          hits.each_slice(batch_size, &block)
+        end
+
+        @elastic_index.delete_scroll(scroll_id)
+      end
+
+      def request_more_ids
+        request_more_hits.to_ids
+      end
+
+      def request_more_hits
+        SearchHits.from_response(request_next_scroll)
+      end
+
+      def request_next_scroll
+        if scroll_id
+          response = @elastic_index.scroll(scroll_id, keep_alive)
+
+          if response['_scroll_id'] != scroll_id
+            @elastic_index.delete_scroll(scroll_id)
+          end
+        else
+          response = initial_search_response
+        end
+
+        @scroll_id =  response['_scroll_id']
+
+        response
+      end
+
+      def total_hits
+        SearchHits.from_response(initial_search_response).total
+      end
+
+      def initial_search_response
+        @initial_search_response ||= begin
+          search_options = { size: batch_size, scroll: keep_alive }
+          elastic_query = @search.reverse_merge('sort' => '_doc')
+
+          @elastic_index.search(elastic_query, search_options)
+        end
+      end
+    end
+
+    module Search
+      def record_exists?(id)
+        get(id)['found']
+      end
+
+      def search(elastic_query, options = {})
+        url = "_search"
+        url += "?#{options.to_query}" if options.any?
+
+        get url, elastic_query
+      end
+
+      def multi_search(headers_and_bodies)
+        queries = headers_and_bodies.flat_map { |header, body| [header.to_json, body.to_json] }
+        queries = queries.join("\n") + "\n"
+        get "_msearch", queries
+      end
+
+      def explain(id, elastic_query)
+        get "_explain", elastic_query
+      end
+
+      def build_scroll_enumerator(search: nil, scroll_id: nil, batch_size: 100, keep_alive: ElasticRecord::Config.scroll_keep_alive)
+        ScrollEnumerator.new(self, search: search, scroll_id: scroll_id, batch_size: batch_size, keep_alive: keep_alive)
+      end
+
+      def scroll(scroll_id, scroll_keep_alive)
+        options = {scroll_id: scroll_id, scroll: scroll_keep_alive}
+        connection.json_get("/_search/scroll?#{options.to_query}")
+      rescue ElasticRecord::ConnectionError => e
+        case e.status_code
+        when '400' then raise ElasticRecord::InvalidScrollError, e.message
+        when '404' then raise ElasticRecord::ExpiredScrollError, e.message
+        else raise e
+        end
+      end
+
+      def delete_scroll(scroll_id)
+        connection.json_delete('/_search/scroll', { scroll_id: scroll_id })
+      end
+    end
+  end
+end

data/lib/elastic_record/model.rb

@@ -1,18 +1,16 @@
 module ElasticRecord
   module Model
-    def self.included(base)
-      base.class_eval do
-        extend Searching
-        extend ClassMethods
-        extend FromSearchHit
-        include Callbacks
-        include AsDocument
-
-        class_attribute :elastic_connection
-        self.elastic_connection = ElasticRecord::Connection.new(ElasticRecord::Config.servers, ElasticRecord::Config.connection_options)
-
-        singleton_class.delegate :query, :filter, :aggregate, to: :elastic_search
-      end
+    extend ActiveSupport::Concern
+
+    included do
+      extend Searching
+      extend ClassMethods
+      extend FromSearchHit
+      include Callbacks
+      include AsDocument
+
+      singleton_class.delegate :query, :filter, :aggregate, to: :elastic_search
+      mattr_accessor :elastic_connection_cache, instance_writer: false
     end
 
     module ClassMethods
@@ -37,6 +35,10 @@ module ElasticRecord
       def elastic_index=(index)
         @elastic_index = index
       end
+
+      def elastic_connection
+        self.elastic_connection_cache ||= ElasticRecord::Connection.new(ElasticRecord::Config.servers, ElasticRecord::Config.connection_options)
+      end
     end
 
     def index_to_elasticsearch

data/lib/elastic_record/relation.rb

@@ -14,13 +14,25 @@ module ElasticRecord
 
     attr_reader :klass, :values
 
-    def initialize(klass, values = {})
+    def initialize(klass, values: {})
       @klass = klass
       @values = values
     end
 
+    def initialize_copy(other)
+      @values = @values.dup
+      reset
+    end
+
+    def becomes(klass)
+      became = klass.allocate
+      became.instance_variable_set(:@klass, @klass)
+      became.instance_variable_set(:@values, @values.dup)
+      became
+    end
+
     def count
-      search_results['hits']['total']
+      search_hits.total
     end
 
     def aggregations
@@ -34,13 +46,16 @@ module ElasticRecord
       klass.elastic_index.explain(id, as_elastic)
     end
 
-    def initialize_copy(other)
-      @values = @values.dup
-      reset
+    def to_a
+      @records ||= find_hits(search_hits)
     end
 
-    def to_a
-      @records ||= search_hits.to_records
+    def find_hits(search_hits)
+      if klass.elastic_index.load_from_source
+        search_hits.hits.map { |hit| klass.from_search_hit(hit) }
+      else
+        klass.find search_hits.to_ids
+      end
     end
 
     def delete_all

data/lib/elastic_record/relation/batches.rb

@@ -9,7 +9,7 @@ module ElasticRecord
 
       def find_in_batches(options = {})
         find_hits_in_batches(options) do |hits|
-          yield hits.to_records
+          yield find_hits(hits)
         end
       end
 
@@ -21,7 +21,7 @@ module ElasticRecord
 
       def find_hits_in_batches(options = {})
         build_scroll_enumerator(options).each_slice do |hits|
-          yield SearchHits.new(klass, hits)
+          yield SearchHits.new(hits)
         end
       end
 

data/lib/elastic_record/relation/hits.rb

@@ -1,18 +1,21 @@
 module ElasticRecord
   class Relation
     module Hits
+      extend ActiveSupport::Concern
+
       def to_ids
         search_hits.to_ids
       end
 
       def search_hits
-        SearchHits.from_response(klass, search_results)
+        SearchHits.from_response(search_results)
       end
 
       def search_results
         @search_results ||= begin
           options = { typed_keys: true }
           options[:search_type] = search_type_value if search_type_value
+          options[:_source] = klass.elastic_index.load_from_source
 
           klass.elastic_index.search(as_elastic, options)
         end

data/lib/elastic_record/relation/search_methods.rb

@@ -57,7 +57,7 @@ module ElasticRecord
         define_method ar_method do |*args, &block|
           result = klass.send(ar_method, *args, &block)
           if result.is_a?(ActiveRecord::Relation)
-            self.class.new(result, values)
+            self.class.new(result, values: values)
           else
             result
           end

data/lib/elastic_record/search_hits.rb

@@ -1,28 +1,20 @@
 module ElasticRecord
   class SearchHits
-    attr_accessor :hits, :model
+    attr_accessor :hits, :model, :total
 
     class << self
-      def from_response(model, response)
-        new(model, response['hits']['hits'])
+      def from_response(response)
+        new(response['hits']['hits'], total: response['hits']['total'])
       end
     end
 
-    def initialize(model, hits)
-      @model = model
+    def initialize(hits, total: nil)
       @hits  = hits
+      @total = total.is_a?(Hash) ? total['value'] : total
     end
 
     def to_ids
       hits.map { |hit| hit['_id'] }
     end
-
-    def to_records
-      if model.elastic_index.load_from_source
-        hits.map { |hit| model.from_search_hit(hit) }
-      else
-        model.find to_ids
-      end
-    end
   end
 end

data/test/dummy/app/models/widget.rb

@@ -34,16 +34,4 @@ class Widget < ActiveRecord::Base
       }
     }
   )
-
-  class << self
-    def anon(&block)
-      Class.new(self) do
-        def self.name
-          'Widget'
-        end
-
-        instance_eval(&block)
-      end
-    end
-  end
 end

data/test/elastic_record/as_document_test.rb

@@ -21,6 +21,11 @@ class ElasticRecord::AsDocumentTest < MiniTest::Test
     assert_equal 1, Widget.elastic_search.filter(color: 'grey').count
     assert_equal 1, Widget.elastic_search.filter('widget_part.name' => 'Doohicky').count
     assert_equal 0, Widget.elastic_search.filter(name: 'elmo').count
+
+    widget.widget_part = { name: nil }
+    widget.save!
+
+    assert_equal 1, Widget.elastic_search.filter('widget_part.name' => nil).count
   end
 
   class SpecialFieldsModel

data/test/elastic_record/from_search_hits_test.rb

@@ -17,14 +17,14 @@ class ElasticRecord::FromSearchHitsTest < MiniTest::Test
   end
 
   def test_ranges
-    document = Project.elastic_relation.search_hits.to_records.first
+    document = Project.elastic_relation.first
 
     assert_equal 'foo', document.name
     assert_equal @project.estimated_start_date, document.estimated_start_date
   end
 
   def test_nested_ranges
-    document = Project.elastic_relation.search_hits.to_records.first
+    document = Project.elastic_relation.first
     team_members = document.team_members.sort_by { |member| member['name'] }
 
     assert_equal 26..29, team_members.first['estimated_age']
@@ -32,7 +32,7 @@ class ElasticRecord::FromSearchHitsTest < MiniTest::Test
   end
 
   def test_object_ranges
-    document = Project.elastic_relation.search_hits.to_records.first
+    document = Project.elastic_relation.first
 
     assert_equal 25..30, document.manager['estimated_age']
   end

data/test/elastic_record/index/documents_test.rb

@@ -78,57 +78,6 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
     assert index.record_exists?('joe')
   end
 
-  def test_build_scroll_enumerator
-    index.index_document('bob', name: 'bob')
-    index.index_document('joe', name: 'joe')
-
-    scroll_enumerator = index.build_scroll_enumerator(search: {'query' => {query_string: {query: 'name:bob'}}})
-
-    assert_equal 1, scroll_enumerator.total_hits
-    assert_equal 1, scroll_enumerator.request_more_ids.size
-  end
-
-  def test_expired_scroll_error
-    index.index_document('bob', name: 'bob')
-    index.index_document('bobs', name: 'bob')
-
-    scroll_enumerator = index.build_scroll_enumerator(
-      search: { 'query' => { query_string: { query: 'name:bob' } } },
-      batch_size: 1,
-      keep_alive: '1ms'
-    )
-
-    scroll_enumerator.request_more_hits
-    index.delete_scroll(scroll_enumerator.scroll_id)
-    assert_raises ElasticRecord::ExpiredScrollError do
-      scroll_enumerator.request_more_hits
-    end
-  end
-
-  def test_each_slice
-    10.times { |i| index.index_document("bob#{i}", color: 'red') }
-    batches = []
-
-    scroll_enumerator = index.build_scroll_enumerator(search: {'query' => {query_string: {query: 'color:red'}}}, batch_size: 1)
-
-    scroll_enumerator.each_slice do |slice|
-      batches << slice
-    end
-
-    assert_equal 10, batches.size
-
-    # Assert context was removed
-    assert_raises ElasticRecord::ExpiredScrollError do
-      scroll_enumerator.request_more_hits
-    end
-  end
-
-  def test_invalid_scroll_error
-    assert_raises ElasticRecord::InvalidScrollError do
-      index.scroll('invalid', '1m')
-    end
-  end
-
   def test_bulk
     assert_nil index.current_bulk_batch
 

data/test/elastic_record/index/mapping_test.rb

@@ -3,23 +3,21 @@ require 'helper'
 class ElasticRecord::Index::MappingTest < MiniTest::Test
   def test_get_mapping
     expected = {
-      "widget" => {
-        "properties" => {
-          "color" => { "type" => "keyword" },
-          "name" => {
-            "type" => "text",
-            "fields" => {
-              "raw" => { "type" => "keyword" }
-            }
-          },
-          "price" => {
-            "type" => "long"
-          },
-          "warehouse_id" => { "type" => "keyword" },
-          "widget_part" => {
-            "properties" => {
-              "name" => { "type" => "keyword" }
-            }
+      "properties" => {
+        "color" => { "type" => "keyword" },
+        "name" => {
+          "type" => "text",
+          "fields" => {
+            "raw" => { "type" => "keyword" }
+          }
+        },
+        "price" => {
+          "type" => "long"
+        },
+        "warehouse_id" => { "type" => "keyword" },
+        "widget_part" => {
+          "properties" => {
+            "name" => { "type" => "keyword" }
           }
         }
       }

data/test/elastic_record/index/search_test.rb

@@ -0,0 +1,60 @@
+require "helper"
+
+class ElasticRecord::Index::SearchTest < MiniTest::Test
+  def test_build_scroll_enumerator
+    index.index_document('bob', name: 'bob')
+    index.index_document('joe', name: 'joe')
+
+    scroll_enumerator = index.build_scroll_enumerator(search: {'query' => {query_string: {query: 'name:bob'}}})
+
+    assert_equal 1, scroll_enumerator.total_hits
+    assert_equal 1, scroll_enumerator.request_more_ids.size
+  end
+
+  def test_expired_scroll_error
+    index.index_document('bob', name: 'bob')
+    index.index_document('bobs', name: 'bob')
+
+    scroll_enumerator = index.build_scroll_enumerator(
+      search: { 'query' => { query_string: { query: 'name:bob' } } },
+      batch_size: 1,
+      keep_alive: '1ms'
+    )
+
+    scroll_enumerator.request_more_hits
+    index.delete_scroll(scroll_enumerator.scroll_id)
+    assert_raises ElasticRecord::ExpiredScrollError do
+      scroll_enumerator.request_more_hits
+    end
+  end
+
+  def test_each_slice
+    10.times { |i| index.index_document("bob#{i}", color: 'red') }
+    batches = []
+
+    scroll_enumerator = index.build_scroll_enumerator(search: {'query' => {query_string: {query: 'color:red'}}}, batch_size: 1)
+
+    scroll_enumerator.each_slice do |slice|
+      batches << slice
+    end
+
+    assert_equal 10, batches.size
+
+    # Assert context was removed
+    assert_raises ElasticRecord::ExpiredScrollError do
+      scroll_enumerator.request_more_hits
+    end
+  end
+
+  def test_invalid_scroll_error
+    assert_raises ElasticRecord::InvalidScrollError do
+      index.scroll('invalid', '1m')
+    end
+  end
+
+  private
+
+    def index
+      @index ||= Widget.elastic_index
+    end
+end

data/test/elastic_record/percolator_model_test.rb

@@ -5,22 +5,20 @@ class ElasticRecord::PercolatorModelTest < MiniTest::Test
     index = WidgetQuery.elastic_index
 
     expected_mapping = {
-      "widget"=> {
-        "properties"=> {
-          "color"=> {"type" => "keyword" },
-          "name"=> {
-            "type" => "text",
-            "fields" => {
-              "raw" => { "type" => "keyword" }
-            }
-          },
-          "price" => { "type" => "long" },
-          "query" => { "type" => "percolator" },
-          "warehouse_id" => { "type" => "keyword" },
-          "widget_part" => {
-            "properties" => {
-              "name" => { "type" => "keyword" }
-            }
+      "properties"=> {
+        "color"=> {"type" => "keyword" },
+        "name"=> {
+          "type" => "text",
+          "fields" => {
+            "raw" => { "type" => "keyword" }
+          }
+        },
+        "price" => { "type" => "long" },
+        "query" => { "type" => "percolator" },
+        "warehouse_id" => { "type" => "keyword" },
+        "widget_part" => {
+          "properties" => {
+            "name" => { "type" => "keyword" }
           }
         }
       }

data/test/elastic_record/relation/batches_test.rb

@@ -16,14 +16,6 @@ class ElasticRecord::Relation::BatchesTest < MiniTest::Test
   #   assert_equal [@red_widget, @blue_widget, @green_widget].to_set, results.to_set
   # end
 
-  def test_find_hits_in_batches
-    results = []
-    Widget.elastic_relation.find_hits_in_batches do |hits|
-      results << hits
-    end
-    assert_equal [[@red_widget, @blue_widget, @green_widget].to_set], results.map(&:to_records).map(&:to_set)
-  end
-
   def test_find_ids_in_batches
     results = []
     Widget.elastic_relation.find_ids_in_batches do |ids|

data/test/elastic_record/relation_test.rb

@@ -1,6 +1,19 @@
 require 'helper'
 
 class ElasticRecord::RelationTest < MiniTest::Test
+  class SpecialRelation < ElasticRecord::Relation
+  end
+
+  def test_becomes
+    parent_relation = Widget.elastic_relation.filter(color: 'red')
+    became_relation = parent_relation.becomes(SpecialRelation)
+
+    assert_kind_of SpecialRelation, became_relation
+    assert_equal Widget, became_relation.klass
+    assert_equal parent_relation.values, became_relation.values
+    refute_equal parent_relation.values.object_id, became_relation.values.object_id
+  end
+
   def test_count
     original_count = Widget.elastic_relation.count
     Widget.create(color: 'red')

data/test/elastic_record/searching_test.rb

@@ -14,18 +14,18 @@ class ElasticRecord::SearchingTest < MiniTest::Test
     assert_equal widget, Widget.es.filter(color: 'red').first
   end
 
-  def test_elastic_scope
-    model = Widget.anon do
-      elastic_scope :by_color, ->(color) { elastic_search.filter(color: color) } do
-        def negative_offset
-          -offset_value
-        end
+  class ScopedWidget < Widget
+    elastic_scope :by_color, ->(color) { elastic_search.filter(color: color) } do
+      def negative_offset
+        -offset_value
       end
     end
+  end
 
-    relation = model.by_color('blue')
+  def test_elastic_scope
+    relation = ScopedWidget.by_color('blue')
 
-    assert_equal model.elastic_relation.filter(color: 'blue'), relation
+    assert_equal ScopedWidget.elastic_relation.filter(color: 'blue'), relation
     assert_equal -5, relation.offset(5).negative_offset
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.6.0
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -75,6 +75,7 @@ files:
 - lib/elastic_record/index/manage.rb
 - lib/elastic_record/index/mapping.rb
 - lib/elastic_record/index/mapping_type.rb
+- lib/elastic_record/index/search.rb
 - lib/elastic_record/index/settings.rb
 - lib/elastic_record/log_subscriber.rb
 - lib/elastic_record/lucene.rb
@@ -163,6 +164,7 @@ files:
 - test/elastic_record/index/manage_test.rb
 - test/elastic_record/index/mapping_test.rb
 - test/elastic_record/index/mapping_type_test.rb
+- test/elastic_record/index/search_test.rb
 - test/elastic_record/index/settings_test.rb
 - test/elastic_record/index_test.rb
 - test/elastic_record/integration/active_record_test.rb
@@ -201,7 +203,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An Elasticsearch querying ORM