freddy 2.3.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55182881b38a721d174a649943e973134d3ebac9c0502b34cce14ddc503f33db
-  data.tar.gz: 2e0c118f4a4af53745b070d512a74bdc87245e8c8489ea6985d788b71ddd9eab
+  metadata.gz: 395a8eab66f9ff57ce7f4703033598596c67ffb8febb2198c7bfed24c0579ad0
+  data.tar.gz: 5645a94b8e077a8f6a01ce96e6a5e546a1885abaf73b239804e9aab84a222789
 SHA512:
-  metadata.gz: b72b0edde6c555492c90a722d19e99ccc32cd49a8066e7a7fcde71625541c90b1a893980b98f002beadc0644132512954e6f4d7850f55b536ef3f4771e71c1b0
-  data.tar.gz: 79a42a9ea43f43a472066129ea8fe5a00c793c458fe36d482d51286dc45e44d7de3cfc2f0fd23828e05cb4d2fe95471b9304d59a1e09c27cbcbbdb53c33fc1c8
+  metadata.gz: 02a7990035a849971f4b68b1f52c15df2643334132b5d7a53aca33373c6e64c6b1cc1a46d28cdc32f83ab16199112e5de389ac05fde2d6a4b57303e64512073a
+  data.tar.gz: 8865375d8f5576e6b3303cf9ecdea515356df8b8219e16b4f4a76faf45437c1f8adab0d172f24671931d0841314f5d766e8b4a69d9f21381c28abb2a03ec3943

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6']
+        ruby-version: ['2.7']
     services:
       rabbitmq:
         image: rabbitmq
@@ -27,6 +27,6 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
-        cache-version: 1
+        cache-version: 2
     - name: Run lint & tests
       run: bundle exec rake

data/.rubocop.yml

@@ -28,3 +28,6 @@ Style/FrozenStringLiteralComment:
 
 Naming/FileName:
   Enabled: no
+
+Gemspec/RequireMFA:
+  Enabled: no

data/.ruby-version

@@ -1 +1 @@
-2.6
+2.7

data/Gemfile

@@ -4,7 +4,7 @@ gem 'hamster', '~> 3.0'
 gem 'opentelemetry-sdk', '~> 1.0.0.rc3'
 gem 'pry'
 gem 'rspec'
-gem 'rubocop', '~> 1.19'
+gem 'rubocop', '~> 1.30'
 gem 'rubocop-rspec', '~> 2.4'
 
 gemspec

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    freddy (2.3.0)
+    freddy (2.5.0)
       bunny (~> 2.11)
+      concurrent-ruby (~> 1.0)
       oj (~> 3.6)
       opentelemetry-api (~> 1.0.0.rc3)
       opentelemetry-semantic_conventions (~> 1.0)
-      thread (~> 0.1)
       zlib (~> 1.1)
 
 GEM
@@ -23,7 +23,7 @@ GEM
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    oj (3.13.2)
+    oj (3.13.14)
     opentelemetry-api (1.0.0.rc3)
     opentelemetry-common (0.19.1)
       opentelemetry-api (~> 1.0.0.rc3)
@@ -36,16 +36,16 @@ GEM
       opentelemetry-semantic_conventions
     opentelemetry-semantic_conventions (1.6.0)
       opentelemetry-api (~> 1.0.0.rc3)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    rbtree (0.4.4)
-    regexp_parser (2.1.1)
+    rbtree (0.4.5)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -60,27 +60,26 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.19.0)
+    rubocop (1.30.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.10.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
     rubocop-rspec (2.4.0)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
-    set (1.0.1)
+    set (1.0.2)
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
-    thread (0.2.2)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
     zlib (1.1.0)
 
 PLATFORMS
@@ -95,8 +94,8 @@ DEPENDENCIES
   pry
   rake
   rspec
-  rubocop (~> 1.19)
+  rubocop (~> 1.30)
   rubocop-rspec (~> 2.4)
 
 BUNDLED WITH
-   2.2.27
+   2.3.9

data/freddy.gemspec

@@ -11,20 +11,19 @@ Gem::Specification.new do |spec|
   spec.summary       = 'API for inter-application messaging supporting acknowledgements and request-response'
   spec.license       = 'MIT'
   spec.homepage      = 'https://github.com/salemove/freddy'
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
   spec.add_dependency 'bunny', '~> 2.11'
+  spec.add_dependency 'concurrent-ruby', '~> 1.0'
   spec.add_dependency 'oj', '~> 3.6'
   spec.add_dependency 'opentelemetry-api', '~> 1.0.0.rc3'
   spec.add_dependency 'opentelemetry-semantic_conventions', '~> 1.0'
-  spec.add_dependency 'thread', '~> 0.1'
   spec.add_dependency 'zlib', '~> 1.1'
 end

data/lib/freddy/adapters/bunny_adapter.rb

@@ -6,8 +6,14 @@ require 'forwardable'
 class Freddy
   module Adapters
     class BunnyAdapter
+      DEFAULT_OPTIONS = {
+        connection_timeout: 5,
+        read_timeout: 5,
+        write_timeout: 5
+      }.freeze
+
       def self.connect(config)
-        bunny = Bunny.new(config)
+        bunny = Bunny.new(DEFAULT_OPTIONS.merge(config))
         bunny.start
         new(bunny)
       end

data/lib/freddy/consumers/respond_to_consumer.rb

@@ -34,7 +34,7 @@ class Freddy
       end
 
       def process_message(delivery)
-        @consume_thread_pool.process do
+        @consume_thread_pool.post do
           delivery.in_span do
             yield(delivery)
           end

data/lib/freddy/consumers/tap_into_consumer.rb

@@ -46,7 +46,7 @@ class Freddy
       end
 
       def process_message(_queue, delivery)
-        @consume_thread_pool.process do
+        @consume_thread_pool.post do
           delivery.in_span do
             yield delivery.payload, delivery.routing_key
             @channel.acknowledge(delivery.tag)

data/lib/freddy/responder_handler.rb

@@ -20,7 +20,8 @@ class Freddy
     #   responder.shutdown
     def shutdown
       @consumer.cancel
-      @consume_thread_pool.wait(:done)
+      @consume_thread_pool.shutdown
+      @consume_thread_pool.wait_for_termination
     end
   end
 end

data/lib/freddy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Freddy
-  VERSION = '2.3.0'
+  VERSION = '2.5.0'
 end

data/lib/freddy.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'thread/pool'
+require 'concurrent'
 require 'securerandom'
 require 'opentelemetry'
 require 'opentelemetry/semantic_conventions'
@@ -85,7 +85,7 @@ class Freddy
     handler_adapter_factory = MessageHandlerAdapters::Factory.new(producer)
 
     Consumers::RespondToConsumer.consume(
-      thread_pool: Thread.pool(@prefetch_buffer_size),
+      thread_pool: Concurrent::FixedThreadPool.new(@prefetch_buffer_size),
       destination: destination,
       channel: channel,
       handler_adapter_factory: handler_adapter_factory,
@@ -128,7 +128,7 @@ class Freddy
     @logger.debug "Tapping into messages that match #{pattern_or_patterns}"
 
     Consumers::TapIntoConsumer.consume(
-      thread_pool: Thread.pool(@prefetch_buffer_size),
+      thread_pool: Concurrent::FixedThreadPool.new(@prefetch_buffer_size),
       patterns: Array(pattern_or_patterns),
       channel: @connection.create_channel(prefetch: @prefetch_buffer_size),
       options: options,

data/spec/freddy/consumers/respond_to_consumer_spec.rb

@@ -16,7 +16,7 @@ describe Freddy::Consumers::RespondToConsumer do
   let(:msg_handler_adapter_factory) { double(for: msg_handler_adapter) }
   let(:msg_handler_adapter) { Freddy::MessageHandlerAdapters::NoOpHandler.new }
   let(:prefetch_buffer_size) { 2 }
-  let(:thread_pool) { Thread.pool(prefetch_buffer_size) }
+  let(:thread_pool) { Concurrent::FixedThreadPool.new(prefetch_buffer_size) }
 
   after do
     connection.close

data/spec/freddy/sync_response_container_spec.rb

@@ -31,12 +31,13 @@ describe Freddy::SyncResponseContainer do
   describe '#wait_for_response' do
     let(:timeout) { 2 }
     let(:response) { { msg: 'response' } }
-    let(:delivery) { OpenStruct.new(type: 'success') }
 
     context 'when called after #call' do
       let(:max_wait_time_in_seconds) { 0.5 }
 
       before do
+        delivery = instance_double(Freddy::Delivery)
+        allow(delivery).to receive(:type).and_return('success')
         container.call(response, delivery)
       end
 

data/spec/integration/tracing_spec.rb

@@ -57,8 +57,8 @@ describe 'Tracing' do
       freddy.deliver_with_response(destination, {})
       names = exporter.finished_spans.map(&:name)
 
-      expect(names.any? { |name| name.include?('amq.gen-') }).to eq(false)
-      expect(names.any? { |name| name.include?('(response queue)') }).to eq(true)
+      expect(names.any? { |name| name.include?('amq.gen-') }).to be(false)
+      expect(names.any? { |name| name.include?('(response queue)') }).to be(true)
     end
   end
 

data/spec/spec_helper.rb

@@ -18,8 +18,6 @@ OpenTelemetry::SDK.configure do |c|
   c.add_span_processor(span_processor)
 end
 
-Thread.abort_on_exception = true
-
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Glia TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,61 +53,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: opentelemetry-api
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: opentelemetry-semantic_conventions
+  name: opentelemetry-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0.rc3
 - !ruby/object:Gem::Dependency
-  name: thread
+  name: opentelemetry-semantic_conventions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: zlib
   requirement: !ruby/object:Gem::Requirement
@@ -191,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -202,17 +202,4 @@ rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: API for inter-application messaging supporting acknowledgements and request-response
-test_files:
-- spec/.rubocop.yml
-- spec/freddy/consumers/respond_to_consumer_spec.rb
-- spec/freddy/error_response_spec.rb
-- spec/freddy/freddy_spec.rb
-- spec/freddy/message_handler_spec.rb
-- spec/freddy/payload_spec.rb
-- spec/freddy/responder_handler_spec.rb
-- spec/freddy/sync_response_container_spec.rb
-- spec/integration/concurrency_spec.rb
-- spec/integration/reply_spec.rb
-- spec/integration/tap_into_with_group_spec.rb
-- spec/integration/tracing_spec.rb
-- spec/spec_helper.rb
+test_files: []