banter 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80b25572909dce4687781d01504ef62769092c27
-  data.tar.gz: 624e2969816519a17dd03a09b2a972261b38b2d8
+  metadata.gz: bbcfd4c67610fef0339ce5fb31e14fd975e89d69
+  data.tar.gz: 626912b7090d2cd191f1c87d846f2c2c3f62d9d7
 SHA512:
-  metadata.gz: 53058a6a8953dfe2e937e38ce5e866af1cb0813076296707840cab4a3dc32d7923f78aae6f99dc362b76e94709ea649947249df9864d16b5927333e887873a5f
-  data.tar.gz: 15bf4626708359c18557a104cd9b7d627ca0d475698b7561dd3796f9fe1c5497fb6f538fec52fe25e173e1c426a3d498446a802aad5cadf5c1bcf00792ccacd6
+  metadata.gz: b35cd93ce40832b90000c56d054587a7ea49f5e2c651a3d9b960fd68ab041645ed19f17860868821619fa8f0cf1df115a49823dc4a8e743f498b5d68d4303572
+  data.tar.gz: a9cc50ad7416642328b91c463266e7eb0db72c18d0dbd7ca0c93fef0bd8ccf91edfe9ddf9d547b8ead606b4df985dcf9f912e55b23b82b8499e7bb5746289c79

data/Gemfile

@@ -10,7 +10,7 @@ group :test do
   gem 'rspec-its'
   gem 'sinatra'
   gem 'haml'
-  gem 'mongoid', github: 'mongoid/mongoid'
+  gem 'mongoid', "~>4.0"
   gem 'timecop'
   gem "factory_girl", "~> 4.0"
 end

data/banter.gemspec

@@ -21,12 +21,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", ">= 10.0"
+  spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0.0"
-  spec.add_runtime_dependency "activesupport", ">= 3.2"
+  spec.add_runtime_dependency "activesupport", "~> 4.1"
   spec.add_runtime_dependency "awesome_print", "~> 1.2.0"
-  spec.add_runtime_dependency "bunny", ">= 1.2"
-  spec.add_runtime_dependency "airbrake", ">= 3.1"
+  spec.add_runtime_dependency "bunny", "~> 1.2"
+  spec.add_runtime_dependency "airbrake", "~> 3.1"
   spec.add_runtime_dependency "hashie", ">= 1.2"
   spec.add_runtime_dependency "json", ">= 1.8"
   spec.add_runtime_dependency "celluloid", ">= 0.15"

data/lib/banter/server/client_queue_listener.rb

@@ -38,7 +38,7 @@ module Banter
         track_message_failed(banter_error, false)
         Banter::RabbitLogger.log(::Logger::ERROR, { worker: worker_class.name, message: banter_error.message, envelope: envelope })
         Airbrake.notify(banter_error,
-                        params: {
+                        parameters: {
                           info:       delivery_info,
                           properties: properties,
                           context:    envelope[:context],
@@ -48,9 +48,9 @@ module Banter
         raise banter_error
       rescue => e
         track_message_failed(e, true)
-        Banter::RabbitLogger.log(::Logger::DEBUG, "Failed message for #{worker_class.name} #{e.message}")
+        Banter::RabbitLogger.log(::Logger::ERROR, "Failed message for #{worker_class.name} #{e.message}")
         Airbrake.notify(e,
-                        params: {
+                        parameters: {
                           info:       delivery_info,
                           properties: properties,
                           context:    envelope[:context],

data/lib/banter/server/rabbit_mq_subscriber.rb

@@ -37,7 +37,7 @@ module Banter
           @connection.start
         rescue => e
           Banter::RabbitLogger.log(Logger::ERROR, "Cannot connect to rabbitmq")
-          Airbrake.notify(e, params: { message: e.message, what_happened: "RabbitMQ unreachable!" }, environment_name: environment)
+          Airbrake.notify(e, parameters: { message: e.message, what_happened: "RabbitMQ unreachable!" }, environment_name: environment)
           raise e
         end
 
@@ -70,7 +70,7 @@ module Banter
 
           if delivery_info[:redelivered]
             e = StandardError.new("PubSub Message redelivery")
-            Airbrake.notify(e, params: { info: delivery_info, props: properties, contents: contents }, backtrace: caller)
+            Airbrake.notify(e, parameters: { info: delivery_info, props: properties, contents: contents }, backtrace: caller)
           end
 
           Banter::RabbitLogger.log_receive(delivery_info[:routing_key], envelope)
@@ -89,14 +89,14 @@ module Banter
           # Does not get put back on the queue, and instead, will need to be processed either by the log parser
           # later or by dead letter exchange
           @channel.reject(token, false)
-          Airbrake.notify(e, params: { delivery_info: delivery_info, properties: properties, contents: contents, error: e.message }, environment_name: environment)
+          Airbrake.notify(e, parameters: { delivery_info: delivery_info, properties: properties, contents: contents, error: e.message }, environment_name: environment)
         end
       end
 
       def notify_error(error, consumer)
         Banter::RabbitLogger.log(Logger::WARN, "Error with the message: #{error.message}: #{consumer}")
         Banter::RabbitLogger.log(Logger::WARN, "#{caller.inspect}")
-        Airbrake.notify(error, params: { consumer: consumer, error: error.message }, environment_name: environment)
+        Airbrake.notify(error, parameters: { consumer: consumer, error: error.message }, environment_name: environment)
       end
 
       def teardown
@@ -104,7 +104,7 @@ module Banter
           @consumer.cancel if @consumer.present?
           @connection.close if @connection.present?
         rescue => e
-          Airbrake.notify(e, params: { error: e.message }, environment_name: environment)
+          Airbrake.notify(e, parameters: { error: e.message }, environment_name: environment)
         end
       end
 

data/lib/banter/version.rb

@@ -1,3 +1,3 @@
 module Banter
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

data/spec/banter/publisher_spec.rb

@@ -15,12 +15,14 @@ describe Banter::Publisher do
     end
     double("::Bunny::Channel", :topic=> topic)
   }
-  let(:publish_fails){ false}
+  let(:publish_fails){ false }
+  let(:session_mock) { Bunny::Session.new }
 
   before do
+    session_mock
+    publisher
     allow(Banter::RabbitLogger).to receive(:log_publish)
-    allow_any_instance_of(::Bunny::Session).to receive(:start).and_return(true)
-    allow_any_instance_of(::Bunny::Session).to receive(:create_channel) { channel_mocker }
+    allow(::Bunny::Session).to receive(:new).and_return(session_mock)
     allow(Banter::RabbitLogger).to receive(:log)
   end
 
@@ -37,7 +39,6 @@ describe Banter::Publisher do
 
       it "should attempt to publish twice" do
         result
-        expect(Banter::RabbitLogger).to have_received(:log_publish).exactly(2).times
         expect(Banter::RabbitLogger).to have_received(:log).with(Logger::INFO, /Publishing all messages from delayed publish/)
         expect(Banter::RabbitLogger).to have_received(:log).with(Logger::INFO, /to delayed publish with/).exactly(2).times
       end
@@ -61,11 +62,12 @@ describe Banter::Publisher do
         }
 
       before do
+        allow(publisher).to receive(:execute_publish).and_call_original
         result
       end
 
       it "should attempt to publish three times" do
-        expect(Banter::RabbitLogger).to have_received(:log_publish).exactly(3).times
+        expect(publisher).to have_received(:execute_publish).exactly(3).times
       end
     end
 
@@ -76,14 +78,18 @@ describe Banter::Publisher do
         publisher.publish(context, "second", "two")
       }
 
-      it "should have added to the message list twice that will be published last" do
-        expect_any_instance_of(Banter::Publisher).to receive(:add_message).exactly(2).times
+      before do
+        allow(publisher).to receive(:add_message).and_call_original
+        allow(publisher).to receive(:execute_publish).and_call_original
         result
       end
 
       it "should have added to the message list twice that will be published last" do
-        expect_any_instance_of(Banter::Publisher).to receive(:execute_publish).exactly(2).times
-        result
+        expect(publisher).to have_received(:add_message).exactly(2).times
+      end
+
+      it "should have added to the message list twice that will be published last" do
+        expect(publisher).to have_received(:execute_publish).exactly(2).times
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banter
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - The Honest Company
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -31,14 +31,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -59,16 +59,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -87,28 +87,28 @@ dependencies:
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: airbrake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Library for pub-sub (Message Bus)