messaging 3.8.2 → 4.0.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f5de68db180283bd52af1504a78b1e019a90b306fca3302ce9d6b43b74e26c0
-  data.tar.gz: '01559c65cd0b05a8d1b96c80fd5993520844603abbe86a9908d40bf54031306a'
+  metadata.gz: 890880412ffa587c9b553e88d7b9ccf192de0bc6d465629b2b81ab499affd239
+  data.tar.gz: 73a9c88db9f865def6150d53001d37222ef1c05576f36250511fbf825482c0f1
 SHA512:
-  metadata.gz: 52c9f50c35e6c38af29f6c3d725ddbb0e2236731e06db249a54ffe357611fecfe39b62411e21fd0776d502d37e3cad5d8c934f44b4e386da376760be05dcac18
-  data.tar.gz: 3868bd007e72cef0150082d7560e67af9967e1f7b6dfcb66b3569f50a6020f3ae3a4cac2eed60f91e1add93197e5314663f245fd2adf3d13f06b7162137f8e67
+  metadata.gz: bb9fd10c0f1434ba2e129c7b9c71b302abd8164186b84f8b5db95ce9b76fd61b2f0052298f2abd33fa7b19cc916924aa42a02fec4254823c96eab7dd85b46255
+  data.tar.gz: 4c1acafd63dc4dd6160813b0fb38f30aa597c70daf70b1c2703fc530fbfbf5905efff67ad19d811cb1696e4b4decc226c2b662f5b15c83c9795ae3583175f815

data/.circleci/config.yml

@@ -8,12 +8,11 @@ orbs:
 
 shared: &shared
   docker:
-    # https://github.com/bukowskis/fineart/wiki/Updating-the-development-docker-image-for-Circle-CI
-    - image: ghcr.io/bukowskis/base-image/development:ruby-2.7.6-v2
+    - image: ghcr.io/bukowskis/base-image/development:ruby-3.3.1-bookworm-v2
       auth:
         username: $GHCR_USER
         password: $GHCR_PASSWORD
-    - image: cimg/postgres:12.11
+    - image: cimg/postgres:16.1
       environment:
         - POSTGRES_HOST_AUTH_METHOD: trust
   resource_class: large
@@ -49,6 +48,10 @@ jobs:
           command: |
             curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
             chmod +x ./cc-test-reporter
+      - run:
+          name: Add postgres to hosts
+          command: |
+           tee -a /etc/hosts \<<<'127.0.0.1 postgres'
       - run:
           name: Database Setup
           command: |

data/.env

@@ -1 +1 @@
-PG_VERSION=12
+PG_VERSION=16

data/Gemfile

@@ -1,16 +1,9 @@
 source 'https://rubygems.org'
 
-git_source(:github) { |path| "https://github.com/#{path}.git" }
-
 gem 'bootsnap', require: false
 gem 'listen'
 gem 'pg'
-gem 'pry'
-gem 'pry-rails'
 gem 'railties'
 gem 'sidekiq'
 
-gem "github-pages", '203',  group: :jekyll_plugins
-gem "jekyll-include-cache", group: :jekyll_plugins
-
 gemspec

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    messaging (3.8.0)
+    messaging (4.0.0.pre)
       activerecord
       activesupport
       after_transaction
       concurrent-ruby (>= 1.0.2)
       concurrent-ruby-ext (>= 1.0.2)
-      dry-configurable (~> 1.0.1)
+      dry-configurable
       dry-container
       dry-equalizer
       dry-initializer
@@ -19,398 +19,169 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.4)
-      actionview (= 5.2.4)
-      activesupport (= 5.2.4)
-      rack (~> 2.0)
+    actionpack (7.0.8)
+      actionview (= 7.0.8)
+      activesupport (= 7.0.8)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4)
-      activesupport (= 5.2.4)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (7.0.8)
+      activesupport (= 7.0.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.4)
-      activesupport (= 5.2.4)
-    activerecord (5.2.4)
-      activemodel (= 5.2.4)
-      activesupport (= 5.2.4)
-      arel (>= 9.0)
-    activesupport (5.2.4)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activerecord (7.0.8)
+      activemodel (= 7.0.8)
+      activesupport (= 7.0.8)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     after_transaction (0.0.5)
       activerecord
-    arel (9.0.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bootsnap (1.4.5)
-      msgpack (~> 1.0)
-    builder (3.2.4)
-    coderay (1.1.2)
+    bootsnap (1.18.3)
+      msgpack (~> 1.2)
+    builder (3.3.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.11.1)
-    colorator (1.1.0)
-    commonmarker (0.17.13)
-      ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.10)
-    concurrent-ruby-ext (1.1.10)
-      concurrent-ruby (= 1.1.10)
-    connection_pool (2.2.2)
-    crass (1.0.5)
+    concurrent-ruby (1.3.3)
+    concurrent-ruby-ext (1.3.3)
+      concurrent-ruby (= 1.3.3)
+    connection_pool (2.4.1)
+    crass (1.0.6)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
-    digest-crc (0.6.0)
-    dnsruby (1.61.9)
-      simpleidn (~> 0.1)
-    docile (1.3.2)
+    diff-lcs (1.5.1)
+    digest-crc (0.6.5)
+      rake (>= 12.0.0, < 14.0.0)
+    docile (1.4.0)
     dry-configurable (1.0.1)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
     dry-container (0.11.0)
       concurrent-ruby (~> 1.0)
-    dry-core (1.0.0)
+    dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
     dry-equalizer (0.3.0)
     dry-initializer (3.1.1)
-    em-websocket (0.5.3)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0)
-    erubi (1.9.0)
-    ethon (0.16.0)
-      ffi (>= 1.15.0)
-    eventmachine (1.2.7)
-    execjs (2.8.1)
-    faraday (2.7.2)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    ffi (1.15.5)
-    forwardable-extended (2.6.0)
-    gemoji (3.0.1)
-    github-pages (203)
-      github-pages-health-check (= 1.16.1)
-      jekyll (= 3.8.5)
-      jekyll-avatar (= 0.7.0)
-      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.1.6)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.13.0)
-      jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.12.1)
-      jekyll-mentions (= 1.5.1)
-      jekyll-optional-front-matter (= 0.3.2)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.3.0)
-      jekyll-redirect-from (= 0.15.0)
-      jekyll-relative-links (= 0.6.1)
-      jekyll-remote-theme (= 0.4.1)
-      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.6.1)
-      jekyll-sitemap (= 1.4.0)
-      jekyll-swiss (= 1.0.0)
-      jekyll-theme-architect (= 0.1.1)
-      jekyll-theme-cayman (= 0.1.1)
-      jekyll-theme-dinky (= 0.1.1)
-      jekyll-theme-hacker (= 0.1.1)
-      jekyll-theme-leap-day (= 0.1.1)
-      jekyll-theme-merlot (= 0.1.1)
-      jekyll-theme-midnight (= 0.1.1)
-      jekyll-theme-minimal (= 0.1.1)
-      jekyll-theme-modernist (= 0.1.1)
-      jekyll-theme-primer (= 0.5.4)
-      jekyll-theme-slate (= 0.1.1)
-      jekyll-theme-tactile (= 0.1.1)
-      jekyll-theme-time-machine (= 0.1.1)
-      jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.11.1)
-      kramdown (= 1.17.0)
-      liquid (= 4.0.3)
-      mercenary (~> 0.3)
-      minima (= 2.5.1)
-      nokogiri (>= 1.10.4, < 2.0)
-      rouge (= 3.13.0)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.16.1)
-      addressable (~> 2.3)
-      dnsruby (~> 1.60)
-      octokit (~> 4.0)
-      public_suffix (~> 3.0)
-      typhoeus (~> 1.3)
-    html-pipeline (2.14.3)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
-    http_parser.rb (0.8.0)
-    i18n (0.9.5)
+    equalizer (0.0.11)
+    erubi (1.12.0)
+    ffi (1.17.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    jekyll (3.8.5)
-      addressable (~> 2.4)
-      colorator (~> 1.0)
-      em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
-      liquid (~> 4.0)
-      mercenary (~> 0.3.3)
-      pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
-      safe_yaml (~> 1.0)
-    jekyll-avatar (0.7.0)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-coffeescript (1.1.1)
-      coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.3.1)
-      commonmarker (~> 0.14)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-commonmark-ghpages (0.1.6)
-      commonmarker (~> 0.17.6)
-      jekyll-commonmark (~> 1.2)
-      rouge (>= 2.0, < 4.0)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
-    jekyll-feed (0.13.0)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-gist (1.5.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.12.1)
-      jekyll (~> 3.4)
-      octokit (~> 4.0, != 4.4.0)
-    jekyll-include-cache (0.2.0)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-mentions (1.5.1)
-      html-pipeline (~> 2.3)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-optional-front-matter (0.3.2)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.3.0)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-redirect-from (0.15.0)
-      jekyll (>= 3.3, < 5.0)
-    jekyll-relative-links (0.6.1)
-      jekyll (>= 3.3, < 5.0)
-    jekyll-remote-theme (0.4.1)
-      addressable (~> 2.0)
-      jekyll (>= 3.5, < 5.0)
-      rubyzip (>= 1.3.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-seo-tag (2.6.1)
-      jekyll (>= 3.3, < 5.0)
-    jekyll-sitemap (1.4.0)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-swiss (1.0.0)
-    jekyll-theme-architect (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.5.4)
-      jekyll (> 3.5, < 5.0)
-      jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.1.1)
-      jekyll (~> 3.5)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.3)
-      jekyll (>= 3.3, < 5.0)
-    jekyll-watch (2.2.1)
-      listen (~> 3.0)
-    jemoji (0.11.1)
-      gemoji (~> 3.0)
-      html-pipeline (~> 2.2)
-      jekyll (>= 3.0, < 5.0)
-    json (2.3.0)
-    kramdown (1.17.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.4.0)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mercenary (0.3.6)
+      nokogiri (>= 1.12.0)
     meter (1.4.0)
       useragent (~> 0.16.3)
-    method_object (1.0.0)
+    method_object (1.1.0)
       dry-initializer
-    method_source (0.9.2)
-    mini_portile2 (2.8.1)
-    minima (2.5.1)
-      jekyll (>= 3.5, < 5.0)
-      jekyll-feed (~> 0.9)
-      jekyll-seo-tag (~> 2.1)
-    minitest (5.13.0)
-    msgpack (1.3.1)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    method_source (1.1.0)
+    mini_portile2 (2.8.7)
+    minitest (5.23.1)
+    msgpack (1.7.2)
+    nokogiri (1.16.5)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    octokit (4.25.1)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
-    pathutil (0.16.2)
-      forwardable-extended (~> 2.6)
-    pg (1.1.4)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-rails (0.3.9)
-      pry (>= 0.10.4)
-    public_suffix (3.1.1)
-    racc (1.6.2)
-    rack (2.0.7)
-    rack-protection (2.0.7)
-      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    pg (1.5.6)
+    racc (1.8.0)
+    rack (2.2.9)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (5.2.4)
-      actionpack (= 5.2.4)
-      activesupport (= 5.2.4)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (10.5.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    redis (4.1.3)
-    rouge (3.13.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    redis-client (0.22.2)
+      connection_pool
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (3.9.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    ruby-enum (0.9.0)
-      i18n
+      rspec-support (~> 3.13.0)
+    rspec-rails (6.1.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
+    rspec-support (3.13.1)
     ruby-kafka (1.5.0)
       digest-crc
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
-    safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.9.2)
-      addressable (>= 2.3.5)
-      faraday (>= 0.17.3, < 3)
-    sidekiq (5.2.7)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (>= 1.5.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
-    simplecov (0.17.1)
+    sidekiq (7.2.4)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      rack (>= 2.2.4)
+      redis-client (>= 0.19.0)
+    simplecov (0.22.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    simpleidn (0.2.1)
-      unf (~> 0.1.4)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.20.3)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    thor (1.3.1)
     thread_safe (0.3.6)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
-    tzinfo (1.2.10)
-      thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     useragent (0.16.10)
-    virtus (2.0.0)
+    virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-    zeitwerk (2.6.6)
+      equalizer (~> 0.0, >= 0.0.9)
+    zeitwerk (2.6.15)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bootsnap
-  bundler (~> 1.14)
-  github-pages (= 203)
-  jekyll-include-cache
   listen
   messaging!
   pg
-  pry
-  pry-rails
   railties
-  rake (~> 10.0)
+  rake
   rspec (~> 3.0)
   rspec-rails
   sidekiq
   simplecov
 
 BUNDLED WITH
-   2.1.4
+   2.5.10

data/bin/console

@@ -6,6 +6,5 @@ require "messaging"
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-require "pry"
-Pry.start
+require "irb"
+IRB.start(__FILE__)

data/docker-compose.yml

@@ -15,7 +15,7 @@ x-shared: &shared
 services:
   runner:
     <<: *shared
-    image: ghcr.io/bukowskis/base-image/development:ruby-2.6.6-v5
+    image: ghcr.io/bukowskis/base-image/development:ruby-3.3.1-bookworm-v2
     stdin_open: true
     tty: true
     command: /bin/sh
@@ -24,8 +24,6 @@ services:
     image: postgres:${PG_VERSION}
     volumes:
       - pg_data:/var/lib/postgresql/data
-    ports:
-      - 5432:5432
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
 

data/lib/messaging/adapters/kafka.rb

@@ -37,7 +37,7 @@ module Messaging
         # We have a specific logger for Ruby-Kafka as it
         # is a bit more noisy than we would like.
         kafka_logger = Messaging.logger.dup.tap { |logger| logger.level = Config.kafka.log_level }
-        ::Kafka.new(**Config.kafka.client.to_h.merge(client_id: Config.app_name, logger: kafka_logger))
+       ::Kafka.new(**Config.kafka.client.to_h.merge(client_id: Config.app_name, logger: kafka_logger))
       end
 
       def self.register!

data/lib/messaging/adapters/postgres/categories.rb

@@ -24,7 +24,7 @@ module Messaging
         def create(name)
           table_name = Category.table_name_for(name)
           sql = <<~SQL
-            CREATE TABLE messaging.#{table_name}
+            CREATE TABLE IF NOT EXISTS messaging.#{table_name}
             PARTITION OF messaging.messages FOR VALUES IN ('#{name}');
           SQL
           connection.execute sql
@@ -39,7 +39,7 @@ module Messaging
         def create_and_partition_by_day(name)
           table_name = Category.table_name_for(name)
           sql = <<~SQL
-            CREATE TABLE messaging.#{table_name}
+            CREATE TABLE IF NOT EXISTS messaging.#{table_name}
             PARTITION OF messaging.messages FOR VALUES IN ('#{name}')
             PARTITION BY RANGE (created_at);
           SQL

data/lib/messaging/adapters/postgres/category.rb

@@ -20,6 +20,10 @@ module Messaging
         def inspect
           "#<Category: #{name}>"
         end
+
+        def to_s
+          name
+        end
       end
     end
   end

data/lib/messaging/adapters/postgres/consumer.rb

@@ -0,0 +1,85 @@
+module Messaging
+  module Adapters
+    class Postgres
+      class Consumer < ActiveRecord::Base
+        include Messaging::Routing
+
+        self.table_name = 'messaging.consumers'
+
+        def self.latest_known_transaction_id
+          connection.select_value('select pg_snapshot_xmin(pg_current_snapshot())')
+        end
+
+        def start
+          obtain_lock
+          refresh_latest_processed_transaction_id
+
+          Messaging.logger.info "[#{name}] Consumer started"
+          @running = true
+          process_messages
+        ensure
+          shutdown
+        end
+
+        def stop
+          @running = false
+          save
+          Messaging.logger.info "[#{name}] Consumer stopping"
+        end
+
+        def shutdown
+          Messaging.logger.info "[#{name}] Consumer stopped"
+          release_lock
+        end
+
+        private
+
+        def refresh_latest_processed_transaction_id
+          reload
+          return if last_processed_transaction_id.present?
+
+          self.last_processed_transaction_id = self.class.latest_known_transaction_id
+          save
+        end
+
+        def process_messages
+          while @running do
+            messages = fetch_messages
+            messages.each do |message|
+              process_message(message)
+            end
+            save if messages.any?
+            pause_polling_for_5_s unless messages.any?
+          end
+        end
+
+        def process_message(message)
+          Middleware.run(Config.consumer.middlewares, message) { handle message }
+          self.last_processed_position = message.global_position
+          self.last_processed_transaction_id = message.transaction_id
+        end
+
+        def pause_polling_for_5_s
+          Messaging.logger.debug "[#{name}] No new messages. Sleeping"
+          sleep 5
+        end
+
+        def fetch_messages
+          SerializedMessage.in_category(categories)
+                           .with_transaction_id_lower_than_any_currently_running_transaction
+                           .newer_than(last_processed_transaction_id, last_processed_position)
+                           .order(:id)
+                           .limit(1000)
+        end
+
+        def obtain_lock
+          Messaging::Adapters::Postgres::CreateLock.(key: "#{app}-consumer-#{name}")
+        end
+
+        def release_lock
+          Messaging::Adapters::Postgres::ReleaseLock.(key: "#{app}-consumer-#{name}")
+        end
+      end
+    end
+  end
+end

data/lib/messaging/adapters/postgres/create_lock.rb

@@ -0,0 +1,28 @@
+require 'method_object'
+
+module Messaging
+  module Adapters
+    class Postgres
+      class CreateLock
+        include MethodObject
+
+        option :key
+        option :connection, default: -> { SerializedMessage.connection }
+
+        def call
+          connection.execute "SELECT pg_advisory_lock(#{lock_key});"
+        rescue ActiveRecord::QueryCanceled => e
+          Messaging.logger.debug "Locking failed, retrying in 5 seconds"
+          sleep 5
+          retry
+        end
+
+        private
+
+        def lock_key
+          Zlib.crc32(key)
+        end
+      end
+    end
+  end
+end

data/lib/messaging/adapters/postgres/release_lock.rb

@@ -0,0 +1,24 @@
+require 'method_object'
+
+module Messaging
+  module Adapters
+    class Postgres
+      class ReleaseLock
+        include MethodObject
+
+        option :key
+        option :connection, default: -> { SerializedMessage.connection }
+
+        def call
+          connection.execute "SELECT pg_advisory_unlock(#{lock_key});"
+        end
+
+        private
+
+        def lock_key
+          Zlib.crc32(key)
+        end
+      end
+    end
+  end
+end

data/lib/messaging/adapters/postgres/serialized_message.rb

@@ -6,17 +6,44 @@ module Messaging
 
         attr_accessor :expected_version
 
+        def self.in_category(categories)
+          where(stream_category: Array(categories).map(&:to_s))
+        end
+
+        def self.with_transaction_id_lower_than_any_currently_running_transaction
+          where('transaction_id < pg_snapshot_xmin(pg_current_snapshot())')
+        end
+
+        def self.newer_than(transaction_id, position)
+          where([
+            'transaction_id = (:transaction_id)::xid8 AND id > :position OR transaction_id > (:transaction_id)::xid8',
+            transaction_id: transaction_id.to_s,
+            position: position.to_i
+          ])
+        end
+
         # We override this AR method to make records retreived
         # from scopes etc. be message objects of the corresponding
         # message class instead of AR objects
         #
         # See https://api.rubyonrails.org/classes/ActiveRecord/Persistence/ClassMethods.html#method-i-instantiate
+        # Rails version < 6
         def self.instantiate(attributes, *_args)
           attributes['message_type'].constantize.new(
             JSON.parse(attributes['data']).merge(stream_position: attributes['stream_position'])
           )
         end
 
+        # Rails version >= 6
+        def self.instantiate_instance_of(klas, attributes, column_types = {}, &block)
+          attributes['message_type'].constantize.new(
+            JSON.parse(attributes['data']).merge(
+              stream_position: attributes['stream_position'],
+              transaction_id: attributes['transaction_id'],
+              global_position: attributes['id'])
+          )
+        end
+
         # Virtual setter for message so we can create a serialized message from a message
         def message=(message)
           self.data = message.attributes_as_json
@@ -42,6 +69,7 @@ module Messaging
         end
 
         def create_or_update(*args)
+          return super if readonly?
           with_locked_stream do
             set_stream_position
             validate_expected_version!

data/lib/messaging/adapters/postgres.rb

@@ -1,6 +1,10 @@
 require 'active_record'
 require_relative 'postgres/serialized_message'
+require_relative 'postgres/consumer'
+
 require_relative 'postgres/advisory_transaction_lock'
+require_relative 'postgres/create_lock'
+require_relative 'postgres/release_lock'
 
 require_relative 'postgres/store'
 module Messaging
@@ -13,12 +17,19 @@ module Messaging
         return if Adapters.key? :postgres
 
         Adapters.register(:postgres, memoize: true) { Postgres.new }
+        Adapters::Consumer.register(:postgres, memoize: true) { Adapters[:postgres] }
         Adapters::Store.register(:postgres, memoize: true) { Store.new }
+        Adapters::Dispatcher.register(:postgres, memoize: true) { ->(_) { } }
       end
       private_class_method :register!
 
       register!
 
+      def create_consumer(name, **options)
+        Consumer.where(app: Messaging.config.app_name, name: name.to_s).first ||
+          Consumer.create(app: Messaging.config.app_name, name: name.to_s)
+      end
+
       def create_messages_table
         sql = <<~SQL
           CREATE SCHEMA IF NOT EXISTS messaging;
@@ -26,6 +37,7 @@ module Messaging
 
           CREATE TABLE messaging.messages (
             id bigint DEFAULT nextval('messaging.messages_id_seq'::regclass) NOT NULL,
+            transaction_id xid8 DEFAULT pg_current_xact_id() NOT NULL,
             uuid uuid NOT NULL,
             stream character varying NOT NULL,
             stream_position bigint NOT NULL,

data/lib/messaging/config_23.rb

@@ -0,0 +1,71 @@
+if Dry::Configurable.respond_to?(:warn_on_setting_positional_default)
+  Dry::Configurable.warn_on_setting_constructor_block false
+  Dry::Configurable.warn_on_setting_positional_default false
+end
+
+module Messaging
+  class Config
+    extend ::Dry::Configurable
+
+    setting :app_name, 'messaging', reader: true
+
+    setting(:error_handlers, [], reader: true) { |value| Array(value) }
+
+    setting :background_job_handler, ->(message, handler_name) { handler_name.constantize.call(message) }, reader: true
+
+    setting :logger, Logger.new(STDOUT), reader: true
+
+    setting :consumer, reader: true do
+      setting :adapter, :kafka
+      setting(:middlewares, []) { |value| Array(value) }
+    end
+
+    setting :dispatcher, reader: true do
+      setting :adapter, :kafka
+      setting(:middlewares, []) { |value| Array(value) }
+    end
+
+    setting :message_store, reader: true do
+      setting :adapter, :postgres
+      setting(:middlewares, []) { |value| Array(value) }
+    end
+
+    setting :kafka, reader: true do
+      setting :log_level, :warn
+      setting :pause_timeout, 10
+
+      setting :client do
+        setting :seed_brokers, ['localhost:9092']
+        setting :connect_timeout
+        setting :socket_timeout
+        setting :ssl_ca_certs_from_system
+        setting :sasl_plain_username
+        setting :sasl_plain_password
+        setting :ssl_ca_cert, ENV['KAFKA_SSL_CA']
+        setting :ssl_client_cert, ENV['KAFKA_SSL_CERTIFICATE']
+        setting :ssl_client_cert_key, ENV['KAFKA_SSL_KEY']
+      end
+
+      setting :consumer do
+        setting :session_timeout, 30
+        setting :offset_commit_interval, 10
+        setting :offset_commit_threshold, 0
+        setting :heartbeat_interval, 10
+      end
+
+      setting :producer do
+        setting :max_queue_size, 5_000
+        setting :delivery_threshold, 10
+        setting :delivery_interval, 0.05
+      end
+    end
+
+    class << self
+      def setup
+        configure do |config|
+          yield(config)
+        end
+      end
+    end
+  end
+end

data/lib/messaging/consumer_supervisor.rb

@@ -55,6 +55,7 @@ module Messaging
     rescue StandardError => e
       return if @signal_to_stop
 
+      Messaging.logger.error "Consumer #{consumer.name} failed: #{e.message}"
       ExceptionHandler.call(e)
       sleep 2
       retry

data/lib/messaging/message.rb

@@ -15,6 +15,8 @@ module Messaging
 
       attr_accessor :stream_position
       attr_accessor :expected_version
+      attr_accessor :global_position
+      attr_accessor :transaction_id
 
       key_attribute :uuid
 

data/lib/messaging/routing/message_matcher.rb

@@ -43,6 +43,10 @@ module Messaging
       def topics
         all_matching_messages.map(&:topic).uniq
       end
+
+      def categories
+        all_matching_messages.map { |m| m.new.stream_category }.uniq
+      end
     end
   end
 end

data/lib/messaging/routing/route.rb

@@ -25,6 +25,10 @@ module Messaging
         matcher.topics
       end
 
+      def categories
+        matcher.categories
+      end
+
       private
 
       def verify_handler!

data/lib/messaging/routing.rb

@@ -89,5 +89,9 @@ module Messaging
     def topics
       routes.flat_map(&:topics).map(&:to_s).uniq
     end
+
+    def categories
+      routes.flat_map(&:categories).map(&:to_s).uniq
+    end
   end
 end

data/lib/messaging/routing_23.rb

@@ -0,0 +1,97 @@
+require 'messaging/routing/message_matcher'
+require 'messaging/routing/route'
+require 'messaging/routing/enqueued_route'
+require 'messaging/routing/enqueue_message_handler'
+
+module Messaging
+  module Routing
+    def self.included(base)
+      base.send :extend, ClassMethods
+    end
+
+    module ClassMethods
+      def definitions
+        @definitions ||= []
+      end
+
+      def on(pattern, **options, &block)
+        definitions << { pattern: pattern, options: options, block: block }
+      end
+
+      def new(*args, &block)
+        instance = allocate
+
+        # Pre-initialize
+        definitions.each do |definition|
+          instance.on(definition[:pattern], definition[:options], &definition[:block])
+        end
+
+        instance.send(:initialize, *args, &block)
+        instance
+      end
+    end
+
+    # Public: Sets up routes for the events that matches the given pattern
+    #
+    # pattern  - Which messages to route. Can be a string, a regexp,
+    #            a Message class, a module or anything that responds to call.
+    #
+    # call:    -  Any object that responds to call.
+    #             Will be called immediately for matching messages.
+    #
+    # enqueue: -  A constant that responds to call.
+    #             Will be enqueued with Sidekiq for matching messages.
+    #             Needs to be a constant that Sidekiq can serialize to a string
+    #             and back again to a constant as you can't store procs in Redis.
+    #
+    # block    -  An optional block that will be called with each matching message.
+    #
+    #
+    # Examples
+    #
+    # Messaging.routes.draw do
+    #   on 'Events::BidPlaced', call: NotifyOtherBidders
+    #
+    #   on Events::BidPlaced, enqueue: NotifyOtherBidders
+    #
+    #   on Events, do |event|
+    #     puts event.inspect
+    #   end
+    #
+    #   on /.*Updated$/, enqueue: AuditChanges
+    #
+    #   on ->(m) { m.topic == 'my-topic' }, call: DoSometing, enqueue: DoSomethingElseWithSidekiq
+    # end
+    #
+    def on(pattern = /.*/, call: nil, enqueue: nil, &block)
+      routes << Route.new(pattern, call) if call
+      routes << Route.new(pattern, block) if block_given?
+      routes << EnqueuedRoute.new(pattern, enqueue) if enqueue
+    end
+
+    # Internal: Handles the message with the matching subscribers
+    def handle(message, context = self)
+      routes.map { |route| route.call(message, context) }
+      message
+    end
+
+    # Internal: Used by Rails reloading in development.
+    def clear_routes!
+      @routes = Set.new
+    end
+
+    private
+
+    def routes
+      @routes ||= Set.new
+    end
+
+    def topics
+      routes.flat_map(&:topics).map(&:to_s).uniq
+    end
+
+    def categories
+      routes.flat_map(&:categories).map(&:to_s).uniq
+    end
+  end
+end

data/lib/messaging/version.rb

@@ -1,3 +1,3 @@
 module Messaging
-  VERSION = '3.8.2'.freeze
+  VERSION = '4.0.1.pre'.freeze
 end

data/lib/messaging.rb

@@ -5,14 +5,25 @@ require 'active_support'
 require 'active_support/notifications'
 require 'active_support/core_ext'
 
-require 'messaging/config'
+if RUBY_VERSION == '2.3.8'
+  require 'messaging/config_23'
+else
+  require 'messaging/config'
+end
+
 require 'messaging/expected_version'
 require 'messaging/instrumentation'
 require 'messaging/meter'
 require 'messaging/exception_handler'
 require 'messaging/message'
 require 'messaging/message/from_json'
-require 'messaging/routing'
+
+if RUBY_VERSION == '2.3.8'
+  require 'messaging/routing_23'
+else
+  require 'messaging/routing'
+end
+
 require 'messaging/routes'
 require 'messaging/adapters'
 require 'messaging/middleware'
@@ -91,6 +102,10 @@ module Messaging
     message_store.messages_in_streams(*streams)
   end
 
+  def self.all_messages
+    message_store.messages
+  end
+
   def self.defined_messages
     ObjectSpace.each_object(Class).select { |c| c.included_modules.include? Messaging::Message }
   end

data/messaging.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'method_object'
   spec.add_dependency 'concurrent-ruby', '>= 1.0.2'
   spec.add_dependency 'concurrent-ruby-ext', '>= 1.0.2'
-  spec.add_dependency 'dry-configurable', '~> 1.0.1'
+  spec.add_dependency 'dry-configurable'
   spec.add_dependency 'dry-container'
   spec.add_dependency 'dry-equalizer'
   spec.add_dependency 'dry-initializer'
@@ -32,8 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ruby-kafka', '>= 0.5.3'
   spec.add_dependency 'virtus'
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'simplecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: messaging
 version: !ruby/object:Gem::Version
-  version: 3.8.2
+  version: 4.0.1.pre
 platform: ruby
 authors:
 - Bukowskis
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -98,16 +98,16 @@ dependencies:
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
@@ -192,34 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +248,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - developers@bukowskis.com
 executables:
@@ -302,6 +288,9 @@ files:
 - lib/messaging/adapters/postgres/categories/row.rb
 - lib/messaging/adapters/postgres/category.rb
 - lib/messaging/adapters/postgres/category_with_partitions.rb
+- lib/messaging/adapters/postgres/consumer.rb
+- lib/messaging/adapters/postgres/create_lock.rb
+- lib/messaging/adapters/postgres/release_lock.rb
 - lib/messaging/adapters/postgres/serialized_message.rb
 - lib/messaging/adapters/postgres/store.rb
 - lib/messaging/adapters/postgres/stream.rb
@@ -314,6 +303,7 @@ files:
 - lib/messaging/adapters/test/stream.rb
 - lib/messaging/cli.rb
 - lib/messaging/config.rb
+- lib/messaging/config_23.rb
 - lib/messaging/consumer_supervisor.rb
 - lib/messaging/exception_handler.rb
 - lib/messaging/expected_version.rb
@@ -333,13 +323,14 @@ files:
 - lib/messaging/routing/enqueued_route.rb
 - lib/messaging/routing/message_matcher.rb
 - lib/messaging/routing/route.rb
+- lib/messaging/routing_23.rb
 - lib/messaging/sidekiq_worker.rb
 - lib/messaging/version.rb
 - messaging.gemspec
 homepage: https://bukowskis.github.io/messaging/
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -354,8 +345,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: A library for decoupling applications by using messaging to communicate between
   components.