esse-active_record 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b48e48c6b27fee2e8612414bd9ba6730bbfd57ddc30b9f5ebadf5742c57d4be4
-  data.tar.gz: c1b74e88c8942aea5a72c58326c0051d57326ff6d6c61e80b723abd043dd74a1
+  metadata.gz: 36873df931f4f1169fefa6e411417b4639218af434ccad541d851cb3a060dcfe
+  data.tar.gz: 500b9266326fd5bea838c09b06f836e6f3f20a9c7482df1dd392ab64759ac71d
 SHA512:
-  metadata.gz: 46019ab0f4d79af084a062fe41de8d1341b9261f0cf3651c94bb3e290db71a0f1794350fed8f2ef58f8dbc98910c2854e7a15fd5027cce0f1fd057ccda734b34
-  data.tar.gz: e2c5861b580b09bf968d04a984ab3e6d94d27c89a2386a84397ceabf9860237be85ec135c79c387c3ad4559e4cbeb1462f863604de01f1a9c047143df0f5448a
+  metadata.gz: cac26d6c6d3c13e0081989925e695b64beaf968409644ed3b45ca8a771c7bc0df3fc22a35762adb94a0b1505e82df3f4541eaf18c3dffc45766867f2bb7428f0
+  data.tar.gz: a65f7bbb4329e39ebc463f2b6342c113fcf42f444879fdefe765db37aabd30fb49905b2521533d323765af44643fca5c27c2156de891bc1fbfe10a00cb3653a6

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-gem 'esse', '~> 0.3.0'
+gem 'esse', '~> 0.3.1'
 gem 'sqlite3', '~> 1.7.3'
 gem 'activerecord', '~> 5.2'
 gem 'esse-rspec', '~> 0.0.6'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    esse-active_record (0.3.2)
+    esse-active_record (0.3.4)
       activerecord (>= 4.2, < 8)
       esse (>= 0.3.0)
 
@@ -39,7 +39,7 @@ GEM
     elasticsearch-transport (7.17.10)
       faraday (>= 1, < 3)
       multi_json
-    esse (0.3.0)
+    esse (0.3.1)
       multi_json
       thor (>= 0.19)
     esse-rspec (0.0.6)
@@ -142,7 +142,7 @@ DEPENDENCIES
   awesome_print
   dotenv
   elasticsearch (~> 7.17, >= 7.17.10)
-  esse (~> 0.3.0)
+  esse (~> 0.3.1)
   esse-active_record!
   esse-rspec (~> 0.0.6)
   pry

data/ci/Gemfile.rails-5.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    esse-active_record (0.3.2)
+    esse-active_record (0.3.4)
       activerecord (>= 4.2, < 8)
       esse (>= 0.3.0)
 

data/ci/Gemfile.rails-6.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    esse-active_record (0.3.2)
+    esse-active_record (0.3.4)
       activerecord (>= 4.2, < 8)
       esse (>= 0.3.0)
 

data/ci/Gemfile.rails-6.1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    esse-active_record (0.3.2)
+    esse-active_record (0.3.4)
       activerecord (>= 4.2, < 8)
       esse (>= 0.3.0)
 

data/ci/Gemfile.rails-7.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    esse-active_record (0.3.2)
+    esse-active_record (0.3.4)
       activerecord (>= 4.2, < 8)
       esse (>= 0.3.0)
 

data/ci/Gemfile.rails-7.1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    esse-active_record (0.3.2)
+    esse-active_record (0.3.4)
       activerecord (>= 4.2, < 8)
       esse (>= 0.3.0)
 

data/lib/esse/active_record/callbacks/indexing_on_update.rb

@@ -19,8 +19,11 @@ module Esse::ActiveRecord
         update_document(document)
         return true unless document.routing
 
-        prev_record = model.class.new(model.attributes.merge(model.previous_changes.transform_values(&:first))).tap(&:readonly!)
-        prev_document = repo.serialize(prev_record)
+        prev_record = model.class.new
+        model.attributes.merge(model.previous_changes.transform_values(&:first)).each do |key, value|
+          prev_record[key] = value
+        end
+        prev_document = repo.serialize(prev_record.tap(&:readonly!))
 
         return true unless prev_document
         return true if [prev_document.id, prev_document.routing].include?(nil)

data/lib/esse/active_record/model.rb

@@ -14,7 +14,14 @@ module Esse
 
         def esse_callback(index_repo_name, operation_name, on: %i[create update destroy], **options, &block)
           @esse_callbacks = esse_callbacks.dup
-          if_enabled = -> { Esse::ActiveRecord::Hooks.enabled?(index_repo_name) && Esse::ActiveRecord::Hooks.enabled_for_model?(self.class, index_repo_name) }
+          cb_if = options.delete(:if)
+          cb_unless = options.delete(:unless)
+          if_enabled = -> {
+            (cb_if.nil? || (cb_if.respond_to?(:call) ? instance_exec(&cb_if) : send(cb_if))) &&
+              (cb_unless.nil? || (cb_unless.respond_to?(:call) ? !instance_exec(&cb_unless) : !send(cb_unless))) &&
+              Esse::ActiveRecord::Hooks.enabled?(index_repo_name) &&
+              Esse::ActiveRecord::Hooks.enabled_for_model?(self.class, index_repo_name)
+          }
 
           Array(on).each do |event|
             identifier, klass = Esse::ActiveRecord::Callbacks.fetch!(operation_name, event)

data/lib/esse/active_record/version.rb

@@ -2,6 +2,6 @@
 
 module Esse
   module ActiveRecord
-    VERSION = '0.3.2'
+    VERSION = '0.3.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esse-active_record
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Marcos G. Zimmermann
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: esse