elastic_record 5.6.0 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c916b053e2c2a228b4da081dad0b380dfcd7aea05c3f970134d25f68b9c9a72
-  data.tar.gz: 7fa353180b59dcc3fafa81a1e4d6def1d1873b1748079c1d676d38458ea7ba78
+  metadata.gz: 4f2931385fc82cbf3dab46e73684d7270ff1db0e04420b5f94dde420ee6afb52
+  data.tar.gz: e51728ade938225112b94e702eb1f5de3072a09cd99ed44882c56e337df65d7f
 SHA512:
-  metadata.gz: aadbe8c69f0a39e70d0cafc2bc77785cfabb1ffec23b5480eb6269cfd7cac955ff6761a2c3d375f68f0d1b625c4e09de89d7913ac84a347161fac3895d4242f1
-  data.tar.gz: 642e51f60c39f3102a4c716b60e3c0ec84c89b5d75ed5828c06f73934c61eebb9a0e19892a0ffa12bdc966b7c0b46608f2337ec522b333929d3ba574d0b49678
+  metadata.gz: 19e245c7ba5fa776897ce78c57876ae473e0ae30710861acc55d552c372df59481289049137c3d141143db5e996eabc1a7a335a384e867903ba2d7134365e27e
+  data.tar.gz: df02367000aab8e3fb6d883fd85e06cd463c4ac2c49ba5150849b8e65691635036864bcc887a4b771d5782eed729c157142feb0e8c799ef07c1d15548eb39319

data/elastic_record.gemspec

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

data/lib/elastic_record/index.rb

@@ -89,7 +89,7 @@ module ElasticRecord
 
     def get(end_path, json = nil)
       path = "/#{alias_name}"
-      path += "/#{mapping_type}"
+      path += "/#{mapping_type}" if custom_mapping_type_name?
       path += "/#{end_path}"
 
       connection.json_get path, json

data/lib/elastic_record/index/documents.rb

@@ -25,13 +25,13 @@ module ElasticRecord
 
       def index_document(id, document, parent: nil, index_name: alias_name)
         if batch = current_bulk_batch
-          instructions = { _index: index_name, _type: mapping_type, _id: id }
+          instructions = { _index: index_name, _id: id }
           instructions[:parent] = parent if parent
 
           batch << { index: instructions }
           batch << document
         else
-          path = "/#{index_name}/#{mapping_type}/#{id}"
+          path = "/#{index_name}/_doc/#{id}"
           path << "?parent=#{parent}" if parent
 
           if id
@@ -47,13 +47,13 @@ module ElasticRecord
         params = {doc: document, doc_as_upsert: true}
 
         if batch = current_bulk_batch
-          instructions = { _index: index_name, _type: mapping_type, _id: id, retry_on_conflict: 3 }
+          instructions = { _index: index_name, _id: id, retry_on_conflict: 3 }
           instructions[:parent] = parent if parent
 
           batch << { update: instructions }
           batch << params
         else
-          path = "/#{index_name}/#{mapping_type}/#{id}/_update?retry_on_conflict=3"
+          path = "/#{index_name}/_doc/#{id}/_update?retry_on_conflict=3"
           path << "&parent=#{parent}" if parent
 
           connection.json_post path, params
@@ -65,11 +65,11 @@ module ElasticRecord
         index_name ||= alias_name
 
         if batch = current_bulk_batch
-          instructions = { _index: index_name, _type: mapping_type, _id: id, retry_on_conflict: 3 }
+          instructions = { _index: index_name, _id: id, retry_on_conflict: 3 }
           instructions[:parent] = parent if parent
           batch << { delete: instructions }
         else
-          path = "/#{index_name}/#{mapping_type}/#{id}"
+          path = "/#{index_name}/_doc/#{id}"
           path << "&parent=#{parent}" if parent
 
           connection.json_delete path

data/test/elastic_record/index/documents_test.rb

@@ -49,7 +49,7 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
     index.update_document('abc', color: 'blue')
 
     expected = {'warehouse_id' => '5', 'color' => 'blue'}
-    assert_equal expected, index.get('abc', index.mapping_type)['_source']
+    assert_equal expected, index.get('abc')['_source']
 
     assert_raises RuntimeError do
       index.update_document(nil, color: 'blue')
@@ -87,11 +87,11 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
       index.delete_document '3'
 
       expected = [
-        {index: {_index: index.alias_name, _type: "widget", _id: "5"}},
+        {index: {_index: index.alias_name, _id: "5"}},
         {color: "green"},
-        {update: {_index: "widgets", _type: "widget", _id: "5", retry_on_conflict: 3}},
+        {update: {_index: "widgets", _id: "5", retry_on_conflict: 3}},
         {doc: {color: "blue"}, doc_as_upsert: true},
-        {delete: {_index: index.alias_name, _type: "widget", _id: "3", retry_on_conflict: 3}}
+        {delete: {_index: index.alias_name, _id: "3", retry_on_conflict: 3}}
       ]
       assert_equal expected, index.current_bulk_batch
     end
@@ -151,7 +151,7 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Test
         InheritedWidget.elastic_index.index_document '5', color: 'green'
 
         expected = [
-          {index: {_index: index.alias_name, _type: "widget", _id: "5"}},
+          {index: {_index: index.alias_name, _id: "5"}},
           {color: "green"}
         ]
         assert_equal expected, index.current_bulk_batch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 5.6.0
+  version: 5.6.1
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic