sanger_warren 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdb0a5a3497a84b68ad0be1b01bfb80167452b6a3209badf12d5bba8cb9e3390
-  data.tar.gz: 8271f438b3ad81320a3a1530292edefdc66a40b4e858a908568b151f22a3ae3c
+  metadata.gz: fdfbee5936ea1a0d909d947261f055d698f4b9b4d343559a9d2fe3432846de95
+  data.tar.gz: 752cf1b26528d531f12786f935526f349d2d9d003c05c9d1c9dba7be5908b062
 SHA512:
-  metadata.gz: 517e0e58370945acc610974a4657fc424ee2483d4e794ce74ebe026580aad2fa47e23643304cedc6df99e6354e1a06a430387f70da71c877ec80bc022c7b3118
-  data.tar.gz: 6bbdfe62aa22ea3bc42106800c79fe1f8b3a16a5d50898479ce17ab1b1bf3854ce02a65a83d641d07295dfb138df5ae2d43a60762a6f82c40f10cc1054877579
+  metadata.gz: cbbfd251869fa87a7a3fac8f96ee4f2b5ae0417e6df780ebf6add5a3610fa4502b1f3d72cbf9ac97af27099f3c54801c37d222f9d326211c73217f11fbcb4988
+  data.tar.gz: 834caca1dbd68fea25c1e64da6a2facdc6a68e40cda4a09dc7fb200889445e84f070f66215de6e5bea525ee46c4e7475205c9fd32dfed4360b039d8052e99fab

data/.github/workflows/ruby.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.6', '2.7', '3.0' ]
+        ruby: [ '3.1' ]
     name: Ruby Test ${{ matrix.ruby }}
 
     steps:
@@ -32,7 +32,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0
+        ruby-version: 3.1
         bundler-cache: true # Runs bundle install and caches gems. See the ruby_test.yml
                             # example if you need more control over bundler.
     - name: Run lint

data/.rubocop.yml

@@ -13,7 +13,7 @@ require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.1
   NewCops: enable
 # Blocks are used to structure tests and are part of the shoulda dsl.
 # The standard BlockLength limits are too stringent for this purpose.

data/.ruby-version

@@ -0,0 +1 @@
+3.1.6

data/CHANGELOG.md

@@ -5,6 +5,16 @@ Unreleased section to make new releases easy.
 
 ## [Unreleased]
 
+### Changed
+
+- The WARREN_TYPE environmental variable can now fully replace the config yaml
+
+## [0.4.1] - 2022-01-04
+
+### Changed
+
+- Relaxed version constraints on dependencies
+
 ## [0.4.0] - 2021-06-09
 
 ### Fixed
@@ -25,7 +35,7 @@ Unreleased section to make new releases easy.
 - Warren::Handler::Test and Warren::Handler::Test::Channel no loner respond to
   `add_exchange`. These methods were undocumented, and unused internally.
 
-## Changed
+### Changed
 
 - Messages must now implement `#headers`, although simply returning an empty
   hash is sufficient.

data/Gemfile

@@ -15,4 +15,4 @@ gem 'simplecov'
 gem 'yard'
 
 # Used to provide instance_doubles for more robust testing
-gem 'activerecord', '~>5.2.0', require: false
+gem 'activerecord', '~>7.2.2.1', require: false

data/Gemfile.lock

@@ -1,40 +1,52 @@
 PATH
   remote: .
   specs:
-    sanger_warren (0.4.0)
-      bunny (~> 2.17.0)
-      connection_pool (~> 2.2.0)
+    sanger_warren (0.5.0)
+      bunny (~> 2.17)
+      connection_pool (~> 2.2)
       multi_json (~> 1.0)
-      thor (~> 1.1.0)
+      thor (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activerecord (5.2.6)
-      activemodel (= 5.2.6)
-      activesupport (= 5.2.6)
-      arel (>= 9.0)
-    activesupport (5.2.6)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    amq-protocol (2.3.2)
-    arel (9.0.0)
+    activemodel (7.2.2.1)
+      activesupport (= 7.2.2.1)
+    activerecord (7.2.2.1)
+      activemodel (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
+      timeout (>= 0.4.0)
+    activesupport (7.2.2.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    amq-protocol (2.3.3)
     ast (2.4.2)
-    bunny (2.17.0)
-      amq-protocol (~> 2.3, >= 2.3.1)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    bunny (2.24.0)
+      amq-protocol (~> 2.3)
+      sorted_set (~> 1, >= 1.0.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    connection_pool (2.2.5)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     diff-lcs (1.4.4)
     docile (1.4.0)
-    i18n (1.8.10)
+    drb (2.2.1)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
+    logger (1.7.0)
     method_source (1.0.0)
-    minitest (5.14.4)
+    minitest (5.25.5)
     multi_json (1.15.0)
     parallel (1.20.1)
     parser (3.0.1.1)
@@ -44,8 +56,9 @@ GEM
       method_source (~> 1.0)
     rainbow (3.0.0)
     rake (13.0.3)
+    rbtree (0.4.6)
     regexp_parser (2.1.1)
-    rexml (3.2.5)
+    rexml (3.3.9)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -76,25 +89,30 @@ GEM
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
+    securerandom (0.4.1)
+    set (1.1.1)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
-    thor (1.1.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
+    thor (1.3.2)
+    timeout (0.4.3)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
-    yard (0.9.26)
+    yard (0.9.35)
 
 PLATFORMS
   ruby
   x86_64-darwin-19
 
 DEPENDENCIES
-  activerecord (~> 5.2.0)
+  activerecord (~> 7.2.2.1)
   pry
   rake (~> 13.0)
   rspec (~> 3.0)

data/README.md

@@ -9,7 +9,7 @@ RabbitMQ via the bunny gem.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'sanger-warren'
+gem 'sanger_warren'
 ```
 
 And then execute:
@@ -156,15 +156,22 @@ some testing examples can be found in the documentation for the
 
 ## 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.
+Install the required ruby version as specified in `sanger-warren.gemspec`. 
 
-To install this gem onto your local machine, run `bundle exec rake install`. To
-release a new version, update the version number in `version.rb`, and then run
-`bundle exec rake release`, which will create a git tag for the version, push
-git commits and tags, and push the `.gem` file to
-[rubygems.org](https://rubygems.org).
+Install the required bundler version as specified by `BUNDLED WITH` in `Gemfile.lock`. 
+
+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.
+
+To install this gem onto your local machine, run `bundle exec rake install`. 
+
+To release a new version:
+
+- update the version number in `version.rb`
+- run `bundle exec rake release` (which will create a git tag for the version)
+- push git commits and tags
+- push the `.gem` file to [rubygems.org](https://rubygems.org) (how?)
 
 ## Contributing
 

data/lib/warren/framework_adaptor/rails_adaptor.rb

@@ -100,7 +100,15 @@ module Warren
 
         yield
       ensure
-        ActiveRecord::Base.clear_active_connections!
+        # Although Rails 7.2 recommends using `ActiveRecord::Base.connection_handler.clear_active_connections!`
+        # to clear all active connections (especially in applications with multiple databases),
+        # Y25-234 investigated the performance and applicability of this versus
+        # `ActiveRecord::Base.connection_pool.release_connection`.
+        #
+        # Since Unified Warehouse (the primary Warren consumer) does not use multiple databases,
+        # `release_connection` was found to be more targeted and performant.
+        # Using `clear_active_connections!` would be redundant and potentially less efficient in this context.
+        ActiveRecord::Base.connection_pool.release_connection
       end
 
       # Returns the rails environment

data/lib/warren/version.rb

@@ -2,5 +2,5 @@
 
 module Warren
   # Gem version number. Bump prior to release of new version
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/warren.rb

@@ -29,7 +29,7 @@ module Warren
   #
   # @return [Warren::Handler::Base] Exact class determined by the type passed in
   #
-  def self.construct(type:, config: {})
+  def self.construct(type: 'UNSPECIFIED', config: {})
     warren_type = ENV.fetch(WARREN_TYPE, type)
     case warren_type
     when 'test' then Warren::Handler::Test.new

data/sanger-warren.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
     the ability to switch in different adapters during testing and development.
   DESCRIPTION
   spec.homepage = 'https://github.com/sanger/warren'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.1.0')
   spec.license = 'GPL'
 
   spec.metadata['homepage_uri'] = spec.homepage
@@ -32,8 +32,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # Dependencies
-  spec.add_runtime_dependency 'bunny', '~> 2.17.0'
-  spec.add_runtime_dependency 'connection_pool', '~> 2.2.0'
+  spec.add_runtime_dependency 'bunny', '~> 2.17'
+  spec.add_runtime_dependency 'connection_pool', '~> 2.2'
   spec.add_runtime_dependency 'multi_json', '~> 1.0'
-  spec.add_runtime_dependency 'thor', '~> 1.1.0'
+  spec.add_runtime_dependency 'thor', '~> 1.1'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sanger_warren
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - James Glover
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2025-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.17.0
+        version: '2.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.17.0
+        version: '2.17'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 description: |
   Warren provides connection pooling for RabbitMQ connections. It also adds
   the ability to switch in different adapters during testing and development.
@@ -80,6 +80,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -140,7 +141,8 @@ metadata:
   source_code_uri: https://github.com/sanger/warren
   changelog_uri: https://github.com/sanger/warren/blob/master/CHANGELOG.md
   documentation_uri: https://rubydoc.info/gems/sanger_warren
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,15 +150,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Configuring and managing bunny RabbitMQ connections
 test_files: []