msgr 0.15.1.1.b150 → 0.15.1.1.b151

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18e58059169b76f1ea3da807d259acdb0f2a45eb
-  data.tar.gz: d0b333aaf3b8e74ee053daeeca3bfa69812644d3
+  metadata.gz: 6778b5c6cddaa79dc917df83eafce6fe900a90a3
+  data.tar.gz: c592eddd080c9daeacd20ad69fa2d248b49acd24
 SHA512:
-  metadata.gz: e025b820877fe71265bf4867db1294ea2a7c37086703ba241a10f3ef4626f09d0084f8595f852bea2d308f2e9c0c533315c53e98a948d779ad8d838d96cb87d1
-  data.tar.gz: 2ec8f4f6fe30f44a736669be056f9585c407065fec6ee89fc5a585af6804610b1eb22c055622e22c70f8b099d0347ff552f37d095d667029a83adca14935f9bf
+  metadata.gz: fc358c8cdfabba724fea529758eb1e88b63ea19b32e77793775562000fb34378823272c48bfb93898ac917e119ba5fdabcfecc89a655177ad6767dcd4f995e24
+  data.tar.gz: 5b34cd2c17174287dd4c6bfe2f2ca15ea65447ec6e250c57e9b8f3c9a6b0a16bfdfa251aec4e0f5fe95a565ff8408d23cf1ef828bae8131929a1f2e7e850fa41

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+* Fix regression in parsing `:uri` config with empty path
+
 ## 0.15.1
 
 * Fix errors with additional configuration keys for AMQP connection (#13)

data/lib/msgr/client.rb

@@ -195,7 +195,7 @@ module Msgr
       config[:pass]  ||= uri.password if uri.password
       config[:host]  ||= uri.host     if uri.host
       config[:port]  ||= uri.port     if uri.port
-      config[:vhost] ||= uri.path     if uri.path
+      config[:vhost] ||= uri.path     unless uri.path.empty?
       config[:ssl]   ||= uri.scheme.casecmp('amqps').zero?
 
       config

data/spec/msgr/msgr/client_spec.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe Msgr::Client do
+  subject { described_class.new config }
+  let(:config) { {} }
+
+  describe '#uri' do
+    subject { super().uri.to_s }
+
+    context 'with default config' do
+      it 'uses the default config' do
+        is_expected.to eq 'amqp://127.0.0.1'
+      end
+    end
+
+    context 'with overwritten URI' do
+      context 'without vhost' do
+        let(:config) { {uri: 'amqp://rabbit'} }
+
+        it 'does not specify a vhost' do
+          is_expected.to eq 'amqp://rabbit'
+        end
+      end
+
+      context 'with empty vhost' do
+        let(:config) { {uri: 'amqp://rabbit/'} }
+
+        it 'does not specify a vhost' do
+          is_expected.to eq 'amqp://rabbit'
+        end
+      end
+
+      context 'with explicit vhost' do
+        let(:config) { {uri: 'amqp://rabbit/some_vhost'} }
+
+        # This behavior is due to legacy parsing in Msgr's config.
+        # We interpret the entire path (incl. the leading slash)
+        # as vhost. As per AMQP rules, this means the leading slash
+        # is part of the vhost, which means it has to be URL encoded.
+        # This will likely change with the next major release.
+        it 'uses the entire path as vhost' do
+          is_expected.to eq 'amqp://rabbit/%2Fsome_vhost'
+        end
+      end
+    end
+
+    context 'with URI and vhost' do
+      let(:config) { {uri: 'amqp://rabbit/some_vhost', vhost: 'real_vhost'} }
+
+      # This is currently the only way to specify a vhost without
+      # leading slash (as a vhost in the :uri config would have
+      # an extra URL encoded leading slash).
+      it 'uses the explicit vhost' do
+        is_expected.to eq 'amqp://rabbit/real_vhost'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 0.15.1.1.b150
+  version: 0.15.1.1.b151
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -137,6 +137,7 @@ files:
 - spec/integration/msgr/railtie_spec.rb
 - spec/integration/msgr_spec.rb
 - spec/integration/spec_helper.rb
+- spec/msgr/msgr/client_spec.rb
 - spec/msgr/msgr/connection_spec.rb
 - spec/msgr/msgr/consumer_spec.rb
 - spec/msgr/msgr/route_spec.rb
@@ -199,6 +200,7 @@ test_files:
 - spec/integration/msgr/railtie_spec.rb
 - spec/integration/msgr_spec.rb
 - spec/integration/spec_helper.rb
+- spec/msgr/msgr/client_spec.rb
 - spec/msgr/msgr/connection_spec.rb
 - spec/msgr/msgr/consumer_spec.rb
 - spec/msgr/msgr/route_spec.rb