rabbit_feed 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 341e94f0f96334c74f5f14a9bd394cb076602342
-  data.tar.gz: d6a2b2fea2255493db135aec552d48493d2e35fd
+  metadata.gz: 0dd9a18fb2e4684fc9680be20a40caa49605c22e
+  data.tar.gz: 61f4a4c44a773c7cf649dc6a80216cb261d8ae68
 SHA512:
-  metadata.gz: 7975aa142d54f3c36880776842680d6b7c1b07c0d3a3973d2622149b2801d303b1b4d99bd26245483827fef0dad1470cdb081984e23dff57d43d03352c9c1f34
-  data.tar.gz: 396188946a955bd285ea5146e33652f171501e5f54a349431917df947a3e9e87c386ffb6c158a9b3993c460ae5c79c882424787c88ad3b732821600a1559f4f3
+  metadata.gz: 66657f7a397849d419d01a62a52c8f43e011025affb5772205f3fbc8c719f76ff1ad2f7407ea3a50675e62bf6320bb43ac8eb70c220a45a9f14caf1aade04bfc
+  data.tar.gz: 51998a861c4fba7d1f25fa0b0bd53ddd8c3343fa3c0c64959ef03bcdc4fabd7414363bc83d4cd2ed3baf30528504bedd2635ed01c40b264753fc867e8cb684e9

data/.rubocop.yml

@@ -28,7 +28,6 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Exclude:
     - 'lib/rabbit_feed/configuration.rb'
-    - 'lib/rabbit_feed.rb'
     - 'lib/rabbit_feed/testing_support/rspec_matchers/publish_event.rb'
 
 Metrics/LineLength:
@@ -45,7 +44,6 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Exclude:
     - 'lib/rabbit_feed/configuration.rb'
-    - 'lib/rabbit_feed.rb'
     - 'lib/rabbit_feed/testing_support/rspec_matchers/publish_event.rb'
 
 Style/Documentation:

data/README.md

@@ -119,7 +119,7 @@ The event will be published to the configured exchange on RabbitMQ (`amq.topic`
 
 ### Returned Events
 
-In the case that there are no consumers configured to subscribe to an event, the event will be returned to the producer. The returned event will be logged, and if your project uses [Airbrake](https://airbrake.io), an error will be reported there.
+In the case that there are no consumers configured to subscribe to an event, the event will be returned to the producer. The returned event will be logged, and if your project uses [Airbrake (v5.0+) or Airbrake-Ruby](https://airbrake.io), an error will be reported there.
 
 ### Testing the Producer
 
@@ -238,7 +238,7 @@ More information about the consumer command line options can be found [here](htt
 
 ### Event Processing Errors
 
-In the case that your consumer raises an error whilst processing an event, the error will be logged. If your project uses [Airbrake](https://airbrake.io), the error will also be reported there. The event that was being processed will remain on the RabbitMQ queue, and will be redelivered to the consumer until it is processed without error.
+In the case that your consumer raises an error whilst processing an event, the error will be logged. If your project uses [Airbrake (v5.0+) or Airbrake-Ruby](https://airbrake.io), the error will also be reported there. The event that was being processed will remain on the RabbitMQ queue, and will be redelivered to the consumer until it is processed without error.
 
 ### Testing the Consumer
 

data/example/non_rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    rabbit_feed (3.0.0)
+    rabbit_feed (3.0.1)
       activemodel (>= 3.2.0, < 6.0.0)
       activesupport (>= 3.2.0, < 6.0.0)
       avro (>= 1.5.4, < 1.9.0)

data/example/rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    rabbit_feed (3.0.0)
+    rabbit_feed (3.0.1)
       activemodel (>= 3.2.0, < 6.0.0)
       activesupport (>= 3.2.0, < 6.0.0)
       avro (>= 1.5.4, < 1.9.0)

data/lib/rabbit_feed.rb

@@ -34,17 +34,13 @@ module RabbitFeed
 
   def exception_notify(exception)
     return unless defined?(Airbrake)
-    if defined?(Airbrake::VERSION) && Airbrake::VERSION.to_i < 5
-      (Airbrake.notify_or_ignore exception) if Airbrake.configuration.public?
-    elsif defined?(Airbrake::AIRBRAKE_VERSION) && Airbrake::AIRBRAKE_VERSION.to_i >= 5
-      if RabbitFeed.configuration.consumer_exit_after_fail
-        # Will need to send the notification right away, otherwise the `exit` would kill the
-        # Airbrake before the notification is sent out
-        Airbrake.notify_sync exception
-      else
-        # Airbrake notify default to sending notification asynchronously
-        Airbrake.notify exception
-      end
+    if RabbitFeed.configuration.consumer_exit_after_fail
+      # Will need to send the notification right away, otherwise the `exit` would kill the
+      # Airbrake before the notification is sent out
+      Airbrake.notify_sync exception
+    else
+      # Airbrake notify default to sending notification asynchronously
+      Airbrake.notify exception
     end
   end
 

data/lib/rabbit_feed/version.rb

@@ -1,3 +1,3 @@
 module RabbitFeed
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.1'.freeze
 end

data/spec/lib/rabbit_feed/consumer_connection_spec.rb

@@ -116,52 +116,25 @@ module RabbitFeed
           before { allow(RabbitFeed.configuration).to receive(:consumer_exit_after_fail).and_return(false) }
 
           context 'when Airbrake is defined' do
-            after do
-              begin
-                Object.send(:remove_const, 'Airbrake'.to_sym)
-              rescue NameError; end
+            around do |example|
+              module ::Airbrake; end
+              example.run
+              Object.send(:remove_const, 'Airbrake'.to_sym)
             end
 
-            context 'when the version is lower than 5' do
-              before do
-                module ::Airbrake
-                  VERSION = '4.0.0'.freeze
-                end
-                allow(Airbrake).to receive(:configuration).and_return(airbrake_configuration)
-              end
-
-              context 'and the Airbrake configuration is public' do
-                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 { subject.consume { raise 'Consuming time' } }.not_to raise_error
-                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
               end
             end
 
-            context 'when the version is greater than 4' do
-              before do
-                module ::Airbrake
-                  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
-                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
-                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
               end
             end
           end

data/spec/lib/rabbit_feed/producer_connection_spec.rb

@@ -19,42 +19,16 @@ module RabbitFeed
     end
 
     describe '#handle_returned_message' do
-      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'.freeze
-            end
-            allow(Airbrake).to receive(:configuration).and_return(airbrake_configuration)
-          end
-
-          context 'and the Airbrake configuration is public' do
-            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))
-              described_class.handle_returned_message 1, 2
-            end
-          end
+        around do |example|
+          module ::Airbrake; end
+          example.run
+          Object.send(:remove_const, 'Airbrake'.to_sym)
         end
 
-        context 'when the version is greater than 4' do
-          before do
-            module ::Airbrake
-              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))
-            described_class.handle_returned_message 1, 2
-          end
+        it 'notifies Airbrake of the return' do
+          expect(Airbrake).to receive(:notify).with(an_instance_of(ReturnedMessageError))
+          described_class.handle_returned_message 1, 2
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_feed
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Simply Business
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-02 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny