elastic_record 4.1.4 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 421498813d046dccefd30ad42c6f838aa9f9eb68
-  data.tar.gz: a86f63e2eac01170619fe51bf2531b856186e676
+  metadata.gz: a164c34c1dc47a0290401edc67c7b1e38d296cdb
+  data.tar.gz: 26045f57baec0c90aca634cc853794e1782b1abd
 SHA512:
-  metadata.gz: 84eec08e7e9e8dfea71136e8865e9a487f436674f04ec6de93c652e6193c184d3b072af6334157ca3f4176ef0532126c93b19e57f1e366248bb6171536785986
-  data.tar.gz: '05934bd3792f3b6a264aa7ec12cb93e9bcf9a50c518bc4f45780c8cb8fad46456cc45f87bfcc7d590eff9166145192e2c12a433753cf4c99b5e494ef9a2bc4b6'
+  metadata.gz: 6a03d0a53928c5ff59653eaa3e7cd00d414cbdb7244e533541426612b233a0fe90abe27b903f391664c1fa3763c42923245d3c2cb54f4c19d521632686d64102
+  data.tar.gz: 84348d5ad734efc2a9a350fc16d58d890e6d2e7765e7841c0d9d857ee99e031a8b4acd76cb9c530c2b84dc164054e5e346d61723f73e2b06553703c05d0e8f9f

data/elastic_record.gemspec

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

data/lib/elastic_record/index/documents.rb

@@ -54,7 +54,7 @@ module ElasticRecord
       def index_record(record, index_name: alias_name)
         unless disabled
           index_document(
-            record.send(record.class.primary_key),
+            record.try(:id),
             record.as_search_document,
             doctype: record.doctype,
             index_name: index_name
@@ -65,7 +65,7 @@ module ElasticRecord
       def update_record(record, index_name: alias_name)
         unless disabled
           update_document(
-            record.send(record.class.primary_key),
+            record.id,
             record.as_partial_update_document,
             doctype: record.doctype,
             index_name: index_name
@@ -84,11 +84,16 @@ module ElasticRecord
           path = "/#{index_name}/#{doctype.name}/#{id}"
           path << "?parent=#{parent}" if parent
 
-          connection.json_put path, document
+          if id
+            connection.json_put path, document
+          else
+            connection.json_post path, document
+          end
         end
       end
 
       def update_document(id, document, doctype: model.doctype, parent: nil, index_name: alias_name)
+        raise "Cannot update a document with empty id" if id.blank?
         params = {doc: document, doc_as_upsert: true}
 
         if batch = current_bulk_batch

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

@@ -1,5 +1,19 @@
 class Warehouse
-  include TestModel
+  class << self
+    def base_class
+      self
+    end
+  end
 
-  define_attributes [:name]
+  include ActiveModel::Model
+  include ElasticRecord::Model
+
+  attr_accessor :id, :name
+  alias_method :as_json, :as_search_document
+
+  elastic_index.load_from_source = true
+
+  def as_search_document
+    { name: name }
+  end
 end

data/test/elastic_record/index/documents_test.rb

@@ -16,6 +16,17 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
     refute index.record_exists?('7')
   end
 
+  def test_index_record_without_id
+    index = Warehouse.elastic_index
+    without_deferring(index) do
+      warehouse = Warehouse.new(name: 'Amazon')
+      result = index.index_record(warehouse)
+
+      assert index.record_exists?(result['_id'])
+      refute index.record_exists?('xyz')
+    end
+  end
+
   def test_index_document
     index.index_document('abc', color: 'red')
 
@@ -23,12 +34,26 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
     refute index.record_exists?('xyz')
   end
 
+  def test_index_document_without_id
+    index = Warehouse.elastic_index
+    without_deferring(index) do
+      result = index.index_document(nil, name: 'red')
+
+      assert index.record_exists?(result['_id'])
+      refute index.record_exists?('xyz')
+    end
+  end
+
   def test_update_document
     index.index_document('abc', warehouse_id: '5', color: 'red')
     index.update_document('abc', color: 'blue')
 
     expected = {'warehouse_id' => '5', 'color' => 'blue'}
     assert_equal expected, index.get('abc', Widget.doctype)['_source']
+
+    assert_raises RuntimeError do
+      index.update_document(nil, color: 'blue')
+    end
   end
 
   def test_delete_document
@@ -94,7 +119,7 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
   end
 
   def test_bulk_error
-    without_deferring do
+    without_deferring(index) do
       begin
         index.bulk do
           index.index_document '5', color: 'green'
@@ -109,7 +134,7 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
   end
 
   def test_bulk_inheritence
-    without_deferring do
+    without_deferring(index) do
       index.bulk do
         InheritedWidget.elastic_index.index_document '5', color: 'green'
 
@@ -124,7 +149,7 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
 
   private
 
-    def without_deferring
+    def without_deferring(index)
       index.disable_deferring!
       yield
       index.reset

data/test/elastic_record/relation_test.rb

@@ -43,16 +43,16 @@ class ElasticRecord::RelationTest < MiniTest::Test
   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')]
+    warehouses = [Warehouse.new(name: 'Amazon'), Warehouse.new(name: 'Walmart')]
+    result = Warehouse.elastic_index.bulk_add(warehouses)
 
-      array = Widget.elastic_relation.to_a
+    array = Warehouse.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
+    assert_equal 2, array.size
+    assert array.first.is_a?(Warehouse)
+    names = array.map(&:name)
+    assert_includes names, 'Amazon'
+    assert_includes names, 'Walmart'
   end
 
   def test_delete_all

metadata

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