esse 0.4.0.rc1 → 0.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6023e2f4fe6b5d8e45dd09e7c98bb250d8862ea3adc769f119011efc07191c5
-  data.tar.gz: 852a46c60435d7c0848254d6b79a4a29ee89efe9e0700975d7d651660ad874d8
+  metadata.gz: 378f933ddf41a9d403121e9272b87814a01ee9e462eea5b9ad556d1ba593e46a
+  data.tar.gz: b3551d3361c380b750ca4e52c065d3372e6ec0c5762526f0f65894c097c79163
 SHA512:
-  metadata.gz: 40b5c6d0ed7ff8ce793cd8be088c01f9377c62cf58366b201c8ee988f04e9f2f3e53118a48c165857394dc100c26fd06b300d653f2afdead076430d19210c554
-  data.tar.gz: f3b4f4acadea569ef1108c1d3d3a2745c965177c29f307e5076357d89aec1f050f778933a350ccb75c0128a295d0f1349899452ea041551fae8ae574fb75793d
+  metadata.gz: f70d6495c34e176226a16e22da5e04b3ac74cce0d3469a3fa3ddf61c133a402d5577113839b0f4a52935cc71564be08930b529e25abb610c6bee1fcdadad77bb
+  data.tar.gz: 1cd02580736bb222d0a6e3e7a26fbdc17e925dafbc8cda97eb87fb911c85f1dac4c32543ffdde3418fade6a632722492147278f6c293184d42cae6ccc2a3ee28

data/lib/esse/document.rb

@@ -109,10 +109,10 @@ module Esse
     end
 
     def inspect
-      attributes = %i[id routing source].map do |attr|
-        value = send(attr)
+      attributes = {id: :id, routing: :routing, source: :memoized_source}.map do |attr_name, attr_src|
+        value = send(attr_src)
         next unless value
-        "#{attr}: #{value.inspect}"
+        "#{attr_name}: #{value.inspect}"
       rescue
         nil
       end.compact.join(', ')
@@ -131,9 +131,17 @@ module Esse
     end
 
     def mutated_source
-      return source unless @__mutations__
+      return memoized_source unless @__mutations__
 
-      @__mutated_source__ ||= source.merge(@__mutations__)
+      @__mutated_source__ ||= memoized_source.merge(@__mutations__)
+    end
+
+    protected
+
+    def memoized_source
+      return @__memoized_source__ if defined?(@__memoized_source__)
+
+      @__memoized_source__ = source || {}
     end
   end
 end

data/lib/esse/errors.rb

@@ -15,6 +15,19 @@ module Esse
       end
     end
 
+    class BulkResponseError < ::Esse::Error
+      attr_reader :response
+
+      def initialize(response)
+        @response = response
+        super(response)
+      end
+
+      def items
+        response.fetch('items', []).select { |item| item.values.dig(0, 'error') }
+      end
+    end
+
     ES_TRANSPORT_ERRORS = {
       'MultipleChoices' => 'MultipleChoicesError', # 300
       'MovedPermanently' => 'MovedPermanentlyError', # 301

data/lib/esse/import/bulk.rb

@@ -49,9 +49,7 @@ module Esse
           requests.each do |request|
             next unless request.body?
             resp = yield request
-            if resp&.[]('errors')
-              raise resp&.fetch('items', [])&.select { |item| item.values.first['error'] }&.join("\n")
-            end
+            raise Esse::Transport::BulkResponseError.new(resp) if resp&.[]('errors')
           end
         rescue Faraday::TimeoutError, Esse::Transport::RequestTimeoutError => e
           retry_count += 1

data/lib/esse/repository/documents.rb

@@ -10,8 +10,31 @@ module Esse
       def update_documents_attribute(name, ids_or_doc_headers = [], kwargs = {})
         batch = documents_for_lazy_attribute(name, ids_or_doc_headers)
         return if batch.empty?
+        kwargs = kwargs.transform_keys(&:to_sym)
 
-        index.bulk(**kwargs.transform_keys(&:to_sym), update: batch)
+        if kwargs.delete(:index_on_missing) { true }
+          begin
+            index.bulk(**kwargs, update: batch)
+          rescue Esse::Transport::BulkResponseError => ex
+            ids = ex.items.map { |item| item.dig('update', '_id') }.compact
+            raise ex if ids.empty?
+
+            each_serialized_batch(eager_load_lazy_attributes: false, preload_lazy_attributes: false, id: ids) do |entries|
+              entries.each do |entry|
+                partial_doc = batch.find { |doc| doc.eql?(entry, match_lazy_doc_header: true) }
+                next unless partial_doc
+
+                partial_doc.source.each do |attr_name, attr_value|
+                  entry.mutate(attr_name) { attr_value }
+                end
+              end
+
+              index.bulk(**kwargs, index: entries)
+            end
+          end
+        else
+          index.bulk(**kwargs, update: batch)
+        end
       end
 
       def documents_for_lazy_attribute(name, ids_or_doc_headers)

data/lib/esse/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Esse
-  VERSION = '0.4.0.rc1'
+  VERSION = '0.4.0.rc2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esse
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc1
+  version: 0.4.0.rc2
 platform: ruby
 authors:
 - Marcos G. Zimmermann
 autorequire:
 bindir: exec
 cert_chain: []
-date: 2024-08-26 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json