rabbit_feed 2.3.7 → 2.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46ec22406bf0b402aac611249d2d6d6f73d68f5a
-  data.tar.gz: a818565a86d18854c86462fa98c28c0be45b7913
+  metadata.gz: d56c7c94bb76a6ee1a8ca77a5666d89dcc26fb30
+  data.tar.gz: 33e7a05722fe28047edb67132cd3902404c622ab
 SHA512:
-  metadata.gz: ecc5101d86353f8377943623d8b7805f7ef6101b7d90092ed97cb60396a9dcb5573081562c01a36f2bdc3504e83e7515448c8aca60225d9985a64b5de0a1f337
-  data.tar.gz: 1da54c92be195050c2815a3a84a2a3be37aa99e2a00b15ba6edddc24dc4e4594cccf7aba620b0f358fbdc217fa033f00a9e433f9d2d4d2551ecad4ad8b66b96d
+  metadata.gz: 10237bc7ef9d916b0bef1d389972063c388e41e3a76f875f494c219f37b431c45a3d63fb364bbdf735d08a68676979b49bc4c3618fb57050941bf21e650d9445
+  data.tar.gz: dc0bd78e8d2c5b6cf709650ca38a0ad90cc56fb00677eca97eac3f5dc27276a4619e459922855784906d4e7f09124430c3f082e4b20520c839c71ddb8f89e111

data/example/non_rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    rabbit_feed (2.3.7)
+    rabbit_feed (2.3.9)
       activemodel (>= 3.2.0, < 5.0.0)
       activesupport (>= 3.2.0, < 5.0.0)
       avro (>= 1.5.4, < 1.8.0)

data/example/rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    rabbit_feed (2.3.7)
+    rabbit_feed (2.3.9)
       activemodel (>= 3.2.0, < 5.0.0)
       activesupport (>= 3.2.0, < 5.0.0)
       avro (>= 1.5.4, < 1.8.0)

data/lib/rabbit_feed/configuration.rb

@@ -32,8 +32,8 @@ module RabbitFeed
       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
-      options[:environment]   = environment
-      options[:application] ||= application
+      options[:environment] = environment
+      options[:application] = application if !!application
       new options
     end
 

data/lib/rabbit_feed/version.rb

@@ -1,3 +1,3 @@
 module RabbitFeed
-  VERSION = '2.3.7'
+  VERSION = '2.3.9'
 end

data/lib/rabbit_feed.rb

@@ -34,7 +34,11 @@ module RabbitFeed
 
   def exception_notify exception
     if defined? Airbrake
-      (Airbrake.notify_or_ignore exception) if Airbrake.configuration.public?
+      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
+        Airbrake.notify exception
+      end
     end
   end
 
@@ -50,9 +54,9 @@ module RabbitFeed
   end
 
   def set_defaults
-    self.log                     = default_logger
-    self.configuration_file_path = 'config/rabbit_feed.yml'
-    self.environment             = ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+    self.log                     ||= default_logger
+    self.configuration_file_path ||= 'config/rabbit_feed.yml'
+    self.environment             ||= ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
   end
   private :set_defaults
 

data/run_example

@@ -27,7 +27,6 @@ echo 'Rails application consumer started'
 # Start the rails application
 echo 'Starting rails application...'
 pushd example/rails_app >/dev/null
-nodenv local v0.10 >/dev/null
 bundle exec unicorn -c config/unicorn.rb -D
 sleep 1
 popd >/dev/null

data/spec/lib/rabbit_feed/configuration_spec.rb

@@ -117,8 +117,8 @@ module RabbitFeed
       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'
+        it 'prefers the application provided' do
+          expect(subject.application).to eq 'new_application'
         end
 
         context 'with an empty config file' do

data/spec/lib/rabbit_feed/consumer_connection_spec.rb

@@ -80,16 +80,36 @@ module RabbitFeed
       context 'when an exception is raised' do
 
         context 'when Airbrake is defined' do
-          before do
-            stub_const('Airbrake', double(:airbrake, configuration: airbrake_configuration))
+          after { Object.send(:remove_const, ('Airbrake').to_sym) rescue NameError }
+
+          context 'when the version is lower than 5' do
+            before do
+              module ::Airbrake
+                VERSION = '4.0.0'
+              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
+            end
           end
 
-          context 'and the Airbrake configuration is public' do
-            let(:airbrake_configuration) { double(:airbrake_configuration, public?: true) }
+          context 'when the version is greater than 4' do
+            before do
+              module ::Airbrake
+                AIRBRAKE_VERSION = '5.0.0'
+              end
+            end
 
             it 'notifies airbrake' do
-              expect(Airbrake).to receive(:notify_or_ignore).with(an_instance_of RuntimeError)
-
+              expect(Airbrake).to receive(:notify).with(an_instance_of RuntimeError)
               expect{ subject.consume { raise 'Consuming time' } }.not_to raise_error
             end
           end

data/spec/lib/rabbit_feed/producer_connection_spec.rb

@@ -19,17 +19,36 @@ module RabbitFeed
     end
 
     describe '#handle_returned_message' do
+      after { Object.send(:remove_const, ('Airbrake').to_sym) rescue NameError }
 
       context 'when Airbrake is defined' do
-        before do
-          stub_const('Airbrake', double(:airbrake, configuration: airbrake_configuration))
+        context 'when the version is lower than 5' do
+          before do
+            module ::Airbrake
+              VERSION = '4.0.0'
+            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
         end
 
-        context 'and the Airbrake configuration is public' do
-          let(:airbrake_configuration) { double(:airbrake_configuration, public?: true) }
+        context 'when the version is greater than 4' do
+          before do
+            module ::Airbrake
+              AIRBRAKE_VERSION = '5.0.0'
+            end
+          end
 
           it 'notifies Airbrake of the return' do
-            expect(Airbrake).to receive(:notify_or_ignore).with(an_instance_of ReturnedMessageError)
+            expect(Airbrake).to receive(:notify).with(an_instance_of ReturnedMessageError)
             described_class.handle_returned_message 1, 2
           end
         end

data/spec/lib/rabbit_feed/producer_spec.rb

@@ -42,7 +42,7 @@ module RabbitFeed
       end
 
       it 'sets the event metadata' do
-        Timecop.freeze(Time.local(1990)) do
+        Timecop.freeze(Time.gm(1990)) do
           expect(subject.metadata).to match({
            'application'    => 'rabbit_feed',
            'created_at_utc' => '1990-01-01T00:00:00.000000Z',

metadata

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