deimos-ruby 1.8.1.pre.beta4 → 1.8.1.pre.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb7b72866d42e8a74dfe9e441b5e1436c81cb16684d2985840980c010416e8af
-  data.tar.gz: 97b806b1b52807ea487a0da20099450d005bf71ac4cd88fbc5eb50aae66726bb
+  metadata.gz: 516d09f0dc29c3388d1885c67d7faf3c2f240eede7278ad1ac76dfa46727e4e7
+  data.tar.gz: c9fcf141d5dfca3de041d82079f773c53b6a2f663fe7a8b3aa5fbee28964fb19
 SHA512:
-  metadata.gz: 0d98923fd57076e391a9e8e1c2a6afb83fbde7769d646fc88d599921d9b0d55a6b1c7bd0df7f3344c71c66915766484bd0c9c19cfa72fef7f9299ab41cf66232
-  data.tar.gz: c537564c70e3d297ca76000cd683f6c0891c18dc3b54d95b9aa6f3ea4b390a59fd2992d070112afc1e562c0bc59e0a4b523cb7bd4d71efafe2b03083df5273a6
+  metadata.gz: f4b5feee05510a8e6c9d85c9af85aff48f01c43419b5e5600a853d60a62d4b06f8430bb91b11047f6fd2579f23a89e8b9cbafe41a40ed84f7448a54b47115587
+  data.tar.gz: e4c1a0b181f4e5289f995056338b78cab4a8da3cb50863e70ba9f78e8526e470a52a035eaa3a34a0261b1ad14dbff41d2e25a3ffff5e75218408e31aa94a9ed0

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+## 1.8.1-beta5 - 2020-08-13
+
+### Fixes :wrench:
+- Fix regression bug which introduces backwards incompatibility
+  with ActiveRecordProducer's `record_attributes` method.
+
 ## 1.8.1-beta4 - 2020-08-12
 
 ### Fixes :wrench:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deimos-ruby (1.8.1.pre.beta3)
+    deimos-ruby (1.8.1.pre.beta4)
       avro_turf (~> 0.11)
       phobos (~> 1.9)
       ruby-kafka (~> 0.7)

data/README.md

@@ -599,7 +599,7 @@ class MyConsumer < Deimos::ActiveRecordConsumer
  
   # Optional override to change the attributes of the record before they
   # are saved.
-  def record_attributes(payload)
+  def record_attributes(payload, key)
     super.merge(:some_field => 'some_value')
   end
 
@@ -680,7 +680,7 @@ class MyConsumer < Deimos::ActiveRecordConsumer
  
   # Optional override to change the attributes of the record before they
   # are saved.
-  def record_attributes(payload)
+  def record_attributes(payload, key)
     super.merge(:some_field => 'some_value')
   end
 end

data/lib/deimos/active_record_consume/batch_consumption.rb

@@ -88,8 +88,13 @@ module Deimos
 
         # Create payloads with payload + key attributes
         upserts = messages.map do |m|
-          record_attributes(m.payload, m.key)&.
-            merge(record_key(m.key))
+          attrs = if self.method(:record_attributes).parameters.size == 2
+                    record_attributes(m.payload, m.key)
+                  else
+                    record_attributes(m.payload)
+                  end
+
+          attrs&.merge(record_key(m.key))
         end
 
         # If overridden record_attributes indicated no record, skip

data/lib/deimos/active_record_consume/message_consumption.rb

@@ -37,7 +37,14 @@ module Deimos
           record = klass.new
           assign_key(record, payload, key)
         end
-        attrs = record_attributes(payload.with_indifferent_access, key)
+
+        # for backwards compatibility
+        # TODO next major release we should deprecate this
+        attrs = if self.method(:record_attributes).parameters.size == 2
+                  record_attributes(payload.with_indifferent_access, key)
+                else
+                  record_attributes(payload.with_indifferent_access)
+                end
         # don't use attributes= - bypass Rails < 5 attr_protected
         attrs.each do |k, v|
           record.send("#{k}=", v)

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '1.8.1-beta4'
+  VERSION = '1.8.1-beta5'
 end

data/spec/kafka_listener_spec.rb

@@ -30,6 +30,7 @@ describe Deimos::KafkaListener do
     end
 
     it 'should listen to publishing errors and republish as Deimos events' do
+      allow(Deimos::Producer).to receive(:descendants).and_return([MyProducer])
       Deimos.subscribe('produce_error') do |event|
         expect(event.payload).to include(
           producer: MyProducer,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.8.1.pre.beta4
+  version: 1.8.1.pre.beta5
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf