deimos-ruby 1.24.0 → 1.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 391cad2b23e7a6ef37106dcc5403af4ef5b62a82c1a6189e712fb3bc339613d1
-  data.tar.gz: 2bbb4468ee975158489ea797ee67c636d1c5da88cda8b10b33923b4410459178
+  metadata.gz: f2be475993ca3cec87d78682f7724b973f5aadb885612f98d5978169da2932bf
+  data.tar.gz: 5ab0f052676184f800965bf68aebecac80583d1da2f38561a305e5f5b57a68c9
 SHA512:
-  metadata.gz: 48f37dc3bf2d016bc8806ccf26def976af003a4a8ebd46dad37e080fdeb9489f0bd3993747feda26a6e37d997b24f169554bb587e8d7ca88af6de85cf41851dd
-  data.tar.gz: ccee77567b4599bacc341e25f8c653a3f4ce21252c39dfb9849ffc2005fe44dc58aaa23537bb636f1545b1a691156225f66e1a909949b0bafb8440efa5269c4e
+  metadata.gz: 918a363d9994537a221ccc6d00131c75a97f36c8cf89bdda47e0a6e6770b36fd1c3b07e5177d0ef284494020d90dd9081bc9d40ec41f4dc8bbe45e9c4165ea1f
+  data.tar.gz: 60d316ef05ce427234e366e32f44addd7188adb45345b025bfb9fd21f339d0c579f317f1e55db20185b9f5f825af3226c27cb53d5e9336ec805200d2a9ce5bd9

data/.github/workflows/ci.yml

@@ -19,10 +19,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up Ruby 2.7
+      - name: Set up Ruby 3.3
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.3
           bundler-cache: true
 
       - name: Bundle install
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.7', '3.0', '3.1' ]
+        ruby: [ '2.7', '3.0', '3.1', '3.2', '3.3' ]
 
     steps:
       - uses: actions/checkout@v3

data/.ruby-version

@@ -1,2 +1 @@
-2.7.0
-
+3.2.2

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 1.24.2 - 2024-05-01
+- Fix: Deprecation notice with Rails 7.
+
+# 1.24.1 - 2024-03-26
+- Fix: ActiveRecordConsumer batch consumption was not working with the trilogy adapter.
+
 # 1.24.0 - 2024-02-26
 
 ***BREAKING CHANGE****

data/deimos-ruby.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_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', '~> 1.7')
   spec.add_development_dependency('ddtrace', '>= 0.11')

data/lib/deimos/active_record_consume/mass_updater.rb

@@ -50,7 +50,8 @@ module Deimos
 
         options = if @key_cols.empty?
                     {} # Can't upsert with no key, just do regular insert
-                  elsif ActiveRecord::Base.connection.adapter_name.downcase =~ /mysql/
+                  elsif ActiveRecord::Base.connection.adapter_name.downcase =~ /mysql/ ||
+                        ActiveRecord::Base.connection.adapter_name.downcase =~ /trilogy/
                     {
                       on_duplicate_key_update: columns
                     }

data/lib/deimos/kafka_topic_info.rb

@@ -6,6 +6,11 @@ module Deimos
     self.table_name = 'kafka_topic_info'
 
     class << self
+
+      def quote_time(time)
+        time.respond_to?(:to_fs) ? time.to_fs(:db) : time.to_s(:db)
+      end
+
       # Lock a topic for the given ID. Returns whether the lock was successful.
       # @param topic [String]
       # @param lock_id [String]
@@ -22,9 +27,9 @@ module Deimos
         qtopic = self.connection.quote(topic)
         qlock_id = self.connection.quote(lock_id)
         qtable = self.connection.quote_table_name('kafka_topic_info')
-        qnow = self.connection.quote(Time.zone.now.to_s(:db))
+        qnow = self.connection.quote(quote_time(Time.zone.now))
         qfalse = self.connection.quoted_false
-        qtime = self.connection.quote(1.minute.ago.to_s(:db))
+        qtime = self.connection.quote(quote_time(1.minute.ago))
 
         # If a record is marked as error and less than 1 minute old,
         # we don't want to pick it up even if not currently locked because

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '1.24.0'
+  VERSION = '1.24.2'
 end

data/spec/spec_helper.rb

@@ -14,6 +14,8 @@ require 'handlers/my_batch_consumer'
 require 'handlers/my_consumer'
 require 'rspec/rails'
 require 'rspec/snapshot'
+require "trilogy_adapter/connection"
+ActiveRecord::Base.public_send :extend, TrilogyAdapter::Connection
 Dir['./spec/schemas/**/*.rb'].sort.each { |f| require f }
 
 # Constants used for consumer specs
@@ -94,6 +96,13 @@ module DbConfigs
       database: 'test',
       host: ENV['MYSQL_HOST'] || '127.0.0.1'
     },
+    {
+      adapter: 'trilogy',
+      port: 3306,
+      username: 'root',
+      database: 'test',
+      host: ENV['MYSQL_HOST'] || '127.0.0.1'
+    },
     {
       adapter: 'sqlite3',
       database: 'test.sqlite3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.24.2
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-26 00:00:00.000000000 Z
+date: 2024-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf
@@ -112,6 +112,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord-trilogy-adapter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: avro
   requirement: !ruby/object:Gem::Requirement
@@ -401,7 +415,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".gitmodules"
@@ -636,7 +649,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Kafka libraries for Ruby.

data/.circleci/config.yml

@@ -1,83 +0,0 @@
-defaults: &defaults
-    parallelism: 1
-    working_directory: ~/workspace
-    docker:
-      - image: ruby:2.6
-        environment:
-          RAILS_ENV: test
-          DB_HOST_IP: 127.0.0.1
-version: 2.1
-jobs:
-  build:
-    <<: *defaults
-    steps:
-      - checkout
-
-      # Restore bundle cache & npm cache
-      - restore_cache:
-          key: 'rails-{{ checksum "Gemfile.lock" }}'
-
-      # Bundle install dependencies in /tmp/
-      # so Dockerfile does not copy them since
-      # its base image is different than CircleCI
-      - run:
-          name: Install bundler
-          command: gem install bundler:2.1.4
-      - run:
-          name: Bundle install
-          command: bundle install --path vendor/bundle --jobs=4 --retry=3
-
-      # Store bundle cache
-      - save_cache:
-          key: 'rails-{{ checksum "Gemfile.lock" }}'
-          paths:
-            - ~/workspace/vendor/bundle
-
-      - persist_to_workspace:
-          root: ~/workspace
-          paths:
-            - .
-
-  lint:
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: ~/workspace
-      - run:
-          name: Install bundler
-          command: gem install bundler:2.1.4
-      - run:
-           name: Point bundle to vendor/bundle
-           command: bundle --path vendor/bundle
-      - run: bundle exec rubocop --display-only-fail-level-offenses --fail-level C
-
-  test-rspec:
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: ~/workspace
-      - run:
-          name: Install bundler
-          command: gem install bundler:2.1.4
-      - run:
-           name: Point bundle to vendor/bundle
-           command: bundle --path vendor/bundle
-      - run: mkdir result
-      - run:
-          name: Running rspec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o result/rspec.xml
-          when: always
-      - store_test_results:
-          path: ~/workspace/result
-
-workflows:
-  version: 2
-  build-and-test:
-    jobs:
-      - build
-      - test-rspec:
-          requires:
-            - build
-      - lint:
-          requires:
-            - build