f

Author: JustSnow

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/umbrellio/rabbit_messaging.git
-  revision: a7c85902a8655745525e3f378e58f816ec4ab9c0
+  revision: 975cdf925ab5102c0234bfcf2732dbaaa49a0ed3
   branch: compression-for-publisher-and-reciver
   specs:
     rabbit_messaging (1.8.0)
@@ -92,7 +92,7 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    amq-protocol (2.5.1)
+    amq-protocol (2.7.0)
     ast (2.4.3)
     base64 (0.3.0)
     benchmark (0.4.0)
@@ -123,8 +123,8 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.12.2)
-    kicks (3.2.0)
-      bunny (~> 2.19)
+    kicks (3.3.0)
+      bunny (~> 2.24)
       concurrent-ruby (~> 1.0)
       rake (>= 12.3, < 14.0)
       serverengine (~> 2.1)

lib/table_sync/publishing/batch.rb

@@ -16,7 +16,7 @@ def initialize(attrs = {})
     self.original_attributes  = attrs[:original_attributes]
     self.custom_version       = attrs[:custom_version]
     self.routing_key          = attrs[:routing_key]
-    self.headers              = attrs[:headers]
+    self.headers              = attrs[:headers] || {}
     self.event                = attrs.fetch(:event, :update).to_sym
     self.compress             = attrs.fetch(:compress, false)
 
@@ -55,9 +55,8 @@ def attributes
       original_attributes: original_attributes,
       custom_version: custom_version,
       routing_key: routing_key,
-      headers: headers,
+      headers: headers.merge(compress: compress),
       event: event,
-      compress: compress,
     }
   end
 

lib/table_sync/publishing/message/base.rb

@@ -15,7 +15,7 @@ def initialize(params = {})
       self.object_class          = params[:object_class]
       self.original_attributes   = params[:original_attributes]
       self.event                 = params[:event].to_sym
-      self.compress              = params.fetch(:compress, false)
+      self.compress              = params.dig(:headers, :compress) || false
 
       @objects = find_or_init_objects
 

lib/table_sync/publishing/message/batch.rb

@@ -13,7 +13,7 @@ def initialize(params = {})
 
     def params
       TableSync::Publishing::Params::Batch.new(
-        { object_class:, headers:, routing_key:, compress: }.compact,
+        { object_class:, headers:, routing_key: }.compact,
       ).construct
     end
   end

lib/table_sync/publishing/message/raw.rb

@@ -60,7 +60,7 @@ def data
 
     def params
       TableSync::Publishing::Params::Raw.new(
-        { model_name:, headers:, routing_key:, compress: }.compact,
+        { model_name:, headers:, routing_key: }.compact,
       ).construct
     end
   end

lib/table_sync/publishing/message/single.rb

@@ -2,12 +2,20 @@
 
 module TableSync::Publishing::Message
   class Single < Base
+    attr_accessor :headers
+
+    def initialize(params = {})
+      super
+
+      self.headers = params[:headers]
+    end
+
     def object
       objects.first
     end
 
     def params
-      TableSync::Publishing::Params::Single.new(object:, compress:).construct
+      TableSync::Publishing::Params::Single.new(object:, headers:).construct
     end
   end
 end

lib/table_sync/publishing/params/base.rb

@@ -13,12 +13,9 @@ def construct
         routing_key:,
         headers:,
         exchange_name:,
-        compress: compress,
       )
     end
 
-    attr_accessor :compress
-
     private
 
     def calculated_routing_key

lib/table_sync/publishing/params/batch.rb

@@ -10,7 +10,6 @@ def initialize(attrs = {})
       @exchange_name      = attrs[:exchange_name]
       @routing_key        = attrs[:routing_key]
       @headers            = attrs[:headers]
-      @compress           = attrs.fetch(:compress, false)
     end
 
     def exchange_name

lib/table_sync/publishing/params/single.rb

@@ -4,11 +4,10 @@ module TableSync::Publishing::Params
   class Single < Base
     attr_reader :object, :routing_key, :headers
 
-    def initialize(object:, compress: false)
+    def initialize(object:, headers: {})
       @object      = object
       @routing_key = calculated_routing_key
-      @headers     = calculated_headers
-      @compress    = compress
+      @headers = headers.merge(calculated_headers || {})
     end
 
     private

lib/table_sync/publishing/raw.rb

@@ -47,9 +47,8 @@ def attributes
       original_attributes: original_attributes,
       custom_version: custom_version,
       routing_key: routing_key,
-      headers: headers,
+      headers: headers.merge(compress: compress),
       event: event,
-      compress: compress,
     }
   end
 end