.github/workflows/main.yml

@@ -14,14 +14,14 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - "4.0.1"
+          - '3.1.2'
 
     steps:
-      - uses: actions/checkout@v3
+    - uses: actions/checkout@v3
-      - name: Set up Ruby
+    - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
-        with:
+      with:
-          ruby-version: ${{ matrix.ruby }}
+        ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
+        bundler-cache: true
-      - name: Run the default task
+    - name: Run the default task
-        run: bundle exec rake
+      run: bundle exec rake

.gitignore

@@ -10,5 +10,4 @@
 # rspec failure tracking
 .rspec_status
 
-*.gem
+*.gem
-.idea

.rubocop.yml

@@ -1,5 +1,4 @@
-plugins:
+require: rubocop-rails
-  - rubocop-rails
 
 AllCops:
   NewCops: enable

Gemfile

@@ -5,12 +5,12 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in outboxable.gemspec
 gemspec
 
-gem 'rake', '~> 13.3.1'
+gem 'rake', '~> 13.0'
-gem 'rspec', '~> 3.13.2'
+gem 'rspec', '~> 3.0'
-gem 'rubocop-rails', '~> 2.34.3'
+gem 'rubocop-rails', '~> 2.18'
 
 group :development, :test do
-  gem 'activesupport', '~> 8.1.2'
+  gem 'activesupport', '~> 7.0'
-  gem 'sidekiq', '~> 8.1.0'
+  gem 'sidekiq', '~> 7.0'
-  gem 'sidekiq-cron', '~> 2.3.1'
+  gem 'sidekiq-cron', '~> 1.10'
 end

Gemfile.lock

@@ -1,139 +1,107 @@
 PATH
   remote: .
   specs:
-    outboxable (1.0.6)
+    outboxable (0.1.3)
-      bunny (>= 2.22)
+      bunny (>= 2.19.0)
-      connection_pool (>= 2.4)
+      connection_pool (~> 2.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.1.2)
+    activesupport (7.0.4.3)
-      base64
+      concurrent-ruby (~> 1.0, >= 1.0.2)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
       i18n (>= 1.6, < 2)
-      json
-      logger (>= 1.4.2)
       minitest (>= 5.1)
-      securerandom (>= 0.3)
+      tzinfo (~> 2.0)
-      tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
     amq-protocol (2.3.2)
-    ast (2.4.3)
+    ast (2.4.2)
-    base64 (0.3.0)
+    bunny (2.20.3)
-    bigdecimal (4.0.1)
-    bunny (2.22.0)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
-    concurrent-ruby (1.3.6)
+    concurrent-ruby (1.2.2)
-    connection_pool (3.0.2)
+    connection_pool (2.3.0)
-    cronex (0.15.0)
+    diff-lcs (1.5.0)
+    et-orbi (1.2.7)
       tzinfo
-      unicode (>= 0.4.4.5)
+    fugit (1.8.1)
-    diff-lcs (1.6.2)
+      et-orbi (~> 1, >= 1.2.7)
-    drb (2.2.3)
-    et-orbi (1.4.0)
-      tzinfo
-    fugit (1.12.1)
-      et-orbi (~> 1.4)
       raabro (~> 1.4)
-    globalid (1.3.0)
+    globalid (1.1.0)
-      activesupport (>= 6.1)
+      activesupport (>= 5.0)
-    i18n (1.14.8)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.18.0)
+    json (2.6.3)
-    language_server-protocol (3.17.0.5)
+    minitest (5.18.0)
-    lint_roller (1.1.0)
+    parallel (1.22.1)
-    logger (1.7.0)
+    parser (3.2.2.0)
-    minitest (6.0.1)
-      prism (~> 1.5)
-    parallel (1.27.0)
-    parser (3.3.10.1)
       ast (~> 2.4.1)
-      racc
-    prism (1.8.0)
     raabro (1.4.0)
-    racc (1.8.1)
+    rack (2.2.6.4)
-    rack (3.2.4)
     rainbow (3.1.1)
-    rake (13.3.1)
+    rake (13.0.6)
     rbtree (0.4.6)
-    redis-client (0.26.3)
+    redis-client (0.14.1)
       connection_pool
-    regexp_parser (2.11.3)
+    regexp_parser (2.7.0)
-    rspec (3.13.2)
+    rexml (3.2.5)
-      rspec-core (~> 3.13.0)
+    rspec (3.12.0)
-      rspec-expectations (~> 3.13.0)
+      rspec-core (~> 3.12.0)
-      rspec-mocks (~> 3.13.0)
+      rspec-expectations (~> 3.12.0)
-    rspec-core (3.13.6)
+      rspec-mocks (~> 3.12.0)
-      rspec-support (~> 3.13.0)
+    rspec-core (3.12.1)
-    rspec-expectations (3.13.5)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
+      rspec-support (~> 3.12.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
+      rspec-support (~> 3.12.0)
-    rspec-support (3.13.6)
+    rspec-support (3.12.0)
-    rubocop (1.82.1)
+    rubocop (1.49.0)
       json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.3.0.2)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
+      regexp_parser (>= 1.8, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.28.0)
-      parser (>= 3.3.7.2)
+      parser (>= 3.2.1.0)
-      prism (~> 1.7)
+    rubocop-rails (2.18.0)
-    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
-      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.75.0, < 2.0)
+      rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
     ruby-progressbar (1.13.0)
-    securerandom (0.4.1)
     set (1.0.3)
-    sidekiq (8.1.0)
+    sidekiq (7.0.7)
-      connection_pool (>= 3.0.0)
+      concurrent-ruby (< 2)
-      json (>= 2.16.0)
+      connection_pool (>= 2.3.0)
-      logger (>= 1.7.0)
+      rack (>= 2.2.4)
-      rack (>= 3.2.0)
+      redis-client (>= 0.11.0)
-      redis-client (>= 0.26.0)
+    sidekiq-cron (1.10.0)
-    sidekiq-cron (2.3.1)
+      fugit (~> 1.8)
-      cronex (>= 0.13.0)
-      fugit (~> 1.8, >= 1.11.1)
       globalid (>= 1.0.1)
-      sidekiq (>= 6.5.0)
+      sidekiq (>= 6)
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode (0.4.4.5)
+    unicode-display_width (2.4.2)
-    unicode-display_width (3.2.0)
-      unicode-emoji (~> 4.1)
-    unicode-emoji (4.2.0)
-    uri (1.1.1)
 
 PLATFORMS
-  arm64-darwin-25
   x86_64-linux
 
 DEPENDENCIES
-  activesupport (~> 8.1.2)
+  activesupport (~> 7.0)
   outboxable!
-  rake (~> 13.3.1)
+  rake (~> 13.0)
-  rspec (~> 3.13.2)
+  rspec (~> 3.0)
-  rubocop-rails (~> 2.34.3)
+  rubocop-rails (~> 2.18)
-  sidekiq (~> 8.1.0)
+  sidekiq (~> 7.0)
-  sidekiq-cron (~> 2.3.1)
+  sidekiq-cron (~> 1.10)
 
 BUNDLED WITH
-   2.4.17
+   2.4.7

README.md

@@ -1,19 +1,6 @@
-# 🚨 Discontinuation Notice for ActiveRecord 🚨
-
-**Effective Date: August 4, 2024**
-
-Please be aware that we are no longer maintaing the part related to **ActiveRecord** in this gem. We are dropping support for ActiveRecord in favor of [Solid Queue](https://github.com/rails/solid_queue). 
-
-In the meantime, we commit to continously support the Mongoid part of the gem.
-
-### New Recommended Gem: `Solid Queue`
-
-For ActiveRecord users, we recommend transitioning to the `Solid Queue` gem, which provides enhanced functionality, improved performance, and better support for modern application requirements. `Solid Queue` is designed to seamlessly integrate with your existing infrastructure while offering robust features to handle your queuing needs efficiently.
-
-
 # Outboxable
 
-The Outboxable Gem is tailored for Rails applications to implement the transactional outbox pattern. It supports both ActiveRecord and Mongoid.
+The Outboxable Gem is tailored for Rails applications to implement the transactional outbox pattern. It currently only supports ActiveRecord.
 
 Please take into consideration that this Gem is **opinionated**, meaning it expects you to follow a certain pattern and specific setting. If you don't like it, you can always fork it and change it.
 
@@ -38,19 +25,13 @@ If bundler is not being used to manage dependencies, install the gem by executin
 $ gem install outboxable
 ```
 
-For use with ActiveRecord, run:
+Then run:
 
 ```shell
-$ rails g outboxable:install --orm activerecord
+$ rails g outboxable:install
 ```
 
-For use with Mongoid, run:
+The command above will add a migration file and the Outbox model. You will need then to run the migrations:
-
-```shell
-$ rails g outboxable:install --orm mongoid
-```
-
-The command above will add a migration file and the Outbox model. You will need then to run the migrations (ActiveRecord only):
 
 ```shell
 $ rails db:migrate
@@ -83,7 +64,7 @@ module Outboxable
 end
 
 Outboxable.configure do |config|
-  # Specify the ORM you are using. Supported values are :activerecord and :mongoid
+  # Specify the ORM you are using. For now, only ActiveRecord is supported.
   config.orm = :activerecord
 
   # Specify the message broker you are using. For now, only RabbitMQ is supported.
@@ -95,7 +76,7 @@ Outboxable.configure do |config|
   config.rabbitmq_user = ENV.fetch('RABBITMQ__USERNAME')
   config.rabbitmq_password = ENV.fetch('RABBITMQ__PASSWORD')
   config.rabbitmq_vhost = ENV.fetch('RABBITMQ__VHOST')
-  config.rabbitmq_exchange_name = ENV.fetch('RABBITMQ__EXCHANGE_NAME')
+  config.rabbitmq_event_bus_exchange = ENV.fetch('EVENTBUS__EXCHANGE_NAME')
 end
 ```
 
@@ -227,12 +208,6 @@ Last but not least, run sidekiq so that the Outboxable Gem can publish the event
 $ bundle exec sidekiq
 ```
 
-
-
-### Mongoid
-
-The Outboxable gem works smoothly with Mongoid. It is to be noted that when used with Mongoid, Outboxable does not use the `_id` as the idempotency key. It creates a field called ``idempotency_key`` which is a UUID generated at the time of the insertion of the document.
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

lib/generators/outboxable/install_generator.rb

@@ -3,37 +3,24 @@ module Outboxable
     include Rails::Generators::Migration
 
     source_root File.expand_path('../../templates', __dir__)
-    class_option :orm, type: :string, default: 'activerecord'
-
-    def initialize(*args)
-      super(*args) # rubocop:disable Style/SuperArguments
-
-      @orm = options[:orm] || 'activerecord'
-      %w[activerecord mongoid].include?(@orm) || raise(ArgumentError, 'Invalid ORM. Only ActiveRecord and Mongoid are supported.')
-    end
 
     # Copy initializer into user app
     def copy_initializer
-      copy_file('activerecord_initializer.rb', 'config/initializers/z_outboxable.rb') if @orm == 'activerecord'
+      copy_file('initializer.rb', 'config/initializers/z_outboxable.rb')
-      copy_file('mongoid_initializer.rb', 'config/initializers/z_outboxable.rb') if @orm == 'mongoid'
     end
 
     # Copy user information (model & Migrations) into user app
     def create_user_model
       target_path = 'app/models/outbox.rb'
-
       if Rails.root.join(target_path).exist?
         say_status('skipped', 'Model outbox already exists')
       else
-        template('activerecrod_outbox.rb', target_path) if @orm == 'activerecord'
+        template('outbox.rb', target_path)
-        template('mongoid_outbox.rb', target_path) if @orm == 'mongoid'
       end
     end
 
     # Copy migrations
     def copy_migrations
-      return if @orm == 'mongoid'
-
       if self.class.migration_exists?('db/migrate', 'create_outboxable_outboxes')
         say_status('skipped', 'Migration create_outboxable_outboxes already exists')
       else

lib/outboxable.rb

@@ -3,15 +3,14 @@
 require_relative 'outboxable/version'
 
 require 'outboxable/worker'
+require 'outboxable/publishing_manager'
+require 'outboxable/polling_publisher_worker'
 require 'outboxable/connection'
 require 'outboxable/configuration'
 require 'outboxable/rabbitmq/publisher'
 
 require 'active_support/concern'
 
-require 'outboxable/publishing_manager'
-require 'outboxable/polling_publisher_worker'
-
 module Outboxable
   class Error < StandardError; end
 
@@ -21,12 +20,12 @@ module Outboxable
     after_create :instantiate_outbox_for_create, if: proc { |object| object.check_outbox_condition(object:, operation: :create) }
     after_update :instantiate_outbox_for_update, if: proc { |object| object.check_outbox_condition(object:, operation: :update) }
 
-    has_many :outboxes, as: :outboxable, dependent: :destroy
+    has_many :outboxes, as: :outboxable, autosave: false
 
     def instantiate_outbox(routing_key:)
       outboxes.new(
         routing_key:,
-        exchange: Outboxable.configuration.rabbitmq_exchange_name,
+        exchange: Outboxable.configuration.rabbitmq_event_bus_exchange,
         payload: as_json
       )
     end

lib/outboxable/configuration.rb

@@ -10,14 +10,14 @@ module Outboxable
 
   class Configuration
     ALLOWED_MESSAGE_BROKERS = %i[rabbitmq].freeze
-    ALLOWED_ORMS = %i[activerecord mongoid].freeze
+    ALLOWED_ORMS = %i[activerecord].freeze
 
     attr_accessor :rabbitmq_host,
                   :rabbitmq_port,
                   :rabbitmq_user,
                   :rabbitmq_password,
                   :rabbitmq_vhost,
-                  :rabbitmq_exchange_name,
+                  :rabbitmq_event_bus_exchange,
                   :message_broker,
                   :orm
 

lib/outboxable/connection.rb

@@ -3,7 +3,6 @@ require 'singleton'
 module Outboxable
   class Connection
     include ::Singleton
-
     attr_reader :connection
 
     def initialize

lib/outboxable/polling_publisher_worker.rb

@@ -1,27 +1,16 @@
 module Outboxable
   class PollingPublisherWorker
     include Sidekiq::Job
+    sidekiq_options queue: 'critical'
 
     def perform
-      Outboxable.configuration.orm == :mongoid ? perform_mongoid : perform_activerecord
-    end
-
-    def perform_activerecord
       Outbox.pending.where(last_attempted_at: [..Time.zone.now, nil]).find_in_batches(batch_size: 100).each do |batch|
         batch.each do |outbox|
           # This is to prevent a job from being retried too many times. Worst-case scenario is 1 minute delay in jobs.
-          ::Outboxable::Worker.perform_async(outbox.id)
+          outbox.update(last_attempted_at: 1.minute.from_now)
-          outbox.update(last_attempted_at: 1.minute.from_now, status: :processing, allow_publish: false)
+          Outboxable::Worker.perform_async(outbox.id)
         end
       end
     end
-
-    def perform_mongoid
-      Outbox.pending.any_of({ last_attempted_at: ..Time.zone.now }, { last_attempted_at: nil }).each do |outbox|
-        # This is to prevent a job from being retried too many times. Worst-case scenario is 1 minute delay in jobs.
-        ::Outboxable::Worker.perform_async(outbox.idempotency_key)
-        outbox.update(last_attempted_at: 1.minute.from_now, status: :processing, allow_publish: false)
-      end
-    end
   end
 end

lib/outboxable/rabbitmq/publisher.rb

@@ -20,12 +20,7 @@ module Outboxable
           exchange = channel.topic(@resource.exchange, durable: true)
 
           # Publish the CloudEvent resource to the exchange
-          exchange.publish(
+          exchange.publish(to_envelope(resource: @resource), routing_key: @resource.routing_key, headers: @resource.try(:headers) || {})
-            to_envelope(resource: @resource),
-            routing_key: @resource.routing_key,
-            headers: @resource.try(:headers) || {},
-            content_type: @resource.try(:content_type) || 'application/json'
-          )
 
           # Wait for confirmation
           confirmed = channel.wait_for_confirms
@@ -34,6 +29,7 @@ module Outboxable
         return unless confirmed
 
         @resource.reload
+        @resource.increment_attempt
         @resource.update(status: :published, retry_at: nil)
       end
     end

lib/outboxable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Outboxable
-  VERSION = '1.0.6'
+  VERSION = '0.1.3'
 end

lib/outboxable/worker.rb

@@ -5,8 +5,7 @@ module Outboxable
     include ::Sidekiq::Job
 
     def perform(outbox_id)
-      Outboxable::PublishingManager.publish(resource: Outbox.find(outbox_id)) if Outboxable.configuration.orm == :activerecord
+      Outboxable::PublishingManager.publish(resource: Outbox.find(outbox_id))
-      Outboxable::PublishingManager.publish(resource: Outbox.find_by!(idempotency_key: outbox_id)) if Outboxable.configuration.orm == :mongoid
     end
   end
 end

lib/templates/create_outboxable_outboxes.rb

@@ -7,7 +7,6 @@ class CreateOutboxableOutboxes < ActiveRecord::Migration[7.0]
 
       t.string :exchange, null: false, default: ''
       t.string :routing_key, null: false, default: ''
-      t.string :content_type, null: false, default: 'application/json'
 
       t.integer  :attempts, null: false, default: 0
       t.datetime :last_attempted_at, null: true
@@ -22,7 +21,5 @@ class CreateOutboxableOutboxes < ActiveRecord::Migration[7.0]
 
       t.timestamps
     end
-
-    add_index :outboxes, %i[status last_attempted_at], name: 'index_outboxes_on_outboxable_status_and_last_attempted_at'
   end
 end

lib/templates/initializer.rb

@@ -23,7 +23,7 @@ Outboxable.configure do |config|
   # Specify the ORM you are using. For now, only ActiveRecord is supported.
   config.orm = :activerecord
 
-  # Specify the ORM you are using. Supported values are :activerecord and :mongoid
+  # Specify the message broker you are using. For now, only RabbitMQ is supported.
   config.message_broker = :rabbitmq
 
   # RabbitMQ configurations
@@ -32,5 +32,5 @@ Outboxable.configure do |config|
   config.rabbitmq_user = ENV.fetch('RABBITMQ__USERNAME')
   config.rabbitmq_password = ENV.fetch('RABBITMQ__PASSWORD')
   config.rabbitmq_vhost = ENV.fetch('RABBITMQ__VHOST')
-  config.rabbitmq_exchange_name = ENV.fetch('RABBITMQ__EXCHANGE_NAME')
+  config.rabbitmq_event_bus_exchange = ENV.fetch('EVENTBUS__EXCHANGE_NAME')
 end

lib/templates/mongoid_initializer.rb

@@ -1,36 +0,0 @@
-# This monkey patch allows you to customize the message format that you publish to your broker.
-# By default, Outboxable publishes a CloudEvent message to your broker.
-module Outboxable
-  module RabbitMq
-    class Publisher
-      # Override this method to customize the message format that you publish to your broker
-      # DO NOT CHANGE THE METHOD SIGNATURE
-      def to_envelope(resource:)
-        {
-          id: resource.id,
-          source: 'http://localhost:3000',
-          specversion: '1.0',
-          type: resource.routing_key,
-          datacontenttype: 'application/json',
-          data: resource.payload
-        }.to_json
-      end
-    end
-  end
-end
-
-Outboxable.configure do |config|
-  # Specify the ORM you are using. For now, only ActiveRecord is supported.
-  config.orm = :mongoid
-
-  # Specify the ORM you are using. Supported values are :activerecord and :mongoid
-  config.message_broker = :rabbitmq
-
-  # RabbitMQ configurations
-  config.rabbitmq_host = ENV.fetch('RABBITMQ__HOST')
-  config.rabbitmq_port = ENV.fetch('RABBITMQ__PORT', 5672)
-  config.rabbitmq_user = ENV.fetch('RABBITMQ__USERNAME')
-  config.rabbitmq_password = ENV.fetch('RABBITMQ__PASSWORD')
-  config.rabbitmq_vhost = ENV.fetch('RABBITMQ__VHOST')
-  config.rabbitmq_exchange_name = ENV.fetch('RABBITMQ__EXCHANGE_NAME')
-end

lib/templates/mongoid_outbox.rb

@@ -1,72 +0,0 @@
-class Outbox
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  attr_writer :allow_publish
-
-  # Fields
-  field :status, type: String, default: 'pending'
-  field :size,   type: String, default: 'single'
-
-  field :exchange, type: String, default: ''
-  field :routing_key, type: String, default: ''
-  field :content_type, type: String, default: 'application/json'
-
-  field :attempts, type: Integer, default: 0
-
-  field :last_attempted_at, type: DateTime, default: nil
-
-  field :retry_at, type: DateTime, default: nil
-
-  field :idempotency_key, type: String
-
-  field :payload, type: Hash, default: {}
-  field :headers, type: Hash, default: {}
-
-  index({ idempotency_key: 1 }, { unique: true, name: 'idempotency_key_unique_index' })
-
-  before_save :check_publishing
-  before_create :set_idempotency_key
-
-  # Callbacks
-  before_create :set_last_attempted_at
-  after_save :publish, if: :allow_publish
-
-  # Validations
-  validates :payload, :exchange, :routing_key, presence: true
-
-  # Associations
-  belongs_to :outboxable, polymorphic: true, optional: true
-
-  def set_last_attempted_at
-    self.last_attempted_at = 10.seconds.from_now
-  end
-
-  def publish
-    Outboxable::Worker.perform_async(idempotency_key)
-    update(status: :processing, last_attempted_at: 1.minute.from_now, allow_publish: false)
-  end
-
-  def set_idempotency_key
-    self.idempotency_key = SecureRandom.uuid if idempotency_key.blank?
-  end
-
-  def check_publishing
-    self.allow_publish = false if published?
-  end
-
-  def allow_publish
-    return true if @allow_publish.nil?
-
-    @allow_publish
-  end
-
-  %w[pending processing published failed].each do |status|
-    define_method "#{status}?" do
-      self.status == status
-    end
-
-    # define scope
-    scope status, -> { where(status:) }
-  end
-end

lib/templates/outbox.rb

@@ -1,31 +1,28 @@
 class Outbox < ApplicationRecord
   attribute :allow_publish, :boolean, default: true
 
-  before_save :check_publishing
   # Callbacks
   before_create :set_last_attempted_at
+  before_save :check_publishing
   after_commit :publish, if: :allow_publish?
   # Enums
-  enum status: { pending: 0, processing: 1, published: 2, failed: 3 }
+  enum status: { pending: 0, published: 1, failed: 2 }
   enum size: { single: 0, batch: 1 }
 
   # Validations
-  validates :payload, :exchange, :routing_key, presence: true
+  validates :payload, presence: true
+  validates :exchange, presence: true
+  validates :routing_key, presence: true
 
   # Associations
   belongs_to :outboxable, polymorphic: true, optional: true
 
   def set_last_attempted_at
-    self.last_attempted_at = 10.seconds.from_now
+    self.last_attempted_at = Time.zone.now
   end
 
   def publish
-    # Run this in own thread
+    Outboxable::Worker.perform_async(id)
-    threaded = Thread.new do
-      Outboxable::Worker.perform_inline(id)
-      update(status: :processing, last_attempted_at: 1.minute.from_now, allow_publish: false)
-    end
-    threaded.join
   end
 
   def check_publishing

outboxable.gemspec

@@ -31,8 +31,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'bunny', '>= 2.22'
+  spec.add_dependency 'bunny', '>= 2.19.0'
-  spec.add_dependency 'connection_pool', '>= 2.4'
+  spec.add_dependency 'connection_pool', '~> 2.3.0'
-
   spec.metadata['rubygems_mfa_required'] = 'true'
 end