table_sync 6.1.0 → 6.6.1

data/lib/table_sync/publishing/helpers/debounce.rb

@@ -124,7 +124,11 @@ module TableSync::Publishing::Helpers
     end
 
     def cache_next_sync_time
-      Rails.cache.write(cache_key, next_sync_time)
+      Rails.cache.write(
+        cache_key,
+        next_sync_time,
+        expires_at: next_sync_time + debounce_time.seconds,
+      )
     end
 
     def cache_key

data/lib/table_sync/publishing/message/base.rb

@@ -6,6 +6,7 @@ module TableSync::Publishing::Message
 
     attr_reader :objects
 
+    attribute :custom_version
     attribute :object_class
     attribute :original_attributes
     attribute :event
@@ -32,19 +33,21 @@ module TableSync::Publishing::Message
 
     def find_or_init_objects
       TableSync::Publishing::Helpers::Objects.new(
-        object_class: object_class, original_attributes: original_attributes, event: event,
+        object_class:, original_attributes:, event:,
       ).construct_list
     end
 
     # MESSAGE PARAMS
 
     def message_params
-      params.merge(data: data)
+      params.merge(data:)
     end
 
     def data
       TableSync::Publishing::Data::Objects.new(
-        objects: objects, event: event,
+        objects:,
+        event:,
+        custom_version:,
       ).construct
     end
 
@@ -60,7 +63,7 @@ module TableSync::Publishing::Message
       TableSync::Instrument.notify(
         table: model_naming.table,
         schema: model_naming.schema,
-        event: event,
+        event:,
         direction: :publish,
         count: objects.count,
       )

data/lib/table_sync/publishing/message/raw.rb

@@ -11,7 +11,7 @@ module TableSync::Publishing::Message
 
     attribute :routing_key
     attribute :headers
-
+    attribute :custom_version
     attribute :event
 
     def publish
@@ -26,7 +26,7 @@ module TableSync::Publishing::Message
       TableSync::Instrument.notify(
         table: table_name,
         schema: schema_name,
-        event: event,
+        event:,
         count: original_attributes.count,
         direction: :publish,
       )
@@ -35,12 +35,15 @@ module TableSync::Publishing::Message
     # MESSAGE PARAMS
 
     def message_params
-      params.merge(data: data)
+      params.merge(data:)
     end
 
     def data
       TableSync::Publishing::Data::Raw.new(
-        model_name: model_name, attributes_for_sync: original_attributes, event: event,
+        model_name:,
+        attributes_for_sync: original_attributes,
+        event:,
+        custom_version:,
       ).construct
     end
 

data/lib/table_sync/publishing/message/single.rb

@@ -7,7 +7,7 @@ module TableSync::Publishing::Message
     end
 
     def params
-      TableSync::Publishing::Params::Single.new(object: object).construct
+      TableSync::Publishing::Params::Single.new(object:).construct
     end
   end
 end

data/lib/table_sync/publishing/params/base.rb

@@ -10,9 +10,9 @@ module TableSync::Publishing::Params
 
     def construct
       DEFAULT_PARAMS.merge(
-        routing_key: routing_key,
-        headers: headers,
-        exchange_name: exchange_name,
+        routing_key:,
+        headers:,
+        exchange_name:,
       )
     end
 

data/lib/table_sync/publishing/raw.rb

@@ -2,17 +2,20 @@
 
 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
 
   attribute :event, default: :update
 
+  require_attributes :model_name, :original_attributes
+
   def publish_now
     message.publish
   end

data/lib/table_sync/publishing/single.rb

@@ -7,7 +7,7 @@ class TableSync::Publishing::Single
   attribute :object_class
   attribute :original_attributes
   attribute :debounce_time
-
+  attribute :custom_version
   attribute :event, Symbol, default: :update
 
   # expect job to have perform_at method
@@ -31,10 +31,10 @@ class TableSync::Publishing::Single
 
   memoize def debounce
     TableSync::Publishing::Helpers::Debounce.new(
-      object_class: object_class,
+      object_class:,
       needle: message.object.needle,
-      debounce_time: debounce_time,
-      event: event,
+      debounce_time:,
+      event:,
     )
   end
 

data/lib/table_sync/receiving/config_decorator.rb

@@ -10,18 +10,18 @@ module TableSync::Receiving
       @config = config
 
       @default_params = {
-        event: event,
-        model: model,
-        version: version,
-        project_id: project_id,
-        raw_data: raw_data,
+        event:,
+        model:,
+        version:,
+        project_id:,
+        raw_data:,
       }
     end
     # rubocop:enable Metrics/ParameterLists
 
-    def method_missing(name, **additional_params, &block)
+    def method_missing(name, **additional_params, &)
       value = @config.send(name)
-      value.is_a?(Proc) ? value.call(@default_params.merge(additional_params), &block) : value
+      value.is_a?(Proc) ? value.call(@default_params.merge(additional_params), &) : value
     end
   end
 end

data/lib/table_sync/receiving/dsl.rb

@@ -16,7 +16,7 @@ module TableSync::Receiving
 
       TableSync::Utils::InterfaceChecker.new(model).implements(:receiving_model)
 
-      config = ::TableSync::Receiving::Config.new(model: model, events: events)
+      config = ::TableSync::Receiving::Config.new(model:, events:)
 
       config.instance_exec(&block) if block
 

data/lib/table_sync/receiving/handler.rb

@@ -16,22 +16,22 @@ class TableSync::Receiving::Handler < Rabbit::EventHandler
 
       next if data.empty?
 
-      version_key = config.version_key(data: data)
+      version_key = config.version_key(data:)
       data.each { |row| row[version_key] = version }
 
-      target_keys = config.target_keys(data: data)
+      target_keys = config.target_keys(data:)
 
-      validate_data(data, target_keys: target_keys)
+      validate_data(data, target_keys:)
 
-      data.sort_by! { |row| row.values_at(*target_keys).to_s }
+      data.sort_by! { |row| row.values_at(*target_keys).map { |value| sort_key(value) } }
 
-      params = { data: data, target_keys: target_keys, version_key: version_key }
+      params = { data:, target_keys:, version_key: }
 
       if event == :update
-        params[:default_values] = config.default_values(data: data)
+        params[:default_values] = config.default_values(data:)
       end
 
-      config.wrap_receiving(event: event, **params) do
+      config.wrap_receiving(event:, **params) do
         perform(config, params)
       end
     end
@@ -64,12 +64,12 @@ class TableSync::Receiving::Handler < Rabbit::EventHandler
       configs = configs.sort_by { |config| "#{config.model.schema}.#{config.model.table}" }
       configs.map do |config|
         ::TableSync::Receiving::ConfigDecorator.new(
-          config: config,
+          config:,
           # next parameters will be send to each proc-options from config
-          event: event,
-          model: model,
-          version: version,
-          project_id: project_id,
+          event:,
+          model:,
+          version:,
+          project_id:,
           raw_data: data,
         )
       end
@@ -78,22 +78,22 @@ class TableSync::Receiving::Handler < Rabbit::EventHandler
 
   def processed_data(config)
     data.filter_map do |row|
-      next if config.skip(row: row)
+      next if config.skip(row:)
 
       row = row.dup
 
-      config.mapping_overrides(row: row).each do |before, after|
+      config.mapping_overrides(row:).each do |before, after|
         row[after] = row.delete(before)
       end
 
-      config.except(row: row).each { |x| row.delete(x) }
+      config.except(row:).each { |x| row.delete(x) }
 
-      row.merge!(config.additional_data(row: row))
+      row.merge!(config.additional_data(row:))
 
-      only = config.only(row: row)
+      only = config.only(row:)
       row, rest = row.partition { |key, _| key.in?(only) }.map(&:to_h)
 
-      rest_key = config.rest_key(row: row, rest: rest)
+      rest_key = config.rest_key(row:, rest:)
       (row[rest_key] ||= {}).merge!(rest) if rest_key
 
       row
@@ -139,14 +139,18 @@ class TableSync::Receiving::Handler < Rabbit::EventHandler
 
       model.after_commit do
         TableSync::Instrument.notify table: model.table, schema: model.schema,
-                                     count: results.count, event: event, direction: :receive
+                                     count: results.count, event:, direction: :receive
       end
 
       if event == :update
-        model.after_commit { config.after_commit_on_update(**params.merge(results: results)) }
+        model.after_commit { config.after_commit_on_update(**params.merge(results:)) }
       else
-        model.after_commit { config.after_commit_on_destroy(**params.merge(results: results)) }
+        model.after_commit { config.after_commit_on_destroy(**params.merge(results:)) }
       end
     end
   end
+
+  def sort_key(value)
+    value.is_a?(Comparable) ? value : value.to_s
+  end
 end

data/lib/table_sync/receiving/model/active_record.rb

@@ -26,7 +26,7 @@ module TableSync::Receiving::Model
         self.inheritance_column = nil
       end
 
-      model_naming = ::TableSync::NamingResolver::ActiveRecord.new(table_name: table_name)
+      model_naming = ::TableSync::NamingResolver::ActiveRecord.new(table_name:)
 
       @table = model_naming.table.to_sym
       @schema = model_naming.schema.to_sym
@@ -66,7 +66,7 @@ module TableSync::Receiving::Model
         row = raw_model.lock("FOR NO KEY UPDATE").where(conditions)
 
         if row.to_a.size > 1
-          raise TableSync::UpsertError.new(data: datum, target_keys: target_keys, result: row)
+          raise TableSync::UpsertError.new(data: datum, target_keys:, result: row)
         end
 
         row = row.first
@@ -99,18 +99,18 @@ module TableSync::Receiving::Model
       result = query.destroy_all.map { |x| row_to_hash(x) }
 
       if result.size > data.size
-        raise TableSync::DestroyError.new(data: data, target_keys: target_keys, result: result)
+        raise TableSync::DestroyError.new(data:, target_keys:, result:)
       end
 
       result
     end
 
-    def transaction(&block)
-      ::ActiveRecord::Base.transaction(&block)
+    def transaction(&)
+      ::ActiveRecord::Base.transaction(&)
     end
 
-    def after_commit(&block)
-      db.add_transaction_record(AfterCommitWrap.new(&block))
+    def after_commit(&)
+      db.add_transaction_record(AfterCommitWrap.new(&))
     end
 
     private

data/lib/table_sync/receiving/model/sequel.rb

@@ -8,7 +8,7 @@ module TableSync::Receiving::Model
       @raw_model = Class.new(::Sequel::Model(table_name)).tap(&:unrestrict_primary_key)
 
       model_naming = ::TableSync::NamingResolver::Sequel.new(
-        table_name: table_name,
+        table_name:,
         db: @raw_model.db,
       )
 
@@ -46,18 +46,18 @@ module TableSync::Receiving::Model
       result = dataset.returning.where(::Sequel.|(*sanitized_data)).delete
 
       if result.size > data.size
-        raise TableSync::DestroyError.new(data: data, target_keys: target_keys, result: result)
+        raise TableSync::DestroyError.new(data:, target_keys:, result:)
       end
 
       result
     end
 
-    def transaction(&block)
-      db.transaction(&block)
+    def transaction(&)
+      db.transaction(&)
     end
 
-    def after_commit(&block)
-      db.after_commit(&block)
+    def after_commit(&)
+      db.after_commit(&)
     end
 
     private

data/lib/table_sync/setup/active_record.rb

@@ -14,7 +14,7 @@ module TableSync::Setup
           TableSync::Publishing::Single.new(
             object_class: self.class.name,
             original_attributes: attributes,
-            event: event,
+            event:,
             debounce_time: options[:debounce_time],
           ).publish_later
         end

data/lib/table_sync/setup/base.rb

@@ -60,7 +60,7 @@ module TableSync::Setup
       {
         if: if_condition,
         unless: unless_condition,
-        debounce_time: debounce_time,
+        debounce_time:,
       }
     end
   end

data/lib/table_sync/setup/sequel.rb

@@ -13,7 +13,7 @@ module TableSync::Setup
             TableSync::Publishing::Single.new(
               object_class: self.class.name,
               original_attributes: values,
-              event: event,
+              event:,
               debounce_time: options[:debounce_time],
             ).publish_later
           end

data/lib/table_sync/utils/proc_array.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 class TableSync::Utils::ProcArray < Proc
-  def initialize(&block)
+  def initialize(&)
     @array = []
-    super(&block)
+    super(&)
   end
 
   def push(&block)
@@ -11,7 +11,7 @@ class TableSync::Utils::ProcArray < Proc
     self
   end
 
-  def call(*args, &block)
-    super(@array, args, &block)
+  def call(*args, &)
+    super(@array, args, &)
   end
 end

data/lib/table_sync/utils/required_validator.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module TableSync::Utils::RequiredValidator
+  module PrependedInitialization
+    def initialize(*)
+      super
+
+      not_filled_attrs = calculate_not_filled_attributes
+      if not_filled_attrs.present?
+        raise(
+          ArgumentError,
+          "Some of required attributes is not provided: #{not_filled_attrs.inspect}",
+        )
+      end
+    end
+  end
+
+  module ClassMethods
+    def require_attributes(*attributes)
+      _required_attributes.push(*attributes)
+    end
+
+    def _required_attributes
+      @_required_attributes ||= []
+    end
+  end
+
+  module InstanceMethods
+    private
+
+    def calculate_not_filled_attributes
+      attributes
+        .select { |key, value| key.in?(self.class._required_attributes) && value.nil? }
+        .keys
+    end
+  end
+
+  def self.included(klass)
+    klass.prepend(PrependedInitialization)
+    klass.extend(ClassMethods)
+    klass.include(InstanceMethods)
+  end
+end

data/lib/table_sync/utils.rb

@@ -5,5 +5,6 @@ module TableSync
     require_relative "utils/proc_array"
     require_relative "utils/proc_keywords_resolver"
     require_relative "utils/interface_checker"
+    require_relative "utils/required_validator"
   end
 end

data/lib/table_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TableSync
-  VERSION = "6.1.0"
+  VERSION = "6.6.1"
 end

data/lib/table_sync.rb

@@ -47,7 +47,7 @@ module TableSync
 
     def sync(object_class, **options)
       setup.new(
-        object_class: object_class,
+        object_class:,
         on: options[:on],
         if_condition: options[:if],
         unless_condition: options[:unless],

data/table_sync.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "table_sync/version"
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
   spec.name        = "table_sync"
   spec.version     = TableSync::VERSION
@@ -27,23 +27,7 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_runtime_dependency "memery"
-  spec.add_runtime_dependency "rabbit_messaging"
+  spec.add_runtime_dependency "rabbit_messaging", ">= 1.1.0"
   spec.add_runtime_dependency "rails"
   spec.add_runtime_dependency "self_data"
-
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop-config-umbrellio"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "simplecov-lcov"
-
-  spec.add_development_dependency "activejob"
-  spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "pg"
-  spec.add_development_dependency "sequel"
-  spec.add_development_dependency "timecop"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "bundler-audit"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake"
 end