banter 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbcfd4c67610fef0339ce5fb31e14fd975e89d69
-  data.tar.gz: 626912b7090d2cd191f1c87d846f2c2c3f62d9d7
+  metadata.gz: c03308431cc8b88c19125424eb68bb908a3d4371
+  data.tar.gz: 40e04814acf8a8bf45890e02340eadf06442a6c6
 SHA512:
-  metadata.gz: b35cd93ce40832b90000c56d054587a7ea49f5e2c651a3d9b960fd68ab041645ed19f17860868821619fa8f0cf1df115a49823dc4a8e743f498b5d68d4303572
-  data.tar.gz: a9cc50ad7416642328b91c463266e7eb0db72c18d0dbd7ca0c93fef0bd8ccf91edfe9ddf9d547b8ead606b4df985dcf9f912e55b23b82b8499e7bb5746289c79
+  metadata.gz: df196c9fa5a9ba80aedf5bddf922f6b148522cb2a1c57b8c953ff180d87d7021d4b12f708d667e8b31edd0df1dbfd5abb1ca0f70dae448bfed5da9c32be0012e
+  data.tar.gz: c192baefaf7eb97f48f0cf3e879f727e8087cd118f33f626556bcf4363520460824d454eb9fb400476e3f707c57c789ebbf79beaec3f1cef90968334ef0a3111

data/.gitignore

@@ -5,6 +5,7 @@
 .yardoc
 .project
 .ruby-gemset
+.ruby-version
 Gemfile.lock
 InstalledFiles
 _yardoc
@@ -20,3 +21,4 @@ tmp
 .rspec
 .idea
 *.log
+.byebug-history

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.1
 services:
   - mongodb
 before_script:

data/Gemfile

@@ -3,14 +3,11 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in banter.gemspec
 gemspec
 
-gem 'coffee-script'
 gem 'json'
 group :test do
   gem 'rack-test'
   gem 'rspec-its'
-  gem 'sinatra'
-  gem 'haml'
-  gem 'mongoid', "~>4.0"
   gem 'timecop'
+  gem 'awesome_print', '~> 1.6', '>= 1.6.1'
   gem "factory_girl", "~> 4.0"
 end

data/README.md

@@ -108,39 +108,6 @@ class UserWelcomeSubscriber < Banter::Subscriber
 end
 ```
 
-### Dashboards!!!
-
-Banter provides dashboards that can be easily enabled in any Rack application.
-
-For a Rails application
-
-```
-# config/application.rb
-config.banter.web_enabled = true
-```
-
-```
-#config/routes.rb
-mount Banter::Web::Application => '/banter'
-```
-
-or 
-
-```
-#config.routes.rb
-  authenticate :admin do
-    mount Banter::Web::Application => '/banter'
-  end
-```
-
-Dashboards currently use Mongo DB (Mongoid gem) to store data, so the following gems should be added to your gemfile
-```
-gem 'mongoid'
-gem 'haml'
-gem 'sinatra'
-```
-
-
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -6,31 +6,3 @@ begin
   task :default => :spec
 end
 
-begin
-  require 'coffee-script'
-
-  namespace :js do
-    def add_javascript(js_file, output_file)
-      js_file_souce = File.read("#{File.dirname(__FILE__)}/web/assets/javascripts/#{js_file}.js")
-      output_file.puts js_file_souce
-    end
-
-    desc "compile coffee-scripts from ./assets/javascripts"
-    task :compile do
-      source = "#{File.dirname(__FILE__)}/web/assets/javascripts/**/*.coffee"
-      target = "#{File.dirname(__FILE__)}/web/assets/javascripts/banter.js"
-      file   = File.open(target, 'w+')
-
-      add_javascript("ng-prettyjson", file)
-
-      Dir.glob(source) do |cf|
-        puts cf
-        file.puts CoffeeScript.compile File.read(cf)
-      end
-
-      file.close
-    end
-  end
-
-
-end

data/banter.gemspec

@@ -2,7 +2,6 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-# require all files in the folder?
 require 'banter/version'
 
 Gem::Specification.new do |spec|
@@ -20,13 +19,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", ">= 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0.0"
-  spec.add_runtime_dependency "activesupport", "~> 4.1"
-  spec.add_runtime_dependency "awesome_print", "~> 1.2.0"
+  spec.add_development_dependency "awesome_print", '>= 1.6.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.rb

@@ -1,7 +1,6 @@
 require "active_support/all"
 require "bunny"
 require "yaml"
-require "airbrake"
 
 require "banter/configuration"
 require "banter/context"
@@ -14,6 +13,7 @@ require "banter/version"
 require "banter/exceptions/payload_validation_error"
 require 'banter/server'
 require 'banter/subscriber'
+require 'banter/notifier'
 require 'banter/delay_publish_model'
 
 if defined?(Rails::Railtie)

data/lib/banter/configuration.rb

@@ -29,6 +29,8 @@ module Banter
 
     mattr_accessor :logger
 
+    mattr_accessor :notifier
+
     # RabbitMQ push and subscribe logging toggle
     # @default true
     mattr_accessor :logging_enabled
@@ -44,10 +46,6 @@ module Banter
     mattr_accessor :batch_messages
     @@batch_messages = false
 
-    # Enable web monitoring
-    # @default false
-    mattr_accessor :web_enabled
-    @@web_enabled = false
 
     mattr_accessor :application_name
     @@application_name = nil

data/lib/banter/notifier.rb

@@ -0,0 +1,16 @@
+module Banter
+  module Notifier
+    def self.notify(error, params_hash)
+      ::Banter::Configuration.notifier.notify(error, params_hash)
+    end
+
+    class StdOutNotifier
+      def self.notify(error, params_hash)
+        STDOUT.puts("Error caught: #{error}, #{params_hash}")
+      end
+    end
+  end
+end
+
+# Is this legit to just load up and assign as default for now?
+::Banter::Configuration.notifier ||= Banter::Notifier::StdOutNotifier

data/lib/banter/publisher.rb

@@ -52,7 +52,7 @@ module Banter
         @publisher = @channel.send(@exchange_type, @exchange, :durable => true, :auto_delete => false)
 
       rescue => e
-        Airbrake.notify(e, parameters: { message: e.message }, environment_name: ENV['RAILS_ENV'])
+        ::Banter::Notifier.notify(e, parameters: { message: e.message }, environment_name: ENV['RAILS_ENV'])
         return
       end
 

data/lib/banter/railtie.rb

@@ -17,10 +17,6 @@ module Banter
     config.after_initialize do
       Banter.logger = config.banter.logger if config.banter.logger
 
-      if Banter::Configuration.web_enabled
-        require 'banter/web'
-      end
-
     end
 
     console do

data/lib/banter/server/client_queue_listener.rb

@@ -30,33 +30,17 @@ module Banter
         Banter::RabbitLogger.log(::Logger::DEBUG, "Message received by listener on #{worker_class.name} with payload: #{envelope[:payload]}")
         worker  = worker_class.new(delivery_info, properties, envelope[:context], envelope)
         payload = envelope[:payload]
-        track_message_received(worker, payload)
         worker.perform!(payload)
-        track_message_successful
         clear_dead_letter(worker_class.config.dead_letter_queue_name, envelope)
       rescue ::Banter::PayloadValidationError => banter_error
-        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,
-                        parameters: {
-                          info:       delivery_info,
-                          properties: properties,
-                          context:    envelope[:context],
-                          payload:    envelope[:payload],
-                          message:    "Validation error for #{worker_class.name}"
-                        })
+
+        ::Banter::Notifier.notify(banter_error, { delivery_info: delivery_info, properties: properties, envelope: envelope})
         raise banter_error
       rescue => e
-        track_message_failed(e, true)
         Banter::RabbitLogger.log(::Logger::ERROR, "Failed message for #{worker_class.name} #{e.message}")
-        Airbrake.notify(e,
-                        parameters: {
-                          info:       delivery_info,
-                          properties: properties,
-                          context:    envelope[:context],
-                          payload:    envelope[:payload],
-                          message:    "Failed perform for #{worker_class.name}"
-                        })
+
+        ::Banter::Notifier.notify(e, { delivery_info: delivery_info, properties: properties, envelope: envelope})
         raise e
       end
 
@@ -67,23 +51,6 @@ module Banter
         end
       end
 
-      protected
-
-      def track_message_successful
-        return unless Banter::Configuration.web_enabled
-        BanterMessage.message_successful
-      end
-
-      def track_message_failed(error, errored = true)
-        return unless Banter::Configuration.web_enabled
-        status = errored ? BanterMessage::STATUS_ERROR : BanterMessage::STATUS_VALIDATION_FAILED
-        BanterMessage.message_failed(error, status)
-      end
-
-      def track_message_received(worker, payload)
-        return unless Banter::Configuration.web_enabled
-        BanterMessage.message_received(worker_class, worker, payload)
-      end
     end
   end
 end

data/lib/banter/server/rabbit_mq_subscriber.rb

@@ -28,7 +28,6 @@ module Banter
         elsif @topic.present?
           @routing_key = "#{@topic}.#"
         end
-
       end
 
       def start(&block)
@@ -37,7 +36,7 @@ module Banter
           @connection.start
         rescue => e
           Banter::RabbitLogger.log(Logger::ERROR, "Cannot connect to rabbitmq")
-          Airbrake.notify(e, parameters: { message: e.message, what_happened: "RabbitMQ unreachable!" }, environment_name: environment)
+          ::Banter::Notifier.notify(e, parameters: { message: e.message, what_happened: "RabbitMQ unreachable!" }, environment_name: environment)
           raise e
         end
 
@@ -70,7 +69,7 @@ module Banter
 
           if delivery_info[:redelivered]
             e = StandardError.new("PubSub Message redelivery")
-            Airbrake.notify(e, parameters: { info: delivery_info, props: properties, contents: contents }, backtrace: caller)
+            ::Banter::Notifier.notify(e, parameters: { info: delivery_info, props: properties, contents: contents }, backtrace: caller)
           end
 
           Banter::RabbitLogger.log_receive(delivery_info[:routing_key], envelope)
@@ -89,14 +88,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, parameters: { delivery_info: delivery_info, properties: properties, contents: contents, error: e.message }, environment_name: environment)
+          ::Banter::Notifier.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, parameters: { consumer: consumer, error: error.message }, environment_name: environment)
+        ::Banter::Notifier.notify(error, parameters: { consumer: consumer, error: error.message }, environment_name: environment)
       end
 
       def teardown
@@ -104,13 +103,14 @@ module Banter
           @consumer.cancel if @consumer.present?
           @connection.close if @connection.present?
         rescue => e
-          Airbrake.notify(e, parameters: { error: e.message }, environment_name: environment)
+          ::Banter::Notifier.notify(e, parameters: { error: e.message }, environment_name: environment)
         end
       end
 
       def environment
         ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
       end
+
     end
   end
 end

data/lib/banter/server/subscriber_server.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'celluloid/autostart'
 require 'celluloid/io'
-require 'awesome_print'
 require 'active_support/all'
 require 'optparse'
 require 'fileutils'
@@ -29,7 +28,6 @@ module Banter
 
       def start
         set_information
-        register_workers
         start_workers
         handle_interrupts
         handle_teardown
@@ -37,16 +35,10 @@ module Banter
         stop_worker
       end
 
-      def register_workers
-        return unless Banter::Configuration.web_enabled
-        BanterWorker.worker_started
-      end
-
       private
 
       def handle_teardown
         ::Banter::RabbitLogger.log_service("all_services", "Starting shutdown of all services")
-        unregister_current_worker
 
         workers.each do |worker|
           ::Banter::RabbitLogger.log_service("all_services", "Tearing down worker: #{worker.worker_class.name}")
@@ -59,11 +51,6 @@ module Banter
         end
       end
 
-      def unregister_current_worker
-        return unless Banter::Configuration.web_enabled
-        BanterWorker.worker_stopped
-      end
-
       def handle_interrupts
         thread     = Thread.current
         interrupts = ["HUP", "INT", "QUIT", "ABRT", "TERM"]

data/lib/banter/version.rb

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

data/spec/banter/notifier_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'bunny'
+
+
+describe Banter::Notifier do
+
+  describe "self.notify" do
+    before do
+      notifier
+      prehook
+      Banter::Configuration.application_name = "TestSuite"
+      subject
+    end
+
+    let(:error) { StandardError.new("TestStandardError") }
+    let(:hash_error) { { keyerr1: "value1err" } }
+    let(:prehook) { }
+
+    subject { ::Banter::Notifier.notify(error, hash_error) }
+    context "without a notification class" do
+      let(:notifier) { }
+      let(:prehook) {
+        allow(STDOUT).to receive(:puts).and_call_original
+        ::Banter::Configuration.notifier = Banter::Notifier::StdOutNotifier
+      }
+      it { expect(STDOUT).to have_received(:puts).with(/Error caught/)}
+
+    end
+
+    context "with a notification class" do
+      let(:notifier) {
+        Banter::Configuration.notifier = TestNotifier
+      }
+
+      it { expect(TestNotifier.instance.error).to eq(error) }
+      it { expect(TestNotifier.instance.hash).to eq(hash_error) }
+    end
+
+  end
+end

data/spec/banter/server/client_queue_listener_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-
 class TestSubscriber < Banter::Subscriber
   subscribe_to "some.test.key"
 end
@@ -27,35 +26,9 @@ describe Banter::Server::ClientQueueListener do
     let(:context_before) { }
     let(:validators) { [] }
     let(:banter_worker) { FactoryGirl.create(:banter_worker, process_name: 'test') }
-    let(:enable_banter_web) {
-      Banter::Configuration.web_enabled = true
-      allow(BanterWorker).to receive(:current).and_return(banter_worker)
-    }
     let!(:application_name) { "testapplication" }
-    let(:banter_message) { BanterMessage.last }
     let(:subscriber_options) {{}}
 
-    after(:each) { Banter::Configuration.web_enabled = false }
-
-    def self.banter_message_fields_are_correct(status, error_message = nil)
-      it { expect(BanterMessage.count).to eq 1 }
-      it { expect(banter_message.subscriber_class).to eq('Klass') }
-      it { expect(banter_message.queue_name).to eq("test.foo_#{application_name}") }
-      it { expect(banter_message.subscribed_key).to eq('test.foo') }
-      it { expect(banter_message.payload).to eq({ "hello" => "moto" }) }
-      it { expect(banter_message.started_at.to_s).to eq(Time.now.to_s) }
-      it { expect(banter_message.done_at.to_s).to eq(Time.now.to_s) }
-      it { expect(banter_message.worker_id).to eq(BanterWorker.current.id) }
-      it { expect(banter_message.status).to eq(status) }
-      if error_message
-        it { expect(banter_message.error_message).to eq(error_message) }
-        it { expect(banter_message.error_backtrace).not_to be_blank }
-      else
-        it { expect(banter_message.error_message).to be_nil }
-        it { expect(banter_message.error_backtrace).to be_nil }
-      end
-    end
-
     before do
       Banter::Configuration.application_name = application_name
       context_before
@@ -88,34 +61,17 @@ describe Banter::Server::ClientQueueListener do
         instance
       }
 
-
       before do
-        subject.call unless respond_to? :no_call
+        safe_call unless respond_to? :no_call
       end
 
-      context "banter web disabled" do
-        context "test exception" do
-          let(:no_call) { true }
-          it { should_not raise_exception }
-        end
-
-        context "call" do
-          it { expect(klass_instance).to have_received(:perform!).with(payload) }
-          it { expect(BanterMessage.count).to eq(0) }
-        end
+      context "test exception" do
+        let(:no_call) { true }
+        it { should_not raise_exception }
       end
 
-      context "banter web enabled" do
-        let(:context_before) { enable_banter_web }
-
-        context "test exception" do
-          let(:no_call) { true }
-          it { should_not raise_exception }
-        end
-
-        context "call" do
-          banter_message_fields_are_correct(BanterMessage::STATUS_SUCCESS)
-        end
+      context "call" do
+        it { expect(klass_instance).to have_received(:perform!).with(payload) }
       end
 
     end
@@ -128,27 +84,31 @@ describe Banter::Server::ClientQueueListener do
         }
         instance
       }
+      let(:prehook) {}
 
-      context "web disabled" do
-        before do
-          allow(Banter::RabbitLogger).to receive(:log)
-        end
-        it { should raise_exception }
-        it { expect(BanterMessage.count).to eq(0) }
+      before do
+        prehook
+        allow(Banter::RabbitLogger).to receive(:log).and_call_original
+        safe_call
       end
 
-      context "banter web enabled" do
-        let(:context_before) { enable_banter_web }
+      context "without a notifier" do
+        let(:prehook) {
+          allow(STDOUT).to receive(:puts).and_call_original
+        }
+        it { expect(@raised_error).not_to be_nil }
+      end
 
-        before do
-          safe_call
-        end
+      context "with a notifier" do
+        let(:prehook) {
+          Banter::Configuration.notifier = TestNotifier
+          allow(TestNotifier).to receive(:notify).and_call_original
+        }
 
-        it { should raise_exception }
-        it "should have called perform" do
-          expect(klass_instance).to have_received(:perform!).with(payload)
-        end
-        banter_message_fields_are_correct(BanterMessage::STATUS_ERROR, 'test exception')
+        it { expect(@raised_error).not_to be_nil }
+        it { expect(TestNotifier).to have_received(:notify) }
+        it { expect(TestNotifier.instance.error.to_s).to match(/test exception/) }
+        it { expect(TestNotifier.instance.hash.keys).to match_array([:delivery_info, :envelope, :properties]) }
       end
     end
 
@@ -158,31 +118,23 @@ describe Banter::Server::ClientQueueListener do
         allow(instance).to receive(:perform!).and_raise(Banter::PayloadValidationError.new("validation failed"))
         instance
       }
-
       let(:result) { subject.call }
+      let(:prehook) {
+        Banter::Configuration.notifier = TestNotifier
+        allow(TestNotifier).to receive(:notify).and_call_original
+      }
+
 
       before do
+        prehook
         safe_call
       end
 
       let!(:validators) { [lambda { |payload| false }] }
-      context "web disabled" do
-        let(:context_before) { allow(Airbrake).to receive(:notify) }
-        it { should raise_exception }
-        it { expect(Airbrake).to have_received(:notify) }
-      end
-
-      context "web enabled" do
-        let(:context_before) do
-          allow(Airbrake).to receive(:notify)
-          enable_banter_web
-        end
-
-        it { expect(Airbrake).to have_received(:notify) }
-        it { should raise_exception }
-        it { expect(klass_instance).to have_received(:perform!).with(payload) }
-        banter_message_fields_are_correct(BanterMessage::STATUS_VALIDATION_FAILED, "validation failed")
-      end
+      it { should raise_exception }
+      it { expect(TestNotifier).to have_received(:notify) }
+      it { expect(TestNotifier.instance.error.to_s).to match(/validation failed/) }
+      it { expect(TestNotifier.instance.hash.keys).to match_array([:delivery_info, :envelope, :properties]) }
     end
 
     context "reprocessing message" do