elastic_record 4.1.3 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7965e969bb8efac9eaa7cbc7ca51904096738d48
-  data.tar.gz: d8d402f88e931c733467579335fd953c2d817fd4
+  metadata.gz: 421498813d046dccefd30ad42c6f838aa9f9eb68
+  data.tar.gz: a86f63e2eac01170619fe51bf2531b856186e676
 SHA512:
-  metadata.gz: cc4f71a68201edfa1ff67044bfa3dd2cd9ef3c68ecdd9eee7dbdc1411500fd1d7c0c0868454ec6c5fe01f5bdfb259393bf902dbb4976bad76b08ece9821f5d59
-  data.tar.gz: '0075226959c8dac41a0f90ad92b1679440f3e17a580c3e218fe217dc8abb3f108c6c8b2c0c5cb291f262c38fbde6c0c052c7d5697854b1c004bb338f33087805'
+  metadata.gz: 84eec08e7e9e8dfea71136e8865e9a487f436674f04ec6de93c652e6193c184d3b072af6334157ca3f4176ef0532126c93b19e57f1e366248bb6171536785986
+  data.tar.gz: '05934bd3792f3b6a264aa7ec12cb93e9bcf9a50c518bc4f45780c8cb8fad46456cc45f87bfcc7d590eff9166145192e2c12a433753cf4c99b5e494ef9a2bc4b6'

data/README.md

@@ -194,6 +194,28 @@ class Product
 end
 ```
 
+### Load Documents from Source
+
+To fetch documents without an additional request to a backing ActiveRecord database you can load the documents from `_source`.
+
+```ruby
+Product.elastic_index.loading_from_source do
+  Product.elastic_search.filter(name: "Pizza")
+end
+
+```
+
+Use `elastic_index.load_from_source = true` to configure an index without ActiveRecord.
+
+```ruby
+class Product
+  include ActiveModel::Model
+  include ElasticRecord::Record
+
+  self.elastic_index.load_from_source = true
+end
+```
+
 ### Index Management ###
 
 If you need to manage multiple indexes via the rake tasks, you will need to declare them explicitly:

data/elastic_record.gemspec

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

data/lib/elastic_record/index.rb

@@ -37,6 +37,7 @@ module ElasticRecord
     attr_accessor :disabled
     attr_accessor :model
     attr_accessor :partial_updates
+    attr_accessor :load_from_source
 
     def initialize(models)
       models = Array.wrap(models)
@@ -65,6 +66,13 @@ module ElasticRecord
       @disabled = false
     end
 
+    def loading_from_source(&block)
+      @load_from_source = true
+      yield
+    ensure
+      @load_from_source = false
+    end
+
     def real_connection
       model.elastic_connection
     end

data/lib/elastic_record/relation.rb

@@ -35,7 +35,7 @@ module ElasticRecord
     end
 
     def to_a
-      @records ||= load_hits(to_ids)
+      @records ||= load_hits
     end
 
     def to_ids
@@ -62,11 +62,12 @@ module ElasticRecord
       klass.current_elastic_search = previous
     end
 
-    def search_hits
-      search_results['hits']['hits']
-    end
-
     private
+
+      def search_hits
+        search_results['hits']['hits']
+      end
+
       def reset
         @search_results = @records = nil
       end
@@ -75,13 +76,21 @@ module ElasticRecord
         @search_results ||= begin
           options = search_type_value ? {search_type: search_type_value} : {}
 
-          klass.elastic_index.search(as_elastic.update('_source' => false), options)
+          unless klass.elastic_index.load_from_source
+            as_elastic.update('_source' => false)
+          end
+
+          klass.elastic_index.search(as_elastic, options)
         end
       end
 
-      def load_hits(ids)
-        scope = select_values.any? ? klass.select(select_values) : klass
-        scope.find(ids)
+      def load_hits
+        if klass.elastic_index.load_from_source
+           search_hits.map { |hit| klass.new(hit['_source'].update('id' => hit['_id'])) }
+        else
+          scope = select_values.any? ? klass.select(select_values) : klass
+          scope.find(to_ids)
+        end
       end
   end
 end

data/lib/elastic_record/tasks/index.rake

@@ -51,9 +51,13 @@ namespace :index do
         index_name = model.elastic_index.create
       end
 
-      puts "  Reindexing into #{index_name}"
-      model.find_in_batches(batch_size: 100) do |records|
-        model.elastic_index.bulk_add(records, index_name: index_name)
+      if model.elastic_index.load_from_source
+        puts "  Reindexing into #{index_name} [skipped]"
+      else
+        puts "  Reindexing into #{index_name}"
+        model.find_in_batches(batch_size: 100) do |records|
+          model.elastic_index.bulk_add(records, index_name: index_name)
+        end
       end
 
       puts "  Deploying index..."

data/test/dummy/.env.test

@@ -1 +1 @@
-DATABASE_URL=postgres://localhost/elastic_record_test
+DATABASE_URL=postgres://localhost/elastic_record_subtest

data/test/elastic_record/index_test.rb

@@ -28,6 +28,13 @@ class ElasticRecord::IndexTest < MiniTest::Test
     refute index.disabled
   end
 
+  def test_loading_from_source
+    index.loading_from_source do
+      assert index.load_from_source
+    end
+    refute index.load_from_source
+  end
+
   private
 
     def index

data/test/elastic_record/relation_test.rb

@@ -42,6 +42,19 @@ class ElasticRecord::RelationTest < MiniTest::Test
     assert array.first.is_a?(Widget)
   end
 
+  def test_to_a_from_source
+    Widget.elastic_index.loading_from_source do
+      create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
+
+      array = Widget.elastic_relation.to_a
+
+      assert_equal 2, array.size
+      assert array.first.is_a?(Widget)
+      assert_equal 'red', array.first.color
+      assert_equal 'blue', array.last.color
+    end
+  end
+
   def test_delete_all
     project_red = Project.create! name: 'Red'
     project_blue = Project.create! name: 'Blue'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.4
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic