msgr 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0280e30254fa68bc13cde2f7bbae229f0e355c74ed14258aa71003e670982470'
-  data.tar.gz: c601b9c42f3d0a0a031f30aa7223009e5cfb90b51da28ff6d39d80961fd9d6d7
+  metadata.gz: 13657fc492608f204e15feb6dd99b4201ae0de4972c6251970009fecab1f4343
+  data.tar.gz: 99b4dbd131d80b3d1ab7b638b78af8a3ec91d43f3a18f30bc7bec073cdd1c89d
 SHA512:
-  metadata.gz: c4503d32dcaffef4c8259f5b5768144d0841f9437cdce6758d88b02f2465e1ffd1a3a1ad0b03130435f222a14971247c41957156088d14496465b5b44315cb02
-  data.tar.gz: f200f775facda3273f45746cbc3c7baa110f0b773ebe9d8c120f6956c2ad061a24c62c47b44660f699e55dd38b5f161595958d8685cbba1edf5d4b8657385804
+  metadata.gz: 7097dd99d5ce3ebfe81763a9a49775ba8605ceca1695d6b736baa0db6057d1c94b0e7d5d1349d9c7df0783c3a26a858a2ee659766a06846bd914bc0fdd75982b
+  data.tar.gz: 0ddde917911e057af0c55d0adc69e26aa4d76c8086df2aea35b7d519715555a4c06544e9befd835f3d638f40dcd6fa480f3dfbdd5e74d0c04b5c230c9d68c074

data/CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [1.3.2] - 2021-09-21
+### Fixed
+- Rake task `msgr:drain` ran before all routes were initialized (#44)
+
 ## [1.3.1] - 2020-12-16
 ### Fixed
 - Delay setting default options for correct relative routing file path
@@ -12,7 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [1.3.0] - 2020-12-16
 ### Added
 - Support and testing for Rails 6.1
-- Rake task  for purging all known queues (#43)
+- Rake task for purging all known queues (#43)
 
 ### Changed
 - High-risk feature to autostart client in-process has been removed without replacement
@@ -114,7 +118,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 - Improve rails initializer code
 
-[Unreleased]: https://github.com/jgraichen/msgr/compare/v1.3.1...HEAD
+[Unreleased]: https://github.com/jgraichen/msgr/compare/v1.3.2...HEAD
+[1.3.2]: https://github.com/jgraichen/msgr/compare/v1.3.1...v1.3.2
 [1.3.1]: https://github.com/jgraichen/msgr/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/jgraichen/msgr/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/jgraichen/msgr/compare/v1.1.0...v1.2.0

data/lib/msgr/client.rb

@@ -21,7 +21,7 @@ module Msgr
       @config.merge! config.symbolize_keys
 
       @mutex  = ::Mutex.new
-      @routes = Routes.new
+      @routes = load_routes
       @pid ||= ::Process.pid
 
       log(:debug) { "Created new client on process ##{@pid}..." }
@@ -59,8 +59,6 @@ module Msgr
 
         log(:debug) { "Start on #{uri}..." }
 
-        @routes << config[:routing_file] if config[:routing_file].present?
-        @routes.reload
         connection.bind(@routes)
       end
     end
@@ -192,5 +190,12 @@ module Msgr
 
       config
     end
+
+    def load_routes
+      Routes.new.tap do |routes|
+        routes << config[:routing_file] if config[:routing_file].present?
+        routes.reload
+      end
+    end
   end
 end

data/lib/msgr/version.rb

@@ -4,7 +4,7 @@ module Msgr
   module VERSION
     MAJOR = 1
     MINOR = 3
-    PATCH = 1
+    PATCH = 2
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
 

data/spec/fixtures/msgr_routes_test_drain.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+route 'abc', to: 'consumer1#action1'
+route 'def', to: 'consumer1#action2'
+route 'ghi', to: 'consumer2#action1'

data/spec/unit/msgr/client_spec.rb

@@ -60,16 +60,11 @@ describe Msgr::Client do
   describe 'drain' do
     subject(:drain) { client.drain }
 
+    let(:config) { {routing_file: 'spec/fixtures/msgr_routes_test_drain.rb'} }
     let(:channel_stub) { instance_double('Msgr::Channel', prefetch: true) }
     let(:queue_stub) { instance_double('Bunny::Queue', purge: true) }
 
     before do
-      client.routes.configure do
-        route 'abc', to: 'consumer1#action1'
-        route 'def', to: 'consumer1#action2'
-        route 'ghi', to: 'consumer2#action1'
-      end
-
       allow(Msgr::Channel).to receive(:new).and_return(channel_stub)
       allow(channel_stub).to receive(:queue).and_return(queue_stub).at_most(3).times
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -103,6 +103,7 @@ files:
 - msgr.gemspec
 - scripts/simple_test.rb
 - spec/fixtures/msgr_routes_test_1.rb
+- spec/fixtures/msgr_routes_test_drain.rb
 - spec/integration/dummy/Rakefile
 - spec/integration/dummy/app/assets/config/manifest.js
 - spec/integration/dummy/app/consumers/application_consumer.rb
@@ -160,12 +161,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.4
 signing_key: 
 specification_version: 4
 summary: 'Msgr: Rails-like Messaging Framework'
 test_files:
 - spec/fixtures/msgr_routes_test_1.rb
+- spec/fixtures/msgr_routes_test_drain.rb
 - spec/integration/dummy/Rakefile
 - spec/integration/dummy/app/assets/config/manifest.js
 - spec/integration/dummy/app/consumers/application_consumer.rb