rabbit_feed 2.4.4 → 3.0.0

data/spec/lib/rabbit_feed/event_routing_spec.rb

@@ -3,55 +3,44 @@ module RabbitFeed
     before do
       EventRouting do
         accept_from('dummy_1') do
-          event('event_1') do |event|
-            event.payload
-          end
-          event('event_2') do |event|
-            event.payload
-          end
+          event('event_1') { |event| event.payload }
+          event('event_2') { |event| event.payload }
         end
         accept_from('dummy_2') do
-          event('event_3') do |event|
-            event.payload
-          end
+          event('event_3') { |event| event.payload }
         end
         accept_from(:any) do
-          event('event_3') do |event|
+          event('event_3') do |_event|
             raise 'event_3 from any app'
           end
-          event('event_4') do |event|
-            event.payload
-          end
+          event('event_4') { |event| event.payload }
         end
         accept_from('dummy_3') do
-          event(:any) do |event|
-            event.payload
-          end
+          event(:any) { |event| event.payload }
         end
       end
     end
 
     it 'should create routing keys for the specified routes' do
-
-      RabbitFeed::Consumer.event_routing.accepted_routes.should =~ %w{
+      RabbitFeed::Consumer.event_routing.accepted_routes.should =~ %w(
         test.dummy_1.event_1
         test.dummy_1.event_2
         test.dummy_2.event_3
         test.*.event_3
         test.*.event_4
         test.dummy_3.*
-      }
+      )
     end
 
     it 'routes the event to the correct action, preferring named applications' do
       events = [
-        Event.new({application: 'dummy_1', name: 'event_1'}, {payload: 1}),
-        Event.new({application: 'dummy_1', name: 'event_2'}, {payload: 2}),
-        Event.new({application: 'dummy_1', name: 'event_4'}, {payload: 4}),
-        Event.new({application: 'dummy_2', name: 'event_3'}, {payload: 3}),
-        Event.new({application: 'none',    name: 'event_4'}, {payload: 4}),
-        Event.new({application: 'dummy_3', name: 'event_1'}, {payload: 1}),
-        Event.new({application: 'dummy_3', name: 'event_2'}, {payload: 2}),
+        Event.new({ application: 'dummy_1', name: 'event_1' }, payload: 1),
+        Event.new({ application: 'dummy_1', name: 'event_2' }, payload: 2),
+        Event.new({ application: 'dummy_1', name: 'event_4' }, payload: 4),
+        Event.new({ application: 'dummy_2', name: 'event_3' }, payload: 3),
+        Event.new({ application: 'none',    name: 'event_4' }, payload: 4),
+        Event.new({ application: 'dummy_3', name: 'event_1' }, payload: 1),
+        Event.new({ application: 'dummy_3', name: 'event_2' }, payload: 2)
       ]
       events.each do |event|
         (RabbitFeed::Consumer.event_routing.handle_event event).should eq event.payload
@@ -60,17 +49,17 @@ module RabbitFeed
 
     it 'raises a routing error when the event cannot be routed' do
       events = [
-        Event.new({application: 'dummy_9', name: 'event_1'}, {payload: 1}),
-        Event.new({application: 'dummy_1', name: 'event_9'}, {payload: 3}),
+        Event.new({ application: 'dummy_9', name: 'event_1' }, payload: 1),
+        Event.new({ application: 'dummy_1', name: 'event_9' }, payload: 3)
       ]
       events.each do |event|
-        expect{ RabbitFeed::Consumer.event_routing.handle_event event }.to raise_error RoutingError
+        expect { RabbitFeed::Consumer.event_routing.handle_event event }.to raise_error RoutingError
       end
     end
 
     describe EventRouting::Application do
       let(:name) { 'name' }
-      subject{ EventRouting::Application.new name }
+      subject { EventRouting::Application.new name }
 
       it { should be_valid }
 
@@ -78,15 +67,15 @@ module RabbitFeed
         let(:name) {}
 
         it 'raises a configuration error' do
-          expect{ subject }.to raise_error ConfigurationError
+          expect { subject }.to raise_error ConfigurationError
         end
       end
     end
 
     describe EventRouting::Event do
       let(:name)  { 'name' }
-      let(:block) { Proc.new{|event|} }
-      subject{ EventRouting::Event.new name, block }
+      let(:block) { proc { |event| } }
+      subject { EventRouting::Event.new name, block }
 
       it { should be_valid }
 
@@ -94,7 +83,7 @@ module RabbitFeed
         let(:name) {}
 
         it 'raises a configuration error' do
-          expect{ subject }.to raise_error ConfigurationError
+          expect { subject }.to raise_error ConfigurationError
         end
       end
 
@@ -102,15 +91,15 @@ module RabbitFeed
         let(:block) {}
 
         it 'raises a configuration error' do
-          expect{ subject }.to raise_error ConfigurationError
+          expect { subject }.to raise_error ConfigurationError
         end
       end
 
       context 'when the event is not provided to the event action' do
-        let(:block) { Proc.new{} }
+        let(:block) { proc {} }
 
         it 'raises a configuration error' do
-          expect{ subject }.to raise_error ConfigurationError
+          expect { subject }.to raise_error ConfigurationError
         end
       end
     end
@@ -119,15 +108,13 @@ module RabbitFeed
       before do
         EventRouting do
           accept_from('dummy_4') do
-            event('event_4') do |event|
-              event.payload
-            end
+            event('event_4') { |event| event.payload }
           end
         end
       end
 
       it 'applies routing definitions in a cumulative manner' do
-        RabbitFeed::Consumer.event_routing.accepted_routes.should =~ %w{
+        RabbitFeed::Consumer.event_routing.accepted_routes.should =~ %w(
           test.dummy_1.event_1
           test.dummy_1.event_2
           test.dummy_2.event_3
@@ -135,19 +122,16 @@ module RabbitFeed
           test.*.event_3
           test.*.event_4
           test.dummy_3.*
-        }
+        )
       end
     end
 
     context 'defining the same application twice' do
-
       it 'raises an exception for a named application' do
         expect do
           EventRouting do
             accept_from('dummy_2') do
-              event('event_4') do |event|
-                event.payload
-              end
+              event('event_4') { |event| event.payload }
             end
           end
         end.to raise_error 'Routing has already been defined for the application with name: dummy_2'
@@ -157,9 +141,7 @@ module RabbitFeed
         expect do
           EventRouting do
             accept_from(:any) do
-              event('event_4') do |event|
-                event.payload
-              end
+              event('event_4') { |event| event.payload }
             end
           end
         end.to raise_error 'Routing has already been defined for the application catch-all: :any'
@@ -167,17 +149,12 @@ module RabbitFeed
     end
 
     context 'defining the same event twice' do
-
       it 'raises an exception for a named event' do
         expect do
           EventRouting do
             accept_from('dummy_5') do
-              event('event_3') do |event|
-                event.payload
-              end
-              event('event_3') do |event|
-                event.payload
-              end
+              event('event_3') { |event| event.payload }
+              event('event_3') { |event| event.payload }
             end
           end
         end.to raise_error 'Routing has already been defined for the event with name: event_3 in application: dummy_5'
@@ -187,12 +164,8 @@ module RabbitFeed
         expect do
           EventRouting do
             accept_from('dummy_5') do
-              event(:any) do |event|
-                event.payload
-              end
-              event(:any) do |event|
-                event.payload
-              end
+              event(:any) { |event| event.payload }
+              event(:any) { |event| event.payload }
             end
           end
         end.to raise_error 'Routing has already been defined for the event catch-all: :any in application: dummy_5'

data/spec/lib/rabbit_feed/event_spec.rb

@@ -4,20 +4,19 @@ module RabbitFeed
     let(:payload)  { { 'customer_id' => '123' } }
     let(:metadata) { { 'name' => 'test_event' } }
 
-    subject { described_class.new metadata, payload, schema  }
+    subject { described_class.new metadata, payload, schema }
 
     describe '.new' do
-
       it { should be_valid }
       its(:schema)   { should eq schema }
-      its(:payload)  { should eq({ 'customer_id' => '123' }) }
-      its(:metadata) { should eq({ 'name' => 'test_event' }) }
+      its(:payload)  { should eq('customer_id' => '123') }
+      its(:metadata) { should eq('name' => 'test_event') }
 
       context 'when payload is nil' do
         let(:payload) {}
 
         it 'should raise an error' do
-          expect{ subject }.to raise_error 'Invalid event: {:payload=>["can\'t be nil"]}'
+          expect { subject }.to raise_error 'Invalid event: {:payload=>["can\'t be nil"]}'
         end
       end
 
@@ -25,15 +24,15 @@ module RabbitFeed
         let(:metadata) {}
 
         it 'should raise an error' do
-          expect{ subject }.to raise_error 'Invalid event: {:metadata=>["can\'t be blank"]}'
+          expect { subject }.to raise_error 'Invalid event: {:metadata=>["can\'t be blank"]}'
         end
       end
 
       context 'when name is blank' do
-        let(:metadata) {{ 'name' => '' }}
+        let(:metadata) { { 'name' => '' } }
 
         it 'should raise an error' do
-          expect{ subject }.to raise_error 'Invalid event: {:metadata=>["name field is required"]}'
+          expect { subject }.to raise_error 'Invalid event: {:metadata=>["name field is required"]}'
         end
       end
     end
@@ -51,7 +50,6 @@ module RabbitFeed
     end
 
     describe '#created_at_utc' do
-
       context 'when the created_at_utc is in the metadata' do
         let(:metadata) { { 'name' => 'test_event', 'created_at_utc' => '2015-03-02T15:55:19.411299Z' } }
 
@@ -79,33 +77,35 @@ module RabbitFeed
                   type: 'record',
                   fields: [
                     { name: 'event_integer', type: 'int' },
-                    { name: 'event_string',  type: 'string' },
-                  ],
-                },
+                    { name: 'event_string',  type: 'string' }
+                  ]
+                }
               },
               {
                 name: 'metadata',
                 type: {
                   name: 'event_metadata',
                   type: 'record',
-                  fields: [{ name: 'name', type: 'string' }],
-                },
-              },
-            ],
+                  fields: [{ name: 'name', type: 'string' }]
+                }
+              }
+            ]
           }.to_json
         )
       end
 
       context 'with invalid payload' do
-        let(:payload)  { {
-          'event_string'  => 'HIGHLY SENSITIVE',
-          'event_integer' => 'incorrect',
-        } }
+        let(:payload) do
+          {
+            'event_string'  => 'HIGHLY SENSITIVE',
+            'event_integer' => 'incorrect'
+          }
+        end
 
         it 'raises an Exception' do
-          expect {
+          expect do
             subject.serialize
-          }.to raise_error(Avro::IO::AvroTypeError)
+          end.to raise_error(Avro::IO::AvroTypeError)
         end
 
         it 'can remove values from exception' do
@@ -117,7 +117,7 @@ module RabbitFeed
             exception_msg = e.message
           end
           expect(exception_msg).to_not be_nil
-          expect(exception_msg).to_not include("HIGHLY SENSITIVE")
+          expect(exception_msg).to_not include('HIGHLY SENSITIVE')
           expect(exception_msg).to include('"event_string"=>"[REMOVED]"')
           expect(exception_msg).to include('"event_integer"=>"incorrect"')
         end
@@ -127,72 +127,25 @@ module RabbitFeed
     describe '.deserialize' do
       subject { described_class.deserialize serialized_event }
 
-      context 'from a post-1.0 event' do
-        let(:schema) do
-          Avro::Schema.parse ({ name: 'post-1.0', type: 'record', fields: [
-            { name: 'payload', type: {
-              name: 'event_payload', type: 'record', fields: [
-                { name: 'customer_id', type: 'string' },
-                ]
-              },
-            },
-            { name: 'metadata', type: {
-              name: 'event_metadata', type: 'record', fields: [
-                { name: 'name', type: 'string' },
-                ]
-              },
-            },
-          ]}.to_json)
-        end
-        let(:serialized_event) { (described_class.new metadata, payload, schema).serialize }
-
-        its(:schema)   { should eq schema }
-        its(:payload)  { should eq({ 'customer_id' => '123' }) }
-        its(:metadata) { should eq({ 'name' => 'test_event' }) }
+      let(:schema) do
+        Avro::Schema.parse({ name: '2.0', type: 'record', fields: [
+          { name: 'payload', type: {
+            name: 'event_payload', type: 'record', fields: [
+              { name: 'customer_id', type: 'string' }
+            ]
+          } },
+          { name: 'metadata', type: {
+            name: 'event_metadata', type: 'record', fields: [
+              { name: 'name', type: 'string' }
+            ]
+          } }
+        ] }.to_json)
       end
+      let(:serialized_event) { (described_class.new metadata, payload, schema).serialize }
 
-      context 'from a 1.0 event' do
-        let(:metadata_and_payload) do
-          {
-            'application'    => 'rabbit_feed',
-            'name'           => 'test_event',
-            'host'           => 'localhost',
-            'version'        => '1.0.0',
-            'environment'    => 'test',
-            'created_at_utc' => '2015-02-22',
-            'customer_id'    => '123',
-          }
-        end
-        let(:schema) do
-          Avro::Schema.parse ({ name: '1.0', type: 'record', fields: [
-            { name: 'customer_id', type: 'string' },
-            { name: 'application', type: 'string' },
-            { name: 'name', type: 'string' },
-            { name: 'host', type: 'string' },
-            { name: 'version', type: 'string' },
-            { name: 'environment', type: 'string' },
-            { name: 'created_at_utc', type: 'string' },
-          ]}.to_json)
-        end
-        let(:serialized_event) do
-          buffer = StringIO.new
-          writer = Avro::DataFile::Writer.new buffer, (Avro::IO::DatumWriter.new schema), schema
-          writer << metadata_and_payload
-          writer.close
-          buffer.string
-        end
-
-        its(:schema)   { should eq schema }
-        its(:payload)  { should eq({ 'customer_id' => '123' }) }
-        its(:metadata) { should eq({
-          'application'    => 'rabbit_feed',
-          'name'           => 'test_event',
-          'host'           => 'localhost',
-          'version'        => '1.0.0',
-          'environment'    => 'test',
-          'created_at_utc' => '2015-02-22',
-          })}
-      end
+      its(:schema)   { should eq schema }
+      its(:payload)  { should eq('customer_id' => '123') }
+      its(:metadata) { should eq('name' => 'test_event') }
     end
   end
 end

data/spec/lib/rabbit_feed/producer_connection_spec.rb

@@ -19,13 +19,17 @@ module RabbitFeed
     end
 
     describe '#handle_returned_message' 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 Airbrake is defined' do
         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
@@ -34,7 +38,7 @@ module RabbitFeed
             let(:airbrake_configuration) { double(:airbrake_configuration, public?: true) }
 
             it 'notifies Airbrake of the return' do
-              expect(Airbrake).to receive(:notify_or_ignore).with(an_instance_of ReturnedMessageError)
+              expect(Airbrake).to receive(:notify_or_ignore).with(an_instance_of(ReturnedMessageError))
               described_class.handle_returned_message 1, 2
             end
           end
@@ -43,12 +47,12 @@ 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
 
           it 'notifies Airbrake of the return' do
-            expect(Airbrake).to receive(:notify).with(an_instance_of ReturnedMessageError)
+            expect(Airbrake).to receive(:notify).with(an_instance_of(ReturnedMessageError))
             described_class.handle_returned_message 1, 2
           end
         end
@@ -57,10 +61,10 @@ module RabbitFeed
 
     describe '#publish' do
       let(:message) { 'the message' }
-      let(:options) { {routing_key: 'routing_key'} }
+      let(:options) { { routing_key: 'routing_key' } }
 
       it 'publishes the message as mandatory and persistent' do
-        expect(bunny_exchange).to receive(:publish).with(message, { persistent: true, mandatory: true, routing_key: 'routing_key' })
+        expect(bunny_exchange).to receive(:publish).with(message, persistent: true, mandatory: true, routing_key: 'routing_key')
         subject.publish message, options
       end
 

data/spec/lib/rabbit_feed/producer_spec.rb

@@ -15,13 +15,13 @@ module RabbitFeed
           end
         end
       end
-      subject{ RabbitFeed::Producer.publish_event event_name, { 'field' => 'value' } }
+      subject { RabbitFeed::Producer.publish_event event_name, 'field' => 'value' }
 
       context 'when event definitions are not set' do
-        before{ RabbitFeed::Producer.event_definitions = nil }
+        before { RabbitFeed::Producer.event_definitions = nil }
 
         it 'raises an error' do
-          expect{ subject }.to raise_error Error
+          expect { subject }.to raise_error Error
         end
       end
 
@@ -29,7 +29,7 @@ module RabbitFeed
         let(:event_name) { 'different event name' }
 
         it 'raises an error' do
-          expect{ subject }.to raise_error Error
+          expect { subject }.to raise_error Error
         end
       end
 
@@ -43,15 +43,13 @@ module RabbitFeed
 
       it 'sets the event metadata' do
         Timecop.freeze(Time.gm(1990)) do
-          expect(subject.metadata).to match({
-           'application'    => 'rabbit_feed',
-           'created_at_utc' => '1990-01-01T00:00:00.000000Z',
-           'environment'    => 'test',
-           'host'           => an_instance_of(String),
-           'name'           => 'event_name',
-           'schema_version' => Event::SCHEMA_VERSION,
-           'version'        => '1.0.0',
-           })
+          expect(subject.metadata).to match('application' => 'rabbit_feed',
+                                            'created_at_utc' => '1990-01-01T00:00:00.000000Z',
+                                            'environment'    => 'test',
+                                            'host'           => an_instance_of(String),
+                                            'name'           => 'event_name',
+                                            'schema_version' => Event::SCHEMA_VERSION,
+                                            'version'        => '1.0.0')
         end
       end
 
@@ -59,12 +57,11 @@ module RabbitFeed
         Timecop.freeze do
           expect(ProducerConnection.instance).to receive(:publish).with(
             an_instance_of(String),
-            {
-              routing_key: 'test.rabbit_feed.event_name',
-              type:        'event_name',
-              app_id:      'rabbit_feed',
-              timestamp:   Time.now.utc.to_i,
-            })
+            routing_key: 'test.rabbit_feed.event_name',
+            type:        'event_name',
+            app_id:      'rabbit_feed',
+            timestamp:   Time.now.utc.to_i
+          )
           subject
         end
       end