rabbit_feed 2.4.4 → 3.0.0

data/spec/lib/rabbit_feed/client_spec.rb

@@ -5,7 +5,7 @@ module RabbitFeed
     let(:pidfile)     { './test.pid' }
     let(:config_file) { 'spec/fixtures/configuration.yml' }
     let(:environment) { 'test' }
-    let(:require_file){ 'rabbit_feed.rb' }
+    let(:require_file) { 'rabbit_feed.rb' }
     let(:application) { 'rabbit_feed_test' }
     let(:arguments) do
       [
@@ -31,10 +31,9 @@ module RabbitFeed
       RabbitFeed.log = nil
       RabbitFeed.configuration_file_path = nil
     end
-    subject{ described_class.new arguments }
+    subject { described_class.new arguments }
 
     describe '.new' do
-
       it { should be_valid }
 
       it 'sets the environment' do
@@ -61,7 +60,7 @@ module RabbitFeed
         let(:command) { 'blah' }
 
         it 'should be invalid' do
-          expect{subject}.to raise_error Error
+          expect { subject }.to raise_error Error
         end
       end
 
@@ -69,7 +68,7 @@ module RabbitFeed
         let(:logfile) { '/blah/blah.log' }
 
         it 'should be invalid' do
-          expect{subject}.to raise_error Error
+          expect { subject }.to raise_error Error
         end
       end
 
@@ -77,7 +76,7 @@ module RabbitFeed
         let(:pidfile) { '/blah/blah.pid' }
 
         it 'should be invalid' do
-          expect{subject}.to raise_error Error
+          expect { subject }.to raise_error Error
         end
       end
 
@@ -85,7 +84,7 @@ module RabbitFeed
         let(:config_file) { '/blah/blah.yml' }
 
         it 'should be invalid' do
-          expect{subject}.to raise_error Error
+          expect { subject }.to raise_error Error
         end
       end
 
@@ -97,7 +96,7 @@ module RabbitFeed
         end
 
         it 'should be invalid' do
-          expect{subject}.to raise_error Error
+          expect { subject }.to raise_error Error
         end
 
         context 'when the RAILS_ENV is present' do
@@ -115,7 +114,7 @@ module RabbitFeed
         let(:require_file) { './' }
 
         it 'should be invalid' do
-          expect{subject}.to raise_error Error
+          expect { subject }.to raise_error Error
         end
       end
     end

data/spec/lib/rabbit_feed/configuration_spec.rb

@@ -1,11 +1,10 @@
 module RabbitFeed
   describe Configuration do
-
     describe '#queue' do
       let(:options) do
         {
           application: 'rabbit_feed',
-          environment: 'test',
+          environment: 'test'
         }
       end
       subject { (described_class.new options).queue }
@@ -13,13 +12,13 @@ module RabbitFeed
       it { should eq 'test.rabbit_feed' }
 
       context 'when a route_prefix_extension is set' do
-      let(:options) do
-        {
-          application: 'rabbit_feed',
-          environment: 'test',
-          route_prefix_extension: 'foobar'
-        }
-      end
+        let(:options) do
+          {
+            application: 'rabbit_feed',
+            environment: 'test',
+            route_prefix_extension: 'foobar'
+          }
+        end
 
         it { should eq 'test.foobar.rabbit_feed' }
       end
@@ -32,7 +31,7 @@ module RabbitFeed
         let(:options) do
           {
             application: 'rabbit_feed',
-            environment: 'test',
+            environment: 'test'
           }
         end
 
@@ -59,7 +58,7 @@ module RabbitFeed
             user:            'guest',
             password:        'guest',
             port:            1234,
-            network_recovery_interval: 1,
+            network_recovery_interval: 1
           }
         end
 
@@ -79,14 +78,14 @@ module RabbitFeed
     describe '.load' do
       let(:file_path)   { 'spec/fixtures/configuration.yml' }
       let(:environment) { 'test_config' }
-      let(:application) { }
+      let(:application) {}
       subject { described_class.load file_path, environment, application }
 
       context 'with missing configuration' do
         let(:environment) { 'production' }
 
         it 'raises an error' do
-          expect{ subject }.to raise_error ConfigurationError
+          expect { subject }.to raise_error ConfigurationError
         end
       end
 
@@ -94,12 +93,11 @@ module RabbitFeed
         let(:file_path) { 'I do not exist' }
 
         it 'raises an error' do
-          expect{ subject }.to raise_error ConfigurationError
+          expect { subject }.to raise_error ConfigurationError
         end
       end
 
       context 'with configuration' do
-
         its(:host)                      { should eq 'localhost' }
         its(:port)                      { should eq 5672 }
         its(:user)                      { should eq 'guest' }
@@ -132,14 +130,14 @@ module RabbitFeed
     end
 
     describe '.new' do
-      let(:options) {{}}
+      let(:options) { {} }
       subject { described_class.new options }
 
       context 'with default options' do
         let(:options) do
           {
             application: 'rabbit_feed',
-            environment: 'test',
+            environment: 'test'
           }
         end
 
@@ -161,8 +159,8 @@ module RabbitFeed
         let(:options) do
           {
             host:                      'host_name',
-            hosts:                     ['host_name0', 'host_name1'],
-            port:                      12345,
+            hosts:                     %w(host_name0 host_name1),
+            port:                      12_345,
             user:                      'user_name',
             password:                  'password',
             application:               'rabbit_feed',
@@ -178,8 +176,8 @@ module RabbitFeed
         end
 
         its(:host)                      { should eq 'host_name' }
-        its(:hosts)                     { should eq ['host_name0', 'host_name1'] }
-        its(:port)                      { should eq 12345 }
+        its(:hosts)                     { should eq %w(host_name0 host_name1) }
+        its(:port)                      { should eq 12_345 }
         its(:user)                      { should eq 'user_name' }
         its(:password)                  { should eq 'password' }
         its(:application)               { should eq 'rabbit_feed' }
@@ -194,9 +192,8 @@ module RabbitFeed
       end
 
       context 'with empty options' do
-
         it 'should raise an error' do
-          expect{ subject }.to raise_error ConfigurationError
+          expect { subject }.to raise_error ConfigurationError
         end
       end
     end

data/spec/lib/rabbit_feed/console_consumer_spec.rb

@@ -11,22 +11,19 @@ module RabbitFeed
     end
 
     describe '#init' do
-
       it 'prints a welcome message' do
-        expect{ subject.init }.to output(
-/RabbitFeed console starting at .* UTC\.\.\.
-Environment: test
-Queue: test\.rabbit_feed_console
-Ready\. Press CTRL\+C to exit\./).to_stdout
+        expect { subject.init }.to output(
+          /RabbitFeed console starting at .* UTC\.\.\.\nEnvironment: test\nQueue: test\.rabbit_feed_console\nReady\. Press CTRL\+C to exit\./
+        ).to_stdout
       end
 
       context 'when there are events on the rabbit_feed_console queue' do
         let(:queue_depth) { 1 }
 
         it 'asks to purge the queue' do
-          expect{ subject.init }.to output(
-/There are currently 1 message\(s\) in the console's queue\.
-Would you like to purge the queue before proceeding\? \(y\/N\)>/).to_stdout
+          expect { subject.init }.to output(
+            %r{There are currently 1 message\(s\) in the console's queue\.\nWould you like to purge the queue before proceeding\? \(y\/N\)>}
+          ).to_stdout
         end
 
         context 'when the user wishes to purge the queue' do
@@ -34,18 +31,18 @@ Would you like to purge the queue before proceeding\? \(y\/N\)>/).to_stdout
 
           it 'purges the queue' do
             expect(connection).to receive(:purge_queue)
-            expect{ subject.init }.to output(/Queue purged\./).to_stdout
+            expect { subject.init }.to output(/Queue purged\./).to_stdout
           end
         end
       end
     end
 
     describe 'receiving an event' do
-      let(:event) { Event.new({name: 'name'},{key: :value}) }
+      let(:event) { Event.new({ name: 'name' }, key: :value) }
       before { subject.init }
 
       it 'prints the event' do
-        expect{ rabbit_feed_consumer.consume_event event }.to output(
+        expect { rabbit_feed_consumer.consume_event event }.to output(
 /-----------------------------------------------name: -----------------------------------------------
 #Event metadata
 name: name
@@ -53,7 +50,8 @@ name: name
 #Event payload
 key: value
 ----------------------------------------------------------------------------------------------------
-1 events received\./).to_stdout
+1 events received\./
+        ).to_stdout
       end
     end
   end

data/spec/lib/rabbit_feed/consumer_connection_spec.rb

@@ -1,7 +1,7 @@
 module RabbitFeed
   describe ConsumerConnection do
-    let(:bunny_queue)      { double(:bunny_queue, bind: nil, subscribe: nil)}
-    let(:bunny_channel)    { double(:bunny_channel, prefetch: nil, nack: nil, ack: nil, queue: bunny_queue, id: 1)}
+    let(:bunny_queue)      { double(:bunny_queue, bind: nil, subscribe: nil) }
+    let(:bunny_channel)    { double(:bunny_channel, prefetch: nil, nack: nil, ack: nil, queue: bunny_queue, id: 1) }
     let(:bunny_connection) { double(:bunny_connection, start: nil, closed?: false, close: nil, create_channel: bunny_channel) }
     before do
       allow(Bunny).to receive(:new).and_return(bunny_connection)
@@ -15,13 +15,13 @@ module RabbitFeed
       before do
         EventRouting do
           accept_from('rabbit_feed') do
-            event('test') {|event|}
+            event('test') { |event| }
           end
         end
       end
 
       it 'binds the queue to the exchange' do
-        expect(bunny_queue).to receive(:bind).with('amq.topic', { routing_key: 'test.rabbit_feed.test'})
+        expect(bunny_queue).to receive(:bind).with('amq.topic', routing_key: 'test.rabbit_feed.test')
         subject
       end
 
@@ -36,8 +36,7 @@ module RabbitFeed
 
         it 'appends the route_prefix_extension to the routing_key' do
           expect(bunny_queue).to receive(:bind).with('amq.topic',
-            { routing_key: 'test_route_prefix_extension.foobar.rabbit_feed.test'}
-          )
+                                                     routing_key: 'test_route_prefix_extension.foobar.rabbit_feed.test')
           subject
         end
       end
@@ -51,34 +50,33 @@ module RabbitFeed
       end
 
       it 'yields the payload' do
-        subject.consume { |payload| payload.should eq 'payload'}
+        subject.consume { |payload| payload.should eq 'payload' }
       end
 
       it 'acknowledges the message' do
         expect(bunny_channel).to receive(:ack)
-        subject.consume { }
+        subject.consume {}
       end
 
       it 'is synchronized' do
         expect(subject).to receive(:synchronized).and_call_original
-        subject.consume { }
+        subject.consume {}
       end
 
       it 'cancels the consumer' do
         expect_any_instance_of(described_class).to receive(:cancel_consumer)
-        subject.consume { }
+        subject.consume {}
       end
 
       context 'when consuming' do
         before { allow(subject.send(:mutex)).to receive(:locked?).and_return(true) }
 
         it 'raises when attempting to consume in parallel' do
-          expect{ subject.consume { } }.to raise_error 'This connection already has a consumer subscribed'
+          expect { subject.consume {} }.to raise_error 'This connection already has a consumer subscribed'
         end
       end
 
       context 'when an exception is raised' do
-
         context 'when the exception is' do
           [SystemExit.new, Interrupt.new, SignalException.new('SIGTERM')].each do |exception|
             context exception.to_s do
@@ -86,7 +84,6 @@ module RabbitFeed
                 test_logger_string_io = StringIO.new
                 logger = Logger.new test_logger_string_io
                 logger.formatter = RabbitFeed::JsonLogFormatter
-                old_logger = RabbitFeed.log
                 RabbitFeed.log = logger
                 test_logger_string_io
               end
@@ -94,15 +91,14 @@ module RabbitFeed
               before { allow(subject).to receive(:handle_message).and_raise(exception) }
 
               it 'does not re-raise error' do
-                expect { subject.consume { } }.to_not raise_error
+                expect { subject.consume {} }.to_not raise_error
               end
 
               it 'logs unsubscribe_from_queue' do
-                subject.consume { }
+                subject.consume {}
 
-                expect(logger.string).to match /unsubscribe_from_queue/
+                expect(logger.string).to match(/unsubscribe_from_queue/)
               end
-
             end
           end
         end
@@ -116,17 +112,20 @@ module RabbitFeed
           end
         end
 
-
         context 'when consumer_exit_after_fail is false' do
           before { allow(RabbitFeed.configuration).to receive(:consumer_exit_after_fail).and_return(false) }
 
           context 'when Airbrake is defined' do
-            after { Object.send(:remove_const, ('Airbrake').to_sym) rescue NameError }
+            after do
+              begin
+                Object.send(:remove_const, 'Airbrake'.to_sym)
+              rescue NameError; end
+            end
 
             context 'when the version is lower than 5' do
               before do
                 module ::Airbrake
-                  VERSION = '4.0.0'
+                  VERSION = '4.0.0'.freeze
                 end
                 allow(Airbrake).to receive(:configuration).and_return(airbrake_configuration)
               end
@@ -135,9 +134,9 @@ module RabbitFeed
                 let(:airbrake_configuration) { double(:airbrake_configuration, public?: true) }
 
                 it 'notifies airbrake' do
-                  expect(Airbrake).to receive(:notify_or_ignore).with(an_instance_of RuntimeError)
+                  expect(Airbrake).to receive(:notify_or_ignore).with(an_instance_of(RuntimeError))
 
-                  expect{ subject.consume { raise 'Consuming time' } }.not_to raise_error
+                  expect { subject.consume { raise 'Consuming time' } }.not_to raise_error
                 end
               end
             end
@@ -145,23 +144,23 @@ module RabbitFeed
             context 'when the version is greater than 4' do
               before do
                 module ::Airbrake
-                  AIRBRAKE_VERSION = '5.0.0'
+                  AIRBRAKE_VERSION = '5.0.0'.freeze
                 end
               end
 
               context 'and consumer_exit_after_fail is true' do
                 before { allow(RabbitFeed.configuration).to receive(:consumer_exit_after_fail).and_return(true) }
                 it 'notifies airbrake synchronously' do
-                  expect(Airbrake).to receive(:notify_sync).with(an_instance_of RuntimeError)
-                  expect{ subject.consume { raise 'Consuming time' } }.not_to raise_error
+                  expect(Airbrake).to receive(:notify_sync).with(an_instance_of(RuntimeError))
+                  expect { subject.consume { raise 'Consuming time' } }.not_to raise_error
                 end
               end
 
               context 'and consumer_exit_after_fail is not true' do
                 before { allow(RabbitFeed.configuration).to receive(:consumer_exit_after_fail).and_return(false) }
                 it 'notifies airbrake' do
-                  expect(Airbrake).to receive(:notify).with(an_instance_of RuntimeError)
-                  expect{ subject.consume { raise 'Consuming time' } }.not_to raise_error
+                  expect(Airbrake).to receive(:notify).with(an_instance_of(RuntimeError))
+                  expect { subject.consume { raise 'Consuming time' } }.not_to raise_error
                 end
               end
             end
@@ -172,7 +171,6 @@ module RabbitFeed
             subject.consume { raise 'Consuming time' }
           end
         end
-
       end
     end
   end

data/spec/lib/rabbit_feed/event_definitions_spec.rb

@@ -19,7 +19,7 @@ module RabbitFeed
     it { should_not be_nil }
     it { should be_valid }
     its(:name) { should eq 'customer_purchases_policy' }
-    its(:sensitive_fields) { should match_array(['price', 'policy_id']) }
+    its(:sensitive_fields) { should match_array(%w(price policy_id)) }
 
     describe EventDefinitions::Event do
       let(:name)       { 'event_name' }
@@ -31,7 +31,7 @@ module RabbitFeed
             definition
           end
           event.payload_contains do
-            field 'field', { type: 'string', definition: 'field definition' }
+            field 'field', type: 'string', definition: 'field definition'
           end
         end
       end
@@ -39,30 +39,30 @@ module RabbitFeed
       it { should be_valid }
       its(:fields)          { should_not be_empty }
       its(:schema)          { should be_a Avro::Schema }
-      its(:metadata_schema) { should eq({
-          name:   'event_metadata',
-          type:   'record',
-          fields: [
-            {name: 'application', type: 'string', doc: 'The name of the application that created the event'},
-            {name: 'host', type: 'string', doc: 'The hostname of the server on which the event was created'},
-            {name: 'environment', type: 'string', doc: 'The environment in which the event was created'},
-            {name: 'version', type: 'string', doc: 'The version of the event payload'},
-            {name: 'schema_version', type: 'string', doc: 'The version of the event schema'},
-            {name: 'name', type: 'string', doc: 'The name of the event'},
-            {name: 'created_at_utc', type: 'string', doc: 'The UTC time that the event was created'},
-        ]})
-      }
-      its(:payload_schema) { should eq({
-          name:   'event_name_payload',
-          type:   'record',
-          fields: [{name: 'field', type: 'string', doc: 'field definition'}],
-        })
-      }
-      its(:event_schema) { should match([
-          { name: 'payload', type: an_instance_of(Hash), doc: 'The event payload (defined by the source system)' },
-          { name: 'metadata', type: an_instance_of(Hash), doc: 'The event metadata (defined by rabbit feed)' },
-        ])
-      }
+      its(:metadata_schema) do
+        should eq(name:   'event_metadata',
+                  type:   'record',
+                  fields: [
+                    { name: 'application', type: 'string', doc: 'The name of the application that created the event' },
+                    { name: 'host', type: 'string', doc: 'The hostname of the server on which the event was created' },
+                    { name: 'environment', type: 'string', doc: 'The environment in which the event was created' },
+                    { name: 'version', type: 'string', doc: 'The version of the event payload' },
+                    { name: 'schema_version', type: 'string', doc: 'The version of the event schema' },
+                    { name: 'name', type: 'string', doc: 'The name of the event' },
+                    { name: 'created_at_utc', type: 'string', doc: 'The UTC time that the event was created' }
+                  ])
+      end
+      its(:payload_schema) do
+        should eq(name:   'event_name_payload',
+                  type:   'record',
+                  fields: [{ name: 'field', type: 'string', doc: 'field definition' }])
+      end
+      its(:event_schema) do
+        should match([
+                       { name: 'payload', type: an_instance_of(Hash), doc: 'The event payload (defined by the source system)' },
+                       { name: 'metadata', type: an_instance_of(Hash), doc: 'The event metadata (defined by rabbit feed)' }
+                     ])
+      end
 
       context 'when the name is nil' do
         let(:name) {}
@@ -99,16 +99,16 @@ module RabbitFeed
       let(:name)       { 'event_name' }
       let(:type)       { 'string' }
       let(:definition) { 'event definition' }
-      subject{ EventDefinitions::Field.new name, type, definition }
+      subject { EventDefinitions::Field.new name, type, definition }
 
       it { should be_valid }
-      its(:schema) { should eq({ name: name, type: type, doc: definition }) }
+      its(:schema) { should eq(name: name, type: type, doc: definition) }
 
       context 'when the name is nil' do
         let(:name) {}
 
         it 'raises a configuration error' do
-          expect{ subject }.to raise_error ConfigurationError
+          expect { subject }.to raise_error ConfigurationError
         end
       end
 
@@ -116,7 +116,7 @@ module RabbitFeed
         let(:type) {}
 
         it 'raises a configuration error' do
-          expect{ subject }.to raise_error ConfigurationError
+          expect { subject }.to raise_error ConfigurationError
         end
       end
 
@@ -124,7 +124,7 @@ module RabbitFeed
         let(:definition) {}
 
         it 'raises a configuration error' do
-          expect{ subject }.to raise_error ConfigurationError
+          expect { subject }.to raise_error ConfigurationError
         end
       end
     end