msgr 0.11.0.rc2 → 0.11.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1702792de09a7bdb79ac0cc05e7cdc89e00ed8ed
-  data.tar.gz: 138ef85e022e7346efc4e2960002c0b2f8bc3a62
+  metadata.gz: 0edffc091410f7c6c9a9bf2e1790ec2a2b6054f2
+  data.tar.gz: 23edf10a838aa69bc79dfdc7ba22633eaf46921d
 SHA512:
-  metadata.gz: 3683e6cdcf37754eb553ceaa6db9c40c0837dd48b2702a619a6639a76a4ecc72d6f044bfa2c8cf26e856d1a47d55aa1471bd8896390fdcf9930ddf1358de4c29
-  data.tar.gz: fc5e451ecd1b6f983ea41f5b6ba06970186183f5efc178e17a071edb50f7346059f80c73d660e5eacd8edfb9e0af206b9b192b659eed26c5ae96b11aff815cf9
+  metadata.gz: 2eee451a47c451ba9e5566d9b5e1ad08bbcf829f3299693cc8e36639aa93dcc89a03a9d5b250ab65fe630f36672e87d4ef78285c1ec05373549d31dde63ce7fe
+  data.tar.gz: 3cbcf7b04c4f164ff1e6fd0631aa1c9e78b50f52e17c91d468b0c5df85ed5e4a2fff970aeec599a7c6269a57d70a60665d146d79d773cfc135aac8058c7d613c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.11.rc3
+
+* Define pool_class by string to make it useable with rails
+* Add checkcredentials config option to disable initial connect to rabbitmq
+  server to check the credentials
+
 ## 0.11.rc2
 
 * Add nack for messages when an error is rescued by dispatcher

data/lib/msgr/dispatcher.rb

@@ -12,10 +12,10 @@ module Msgr
     attr_reader :pool
 
     def initialize(config)
-      log(:info) { "Initialize new dispatcher (#{config[:max]} threads)..." }
+      config[:pool_class] ||= 'Concurrent::CachedThreadPool'
+      log(:info) { "Initialize new dispatcher (#{config[:pool_class]} with #{config[:max]} threads)..." }
 
-      config[:pool_class] ||= ::Concurrent::CachedThreadPool
-      @pool = config[:pool_class].new(max: config[:max])
+      @pool = config[:pool_class].constantize.new(max: config[:max])
     end
 
     def call(message)

data/lib/msgr/railtie.rb

@@ -27,8 +27,8 @@ module Msgr
         return unless cfg # no config given -> does not load Msgr
 
         Msgr.config = cfg
-        Msgr.client.connect
-        Msgr.start if !cfg[:autostart].nil? && cfg[:autostart]
+        Msgr.client.connect if cfg[:checkcredentials]
+        Msgr.start if cfg[:autostart]
       end
 
       def parse_config(cfg)
@@ -56,6 +56,15 @@ module Msgr
             raise ArgumentError, "Invalid value for rabbitmq config autostart: \"#{cfg[:autostart]}\""
         end
 
+        case cfg[:checkcredentials]
+          when true, 'true', 'enabled', nil
+            cfg[:checkcredentials] = true
+          when false, 'false', 'disabled'
+            cfg[:checkcredentials] = false
+          else
+            raise ArgumentError, "Invalid value for rabbitmq config checkcredentials: \"#{cfg[:checkcredentials]}\""
+        end
+
         cfg[:routing_file] ||= Rails.root.join('config/msgr.rb').to_s
         cfg
       end

data/lib/msgr/version.rb

@@ -3,7 +3,7 @@ module Msgr
     MAJOR = 0
     MINOR = 11
     PATCH = 0
-    STAGE = 'rc2'
+    STAGE = 'rc3'
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
 
     def self.to_s; STRING end

data/scripts/simple_test.rb

@@ -28,7 +28,7 @@ class NullPool
 end
 
 @client = Msgr::Client.new user: 'guest', password: 'guest',
-                           max: 4#, pool_class: NullPool
+                           max: 4#, pool_class: 'NullPool'
 
 @client.routes.configure do
   route 'abc.#', to: 'test#index'

data/spec/integration/msgr/railtie_spec.rb

@@ -29,6 +29,12 @@ describe Msgr::Railtie do
 
         it { should raise_error 'Invalid value for rabbitmq config autostart: "unvalid"'}
       end
+
+      context 'with invalid checkcredentials value' do
+        let(:settings) { {"test" => { uri: 'hans', checkcredentials: 'unvalid'}} }
+
+        it { should raise_error 'Invalid value for rabbitmq config checkcredentials: "unvalid"'}
+      end
     end
 
     context 'without set routes file' do
@@ -78,5 +84,21 @@ describe Msgr::Railtie do
         Msgr::Railtie.load config
       end
     end
+
+    context 'without checkcredentials value' do
+      it 'should connect to rabbitmq directly to check credentials' do
+        expect_any_instance_of(Msgr::Client).to receive(:connect)
+        expect(Msgr::Railtie).to receive(:load_config).and_return({ "test" => { uri: 'test' } })
+        Msgr::Railtie.load config
+      end
+    end
+
+    context 'with checkcredentials is false' do
+      it 'should connect to rabbitmq directly to check credentials' do
+        expect_any_instance_of(Msgr::Client).to_not receive(:connect)
+        expect(Msgr::Railtie).to receive(:load_config).and_return({ "test" => { uri: 'test', checkcredentials: false } })
+        Msgr::Railtie.load config
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 0.11.0.rc2
+  version: 0.11.0.rc3
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: 'Msgr: Rails-like Messaging Framework'