elastic_record 5.3.1 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8877637e666a191a2b01fb967d998d36fe0a12023fdb8030a4c719bb77ae246
-  data.tar.gz: 8f0136038c8d2b540c0e53e7c650a16ec7e5668274ae07631c2bc63ed3e4469b
+  metadata.gz: ab3d32f450ac1c3c57de3216607cd0e98933ee13e009081556e40170db56c4e7
+  data.tar.gz: 3fe65fcfe4e06a56606aeb26e5dc0850433a146da77f3ceb4fcbf5fdff225813
 SHA512:
-  metadata.gz: 8e559697ea16610802ff1e7422cc5365f60098fbbda49565fc7227c1973c90bcacd0f893ee5a221316dde4e14a89338956134698dd5705a01581898f30a0bbb9
-  data.tar.gz: ab182a767408f8843d854d79ac2f7f4f19d17ddbde11bbe52393d9eac12360fee38292a09c03a97ef726b76ddaea12ba4fb829a059c2ee505e6541f0cd4dd17c
+  metadata.gz: a7afe879bc728ec2feecf6c616fa7b405d2df8172b468a052c307eee5ae02f97062e7f24d04efaecc9717591b489e3c01e4023d8f7034a4afd5ed0cf99bc106c
+  data.tar.gz: 79e3764907546cab0d8355f96ae32ca8460f8037a26009af46d77b3b8b107e6022832207227979a236d48507a2c70d069001c8b206b9c80960d920019084b4a8

data/.travis.yml

@@ -1,7 +1,6 @@
-rvm: 2.4.1
+rvm: 2.5.3
 cache: bundler
-sudo: false
-dist: trusty
+dist: xenial
 
 before_install:
 - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
@@ -16,7 +15,7 @@ before_script:
 
 env:
   global:
-  - ES_VERSION=6.2.3
+  - ES_VERSION=6.4.3
 
 services:
 - postgresql

data/elastic_record.gemspec

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

data/lib/elastic_record.rb

@@ -15,6 +15,7 @@ module ElasticRecord
   autoload :PercolatorModel
   autoload :Relation
   autoload :Searching
+  autoload :SearchHits
 
   module AggregationResponse
     extend ActiveSupport::Autoload

data/lib/elastic_record/index/documents.rb

@@ -3,27 +3,27 @@ require 'active_support/core_ext/object/to_query'
 module ElasticRecord
   class Index
     class ScrollEnumerator
-      attr_reader :keep_alive, :batch_size, :scroll_id
+      attr_reader :scroll_id, :keep_alive, :batch_size
       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
+        @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).any?
+        while (hits = request_more_hits.hits).any?
           hits.each_slice(batch_size, &block)
         end
       end
 
       def request_more_ids
-        request_more_hits.map { |hit| hit['_id'] }
+        request_more_hits.to_ids
       end
 
       def request_more_hits
-        request_next_scroll['hits']['hits']
+        SearchHits.from_response(@elastic_index.model, request_next_scroll)
       end
 
       def request_next_scroll
@@ -43,7 +43,7 @@ module ElasticRecord
 
       def initial_search_response
         @initial_search_response ||= begin
-          search_options = {size: batch_size, scroll: keep_alive}
+          search_options = { size: batch_size, scroll: keep_alive }
           elastic_query = @search.reverse_merge('sort' => '_doc')
 
           @elastic_index.search(elastic_query, search_options)

data/lib/elastic_record/relation.rb

@@ -39,7 +39,7 @@ module ElasticRecord
     end
 
     def to_a
-      @records ||= load_hits(search_hits)
+      @records ||= search_hits.to_records
     end
 
     def delete_all

data/lib/elastic_record/relation/batches.rb

@@ -9,13 +9,13 @@ module ElasticRecord
 
       def find_in_batches(options = {})
         build_scroll_enumerator(options).each_slice do |hits|
-          yield load_hits(hits)
+          yield SearchHits.new(klass, hits).to_records
         end
       end
 
-      def find_ids_in_batches(options = {}, &block)
+      def find_ids_in_batches(options = {})
         build_scroll_enumerator(options).each_slice do |hits|
-          yield map_hits_to_ids(hits)
+          yield SearchHits.new(klass, hits).to_ids
         end
       end
 

data/lib/elastic_record/relation/hits.rb

@@ -2,37 +2,16 @@ module ElasticRecord
   class Relation
     module Hits
       def to_ids
-        map_hits_to_ids search_hits
-      end
-
-      def load_hits(search_hits)
-        if klass.elastic_index.load_from_source
-           search_hits.map { |hit| load_from_hit(hit) }
-        else
-          klass.find map_hits_to_ids(search_hits)
-        end
-      end
-
-      def map_hits_to_ids(hits)
-        hits.map { |hit| hit['_id'] }
+        search_hits.to_ids
       end
 
       def search_hits
-        search_results['hits']['hits']
-      end
-
-      def load_from_hit(hit)
-        record = klass.new
-        record.id = hit['_id']
-        hit['_source'].each do |k, v|
-          record.send("#{k}=", v) if record.respond_to?("#{k}=")
-        end
-        record
+        SearchHits.from_response(klass, search_results)
       end
 
       def search_results
         @search_results ||= begin
-          options = {typed_keys: true}
+          options = { typed_keys: true }
           options[:search_type] = search_type_value if search_type_value
 
           klass.elastic_index.search(as_elastic, options)

data/lib/elastic_record/search_hits.rb

@@ -0,0 +1,39 @@
+module ElasticRecord
+  class SearchHits
+    attr_accessor :hits, :model
+
+    class << self
+      def from_response(model, response)
+        new(model, response['hits']['hits'])
+      end
+    end
+
+    def initialize(model, hits)
+      @model = model
+      @hits  = hits
+    end
+
+    def to_ids
+      hits.map { |hit| hit['_id'] }
+    end
+
+    def to_records
+      if model.elastic_index.load_from_source
+        hits.map { |hit| load_from_hit(hit) }
+      else
+        model.find to_ids
+      end
+    end
+
+    private
+
+      def load_from_hit(hit)
+        model.new.tap do |record|
+          record.id = hit['_id']
+          hit['_source'].each do |k, v|
+            record.send("#{k}=", v) if record.respond_to?("#{k}=")
+          end
+        end
+      end
+  end
+end

data/test/elastic_record/relation/hits_test.rb

@@ -8,34 +8,11 @@ class ElasticRecord::Relation::HitsTest < MiniTest::Test
     assert_equal [red_widget.id.to_s, blue_widget.id.to_s].to_set, Widget.elastic_relation.to_ids.to_set
   end
 
-  def test_to_a
-    red_widget = Widget.create(color: 'red')
-    blue_widget = Widget.create(color: 'red')
-
-    array = Widget.elastic_relation.to_a
-
-    assert_equal 2, array.size
-    assert array.first.is_a?(Widget)
-  end
-
-  def test_to_a_from_source
-    warehouses = [Project.new(name: 'Latte'), Project.new(name: 'Americano')]
-    result = Project.elastic_index.bulk_add(warehouses)
-
-    array = Project.elastic_relation.to_a
-
-    assert_equal 2, array.size
-    assert array.first.is_a?(Project)
-    names = array.map(&:name)
-    assert_includes names, 'Latte'
-    assert_includes names, 'Americano'
-  end
-
   def test_search_hits
     coffees = [Project.new(name: 'Latte'), Project.new(name: 'Americano')]
     Project.elastic_index.bulk_add(coffees)
 
-    array = Project.elastic_relation.search_hits
+    array = Project.elastic_relation.search_hits.hits
     assert_equal %w(Latte Americano).to_set, array.map { |hit| hit["_source"]["name"] }.to_set
   end
 

data/test/elastic_record/relation_test.rb

@@ -28,6 +28,29 @@ class ElasticRecord::RelationTest < MiniTest::Test
     # explain = Widget.elastic_relation.filter(color: 'blue').explain('10')
   end
 
+  def test_to_a
+    Widget.create(color: 'red')
+    Widget.create(color: 'red')
+
+    array = Widget.elastic_relation.to_a
+
+    assert_equal 2, array.size
+    assert array.first.is_a?(Widget)
+  end
+
+  def test_to_a_from_source
+    warehouses = [Project.new(name: 'Latte'), Project.new(name: 'Americano')]
+    Project.elastic_index.bulk_add(warehouses)
+
+    array = Project.elastic_relation.to_a
+
+    assert_equal 2, array.size
+    assert array.first.is_a?(Project)
+    names = array.map(&:name)
+    assert_includes names, 'Latte'
+    assert_includes names, 'Americano'
+  end
+
   def test_delete_all
     project_red = Warehouse.create! name: 'Red'
     project_blue = Warehouse.create! name: 'Blue'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.4.0
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2018-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -91,6 +91,7 @@ files:
 - lib/elastic_record/relation/none.rb
 - lib/elastic_record/relation/search_methods.rb
 - lib/elastic_record/relation/value_methods.rb
+- lib/elastic_record/search_hits.rb
 - lib/elastic_record/searching.rb
 - lib/elastic_record/tasks/index.rake
 - test/dummy/.env.example