rabbit_feed 2.1.2 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a254021c58185a15c29214a7361fca851d51ae4e
-  data.tar.gz: 63bddce1a50ec017cf59c61d21d77b5b36910242
+  metadata.gz: 58c69d09c8fed13331610e7015a5dcbe19e282cd
+  data.tar.gz: fd29cc489c1bb251ab1e16bf35eda04728cc839e
 SHA512:
-  metadata.gz: b68e75c49e38da3619904f7144509705d659d97627e3f9b57b4e106023e8ed635c60aaab19dd1496e78321379288c4bae9681ae1be68dacf3842ee72e9c72fe7
-  data.tar.gz: 58a49087c1cdda30bff123501fb5c8bb3a12f3bf68b9df3f316feb12bb8d67b1fd508a5a147b08e1d5fc26761c6edc4883974ed0f4911fb9b1a1150d431eb996
+  metadata.gz: 5389a17aa4bffe0bacbf21f170a86fad67dc23349082502e11fff40b5bb404c405d92c6cfad9e2039bf1d1e00f83c0ccac7d12bf72bd02c2b102520199468511
+  data.tar.gz: 458a801d1631ee4be89aa3a5c59f2fd861e810a93117d536b64b2a1d725f0cc5c4162b5c4648601b81a70c03a1ae341b2926715d4865f1e1dc639ed46ac8831f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rabbit_feed (2.1.2)
+    rabbit_feed (2.1.5)
       activemodel (>= 3.2.0, < 5.0.0)
       activesupport (>= 3.2.0, < 5.0.0)
       avro (>= 1.5.4, < 1.8.0)
@@ -12,10 +12,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activesupport (4.2.0)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -34,7 +34,7 @@ GEM
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     columnize (0.9.0)
-    connection_pool (2.1.2)
+    connection_pool (2.1.3)
     debug_inspector (0.0.2)
     debugger (1.6.8)
       columnize (>= 0.3.1)
@@ -52,7 +52,7 @@ GEM
       json
     json (1.8.2)
     method_source (0.8.2)
-    minitest (5.5.1)
+    minitest (5.7.0)
     multi_json (1.10.1)
     pidfile (0.3.0)
     pry (0.10.1)
@@ -107,7 +107,7 @@ GEM
       simplecov-html (~> 0.9.0)
     simplecov-html (0.9.0)
     slop (3.6.0)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     timecop (0.7.3)
     turnip (1.2.4)
       gherkin (>= 2.5)
@@ -128,3 +128,6 @@ DEPENDENCIES
   rspec-its
   rutabaga
   timecop
+
+BUNDLED WITH
+   1.10.5

data/README.md

@@ -20,7 +20,7 @@ Add this line to your application's Gemfile:
 
 ### Configuration
 
-Create a `config/rabbit_feed.yml` file. The following options can be specified:
+Create a `config/rabbit_feed.yml` file. The following options should be specified:
 
     environment:
       host: RabbitMQ host
@@ -36,6 +36,24 @@ Sample:
       password: guest
       application: beavers
 
+Configuration options that can be specified are:
+
+| Name | Use |
+| ---- | --- |
+| `host` | Hostname or IP of the RabbitMQ server |
+| `hosts` | Array of hostnames or IPs of a RabbitMQ cluster |
+| `port` | The port to use on the RabbitMQ server |
+| `user` | The user to authenticate with the RabbitMQ server |
+| `password` | The password to authenticate with the RabbitMQ server |
+| `application` | The name of the application - used for routing events to the specified consumers |
+| `environment` | The environment of the application - used for routing events to the specified consumers |
+| `exchange` | The name of the RabbitMQ exchange to which events are published |
+| `heartbeat` | The interval at which to send heartbeats to the RabbitMQ server (in seconds) |
+| `connect_timeout` | The timeout (in seconds) for connecting to the RabbitMQ server |
+| `network_recovery_interval` | Recovery interval (in seconds) periodic network recovery will use |
+| `auto_delete_queue` | If true, any queues created will auto-delete upon disconnect |
+| `auto_delete_exchange` | If true, any exchanges created will auto-delete upon disconnect |
+
 ### Initialisation
 
 If installing in a rails application, the following should be defined in `config/initializers/rabbit_feed.rb`:
@@ -219,6 +237,7 @@ Publishes an event. Note: until you've specified the [event definitions](https:/
 Starts a consumer. Note: until you've specified the [event routing](https://github.com/simplybusiness/rabbit_feed#event-routing-dsl), this will not receive any events. Options are as follows:
 
     --environment The environment to run in
+    --application The name of the application (used for routing events)
     --config The location of the rabbit_feed configuration file
     --logfile The location of the log file
     --require The project file containing the dependancies (only necessary if running with non-rails application)

data/example/non_rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    rabbit_feed (2.1.1)
+    rabbit_feed (2.1.5)
       activemodel (>= 3.2.0, < 5.0.0)
       activesupport (>= 3.2.0, < 5.0.0)
       avro (>= 1.5.4, < 1.8.0)
@@ -12,10 +12,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activesupport (4.2.0)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -27,12 +27,12 @@ GEM
     builder (3.2.2)
     bunny (1.7.0)
       amq-protocol (>= 1.9.2)
-    connection_pool (2.1.2)
+    connection_pool (2.1.3)
     diff-lcs (1.2.5)
     i18n (0.7.0)
-    json (1.8.2)
-    minitest (5.5.1)
-    multi_json (1.11.0)
+    json (1.8.3)
+    minitest (5.7.0)
+    multi_json (1.11.1)
     pidfile (0.3.0)
     rake (10.4.2)
     rspec (3.2.0)
@@ -48,7 +48,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -59,3 +59,6 @@ DEPENDENCIES
   rabbit_feed!
   rake
   rspec
+
+BUNDLED WITH
+   1.10.5

data/example/rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    rabbit_feed (2.1.1)
+    rabbit_feed (2.1.5)
       activemodel (>= 3.2.0, < 5.0.0)
       activesupport (>= 3.2.0, < 5.0.0)
       avro (>= 1.5.4, < 1.8.0)
@@ -61,7 +61,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.9.1)
-    connection_pool (2.1.2)
+    connection_pool (2.1.3)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.3.0)
@@ -189,3 +189,6 @@ DEPENDENCIES
   turbolinks
   uglifier (>= 1.3.0)
   unicorn
+
+BUNDLED WITH
+   1.10.5

data/lib/rabbit_feed/client.rb

@@ -92,6 +92,7 @@ module RabbitFeed
 
     def set_configuration
       RabbitFeed.environment             = environment
+      RabbitFeed.application             = options[:application]
       RabbitFeed.configuration_file_path = options[:config_file]
       ENV['RACK_ENV']  ||= RabbitFeed.environment
       ENV['RAILS_ENV'] ||= RabbitFeed.environment
@@ -138,6 +139,10 @@ module RabbitFeed
 
       parser = OptionParser.new do |o|
 
+        o.on '-a', '--application VAL', 'Name of the application' do |arg|
+          opts[:application] = arg
+        end
+
         o.on '-m', '--payload VAL', 'Payload of event to produce' do |arg|
           opts[:payload] = arg
         end

data/lib/rabbit_feed/configuration.rb

@@ -2,13 +2,14 @@ module RabbitFeed
   class Configuration
     include ActiveModel::Validations
 
-    attr_reader :host, :port, :user, :password, :application, :environment, :exchange, :pool_size, :pool_timeout, :heartbeat, :connect_timeout, :network_recovery_interval, :auto_delete_queue, :auto_delete_exchange
+    attr_reader :host, :hosts, :port, :user, :password, :application, :environment, :exchange, :pool_size, :pool_timeout, :heartbeat, :connect_timeout, :network_recovery_interval, :auto_delete_queue, :auto_delete_exchange
     validates_presence_of :application, :environment, :exchange, :pool_timeout
 
     def initialize options
       RabbitFeed.log.debug "RabbitFeed initialising with options: #{options}..."
 
       @host                      = options[:host]
+      @hosts                     = options[:hosts]
       @port                      = options[:port]
       @user                      = options[:user]
       @password                  = options[:password]
@@ -24,13 +25,15 @@ module RabbitFeed
       validate!
     end
 
-    def self.load file_path, environment
-      RabbitFeed.log.debug "Reading configurations from #{file_path} in #{environment}..."
+    def self.load file_path, environment, application
+      RabbitFeed.log.debug "Reading configurations from #{file_path} in #{environment} for application #{application}..."
 
       raise ConfigurationError.new "The RabbitFeed configuration file path specified does not exist: #{file_path}" unless (File.exist? file_path)
 
       options = read_configuration_file file_path, environment
-      new options.merge(environment: environment)
+      options[:environment]   = environment
+      options[:application] ||= application
+      new options
     end
 
     def queue
@@ -42,6 +45,7 @@ module RabbitFeed
         options[:heartbeat] = heartbeat if heartbeat
         options[:connect_timeout] = connect_timeout if connect_timeout
         options[:host] = host if host
+        options[:hosts] = hosts if hosts
         options[:user] = user if user
         options[:password] = password if password
         options[:port] = port if port

data/lib/rabbit_feed/consumer_connection.rb

@@ -42,9 +42,10 @@ module RabbitFeed
       end
 
       sleep # Sleep indefinitely, as the consumer runs in its own thread
-    rescue
+    rescue SystemExit, Interrupt
+      RabbitFeed.log.info "Consumer #{self.to_s} received exit request, exiting..."
+    ensure
       (cancel_consumer consumer) if consumer.present?
-      raise
     end
 
     private

data/lib/rabbit_feed/version.rb

@@ -1,3 +1,3 @@
 module RabbitFeed
-  VERSION = '2.1.2'
+  VERSION = '2.1.5'
 end

data/lib/rabbit_feed.rb

@@ -26,13 +26,13 @@ module RabbitFeed
   class RoutingError < Error; end
   class ReturnedMessageError < Error; end
 
-  attr_accessor :log, :environment, :configuration_file_path
+  attr_accessor :log, :environment, :configuration_file_path, :application
 
   def configuration
     RabbitFeed.log                     ||= (Logger.new STDOUT)
     RabbitFeed.configuration_file_path ||= 'config/rabbit_feed.yml'
     RabbitFeed.environment             ||= ENV['RAILS_ENV'] || ENV['RACK_ENV']
-    @configuration                     ||= (Configuration.load RabbitFeed.configuration_file_path, RabbitFeed.environment)
+    @configuration                     ||= (Configuration.load RabbitFeed.configuration_file_path, RabbitFeed.environment, application)
   end
 
   def exception_notify exception

data/spec/fixtures/configuration.yml

@@ -11,3 +11,4 @@ test:
   network_recovery_interval: 0.1
   auto_delete_queue: true
   auto_delete_exchange: true
+test_blank:

data/spec/lib/rabbit_feed/client_spec.rb

@@ -8,6 +8,7 @@ module RabbitFeed
     let(:config_file) { 'spec/fixtures/configuration.yml' }
     let(:environment) { 'test' }
     let(:require_file){ 'rabbit_feed.rb' }
+    let(:application) { 'rabbit_feed_test' }
     let(:arguments) do
       [
         command,
@@ -21,11 +22,14 @@ module RabbitFeed
         pidfile,
         '--require',
         require_file,
+        '--application',
+        application,
         '--daemon'
       ]
     end
     before do
       RabbitFeed.environment = nil
+      RabbitFeed.application = nil
       RabbitFeed.log = nil
       RabbitFeed.configuration_file_path = nil
     end
@@ -40,6 +44,11 @@ module RabbitFeed
         expect(RabbitFeed.environment).to eq 'test'
       end
 
+      it 'sets the application' do
+        subject
+        expect(RabbitFeed.application).to eq 'rabbit_feed_test'
+      end
+
       it 'sets the logger' do
         subject
         expect(RabbitFeed.log).to be_a Logger

data/spec/lib/rabbit_feed/configuration_spec.rb

@@ -69,7 +69,8 @@ module RabbitFeed
     describe '.load' do
       let(:file_path)   { 'spec/fixtures/configuration.yml' }
       let(:environment) { 'test' }
-      subject { described_class.load file_path, environment }
+      let(:application) { }
+      subject { described_class.load file_path, environment, application }
 
       context 'with missing configuration' do
         let(:environment) { 'production' }
@@ -104,6 +105,21 @@ module RabbitFeed
         its(:auto_delete_exchange)      { should be_truthy }
       end
 
+      context 'with application provided' do
+        let(:application) { 'new_application' }
+
+        it 'prefers the application specified in the config file' do
+          expect(subject.application).to eq 'rabbit_feed'
+        end
+
+        context 'with an empty config file' do
+          let(:environment) { 'test_blank' }
+
+          it 'prefers the application provided' do
+            expect(subject.application).to eq 'new_application'
+          end
+        end
+      end
     end
 
     describe '.new' do
@@ -119,6 +135,7 @@ module RabbitFeed
         end
 
         its(:host)                      { should be_nil }
+        its(:hosts)                     { should be_nil }
         its(:port)                      { should be_nil }
         its(:user)                      { should be_nil }
         its(:password)                  { should be_nil }
@@ -135,6 +152,7 @@ module RabbitFeed
         let(:options) do
           {
             host:                      'host_name',
+            hosts:                     ['host_name0', 'host_name1'],
             port:                      12345,
             user:                      'user_name',
             password:                  'password',
@@ -151,6 +169,7 @@ module RabbitFeed
         end
 
         its(:host)                      { should eq 'host_name' }
+        its(:hosts)                     { should eq ['host_name0', 'host_name1'] }
         its(:port)                      { should eq 12345 }
         its(:user)                      { should eq 'user_name' }
         its(:password)                  { should eq 'password' }

data/spec/lib/rabbit_feed/consumer_connection_spec.rb

@@ -46,6 +46,7 @@ module RabbitFeed
       before do
         allow(bunny_queue).to receive(:subscribe).and_yield(double(:delivery_info, delivery_tag: :tag), 'properties', 'payload')
         allow_any_instance_of(described_class).to receive(:sleep)
+        allow_any_instance_of(described_class).to receive(:cancel_consumer)
       end
 
       it 'yields the payload' do
@@ -57,6 +58,11 @@ module RabbitFeed
         subject.consume { }
       end
 
+      it 'cancels the consumer' do
+        expect_any_instance_of(described_class).to receive(:cancel_consumer)
+        subject.consume { }
+      end
+
       context 'when an exception is raised' do
 
         context 'when Airbrake is defined' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_feed
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.5
 platform: ruby
 authors:
 - Simply Business
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Enables your Ruby applications to perform centralized event logging with