active_publisher 1.4.2 → 1.6.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29d5272d509cc5f9a8e2ff0de59457ef5de1a98e57db0d777feb9e27f6e4e75d
-  data.tar.gz: 97b72119524a26af0caf2536f71e08547dbc3785ce6aacf3143a848a325a9cee
+  metadata.gz: c119d81b1c0b6d5f0f34ecc50fcfc5dd01a122b0fe4dc34c1e846532e763b88f
+  data.tar.gz: 23201174a88e23d15832806617ed3bfab36d4d0f8999fdbe27276654f995c1f1
 SHA512:
-  metadata.gz: 83072d8997f470c99b02c683cddc669b57e6087576fae90ef957b79d414652785a1e4c9b1de384aa35a8c89be2276f539f1abcd17a88a67598496162c2bab4c1
-  data.tar.gz: e388ff6b32215969e32f437f7663216e703ef53ccd03e792ac427604629e4e658313b095aec14ae18c2bd6b35c6a8e147e22f5130c776d50f7d6a459d164e63b
+  metadata.gz: 1d0ac9632558a9c27a18816855188d30b436734916c2c9e076c0608990b34e033eb5f8bfd3813b150f66543852e714680e8274dd7660dbdfd996a4aca9f81ab9
+  data.tar.gz: e4f244ab7ccdf4a3e5111de0c917885681e4763cd3b1f8f658cd46c8242129ec97fb06f18b469e4064b1caab3e49a3d97ada09d8ddad6aa118d5a3370b68e128

data/.circleci/config.yml

@@ -1,57 +1,92 @@
-# Inspired by: http://mikebian.co/running-tests-against-multiple-ruby-versions-using-circleci/
-
 version: 2.1
 
-orbs:
-  ruby: circleci/ruby@1.1
-
 jobs:
-  test:
-    parallelism: 1
+  build_and_test:
     parameters:
-      ruby-image:
+      docker_image:
         type: string
+        description: "The Ruby or JRuby Docker image to test against"
+
     docker:
-      - image: << parameters.ruby-image >>
-      - image: rabbitmq
+      # 1. The Primary Container (where your code actually runs)
+      - image: << parameters.docker_image >>
+        environment:
+          JRUBY_OPTS: "-J-Xmx1024m"
+          RAILS_ENV: test
+          # Tell your app where to find RabbitMQ (if your app uses this ENV var)
+          RABBITMQ_URL: "amqp://guest:guest@localhost:5672"
+
+      # 2. The Service Container (runs in the background)
+      - image: rabbitmq:3
+        # If you need the management UI for debugging, use `rabbitmq:3-management` instead
+        # environment:
+        #   RABBITMQ_DEFAULT_USER: guest
+        #   RABBITMQ_DEFAULT_PASS: guest
+
+    working_directory: ~/project
 
     steps:
       - checkout
+
       - run:
-          name: install dockerize
-          command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && sudo tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
-          environment:
-            DOCKERIZE_VERSION: v0.3.0
-      - run:
-          name: Wait for rabbitmq
-          command: dockerize -wait tcp://localhost:5672 -timeout 1m
-      - run:
-          name: Install bundler
-          command: gem install bundler
+          name: Install System Dependencies
+          command: |
+            if [ "$(id -u)" = "0" ]; then
+              apt-get update && apt-get install -y build-essential git
+            else
+              sudo apt-get update && sudo apt-get install -y build-essential git
+            fi
+
+      # Note: We added the docker_image parameter to the cache key
+      # so MRI and JRuby gems don't conflict.
+      - restore_cache:
+          keys:
+            - v1-gems-<< parameters.docker_image >>-{{ checksum "Gemfile.lock" }}
+            - v1-gems-<< parameters.docker_image >>-
+
       - run:
-          name: Which bundler?
-          command: bundle -v
+          name: Install Ruby Dependencies
+          command: |
+            gem install bundler
+            bundle config set --local path 'vendor/bundle'
+            bundle install --jobs=4 --retry=3
+
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-gems-<< parameters.docker_image >>-{{ checksum "Gemfile.lock" }}
+
+      # Wait for RabbitMQ to be ready before running tests.
+      # Service containers can sometimes take a few seconds to boot up.
       - run:
-          name: bundle install
-          command: bundle install
+          name: Wait for RabbitMQ
+          command: |
+            if [ "$(id -u)" = "0" ]; then
+              apt-get install -y netcat-openbsd
+            else
+              sudo apt-get install -y netcat-openbsd
+            fi
+
+            echo "Waiting for RabbitMQ to start..."
+            while ! nc -z localhost 5672; do
+              sleep 1
+            done
+            echo "RabbitMQ is ready!"
+
       - run:
-          name: rspec
+          name: Run Tests
           command: bundle exec rspec
 
-# strangely, there seems to be very little documentation about exactly how martix builds work.
-# By defining a param inside your job definition, Circle CI will automatically spawn a job for
-# unique param value passed via `matrix`. Neat!
-# https://circleci.com/blog/circleci-matrix-jobs/
 workflows:
-  build_and_test:
+  version: 2
+  ruby_compatibility_matrix:
     jobs:
-      - test:
+      - build_and_test:
+          name: test-<< matrix.docker_image >>
           matrix:
             parameters:
-              ruby-image:
-                - circleci/ruby:2.6
-                - circleci/ruby:2.7
-                - cimg/ruby:3.0
-                - cimg/ruby:3.1
-                - circleci/jruby:9.2
-                - circleci/jruby:9.3
+              docker_image:
+                - "cimg/ruby:3.1"
+                - "cimg/ruby:3.4"
+                - "jruby:9.4"
+                - "jruby:10"

data/.github/workflows/ruby.yaml

@@ -0,0 +1,44 @@
+name: Build and Test
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['3.1', '3.4', 'jruby-9.4', 'jruby-10']
+
+    services:
+      rabbitmq:
+        image: rabbitmq
+        ports:
+          - 5672:5672
+        # GHA natively waits for the service to be healthy, replacing `dockerize`
+        options: >-
+          --health-cmd "rabbitmq-diagnostics -q ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          # This automatically runs `bundle install` and caches the gems for faster runs!
+          bundler-cache: true
+
+      - name: Which bundler?
+        run: bundle -v
+
+      - name: RSpec
+        run: bundle exec rspec

data/active_publisher.gemspec

@@ -26,9 +26,10 @@ Gem::Specification.new do |spec|
     spec.add_dependency 'bunny', '~> 2.1'
   end
 
-  spec.add_dependency 'activesupport', '>= 3.2'
+  spec.required_ruby_version = '>= 3.1.0'
+
+  spec.add_dependency 'activesupport', '>= 6.0'
   spec.add_dependency 'concurrent-ruby'
-  spec.add_dependency 'multi_op_queue', '>= 0.2.0'
 
   spec.add_development_dependency "benchmark-ips"
   spec.add_development_dependency "bundler"

data/lib/active_publisher/async/in_memory_adapter/async_queue.rb

@@ -20,7 +20,7 @@ module ActivePublisher
           self.back_pressure_strategy = back_pressure_strategy
           @max_queue_size = max_queue_size
           @supervisor_interval = supervisor_interval
-          @queue = ::MultiOpQueue::Queue.new
+          @queue = ::ActivePublisher::MultiOpQueue::Queue.new
           @consumers = {}
           create_and_supervise_consumers!
         end

data/lib/active_publisher/async/in_memory_adapter.rb

@@ -1,9 +1,9 @@
-require "active_publisher/message"
 require "active_publisher/async/in_memory_adapter/async_queue"
 require "active_publisher/async/in_memory_adapter/channel"
 require "active_publisher/async/in_memory_adapter/consumer_thread"
+require "active_publisher/message"
+require "active_publisher/multi_op_queue"
 require "concurrent"
-require "multi_op_queue"
 
 module ActivePublisher
   module Async

data/lib/active_publisher/async/redis_adapter.rb

@@ -1,7 +1,7 @@
 require "active_publisher"
-require "active_publisher/message"
 require "active_publisher/async/redis_adapter/consumer"
-require "multi_op_queue"
+require "active_publisher/message"
+require "active_publisher/multi_op_queue"
 
 module ActivePublisher
   module Async
@@ -26,7 +26,7 @@ module ActivePublisher
           # do something with supervision ?
           @redis_pool = new_redis_pool
           @async_queue = ::ActivePublisher::Async::RedisAdapter::Consumer.new(redis_pool)
-          @queue = ::MultiOpQueue::Queue.new
+          @queue = ::ActivePublisher::MultiOpQueue::Queue.new
           @flush_max = ::ActivePublisher.configuration.messages_per_batch
           @flush_min = @flush_max / 2
 

data/lib/active_publisher/configuration.rb

@@ -84,9 +84,9 @@ module ActivePublisher
       absolute_config_path = ::File.expand_path(::File.join("config", "active_publisher.yml"))
       action_subscriber_config_file = ::File.expand_path(::File.join("config", "action_subscriber.yml"))
 
-      if ::File.exists?(absolute_config_path)
+      if ::File.exist?(absolute_config_path)
         yaml_config = load_yaml_config_from_file(absolute_config_path)[env]
-      elsif ::File.exists?(action_subscriber_config_file)
+      elsif ::File.exist?(action_subscriber_config_file)
         yaml_config = load_yaml_config_from_file(action_subscriber_config_file)[env]
       end
 

data/lib/active_publisher/multi_op_queue.rb

@@ -0,0 +1,203 @@
+module ActivePublisher
+  module MultiOpQueue
+    # Original Queue implementation from Ruby-2.0.0
+    # https://github.com/ruby/ruby/blob/ruby_2_0_0/lib/thread.rb
+    #
+    # This class provides a way to synchronize communication between threads.
+    #
+    # Example:
+    #
+    #   require 'thread'
+    #
+    #   queue = Queue.new
+    #
+    #   producer = Thread.new do
+    #     5.times do |i|
+    #       sleep rand(i) # simulate expense
+    #       queue << i
+    #       puts "#{i} produced"
+    #     end
+    #   end
+    #
+    #   consumer = Thread.new do
+    #     5.times do |i|
+    #       value = queue.pop
+    #       sleep rand(i/2) # simulate expense
+    #       puts "consumed #{value}"
+    #     end
+    #   end
+    #
+    #   consumer.join
+    #
+    class Queue
+      #
+      # Creates a new queue.
+      #
+      def initialize
+        @que = []
+        @num_waiting = 0
+        @mutex = Mutex.new
+        @cond = ConditionVariable.new
+      end
+
+      #
+      # Concatenates +ary+ onto the queue.
+      #
+      def concat(ary)
+        handle_interrupt do
+          @mutex.synchronize do
+            @que.concat ary
+            @cond.signal
+          end
+        end
+      end
+
+      #
+      # Pushes +obj+ to the queue.
+      #
+      def push(obj)
+        handle_interrupt do
+          @mutex.synchronize do
+            @que.push obj
+            @cond.signal
+          end
+        end
+      end
+
+      #
+      # Alias of push
+      #
+      alias << push
+
+      #
+      # Alias of push
+      #
+      alias enq push
+
+      #
+      # Retrieves data from the queue.  If the queue is empty, the calling thread is
+      # suspended until data is pushed onto the queue.  If +non_block+ is true, the
+      # thread isn't suspended, and an exception is raised.
+      #
+      def pop(non_block=false)
+        handle_interrupt do
+          @mutex.synchronize do
+            while true
+              if @que.empty?
+                if non_block
+                  raise ThreadError, "queue empty"
+                else
+                  begin
+                    @num_waiting += 1
+                    @cond.wait @mutex
+                  ensure
+                    @num_waiting -= 1
+                  end
+                end
+              else
+                return @que.shift
+              end
+            end
+          end
+        end
+      end
+
+      #
+      # Alias of pop
+      #
+      alias shift pop
+
+      #
+      # Alias of pop
+      #
+      alias deq pop
+
+      #
+      # Retrieves data from the queue and returns array of contents.
+      # If +num_to_pop+ are available in the queue then multiple elements are returned in array response
+      # If the queue is empty, the calling thread is
+      # suspended until data is pushed onto the queue.  If +non_block+ is true, the
+      # thread isn't suspended, and an exception is raised.
+      #
+      def pop_up_to(num_to_pop = 1, opts = {})
+        case opts
+        when TrueClass, FalseClass
+          non_bock = opts
+        when Hash
+          timeout = opts.fetch(:timeout, nil)
+          non_block = opts.fetch(:non_block, false)
+        end
+
+        handle_interrupt do
+          @mutex.synchronize do
+            while true
+              if @que.empty?
+                if non_block
+                  raise ThreadError, "queue empty"
+                else
+                  begin
+                    @num_waiting += 1
+                    @cond.wait(@mutex, timeout)
+                    return nil if @que.empty?
+                  ensure
+                    @num_waiting -= 1
+                  end
+                end
+              else
+                return @que.shift(num_to_pop)
+              end
+            end
+          end
+        end
+      end
+
+      #
+      # Returns +true+ if the queue is empty.
+      #
+      def empty?
+        @que.empty?
+      end
+
+      #
+      # Removes all objects from the queue.
+      #
+      def clear
+        @que.clear
+      end
+
+      #
+      # Returns the length of the queue.
+      #
+      def length
+        @que.length
+      end
+
+      #
+      # Alias of length.
+      #
+      alias size length
+
+      #
+      # Returns the number of threads waiting on the queue.
+      #
+      def num_waiting
+        @num_waiting
+      end
+
+      private
+
+      def handle_interrupt
+        @handle_interrupt = Thread.respond_to?(:handle_interrupt) if @handle_interrupt.nil?
+
+        if @handle_interrupt
+          Thread.handle_interrupt(StandardError => :on_blocking) do
+            yield
+          end
+        else
+          yield
+        end
+      end
+    end
+  end
+
+end

data/lib/active_publisher/version.rb

@@ -1,3 +1,3 @@
 module ActivePublisher
-  VERSION = "1.4.2"
+  VERSION = "1.6.0.pre1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_publisher
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.6.0.pre1
 platform: ruby
 authors:
 - Brian Stien
@@ -9,10 +9,9 @@ authors:
 - Brandon Dewitt
 - Devin Christensen
 - Michael Ries
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -34,14 +33,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -56,20 +55,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: multi_op_queue
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +165,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/workflows/ruby.yaml"
 - ".gitignore"
 - ".rspec"
 - CODE_OF_CONDUCT.md
@@ -203,12 +189,12 @@ files:
 - lib/active_publisher/connection.rb
 - lib/active_publisher/logging.rb
 - lib/active_publisher/message.rb
+- lib/active_publisher/multi_op_queue.rb
 - lib/active_publisher/version.rb
 homepage: https://github.com/mxenabled/active_publisher
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,15 +202,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.13
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Aims to make publishing work across MRI and jRuby painless and add some nice
   features like automatially publishing lifecycle events for ActiveRecord models.