banter 1.4.0 → 2.0.0

data/spec/banter/server/rabbitmq_subscriber_spec.rb

@@ -35,12 +35,12 @@ describe Banter::Server::RabbitMQSubscriber do
       subscriber.instance_variable_set(:@channel, double("channel", :ack=>true, :reject=>true))
       allow(subscriber.channel).to receive(:ack)
       allow(subscriber.channel).to receive(:reject)
-      allow(Airbrake).to receive(:notify)
     end
 
 
     context "subscriber has an error" do
       before do
+        Banter::Configuration.notifier = TestNotifier
         subscriber.instance_variable_set(:@callback_block, method(:raise_method) )
       end
 
@@ -54,15 +54,16 @@ describe Banter::Server::RabbitMQSubscriber do
         expect(subscriber.channel).to have_received(:reject).with(1, false)
       end
 
-      it "should have generated an airbrake" do
+      it "should have generated a notification" do
         result
-        expect(Airbrake).to have_received(:notify).exactly(1).times
+        expect(TestNotifier.instance.error.to_s).to match(/Bad Subscriber/)
       end
     end
 
     context "subscriber works correctly" do
       before do
         subscriber.instance_variable_set(:@callback_block, method(:do_nothing) )
+        allow(TestNotifier).to receive(:notify).and_call_original
       end
 
       it "should not raise any errors" do
@@ -74,18 +75,20 @@ describe Banter::Server::RabbitMQSubscriber do
         expect(subscriber.channel).to have_received(:ack).with(1)
       end
 
-      it "should not have generated an airbrake" do
+      it "should not have trigggered a notification" do
         result
-        expect(Airbrake).not_to have_received(:notify)
+        expect(TestNotifier).not_to have_received(:notify)
       end
     end
 
     context "logger has problems" do
 
       before do
+        Banter::Configuration.notifier = TestNotifier
         subscriber.instance_variable_set(:@callback_block, method(:do_nothing) )
         allow(Banter::RabbitLogger).to receive(:log_receive).and_raise("Cannot log")
         allow(Banter::RabbitLogger).to receive(:log_complete)
+        allow(TestNotifier).to receive(:notify).and_call_original
       end
 
       it "should not raise any errors" do
@@ -103,9 +106,9 @@ describe Banter::Server::RabbitMQSubscriber do
       end
 
 
-      it "should have generated an airbrake" do
+      it "should have generated a notification" do
         result
-        expect(Airbrake).to have_received(:notify).exactly(1).times
+        expect(TestNotifier).to have_received(:notify).exactly(1).times
       end
 
 
@@ -119,16 +122,17 @@ describe Banter::Server::RabbitMQSubscriber do
     let(:result) { subscriber.notify_error(error, consumer)}
 
     before do
-      allow(Airbrake).to receive(:notify)
+      Banter::Configuration.notifier = TestNotifier
+      allow(TestNotifier).to receive(:notify).and_call_original
     end
 
     it "should not raise any errors" do
       expect{result}.not_to raise_error
     end
 
-    it "should inform airbrake of the problem" do
+    it "should inform of the problem" do
       result
-      expect(Airbrake).to have_received(:notify).exactly(1).times
+      expect(TestNotifier).to have_received(:notify).exactly(1).times
     end
 
   end

data/spec/banter/server/subscriber_server_spec.rb

@@ -53,64 +53,4 @@ describe Banter::Server::SubscriberServer do
     it { expect(subject.hostname).not_to be_nil }
   end
 
-  describe '#register_workers' do
-
-    context "web not enabled" do
-      before { subject.send(:register_workers)}
-      it "doesn't create BanterWorker" do
-        expect(BanterWorker.count).to eq(0)
-      end
-    end
-
-    context "web enabled" do
-      before {
-        Banter::Configuration.web_enabled = true
-        subject.set_workers([MyTestSubscriber1, MyTestSubscriber2])
-        subject.instance_variable_set(:@pid, 123)
-        subject.instance_variable_set(:@hostname, 'mymachine')
-        subject.send(:register_workers)
-      }
-
-      after {
-        Banter::Configuration.web_enabled = false
-      }
-
-      let(:banter_worker) { BanterWorker.last }
-
-      it "creates banter worker" do
-        expect(BanterWorker.count).to eq(1)
-      end
-
-      it "sets up BanterWorker.current" do
-        expect(BanterWorker.current).to eq(banter_worker)
-      end
-
-      it { expect(banter_worker.pid).to eq(123)}
-      it { expect(banter_worker.hostname).to eq("mymachine")}
-      it { expect(banter_worker.started_at.to_s).to eq(Time.now.to_s)}
-      it { expect(banter_worker.worker_classes).to eq(["MyTestSubscriber1", "MyTestSubscriber2"])}
-    end
-  end
-
-  describe '#unregister_current_worker' do
-    context "web enabled" do
-
-      let(:banter_worker) { FactoryGirl.create(:banter_worker) }
-      before {
-        Banter::Configuration.web_enabled = true
-        BanterWorker.class_variable_set(:@@current, banter_worker)
-        subject.send(:unregister_current_worker)
-      }
-
-      after {
-        Banter::Configuration.web_enabled = false
-      }
-
-      it "sets stopped_at" do
-        expect(banter_worker.stopped_at.to_s).to eq(Time.now.to_s)
-      end
-    end
-
-  end
-
 end

data/spec/banter/subscriber_spec.rb

@@ -21,87 +21,6 @@ describe Banter::Subscriber do
     end
   end
 
-  describe '#at' do
-    let(:subscriber) { Banter::Subscriber.new({}, {}, {}, {}) }
-    context 'web not enabled' do
-      before do
-        allow(Banter::Configuration).to receive(:web_enabled).and_return(false)
-        subscriber.send(:at, 123)
-      end
-
-      it 'doesnt do a thing' do
-        expect(BanterMessage.count).to eq(0)
-      end
-    end
-
-    context 'web enabled' do
-      let(:banter_message) { FactoryGirl.create(:banter_message)}
-      before do
-        allow(Banter::Configuration).to receive(:web_enabled).and_return(true)
-        allow(BanterMessage).to receive(:current).and_return(banter_message)
-        subscriber.send(:at, 123)
-      end
-
-      it 'updates progress_at on current message' do
-        expect(banter_message.progress_at).to eq(123)
-      end
-    end
-  end
-
-  describe '#total' do
-    let(:subscriber) { Banter::Subscriber.new({}, {}, {}, {}) }
-    context 'web not enabled' do
-      before do
-        allow(Banter::Configuration).to receive(:web_enabled).and_return(false)
-        subscriber.send(:total, 1230)
-      end
-
-      it 'doesnt do a thing' do
-        expect(BanterMessage.count).to eq(0)
-      end
-    end
-
-    context 'web enabled' do
-      let(:banter_message) { FactoryGirl.create(:banter_message)}
-      before do
-        allow(Banter::Configuration).to receive(:web_enabled).and_return(true)
-        allow(BanterMessage).to receive(:current).and_return(banter_message)
-        subscriber.send(:total, 1230)
-      end
-
-      it 'updates progress_at on current message' do
-        expect(banter_message.progress_total).to eq(1230)
-      end
-    end
-  end
-
-  describe '#progress' do
-    let(:subscriber) { Banter::Subscriber.new({}, {}, {}, {}) }
-    context 'web not enabled' do
-      before do
-        allow(Banter::Configuration).to receive(:web_enabled).and_return(false)
-        subscriber.send(:progress, foo: 'bar')
-      end
-
-      it 'doesnt do a thing' do
-        expect(BanterMessage.count).to eq(0)
-      end
-    end
-
-    context 'web enabled' do
-      let(:banter_message) { FactoryGirl.create(:banter_message)}
-      before do
-        allow(Banter::Configuration).to receive(:web_enabled).and_return(true)
-        allow(BanterMessage).to receive(:current).and_return(banter_message)
-        subscriber.send(:progress, foo: 'bar')
-      end
-
-      it 'updates progress_at on current message' do
-        expect(banter_message.progress).to eq(foo: 'bar')
-      end
-    end
-  end
-
   describe ".validates_payload_with" do
     before do
       validators.each do |validator|

data/spec/spec_helper.rb

@@ -6,13 +6,12 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
 
-require 'awesome_print'
 require 'banter'
 require 'banter/server'
+require 'support/test_notifier'
 ENV['RAILS_ENV'] ||= "test"
 ENV['RACK_ENV'] ||= "test"
 require 'rack/test'
-require 'banter/web'
 require 'timecop'
 require 'factory_girl'
 require 'rspec/its'
@@ -29,10 +28,6 @@ RSpec.configure do |config|
   config.filter_run :focus
   config.order = 'random'
   config.include RSpecMixin
-  config.before(:each) {
-    BanterWorker.delete_all
-    BanterMessage.delete_all
-  }
 
   config.before(:each) {
     t = Time.new
@@ -44,8 +39,6 @@ end
 Banter::Configuration.configure_with("test", File.expand_path("../config.yml", __FILE__))
 Banter::Configuration.logger = ActiveSupport::TaggedLogging.new(Logger.new(nil))
 
-Mongoid.load!(File.expand_path("../mongoid.yml", __FILE__))
-
 # Test subscriber classes to make testing easier
 class MyTestSubscriber1 < Banter::Subscriber
   subscribe_to "foo.bar.one"

data/spec/support/test_notifier.rb

@@ -0,0 +1,17 @@
+class TestNotifier
+  attr_accessor :error
+  attr_accessor :hash
+
+  @@instance = nil
+
+  def self.instance
+    @@instance ||= TestNotifier.new
+  end
+
+  def self.notify(error, hash)
+    instance = self.instance
+    instance.error = error
+    instance.hash = hash
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banter
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - The Honest Company
@@ -11,160 +11,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   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
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
+        version: 1.6.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   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
   name: hashie
   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: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.15'
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.15'
 description: Publish & subscribe to messages
@@ -177,9 +149,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -195,6 +166,7 @@ files:
 - lib/banter/exceptions/payload_validation_error.rb
 - lib/banter/message.rb
 - lib/banter/middleware.rb
+- lib/banter/notifier.rb
 - lib/banter/publisher.rb
 - lib/banter/rabbit_logger.rb
 - lib/banter/railtie.rb
@@ -204,57 +176,22 @@ files:
 - lib/banter/server/subscriber_server.rb
 - lib/banter/subscriber.rb
 - lib/banter/version.rb
-- lib/banter/web.rb
-- lib/banter/web/application.rb
-- lib/banter/web/helpers.rb
-- lib/banter/web/models/banter_message.rb
-- lib/banter/web/models/banter_worker.rb
-- lib/banter/web/serializers/banter_message_serializer.rb
-- lib/banter/web/serializers/banter_worker_serializer.rb
-- lib/banter/web/serializers/subscriber_serializer.rb
 - lib/generators/banter/install_generator.rb
 - lib/generators/banter/templates/banter.yml
 - spec/banter/cli_spec.rb
 - spec/banter/configuration_spec.rb
 - spec/banter/message_spec.rb
+- spec/banter/notifier_spec.rb
 - spec/banter/publisher_spec.rb
 - spec/banter/rabbit_logger_spec.rb
 - spec/banter/server/client_queue_listener_spec.rb
 - spec/banter/server/rabbitmq_subscriber_spec.rb
 - spec/banter/server/subscriber_server_spec.rb
 - spec/banter/subscriber_spec.rb
-- spec/banter/web/application_spec.rb
-- spec/banter/web/serializers/banter_message_serializer_spec.rb
-- spec/banter/web/serializers/banter_worker_serializer_spec.rb
 - spec/config.yml
-- spec/factories/banter_messages.rb
-- spec/factories/banter_workers.rb
 - spec/fixtures/utf_message.json
-- spec/mongoid.yml
 - spec/spec_helper.rb
-- web/assets/javascripts/banter.js
-- web/assets/javascripts/dashboard_app/app.coffee
-- web/assets/javascripts/dashboard_app/controllers/message_controller.coffee
-- web/assets/javascripts/dashboard_app/controllers/messages_controller.coffee
-- web/assets/javascripts/dashboard_app/controllers/subscribers_controller.coffee
-- web/assets/javascripts/dashboard_app/controllers/worker_controller.coffee
-- web/assets/javascripts/dashboard_app/controllers/workers_list_controller.coffee
-- web/assets/javascripts/dashboard_app/routes.coffee
-- web/assets/javascripts/dashboard_app/services/common_methods_service.coffee
-- web/assets/javascripts/dashboard_app/services/message_methods_service.coffee
-- web/assets/javascripts/dashboard_app/services/messages_service.coffee
-- web/assets/javascripts/dashboard_app/services/subscribers_service.coffee
-- web/assets/javascripts/dashboard_app/services/worker_methods_service.coffee
-- web/assets/javascripts/dashboard_app/services/worker_service.coffee
-- web/assets/javascripts/ng-prettyjson.js
-- web/assets/stylesheets/banter.css
-- web/views/_message.haml
-- web/views/_messages.haml
-- web/views/_subscribers.haml
-- web/views/_worker.haml
-- web/views/_workers_list.haml
-- web/views/index.haml
-- web/views/layout.haml
+- spec/support/test_notifier.rb
 homepage: https://github.com/honest/banter
 licenses:
 - MIT
@@ -265,17 +202,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Library for pub-sub (Message Bus)
@@ -283,18 +220,14 @@ test_files:
 - spec/banter/cli_spec.rb
 - spec/banter/configuration_spec.rb
 - spec/banter/message_spec.rb
+- spec/banter/notifier_spec.rb
 - spec/banter/publisher_spec.rb
 - spec/banter/rabbit_logger_spec.rb
 - spec/banter/server/client_queue_listener_spec.rb
 - spec/banter/server/rabbitmq_subscriber_spec.rb
 - spec/banter/server/subscriber_server_spec.rb
 - spec/banter/subscriber_spec.rb
-- spec/banter/web/application_spec.rb
-- spec/banter/web/serializers/banter_message_serializer_spec.rb
-- spec/banter/web/serializers/banter_worker_serializer_spec.rb
 - spec/config.yml
-- spec/factories/banter_messages.rb
-- spec/factories/banter_workers.rb
 - spec/fixtures/utf_message.json
-- spec/mongoid.yml
 - spec/spec_helper.rb
+- spec/support/test_notifier.rb