updated rabbit-messaging gem

Author: dmitrii.buk

Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    table_sync (6.6.3)
+    table_sync (6.7.0)
       memery
-      rabbit_messaging (>= 1.1.0)
+      rabbit_messaging (>= 1.6.2)
       rails
       self_data
 
@@ -148,6 +148,22 @@ GEM
     nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    nokogiri (1.18.8-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.8-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.8-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.8-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.8-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.8-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.8-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.8-x86_64-linux-musl)
+      racc (~> 1.4)
     ostruct (0.6.1)
     parallel (1.27.0)
     parser (3.3.8.0)
@@ -164,10 +180,9 @@ GEM
     psych (5.2.6)
       date
       stringio
-    rabbit_messaging (1.5.0)
+    rabbit_messaging (1.6.2)
       bunny (~> 2.0)
       kicks
-      tainbox
     racc (1.8.1)
     rack (3.1.15)
     rack-session (2.1.1)
@@ -294,8 +309,6 @@ GEM
       rbtree
       set (~> 1.0)
     stringio (3.1.7)
-    tainbox (2.1.2)
-      activesupport
     thor (1.3.2)
     timecop (0.9.10)
     timeout (0.4.3)
@@ -312,7 +325,15 @@ GEM
     zeitwerk (2.6.18)
 
 PLATFORMS
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
   ruby
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   activejob

lib/table_sync/publishing/batch.rb

@@ -1,18 +1,23 @@
 # frozen_string_literal: true
 
 class TableSync::Publishing::Batch
-  include Tainbox
-  include TableSync::Utils::RequiredValidator
+  attr_accessor :object_class,
+                :original_attributes,
+                :custom_version,
+                :routing_key,
+                :headers,
+                :event
 
-  attribute :object_class
-  attribute :original_attributes
-  attribute :custom_version
-  attribute :routing_key
-  attribute :headers
+  def initialize(attrs = {})
+    @object_class         = attrs[:object_class]
+    @original_attributes  = attrs[:original_attributes]
+    @custom_version       = attrs[:custom_version]
+    @routing_key          = attrs[:routing_key]
+    @headers              = attrs[:headers]
+    @event                = attrs.fetch(:event, :update)
 
-  attribute :event, default: :update
-
-  require_attributes :object_class, :original_attributes
+    validate_required_attributes!
+  end
 
   def publish_later
     job.perform_later(job_attributes)
@@ -30,6 +35,27 @@ def message
 
   private
 
+  def validate_required_attributes!
+    missing = []
+    missing << :object_class if object_class.nil?
+    missing << :original_attributes if original_attributes.nil?
+
+    unless missing.empty?
+      raise ArgumentError, "Some of required attributes is not provided: #{missing.inspect}"
+    end
+  end
+
+  def attributes
+    {
+      object_class: object_class,
+      original_attributes: original_attributes,
+      custom_version: custom_version,
+      routing_key: routing_key,
+      headers: headers,
+      event: event,
+    }
+  end
+
   # JOB
 
   def job

lib/table_sync/publishing/message/base.rb

@@ -2,17 +2,18 @@
 
 module TableSync::Publishing::Message
   class Base
-    include Tainbox
+    attr_accessor :custom_version,
+                  :object_class,
+                  :original_attributes,
+                  :event
 
     attr_reader :objects
 
-    attribute :custom_version
-    attribute :object_class
-    attribute :original_attributes
-    attribute :event
-
-    def initialize(params)
-      super
+    def initialize(params = {})
+      @custom_version        = params[:custom_version]
+      @object_class          = params[:object_class]
+      @original_attributes   = params[:original_attributes]
+      @event                 = params[:event]
 
       @objects = find_or_init_objects
 

lib/table_sync/publishing/message/batch.rb

@@ -2,12 +2,18 @@
 
 module TableSync::Publishing::Message
   class Batch < Base
-    attribute :headers
-    attribute :routing_key
+    attr_accessor :headers, :routing_key
+
+    def initialize(params = {})
+      super
+
+      @headers     = params[:headers]
+      @routing_key = params[:routing_key]
+    end
 
     def params
       TableSync::Publishing::Params::Batch.new(
-        attributes.slice(:object_class, :headers, :routing_key).compact,
+        { object_class:, headers:, routing_key: }.compact,
       ).construct
     end
   end

lib/table_sync/publishing/message/raw.rb

@@ -2,17 +2,25 @@
 
 module TableSync::Publishing::Message
   class Raw
-    include Tainbox
+    attr_accessor :model_name,
+                  :table_name,
+                  :schema_name,
+                  :original_attributes,
+                  :routing_key,
+                  :headers,
+                  :custom_version,
+                  :event
 
-    attribute :model_name
-    attribute :table_name
-    attribute :schema_name
-    attribute :original_attributes
-
-    attribute :routing_key
-    attribute :headers
-    attribute :custom_version
-    attribute :event
+    def initialize(params = {})
+      self.model_name          = params[:model_name]
+      self.table_name          = params[:table_name]
+      self.schema_name         = params[:schema_name]
+      self.original_attributes = params[:original_attributes]
+      self.routing_key         = params[:routing_key]
+      self.headers             = params[:headers]
+      self.custom_version      = params[:custom_version]
+      self.event               = params[:event]
+    end
 
     def publish
       Rabbit.publish(message_params)
@@ -49,7 +57,7 @@ def data
 
     def params
       TableSync::Publishing::Params::Raw.new(
-        attributes.slice(:model_name, :headers, :routing_key).compact,
+        { model_name:, headers:, routing_key: }.compact,
       ).construct
     end
   end

lib/table_sync/publishing/params/batch.rb

@@ -2,13 +2,27 @@
 
 module TableSync::Publishing::Params
   class Batch < Base
-    include Tainbox
+    attr_accessor :object_class
+    attr_writer :exchange_name, :routing_key, :headers
 
-    attribute :object_class
+    def initialize(attrs = {})
+      self.object_class   = attrs[:object_class]
+      @exchange_name      = attrs[:exchange_name]
+      @routing_key        = attrs[:routing_key]
+      @headers            = attrs[:headers]
+    end
+
+    def exchange_name
+      @exchange_name || TableSync.exchange_name
+    end
 
-    attribute :exchange_name, default: -> { TableSync.exchange_name }
-    attribute :routing_key,   default: -> { calculated_routing_key }
-    attribute :headers,       default: -> { calculated_headers }
+    def routing_key
+      @routing_key || calculated_routing_key
+    end
+
+    def headers
+      @headers || calculated_headers
+    end
 
     private
 

lib/table_sync/publishing/params/raw.rb

@@ -2,8 +2,13 @@
 
 module TableSync::Publishing::Params
   class Raw < Batch
-    attribute :model_name
+    attr_accessor :model_name
 
     alias_method :object_class, :model_name
+
+    def initialize(attrs = {})
+      super
+      self.model_name = attrs[:model_name]
+    end
   end
 end

lib/table_sync/publishing/raw.rb

@@ -1,18 +1,29 @@
 # frozen_string_literal: true
 
 class TableSync::Publishing::Raw
-  include Tainbox
   include TableSync::Utils::RequiredValidator
 
-  attribute :model_name
-  attribute :table_name
-  attribute :schema_name
-  attribute :original_attributes
-  attribute :custom_version
-  attribute :routing_key
-  attribute :headers
+  attr_accessor :model_name,
+                :table_name,
+                :schema_name,
+                :original_attributes,
+                :custom_version,
+                :routing_key,
+                :headers,
+                :event
 
-  attribute :event, default: :update
+  def initialize(attributes = {})
+    attributes ||= {}
+
+    @model_name           = attributes[:model_name]
+    @table_name           = attributes[:table_name]
+    @schema_name          = attributes[:schema_name]
+    @original_attributes  = attributes[:original_attributes]
+    @custom_version       = attributes[:custom_version]
+    @routing_key          = attributes[:routing_key]
+    @headers              = attributes[:headers]
+    @event                = attributes.fetch(:event, :update)
+  end
 
   require_attributes :model_name, :original_attributes
 
@@ -23,4 +34,19 @@ def publish_now
   def message
     TableSync::Publishing::Message::Raw.new(attributes)
   end
+
+  private
+
+  def attributes
+    {
+      model_name: model_name,
+      table_name: table_name,
+      schema_name: schema_name,
+      original_attributes: original_attributes,
+      custom_version: custom_version,
+      routing_key: routing_key,
+      headers: headers,
+      event: event,
+    }
+  end
 end

lib/table_sync/publishing/single.rb

@@ -1,14 +1,21 @@
 # frozen_string_literal: true
 
 class TableSync::Publishing::Single
-  include Tainbox
   include Memery
 
-  attribute :object_class
-  attribute :original_attributes
-  attribute :debounce_time
-  attribute :custom_version
-  attribute :event, Symbol, default: :update
+  attr_accessor :object_class,
+                :original_attributes,
+                :debounce_time,
+                :custom_version,
+                :event
+
+  def initialize(attrs = {})
+    self.object_class         = attrs[:object_class]
+    self.original_attributes  = attrs[:original_attributes]
+    self.debounce_time        = attrs[:debounce_time]
+    self.custom_version       = attrs[:custom_version]
+    self.event                = attrs.fetch(:event, :update)
+  end
 
   # expect job to have perform_at method
   # debounce destroyed event
@@ -40,6 +47,16 @@ def publish_now
 
   private
 
+  def attributes
+    {
+      object_class: object_class,
+      original_attributes: original_attributes,
+      debounce_time: debounce_time,
+      custom_version: custom_version,
+      event: event,
+    }
+  end
+
   # JOB
 
   def job