lib/redstream/model.rb in redstream-0.4.4 vs lib/redstream/model.rb in redstream-0.5.0

@@ -10,12 +10,10 @@
   #
   #     redstream_callbacks
   #   end
 
   module Model
-    IVAR_DELAY_MESSAGE_ID = :@__redstream_delay_message_id__
-
     def self.included(base)
       base.extend(ClassMethods)
     end
 
     module ClassMethods
@@ -29,23 +27,19 @@
       #
       # @param producer [Redstream::Producer] A Redstream::Producer that is
       #   responsible for writing to a redis stream
 
       def redstream_callbacks(producer: Producer.new)
-        after_save    { |object| instance_variable_set(IVAR_DELAY_MESSAGE_ID, producer.delay(object)) if object.saved_changes.present? }
-        after_touch   { |object| instance_variable_set(IVAR_DELAY_MESSAGE_ID, producer.delay(object)) }
-        after_destroy { |object| instance_variable_set(IVAR_DELAY_MESSAGE_ID, producer.delay(object)) }
+        after_save    { |object| producer.delay(object) if object.saved_changes.present? }
+        after_touch   { |object| producer.delay(object) }
+        after_destroy { |object| producer.delay(object) }
 
         after_commit(on: [:create, :update]) do |object|
-          if object.saved_changes.present?
-            producer.queue(object, delay_message_id: instance_variable_get(IVAR_DELAY_MESSAGE_ID))
-            instance_variable_set(IVAR_DELAY_MESSAGE_ID, nil)
-          end
+          producer.queue(object) if object.saved_changes.present?
         end
 
         after_commit(on: :destroy) do |object|
-          producer.queue(object, delay_message_id: instance_variable_get(IVAR_DELAY_MESSAGE_ID))
-          instance_variable_set(IVAR_DELAY_MESSAGE_ID, nil)
+          producer.queue(object)
         end
       end
 
       def redstream_name
         name.pluralize.underscore