msgr 0.14.1.1.b112 → 0.14.1.1.b124

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTg4NDhmODcwZWU2MzEzOTQ1ODllNzg5ODdiNGFjODJiOGZmMmZiMQ==
-  data.tar.gz: !binary |-
-    NDUwNjY3NDU5ZWQ1ZjM1ZjdkYTE0N2YwYjg4YTRjZmFhOTYyOTEzOA==
+SHA1:
+  metadata.gz: ecda8758c7878ecf3d464b1fcd382205499bd10a
+  data.tar.gz: d9ad4ae2f6c2615aeb58643a6d138a7a5f54658f
 SHA512:
-  metadata.gz: !binary |-
-    N2M3OGEyMWUwNTA5MGQyN2Q1MjkzMWRiNWIwYmVhZjIzNzk3ZmE5MGIwZGU4
-    YmQ4OTM2MGMxZjFkZmE0ZTlmNTdiNmQ4MzE5NmU1ZDgwNDdlNWEyZGU2N2U2
-    YjUwYjViZTg1MjIyOTdjY2M4Mjk5OThjN2I0MzNjZTVlMWRkYjc=
-  data.tar.gz: !binary |-
-    MjY0OWNlMGQ0N2U3MjdmMWZmYWI1YTI2NGM0ZGQ0MjlhODA3ZDkyZWE3ZDNj
-    M2NjM2VmYmUzNGVmMTFjZjA1NDhjNmMzNzZiMGE5ZTJhNjBkOGFiNDZlNmI3
-    OGNhYmNiY2U1Nzk4ZTg0NDg4NDNmYjk0YmMxYTVlZTAxOGNjMzc=
+  metadata.gz: 1b90ebb2242b8168535e73f26605de36549c0191a8c0018167c9944d3da6ff38a503298d956142000822001602369680fbd002d7b9c3471b2ca5d0c22a539814
+  data.tar.gz: 7703cc56be933682a2986c4a2cbfcee45c77b049eda474fc0e8f9e17994f37e3509e8639bf6bf993b8ecca2837f4d32f8dea88514b8f3d2a2b1dbeb48b3343f7

data/.travis.yml

@@ -1,26 +1,21 @@
+dist: trusty
 sudo: false
 language: ruby
 bundler_args: "--without development"
 services:
 - rabbitmq
 rvm:
-- '2.3.1'
-- '2.2.5'
+- '2.4.1'
+- '2.3.3'
+- '2.2.7'
 - '2.1.10'
 gemfile:
+- gemfiles/Gemfile.rails-5-0
 - gemfiles/Gemfile.rails-4-2
-- gemfiles/Gemfile.rails-4-1
-- gemfiles/Gemfile.rails-4-0
-env:
-- BUNNY_VERSION="~> 2.0"
-- BUNNY_VERSION="~> 1.5"
-- BUNNY_VERSION="~> 1.4.0"
 matrix:
   exclude:
-  - rvm: '2.3.1'
-    gemfile: gemfiles/Gemfile.rails-4-0
-  - rvm: '2.2.5'
-    gemfile: gemfiles/Gemfile.rails-4-0
+  - rvm: '2.1.10'
+    gemfile: gemfiles/Gemfile.rails-5-0
 script:
 - bundle exec rake spec:msgr
 - bundle exec rake spec:integration
@@ -32,4 +27,4 @@ deploy:
   on:
     branch: master
     repo: jgraichen/msgr
-    rvm: 2.3.1
+    rvm: 2.3.3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## master
+
+* Add new configuration option `:raise_exceptions` that can be used to enable exceptions being raised from consumers. Mostly useful for testing consumers. Defaults to `false`.
+
 ## 0.14.0
 
 * Add experimental test pool (`Msgr::TestPool`)

data/Gemfile

@@ -3,31 +3,23 @@ source 'https://rubygems.org'
 # Development gems
 #
 gem 'rake'
-gem 'rspec'
-gem 'rspec-message-within', '>= 1.1.1'
+gem 'rspec', '~> 3.0'
 gem 'fuubar'
 gem 'coveralls'
 
 # Doc
 group :development do
-  gem 'yard', '~> 0.8.6'
+  gem 'yard', '~> 0.9.8'
   gem 'listen'
   gem 'guard-yard'
   gem 'guard-rspec'
-  gem 'redcarpet', platform: :ruby
+  gem 'redcarpet'
 end
 
 group :rails do
-  gem 'rails', '>= 3.2', '< 5'
+  gem 'rails', '>= 3.2'
   gem 'rspec-rails'
-  gem 'sqlite3', platform: :ruby
-  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
-end
-
-platform :rbx do
-  gem 'rubysl'
-  gem 'rubinius-coverage'
-  gem 'racc'
+  gem 'sqlite3'
 end
 
 # Specify your gem's dependencies in acfs.gemspec

data/README.md

@@ -11,9 +11,7 @@ You know it and you like it. Using Rails you can just declare your routes and
 create a controller. That's all you need to process requests.
 
 With *Msgr* you can do the same for asynchronous AMQP messaging. Just define
-your routes, create your consumer and watch you app processing messages.
-
-*Note: Msgr is still under heavy development.*
+your routes, create your consumer and watch your app processing messages.
 
 ## Installation
 
@@ -98,6 +96,50 @@ common: &common
 And call inside each worker `Msgr.start` - e.g. in an after-fork block
 
 
+## Testing
+
+### Recommended configuration
+
+```yaml
+test:
+  <<: *common
+  pool_class: Msgr::TestPool
+  raise_exceptions: true
+```
+
+The `Msgr::TestPool` pool implementation executes all consumers synchronously.
+By enabling the `raise_exceptions` configuration flag, we can ensure that exceptions raised in a consumer will not be swallowed by dispatcher (which it usually does in order to retry consuming the message).
+
+### RSpec example
+
+In your `spec_helper.rb`:
+
+```ruby
+config.after(:each) do
+  # Flush the consumer queue
+  Msgr.client.stop delete: true
+  Msgr::TestPool.reset
+end
+```
+
+In a test:
+
+```ruby
+before { Msgr.client.start }
+
+it 'executes the consumer' do
+  # Publish an event on our queue
+  Msgr.publish 'payload', to: 'msgr.queue.my_queue'
+  
+  # Let the TestPool handle exactly one event
+  Msgr::TestPool.run count: 1
+  
+  # And finally, assert that something happened
+  expect(actual).to eq expected
+end
+```
+
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -19,13 +19,13 @@ namespace :spec do
 
   desc 'Run all unit specs.'
   RSpec::Core::RakeTask.new(:msgr) do |t|
-    t.ruby_opts="#{ENV['CI'] ? '' : '-w -W2'} -Ispec/support -rsetup -Ispec/msgr"
+    t.ruby_opts = '-Ispec/support -rsetup -Ispec/msgr'
     t.pattern = 'spec/msgr/**/*_spec.rb'
   end
 
   desc 'Run all integration specs.'
   RSpec::Core::RakeTask.new(:integration) do |t|
-    t.ruby_opts="#{ENV['CI'] ? '' : '-w -W2'} -Ispec/support -rsetup -Ispec/integration"
+    t.ruby_opts = '-Ispec/support -rsetup -Ispec/integration'
     t.pattern = 'spec/integration/**/*_spec.rb'
   end
 end

data/gemfiles/Gemfile.rails-4-0

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 self.instance_eval Bundler.read_file 'Gemfile'
 
 gem 'activesupport', '~> 4.0.0'
-gem 'bunny', ENV['BUNNY_VERSION']
+gem 'bunny', ENV['BUNNY_VERSION'] if ENV['BUNNY_VERSION']

data/gemfiles/Gemfile.rails-4-1

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 self.instance_eval Bundler.read_file 'Gemfile'
 
 gem 'activesupport', '~> 4.1.0'
-gem 'bunny', ENV['BUNNY_VERSION']
+gem 'bunny', ENV['BUNNY_VERSION'] if ENV['BUNNY_VERSION']

data/gemfiles/Gemfile.rails-4-2

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 self.instance_eval Bundler.read_file 'Gemfile'
 
 gem 'activesupport', '~> 4.2.0'
-gem 'bunny', ENV['BUNNY_VERSION']
+gem 'bunny', ENV['BUNNY_VERSION'] if ENV['BUNNY_VERSION']

data/gemfiles/Gemfile.rails-5-0

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Load root Gemfile
+self.instance_eval Bundler.read_file 'Gemfile'
+
+gem 'activesupport', '~> 5.0.0'
+gem 'bunny', ENV['BUNNY_VERSION'] if ENV['BUNNY_VERSION']

data/lib/msgr/dispatcher.rb

@@ -7,13 +7,14 @@ module Msgr
   class Dispatcher
     include Logging
 
-    attr_reader :pool
+    attr_reader :config, :pool
 
     def initialize(config)
       config[:pool_class] ||= 'Msgr::Dispatcher::NullPool'
 
       log(:debug) { "Initialize new dispatcher (#{config[:pool_class]}: #{config})..." }
 
+      @config = config
       @pool = config[:pool_class].constantize.new config
     end
 
@@ -39,6 +40,8 @@ module Msgr
         "Dispatcher error: #{error.class.name}: #{error}\n" +
             error.backtrace.join("\n")
       end
+
+      raise error if config[:raise_exceptions]
     ensure
       if defined?(ActiveRecord) && ActiveRecord::Base.connection_pool.active_connection?
         log(:debug) { 'Release used AR connection for dispatcher thread.' }

data/lib/msgr/railtie.rb

@@ -61,6 +61,15 @@ module Msgr
             raise ArgumentError, "Invalid value for rabbitmq config checkcredentials: \"#{cfg[:checkcredentials]}\""
         end
 
+        case cfg[:raise_exceptions]
+          when true, 'true', 'enabled'
+            cfg[:raise_exceptions] = true
+          when false, 'false', 'disabled', nil
+            cfg[:raise_exceptions] = false
+          else
+            raise ArgumentError, "Invalid value for rabbitmq config raise_exceptions: \"#{cfg[:raise_exceptions]}\""
+        end
+
         cfg[:routing_file] ||= Rails.root.join('config/msgr.rb').to_s
         cfg
       end

data/spec/integration/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/integration/msgr/dispatcher_spec.rb

@@ -6,8 +6,15 @@ class DispatcherTestConsumer < Msgr::Consumer
   end
 end
 
+class DispatcherRaiseConsumer < Msgr::Consumer
+  def index
+    raise ArgumentError, 'Not happy with the payload'
+  end
+end
+
 describe Msgr::Dispatcher do
-  let(:dispatcher) { described_class.new max: 1 }
+  let(:dispatcher) { described_class.new config }
+  let(:config) { { max: 1 } }
   let(:consumer) { 'DispatcherTestConsumer' }
   let(:route) do
     double(:route).tap do |t|
@@ -22,30 +29,45 @@ describe Msgr::Dispatcher do
   end
   let(:delivery_info) do
      double(:delivery_info).tap do |ti|
-       allow(ti).to receive(:delivery_tag).and_return { 3 }
+       allow(ti).to receive(:delivery_tag).and_return(3)
     end
   end
   let(:payload) { {} }
   let(:metadata) do
     double(:metadata).tap do |metadata|
-      allow(metadata).to receive(:content_type).and_return { 'text/plain' }
+      allow(metadata).to receive(:content_type).and_return('text/plain')
     end
   end
   let(:message) { Msgr::Message.new connection, delivery_info, metadata, payload, route }
   let(:action) { -> { dispatcher.call message }}
 
-  before do
-    expect_any_instance_of(::Msgr::Dispatcher::NullPool).to receive(:post).and_return { |m, &block| block.call m}
-    expect_any_instance_of(DispatcherTestConsumer).to receive(:index)
-  end
-
   it 'should consume message' do
+    expect_any_instance_of(DispatcherTestConsumer).to receive(:index)
     dispatcher.call message
   end
 
-  context 'with not acknowlged message' do
+  context 'with not acknowledged message' do
     before { dispatcher.call message }
     subject { message }
     it { should be_acked }
   end
+
+  describe 'exception swallowing' do
+    let(:consumer) { 'DispatcherRaiseConsumer' }
+    before do
+      allow(message).to receive(:nack)
+    end
+
+    it 'should swallow exceptions by default' do
+      expect { dispatcher.call(message) }.not_to raise_error
+    end
+
+    context 'with raise_exceptions configuration option and a synchronous pool' do
+      let(:config) { super().merge(raise_exceptions: true) }
+
+      it 'should raise the exception' do
+        expect { dispatcher.call(message) }.to raise_error(ArgumentError)
+      end
+    end
+  end
 end

data/spec/integration/msgr/railtie_spec.rb

@@ -35,30 +35,57 @@ describe Msgr::Railtie do
 
         it { should raise_error 'Invalid value for rabbitmq config checkcredentials: "unvalid"'}
       end
+
+      context 'with invalid raise_exceptions value' do
+        let(:settings) { {"test" => { uri: 'franz', raise_exceptions: 'unvalid'}} }
+
+        it { should raise_error 'Invalid value for rabbitmq config raise_exceptions: "unvalid"'}
+      end
     end
 
     context 'without set routes file' do
       let(:settings) { {"test" => { uri: 'test'}} }
 
-      its([:routing_file]) { should eq Rails.root.join('config/msgr.rb').to_s }
+      context '[:routing_file]' do
+        subject { super()[:routing_file] }
+        it { should eq Rails.root.join('config/msgr.rb').to_s }
+      end
     end
 
     context 'with set routes file' do
       let(:settings) { {"test" => { uri: 'test', 'routing_file' => 'my fancy file' }} }
 
-      its([:routing_file]) { should eq 'my fancy file' }
+      context '[:routing_file]' do
+        subject { super()[:routing_file] }
+        it { should eq 'my fancy file' }
+      end
     end
 
     context 'with uri as symbol' do
       let(:settings) { {"test" => { uri: "hans"}}}
 
-      its([:uri]) { should eq 'hans' }
+      context '[:uri]' do
+        subject { super()[:uri] }
+        it { should eq 'hans' }
+      end
     end
 
     context 'with uri as string' do
       let(:settings) { {"test" => { 'uri' => "hans"}}}
 
-      its([:uri]) { should eq 'hans' }
+      context '[:uri]' do
+        subject { super()[:uri] }
+        it { should eq 'hans' }
+      end
+    end
+
+    context 'without raise_exceptions config' do
+      let(:settings) { {"test" => { 'uri' => 'hans'}, "development" => { 'uri' => 'hans_dev'}}}
+
+      describe '[:raise_exceptions]' do
+        subject { super()[:raise_exceptions] }
+        it { should eq false }
+      end
     end
   end
 

data/spec/integration/msgr_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe TestController do
+describe TestController, type: :request do
   it 'should send messages on :index' do
     get '/'
   end

data/spec/integration/spec_helper.rb

@@ -13,7 +13,6 @@ ENV['RAILS_ENV'] ||= 'test'
 ENV['RAILS_GROUPS'] = ENV['RAILS_GROUPS'] ? "rails,#{ENV['RAILS_GROUPS']}" : 'rails'
 require File.expand_path('../dummy/config/environment', __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

data/spec/msgr/msgr/routes_spec.rb

@@ -7,7 +7,9 @@ describe Msgr::Routes do
     let(:block) { Proc.new{} }
 
     it 'should evaluate given block within instance context' do
-      expect(routes).to receive(:instance_eval).with { |p| p == block }
+      expect(routes).to receive(:instance_eval) do |&p|
+        expect(p).to be block
+      end
 
       routes.configure &block
     end
@@ -32,7 +34,7 @@ describe Msgr::Routes do
     let(:each) { routes.each }
 
     it 'should iterate over configured routes' do
-      expect(each).to have(2).items
+      expect(each.size).to eq 2
 
       expect(each.map(&:keys)).to eq [%w(abc.#), %w(edf.#)]
       expect(each.map(&:consumer)).to eq %w(TestConsumer TestConsumer)
@@ -70,7 +72,6 @@ describe Msgr::Routes do
 
       it 'should add second binding to first route' do
         subject.call
-        expect(routes.routes.first.keys).to have(2).items
         expect(routes.routes.first.keys).to eq %w(routing.key another.routing.key)
       end
     end
@@ -98,7 +99,7 @@ describe Msgr::Routes do
     it 'should clear old routes before reloading' do
       routes.route 'abc', to: 'abc#test'
       routes.reload
-      expect(routes.each).to have(0).items
+      expect(routes.each.size).to eq 0
     end
   end
 

data/spec/msgr/spec_helper.rb

@@ -8,8 +8,6 @@ Coveralls.wear! do
   add_filter 'spec'
 end
 
-require 'rspec/autorun'
-require 'rspec/message/within'
 require 'msgr'
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }

metadata

@@ -1,86 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 0.14.1.1.b112
+  version: 0.14.1.1.b124
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-description: ! 'Msgr: Rails-like Messaging Framework'
+description: 'Msgr: Rails-like Messaging Framework'
 email:
 - jg@altimos.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -90,6 +90,7 @@ files:
 - gemfiles/Gemfile.rails-4-0
 - gemfiles/Gemfile.rails-4-1
 - gemfiles/Gemfile.rails-4-2
+- gemfiles/Gemfile.rails-5-0
 - lib/msgr.rb
 - lib/msgr/binding.rb
 - lib/msgr/client.rb
@@ -173,20 +174,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: ! 'Msgr: Rails-like Messaging Framework'
+summary: 'Msgr: Rails-like Messaging Framework'
 test_files:
 - spec/fixtures/msgr-routes-test-1.rb
 - spec/integration/dummy/README.rdoc