messaging 3.7.0 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 860c436d2faab463d40144358859eb282aa352370ffb2c725cfa292c267eb959
-  data.tar.gz: cf39e2bf8a10ebe84cfe09d9e74d0fa9bce654803478865b47601b5ada04d404
+  metadata.gz: 6b8fa8dc1718dad30b304f383f7083c633501cf97a9fe8b25ca813f2e0a93381
+  data.tar.gz: a3ba85a1d64ae1b6a4f43a272465431f36a7a883880a38167860179acf6dd6d0
 SHA512:
-  metadata.gz: '0751658ec0a77cc8fd925963c1530c05ee31cb458c8f773a8aba7dd333569e90547945d52dda5cbee21e0f0668cf6d7909cb2f2bd598815a4145cff375233573'
-  data.tar.gz: 0abc8205f0f400f5cade71abe7f075a96338beb44c8559c79b5603f478ddbd8dec7dee4a7ca56784e2be2f10238f16667fd2d68a7e7e54b36caa0529fd62fd95
+  metadata.gz: dc805a0b0407bb15de8ac75778156dbd1f5bcc0672aaf25c8be8766bd14894af524d6a4f579861443821b3f9a9b15e667a4fde8e5799e8a8592c98893b460034
+  data.tar.gz: 8862bddce2dcd81154173551625168db71f2aa4bd2c609a43454b579e2332ab7c2f26e3a767b5deb018f947d61a9bda92ac9a73b332401341098dce3acda1bbf

data/.circleci/config.yml

@@ -2,51 +2,53 @@
 #
 # Check https://circleci.com/docs/2.0/language-ruby/ for more details
 #
-version: 2
-jobs:
-  build:
-    docker:
-      - image: circleci/ruby:2.4.1-node-browsers
-        environment:
-          - CC_TEST_REPORTER_ID: 94ada9b95ee3f232a6e984809d37917cfee90ac47805429e8c49742b2e8d2276
-          - RAILS_ENV: test
-      - image: circleci/postgres:12.5-ram
-        environment:
-          - POSTGRES_HOST_AUTH_METHOD: trust
-          - POSTGRES_PASSWORD: password
+version: 2.1
+orbs:
+   slack: circleci/slack@4.8.2
 
-    working_directory: ~/repo
+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.6.6-v5
+      auth:
+        username: $GHCR_USER
+        password: $GHCR_PASSWORD
+    - image: cimg/postgres:12.11
+      environment:
+        - POSTGRES_HOST_AUTH_METHOD: trust
+  resource_class: large
+  environment:
+    - CC_TEST_REPORTER_ID: 94ada9b95ee3f232a6e984809d37917cfee90ac47805429e8c49742b2e8d2276
+    - DISABLE_SPRING: 1
+    - RACK_ENV: test
 
+commands:
+  bundle_install:
     steps:
-      - run:
-          name: Install aptitude because it has much more helpful error messages when ending up in dependency hell
-          command: sudo apt-get install --assume-yes aptitude
-
-      - run:
-          name: Install Postgres Client
-          command: sudo aptitude -y install postgresql-client
-
-      - checkout
-
-      - run:
-          name: Setup Code Climate test-reporter
-          command: |
-            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-            chmod +x ./cc-test-reporter
-
       - restore_cache:
           name: Restore Bundler Cache
-          key: messaging-bundle-{{ checksum "Gemfile.lock" }}
+          key: bukowskis-bundle-{{ .Environment.CACHE_VERSION }}-{{ checksum "Gemfile.lock" }}
 
       - run:
-          name: install dependencies
-          command: bundle install --jobs=4 --retry=3 --path vendor/bundle
+          name: Bundle Install
+          command: bundle install --path=vendor/bundle --jobs=4 --retry=3
 
       - save_cache:
-          key: messagin-bundle-{{ checksum "Gemfile.lock" }}
+          key: bukowskis-bundle-{{ .Environment.CACHE_VERSION }}-{{ checksum "Gemfile.lock" }}
           paths:
             - vendor/bundle
 
+jobs:
+  specs:
+    <<: *shared
+    steps:
+      - checkout
+      - bundle_install
+      - run:
+          name: Setup Code Climate test-reporter
+          command: |
+            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+            chmod +x ./cc-test-reporter
       - run:
           name: Database Setup
           command: |
@@ -65,4 +67,4 @@ workflows:
   version: 2
   messaging_specs:
     jobs:
-      - build
+      - specs

data/.env

@@ -0,0 +1 @@
+PG_VERSION=12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    messaging (3.5.7)
+    messaging (3.7.2)
       activerecord
       activesupport
       after_transaction
@@ -45,8 +45,8 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    after_transaction (0.0.3)
-      activerecord (< 6.0)
+    after_transaction (0.0.5)
+      activerecord
     arel (9.0.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -73,24 +73,23 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
-    digest-crc (0.5.1)
+    digest-crc (0.6.0)
     dnsruby (1.61.3)
       addressable (~> 2.5)
     docile (1.3.2)
-    dry-configurable (0.8.3)
+    dry-configurable (0.13.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-    dry-container (0.7.2)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.2.2)
-    dry-initializer (3.0.3)
+    dry-equalizer (0.3.0)
+    dry-initializer (3.0.4)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    equalizer (0.0.11)
     erubi (1.9.0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
@@ -101,7 +100,6 @@ GEM
     ffi (1.11.3)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    geocoder (1.2.13)
     github-pages (203)
       github-pages-health-check (= 1.16.1)
       jekyll (= 3.8.5)
@@ -151,7 +149,6 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 3.0)
       typhoeus (~> 1.3)
-    hashie (4.1.0)
     html-pipeline (2.12.2)
       activesupport (>= 2)
       nokogiri (>= 1.4)
@@ -272,21 +269,11 @@ GEM
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    locality (1.1.0)
-      activesupport
-      geocoder (= 1.2.13)
-      hashie
-      i18n
-      maxminddb (= 0.1.8)
-      operation
-      trouble
     loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    maxminddb (0.1.8)
     mercenary (0.3.6)
-    meter (1.2.7)
-      locality (~> 1.1.0)
+    meter (1.4.0)
       useragent (~> 0.16.3)
     method_object (1.0.0)
       dry-initializer
@@ -303,7 +290,6 @@ GEM
       mini_portile2 (~> 2.4.0)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    operation (1.4.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     pg (1.1.4)
@@ -358,7 +344,7 @@ GEM
     rspec-support (3.9.0)
     ruby-enum (0.7.2)
       i18n
-    ruby-kafka (1.0.0)
+    ruby-kafka (1.5.0)
       digest-crc
     rubyzip (1.3.0)
     safe_yaml (1.0.5)
@@ -384,18 +370,16 @@ GEM
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
     thread_safe (0.3.6)
-    trouble (0.0.13)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
     useragent (0.16.10)
-    virtus (1.0.5)
+    virtus (2.0.0)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
 
 PLATFORMS
   ruby

data/docker-compose.yml

@@ -0,0 +1,62 @@
+version: '3.4'
+
+x-shared: &shared
+    tmpfs:
+      - /tmp
+    environment:
+      - RAILS_ENV=${RAILS_ENV:-development}
+      - BOOTSNAP_CACHE_DIR=/rails_cache/bootsnap
+    volumes:
+      - .:/app
+      - bundle:/usr/local/bundle
+    networks:
+      - ${NETWORK_NAME:-default}
+
+services:
+  runner:
+    <<: *shared
+    image: ghcr.io/bukowskis/base-image/development:ruby-2.6.6-v5
+    stdin_open: true
+    tty: true
+    command: /bin/sh
+
+  postgres:
+    image: postgres:${PG_VERSION}
+    volumes:
+      - pg_data:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
+    environment:
+      - POSTGRES_HOST_AUTH_METHOD=trust
+
+  zookeeper:
+    image: zookeeper
+    ports:
+      - "2181:2181"
+
+  kafka:
+    image: niks123123/kafka:2.7.0
+    ports:
+      - "9092:9092"
+    depends_on:
+      - zookeeper
+    environment:
+      KAFKA_ADVERTISED_HOST_NAME: kafka
+      KAFKA_ADVERTISED_PORT: 9092
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+
+volumes:
+  bundle:
+    name: bundle
+  pg_data:
+    name: pg_data_${PG_VERSION}
+
+networks:
+  default:
+    name: messaging_default
+  external:
+    name: ${EXTERNAL_NETWORK}
+    external: true

data/lib/messaging/adapters/kafka/producer.rb

@@ -20,8 +20,8 @@ module Messaging
         def call(message)
           reconnect if forked?
           producer.produce(message.to_json, key: message.message_key, topic: message.topic)
-        rescue ::Kafka::BufferOverflow => exception
-          Trouble.notify(exception, pid: Process.pid, message: message.to_json)
+        rescue ::Kafka::BufferOverflow => e
+          ExceptionHandler.call(e, message: message.to_json)
         end
 
         def shutdown

data/lib/messaging/adapters/kafka.rb

@@ -27,7 +27,7 @@ module Messaging
 
       # Internal: Setup a Ruby-Kafka consumer
       def create_kafka_consumer(group_id)
-        client.consumer({ group_id: group_id }.merge(Config.kafka.consumer.to_hash))
+        client.consumer({ group_id: group_id }.merge(Config.kafka.consumer.to_h))
       end
 
       private
@@ -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_hash.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/version.rb

@@ -1,3 +1,3 @@
 module Messaging
-  VERSION = '3.7.0'.freeze
+  VERSION = '3.7.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: messaging
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.2
 platform: ruby
 authors:
 - Bukowskis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2023-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -271,6 +271,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".env"
 - ".gitignore"
 - ".rspec"
 - Gemfile
@@ -282,6 +283,7 @@ files:
 - _layouts/single.html
 - bin/console
 - bin/setup
+- docker-compose.yml
 - docs/adapters.md
 - docs/consuming.md
 - docs/installation.md