deimos-ruby 2.2.0.pre.beta5 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db5c16da104f2dc590089d74bb0258b550e1869bd63eeb58d0910a371fef45d2
-  data.tar.gz: 620c83082f57c1cd15e21caf8ab659d322ed0481f095f69d7b16474f448897bc
+  metadata.gz: 0c65bec6ee47b3c7fc30871b7124d0dea51b7cfc831b07a4f36eb27c48636fc1
+  data.tar.gz: bb411d26783b61f8737c70ddb8045d99a0673324ddef9eaa61bfa5c3c3e8933c
 SHA512:
-  metadata.gz: 6a03650213e66339ebeebea866a7c1596d9e4c2d171980d8c7c2731ecebf2dbd7093d7376ac6aedd995d2965b03764cace107d5f3c01f9b43f28590ba6f0a70e
-  data.tar.gz: 749f679a6d7363e8f297cdaa31acfeb1c868cbebfdaeca01a9d2efec8678b1008598be73e9eae394c134d759804f06925fcce1d2e3a1fb95eab85a8f0284d804
+  metadata.gz: 7cfbb246222b9bbf795f9614f3c5ca9e15f217a84bec6c9f0d3e454179295a8c16539e36827f34dd4af2474568d6ecc7e6296fae5197a92be28ab7c8a72903c4
+  data.tar.gz: 6fef3d36d1b7ad788eb40a985c24b50205c96bec6cabb13f6b6d29b37dcae2cabbe142ddce0622fa33fcfd7d087a1d1ae50756bd338754bf427c4d420ef8d1bc

data/.rubocop.yml

@@ -1,14 +1,21 @@
 inherit_from: .rubocop_todo.yml
 
-require: rubocop-rspec
+plugins:
+  - rubocop-rspec
 
 AllCops:
   TargetRubyVersion: 2.5
   Exclude:
     - lib/deimos/monkey_patches/*.rb
+    - spec/gen/**/*.rb
+    - lib/deimos/ext/routing_defaults.rb # provided by Maciej
     - vendor/**/*
     - Guardfile
   NewCops: enable
+  SuggestExtensions: false
+
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec
 
 # class Plumbus
 # private
@@ -41,9 +48,9 @@ Layout/EmptyLinesAroundBlockBody:
 Layout/LineLength:
   Max: 120
   Severity: refactor
-#  TODO: uncomment the files below once rubocop is fixed
-#  Exclude:
-#  - 'spec/**/*'
+  SplitStrings: true
+  Exclude:
+  - bin/console # this causes LineLength to crash for some reason on line 15
 
 # foo = if expression
 #         'bar'
@@ -73,6 +80,10 @@ Lint/AssignmentInCondition:
   AllowSafeAssignment: false
   Severity: convention
 
+Lint/UnderscorePrefixedVariableName:
+  Exclude:
+    - spec/schemas/**/*.rb
+
 Lint/UnusedBlockArgument:
   AllowUnusedKeywordArguments: true
 
@@ -81,7 +92,10 @@ Lint/UnusedMethodArgument:
 
 Metrics/AbcSize:
   Severity: refactor
-  Max: 35
+  Max: 40
+  Exclude:
+    - lib/generators/deimos/v2_generator.rb
+    - lib/deimos/test_helpers.rb
 
 Metrics/BlockLength:
   Enabled: false
@@ -108,7 +122,10 @@ Metrics/ParameterLists:
 
 Metrics/PerceivedComplexity:
   Severity: refactor
-  Max: 10
+  Max: 15
+  Exclude:
+    - lib/generators/deimos/v2_generator.rb
+    - lib/deimos/test_helpers.rb
 
 # Use alias_method instead of alias
 Style/Alias:
@@ -152,20 +169,8 @@ Style/CollectionMethods:
 Style/DateTime:
   AllowCoercion: true
 
-# TODO: uncomment the lines below once rubocop is fixed
-#Style/Documentation:
-#  Exclude:
-#  - 'app/controllers/**/*'
-#  - 'app/helpers/**/*'
-#  - 'db/**/*'
-
-# Force documentation for public methods and classes
-Style/DocumentationMethod:
-  Enabled: true
-# TODO: uncomment the file below once rubocop is fixed
-#  Exclude:
-#  - 'app/controllers/**/*'
-#  - 'db/**/*'
+Style/Documentation:
+  Enabled: false
 
 # Allow else with just nil in it
 Style/EmptyElse:
@@ -202,7 +207,7 @@ Style/LineEndConcatenation:
 # Require parentheses around all method arguments except for whitelist
 Style/MethodCallWithArgsParentheses:
   Enabled: true
-  IgnoredMethods:
+  AllowedMethods:
     - puts
     - render
     - redirect_to
@@ -236,10 +241,6 @@ Style/MethodCallWithArgsParentheses:
     - before_destroy
     - after_destroy
     - queue_as
-# TODO: uncomment the file below once rubocop is fixed
-#  Exclude:
-#    - 'bin/**/*'
-#    - 'Gemfile'
 
 # Do not allow "end.something"
 Style/MethodCalledOnDoEndBlock:
@@ -292,10 +293,6 @@ RSpec/ExampleLength:
 RSpec/ExampleWording:
   Enabled: false
 
-# Allow describing specs without only using classes and methods
-RSpec/FilePath:
-  Enabled: false
-
 # Use before(:each), not before or before(:example)
 RSpec/HookArgument:
   EnforcedStyle: each
@@ -318,9 +315,12 @@ RSpec/MessageSpies:
   Enabled: false
 
 RSpec/MultipleExpectations:
-  Max: 10
+  Max: 20
   Severity: refactor
 
+RSpec/MultipleMemoizedHelpers:
+  Max: 10
+
 # Allow both and_return() and block returns (use these for multi-line)
 RSpec/ReturnFromStub:
   Enabled: false
@@ -334,6 +334,9 @@ RSpec/ExpectActual:
 RSpec/BeforeAfterAll:
   Enabled: false
 
+RSpec/SpecFilePathFormat:
+  Enabled: false
+
 Security/YAMLLoad:
   Exclude:
     - 'lib/deimos.rb'

data/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 2.2.1 - 2025-11-13
+
+- Fix: The global `use_schema_classes` setting wasn't being respected.
+- Fix: `fetch_record` was being passed a hash even if `use_schema_classes` was set to true.
+- Fix crash on ERB 6.0 (legacy_trim_mode is removed)
+
+# 2.2.0 - 2025-11-11
+
 - Feature: Support Protobuf as a schema backend.
 - Feature: Add the ability to specify the schema backend per topic.
 

data/Gemfile

@@ -4,9 +4,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in boilerplate.gemspec
 gemspec
-
-# for older activesupport
-gem 'mutex_m'
-gem 'bigdecimal'
-gem 'benchmark'
-gem 'drb'

data/deimos-ruby.gemspec

@@ -15,36 +15,41 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency('avro_turf', '>= 1.4', '< 2')
-  spec.add_runtime_dependency('karafka', '~> 2.0')
-  spec.add_runtime_dependency('fig_tree', '~> 0.2.0')
-  spec.add_runtime_dependency('sigurd', '>= 0.1.0', '< 1.0')
+  spec.add_dependency('avro_turf', '>= 1.4', '< 2')
+  spec.add_dependency('benchmark', '~> 0.5')
+  spec.add_dependency('fig_tree', '~> 0.2.0')
+  spec.add_dependency('karafka', '~> 2.0')
+  spec.add_dependency('sigurd', '>= 0.1.0', '< 1.0')
 
   spec.add_development_dependency('activerecord-import')
-  spec.add_development_dependency('activerecord-trilogy-adapter')
   spec.add_development_dependency('avro', '~> 1.9')
   spec.add_development_dependency('database_cleaner', '~> 2.1')
   spec.add_development_dependency('ddtrace', '>= 0.11')
   spec.add_development_dependency('dogstatsd-ruby', '>= 4.2')
-  spec.add_development_dependency('proto_turf')
   spec.add_development_dependency('guard', '~> 2')
   spec.add_development_dependency('guard-rspec', '~> 4')
   spec.add_development_dependency('guard-rubocop', '~> 1')
   spec.add_development_dependency('karafka-testing', '~> 2.0')
-  spec.add_development_dependency('trilogy', '>= 0.1')
   spec.add_development_dependency('pg', '~> 1.1')
+  spec.add_development_dependency('proto_turf')
   spec.add_development_dependency('rails', '~> 8.0')
   spec.add_development_dependency('rake', '~> 13')
   spec.add_development_dependency('rspec', '~> 3')
   spec.add_development_dependency('rspec_junit_formatter', '~>0.3')
   spec.add_development_dependency('rspec-rails', '~> 8.0')
   spec.add_development_dependency('rspec-snapshot', '~> 2.0')
-  spec.add_development_dependency('rubocop', '0.89.0')
-  spec.add_development_dependency('rubocop-rspec', '1.42.0')
+  spec.add_development_dependency('rubocop', '~> 1.0')
+  spec.add_development_dependency('rubocop-rspec', '3.8')
   spec.add_development_dependency('sord', '>= 5.0')
   spec.add_development_dependency('sqlite3', '~> 2.7')
   spec.add_development_dependency('steep', '~> 1.0')
+  spec.add_development_dependency('trilogy', '>= 0.1')
+
+  # for older activerecord
+  spec.add_development_dependency('bigdecimal')
+  spec.add_development_dependency('mutex_m')
+
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/karafka.rb

@@ -1,14 +1,17 @@
+# frozen_string_literal: true
+
 # Used in regenerate_test_schema_classes.rb
 
 class MyConsumer < Deimos::Consumer
-  def consume(payload, metadata); end
+  def consume(payload, metadata)
+  end
 end
 
-require_relative "./lib/generators/deimos/schema_class_generator"
+require_relative 'lib/generators/deimos/schema_class_generator'
 
 Deimos.configure do |deimos_config|
   deimos_config.schema.nest_child_schemas = true
-  deimos_config.schema.path = "spec/schemas"
+  deimos_config.schema.path = 'spec/schemas'
   deimos_config.schema.backend = :avro_validation
   deimos_config.schema.generated_class_path = './spec/schemas'
   deimos_config.schema.use_full_namespace = true
@@ -21,7 +24,7 @@ end
 class KarafkaApp < Karafka::App
   setup do
     config.kafka = {
-      "bootstrap.servers": '127.0.0.1:9092'
+      'bootstrap.servers': '127.0.0.1:9092'
     }
   end
   routes.draw do

data/lib/deimos/active_record_consume/batch_consumption.rb

@@ -30,7 +30,7 @@ module Deimos
         tag = topic.name
         Deimos.config.tracer.active_span.set_tag('topic', tag)
 
-        Karafka.monitor.instrument('deimos.ar_consumer.consume_batch', {topic: tag}) do
+        Karafka.monitor.instrument('deimos.ar_consumer.consume_batch', { topic: tag }) do
           if @compacted && deimos_messages.map(&:key).compact.any?
             update_database(compact_messages(deimos_messages))
           else
@@ -154,9 +154,9 @@ module Deimos
         invalid = filter_records(record_list)
         if invalid.any?
           Karafka.monitor.instrument('deimos.batch_consumption.invalid_records', {
-            records: invalid,
-            consumer: self.class
-          })
+                                       records: invalid,
+                                       consumer: self.class
+                                     })
         end
         return if record_list.empty?
 
@@ -171,9 +171,9 @@ module Deimos
                                   save_associations_first: self.save_associations_first,
                                   bulk_import_id_column: self.bulk_import_id_column)
         Karafka.monitor.instrument('deimos.batch_consumption.valid_records', {
-          records: updater.mass_update(record_list),
-          consumer: self.class
-        })
+                                     records: updater.mass_update(record_list),
+                                     consumer: self.class
+                                   })
       end
 
       # @param record_list [BatchRecordList]

data/lib/deimos/active_record_consume/batch_record.rb

@@ -43,8 +43,8 @@ module Deimos
       def validate_import_id!
         return if @klass.column_names.include?(self.bulk_import_column.to_s)
 
-        raise "Create bulk_import_id on the #{@klass.table_name} table." \
-                ' Run rails g deimos:bulk_import_id {table} to create the migration.'
+        raise "Create bulk_import_id on the #{@klass.table_name} table. " \
+              'Run rails g deimos:bulk_import_id {table} to create the migration.'
       end
 
       # @return [Class < ActiveRecord::Base]

data/lib/deimos/active_record_consume/message_consumption.rb

@@ -8,6 +8,7 @@ module Deimos
     # as ActiveRecord instances.
     module MessageConsumption
       include Deimos::Consume::MessageConsumption
+
       # Find the record specified by the given payload and key.
       # Default is to use the primary key column and the value of the first
       # field in the key.
@@ -33,16 +34,16 @@ module Deimos
       def consume_message(message)
         unless self.process_message?(message)
           Deimos::Logging.log_debug(
-              message: 'Skipping processing of message',
-              payload: message.payload.to_h,
-              metadata: Deimos::Logging.metadata_log_text(message.metadata)
-            )
+            message: 'Skipping processing of message',
+            payload: message.payload.to_h,
+            metadata: Deimos::Logging.metadata_log_text(message.metadata)
+          )
           return
         end
 
         klass = self.class.config[:record_class]
         payload = message.payload
-        if payload.is_a?(Hash) || payload.nil? || payload.is_a?(SchemaClass::Record)
+        if payload.is_a?(Hash) || payload.nil?
           payload = payload.to_h.with_indifferent_access
         end
         record = fetch_record(klass, payload, message.key)

data/lib/deimos/active_record_consume/schema_model_converter.rb

@@ -38,9 +38,9 @@ module Deimos
         if column.type == :datetime
           int_val = begin
                       val.is_a?(Integer) ? val : (val.is_a?(String) && Integer(val))
-                    rescue StandardError
+          rescue StandardError
                       nil
-                    end
+          end
 
           return Time.zone.at(int_val) if int_val
         end

data/lib/deimos/active_record_consumer.rb

@@ -83,6 +83,7 @@ module Deimos
     def key_converter
       decoder = self.topic.deserializers[:key]&.backend
       return nil if decoder.nil?
+
       @key_converter ||= ActiveRecordConsume::SchemaModelConverter.new(decoder, @klass)
     end
 

data/lib/deimos/active_record_producer.rb

@@ -56,6 +56,7 @@ module Deimos
 
       def encoder
         raise "No schema or namespace configured for #{self.name}" if karafka_config.nil?
+
         karafka_config.deserializers[:payload].backend
       end
 
@@ -71,7 +72,8 @@ module Deimos
         payload.delete_if do |k, _|
           k.to_sym != :payload_key && !fields.map(&:name).include?(k)
         end
-        return payload unless self.karafka_config.use_schema_classes
+        return payload if self.karafka_config.use_schema_classes.nil? &&
+                          !Deimos.config.schema.use_schema_classes
 
         Utils::SchemaClass.instance(payload, encoder.schema, encoder.namespace)
       end
@@ -93,7 +95,7 @@ module Deimos
       # @param min_id [Numeric] the minimum ID (i.e. all IDs must be greater
       # than this value).
       # @return [ActiveRecord::Relation]
-      def poll_query(time_from:, time_to:, column_name: :updated_at, min_id:)
+      def poll_query(time_from:, time_to:, min_id:, column_name: :updated_at)
         klass = @record_class
         table = ActiveRecord::Base.connection.quote_table_name(klass.table_name)
         column = ActiveRecord::Base.connection.quote_column_name(column_name)

data/lib/deimos/backends/base.rb

@@ -12,7 +12,7 @@ module Deimos
           topic = producer_class.topic
           execute(producer_class: producer_class, messages: messages)
           message = ::Deimos::Logging.messages_log_text(producer_class.karafka_config.payload_log, messages)
-          Deimos::Logging.log_info({message: "Publishing Messages for #{topic}:" }.merge(message))
+          Deimos::Logging.log_info({ message: "Publishing Messages for #{topic}:" }.merge(message))
         end
 
         # @param producer_class [Class<Deimos::Producer>]
@@ -22,8 +22,6 @@ module Deimos
           raise MissingImplementationError
         end
 
-      private
-
       end
     end
   end

data/lib/deimos/backends/outbox.rb

@@ -13,7 +13,7 @@ module Deimos
           records = messages.map do |m|
             Deimos::ProducerMiddleware.call(m)
             message = Deimos::KafkaMessage.new(
-              message: m[:payload] ? m[:payload].to_s.b : nil,
+              message: m[:payload]&.to_s&.b,
               topic: m[:topic],
               partition_key: partition_key_for(m)
             )