msgr 0.15.0.1.b136 → 0.15.0.1.b139

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a04f6da157c82653ba50c5d81741fd32b897db3
-  data.tar.gz: 1aeebed739de7c091fcc6e8ab5fd5b8d81e0022f
+  metadata.gz: dc6380bab1ce06ee0a36d47942d9a6c3fa56efb5
+  data.tar.gz: 92bb7ec6e91aeb2edab35d1b1af12aa0097de34c
 SHA512:
-  metadata.gz: 567bea8bc94f5d70aa6796d0f11a17d21545327698ad99a82875b7ea62b5ff2d53e344d0b058b18b8f2ef2203f20091ae83e83b73334475799a54b25f9a27043
-  data.tar.gz: a1274b7044da7ace1fa3927bff548ed01f7496833e0d14a0ab309c496fe22921cd78f437539093b09af53495bf7acd253d73e46a6ad03bc0efc9b7a7757a86a1
+  metadata.gz: 2653a9e0db967ccdd1a4869c77f645ddca8bfffa6961edb3c1d8837462bf237bfcf5671f27f438121d827a0f75a65a1ca5a4ea7409c55dada63997f7c0bc5e1a
+  data.tar.gz: 8546dffaf7a57db1bc58bb531f66d884a04cb3f97018b4061f4f19b31c70864e8109734781e658b85a73bb67ec105232ce6801911e0b29d10bbd85198d39e25d

data/.travis.yml

@@ -18,6 +18,8 @@ script:
 - bundle exec rake spec:integration
 
 jobs:
+  allow_failures:
+    - gemfile: gemfiles/Gemfile.rails-master
   include:
     - stage: Beta release
       rvm: '2.4.1'

data/Gemfile

@@ -1,23 +1,25 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Development gems
 #
+gem 'coveralls'
+gem 'fuubar'
 gem 'rake'
 gem 'rspec', '~> 3.0'
-gem 'fuubar'
-gem 'coveralls'
 
 # Doc
 group :development do
-  gem 'yard', '~> 0.9.8'
-  gem 'listen'
-  gem 'guard-yard'
   gem 'guard-rspec'
+  gem 'guard-yard'
+  gem 'listen'
   gem 'redcarpet'
+  gem 'yard', '~> 0.9.8'
 end
 
 group :rails do
-  gem 'rails', '>= 3.2'
+  gem 'rails', '>= 3.2' unless $RAILS
   gem 'rspec-rails'
   gem 'sqlite3'
 end

data/gemfiles/Gemfile.rails-master

@@ -5,3 +5,9 @@ self.instance_eval Bundler.read_file 'Gemfile'
 
 gem 'activesupport', git: 'https://github.com/rails/rails'
 gem 'bunny', ENV['BUNNY_VERSION'] if ENV['BUNNY_VERSION']
+
+group :rails do
+  $RAILS = true
+  gem 'rails', '>= 3.2', git: 'https://github.com/rails/rails'
+  gem 'arel', git: 'https://github.com/rails/arel'
+end

data/lib/msgr/client.rb

@@ -1,25 +1,25 @@
 # frozen_string_literal: true
+
+require 'uri'
+require 'cgi'
+
 module Msgr
   # rubocop:disable Metrics/ClassLength
   class Client
     include Logging
-    attr_reader :uri, :config
 
-    # rubocop:disable Metrics/AbcSize
-    # rubocop:disable Metrics/MethodLength
-    def initialize(config = {})
-      @uri = ::URI.parse config[:uri] ? config.delete(:uri) : 'amqp://localhost/'
-      config[:pass] ||= @uri.password
+    attr_reader :config
 
-      @uri.user   = config[:user] ||= @uri.user || 'guest'
-      @uri.scheme = (config[:ssl] ||= @uri.scheme.to_s.casecmp('amqps').zero?) ? 'amqps' : 'amqp'
-      @uri.host   = config[:host] ||= @uri.host || '127.0.0.1'
-      @uri.port   = config[:port] ||= @uri.port
-      @uri.path   = config[:vhost] ||= @uri.path.present? ? @uri.path : '/'
-      config.reject! {|_, v| v.nil? }
+    # rubocop:disable MethodLength
+    def initialize(config = {})
+      @config = {
+        host: '127.0.0.1',
+        vhost: '/',
+        max: 2
+      }
 
-      @config = config
-      @config[:max] ||= 2
+      @config.merge! parse(config.delete(:uri)) if config.key?(:uri)
+      @config.merge! config.symbolize_keys
 
       @mutex  = ::Mutex.new
       @routes = Routes.new
@@ -27,6 +27,30 @@ module Msgr
 
       log(:debug) { "Created new client on process ##{@pid}..." }
     end
+    # rubocop:enable all
+
+    # rubocop:disable AbcSize
+    # rubocop:disable MethodLength
+    # rubocop:disable PerceivedComplexity
+    # rubocop:disable CyclomaticComplexity
+    def uri
+      @uri = begin
+        uri = ::URI.parse('amqp://localhost')
+
+        uri.user     = CGI.escape(config[:user]) if config.key?(:user)
+        uri.password = '****'                    if config.key?(:pass)
+        uri.host     = config[:host]             if config.key?(:host)
+        uri.port     = config[:port]             if config.key?(:port)
+        uri.scheme   = config[:ssl] ? 'amqps' : 'amqp'
+
+        if config.key?(:vhost) && config[:vhost] != '/'
+          uri.path = "/#{CGI.escape(config[:vhost])}"
+        end
+
+        uri
+      end
+    end
+    # rubocop:enable all
 
     def running?
       mutex.synchronize do
@@ -35,6 +59,7 @@ module Msgr
       end
     end
 
+    # rubocop:disable AbcSize
     def start
       mutex.synchronize do
         check_process!
@@ -47,6 +72,7 @@ module Msgr
         connection.bind(@routes)
       end
     end
+    # rubocop:enable all
 
     def connect
       mutex.synchronize do
@@ -59,6 +85,7 @@ module Msgr
       end
     end
 
+    # rubocop:disable AbcSize
     def stop(opts = {})
       mutex.synchronize do
         check_process!
@@ -73,6 +100,7 @@ module Msgr
         reset
       end
     end
+    # rubocop:enable all
 
     def purge(release: false)
       mutex.synchronize do
@@ -155,5 +183,23 @@ module Msgr
       @bindings   = nil
       @dispatcher = nil
     end
+
+    # rubocop:disable AbcSize
+    def parse(uri)
+      # Legacy parsing of URI configuration; does not follow usual
+      # AMQP vhost encoding but used regular URL path
+      uri = ::URI.parse(uri)
+
+      config = {}
+      config[:user]  ||= uri.user     if uri.user
+      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[:ssl]   ||= uri.scheme.casecmp('amqps').zero?
+
+      config
+    end
+    # rubocop:enable all
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 0.15.0.1.b136
+  version: 0.15.0.1.b139
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport