banter 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51871d5d895dbf72454f67a614a14aa8af5cd6ee
-  data.tar.gz: 37321de3cd2605a5b7d99ffce5e979167b7597df
+  metadata.gz: 4d85903bb31f3228276c85be5bafef8248ce7d59
+  data.tar.gz: b0360f892d785b4f43cd1edea68a2dd46770a183
 SHA512:
-  metadata.gz: 9dba68030359665879dbd785c613523282f97a5b91a721824c91dd4375e87a8299e39f68af759595ffe5963b584b7981b526a7a5d0071f05b2a4a02cc1c95669
-  data.tar.gz: 16ba97865260c2e81463d374f1c4806cf17ad65628022aa6abc90da7e6d8af8741a0166afd67887f59a5d87c5f9f8dc53ccb989e7609f376e379212d5707173a
+  metadata.gz: 35b341cecc7fc70ded556ccdd4fc982e10a287d792e98806124b62a6cd12cad61be3e77510f8aee20244578705b0d8407ddb08272333a2a638e7dd9f98cc16d8
+  data.tar.gz: 45116f712ef2bb23029c23ad55ac820a942230602500439f069240eb2499c15143a05ed06e9e8ad4f6ccd575ed4da11334ab46ffae6547bf5c118e973f7bf9a4

data/.travis.yml

@@ -12,7 +12,6 @@ notifications:
   email:
     - webadmin@honest.com
     - tushar@honest.com
-  on_success: always
   on_failure: always
 
 

data/Gemfile

@@ -7,6 +7,7 @@ gem 'coffee-script'
 gem 'json'
 group :test do
   gem 'rack-test'
+  gem 'rspec-its'
   gem 'sinatra'
   gem 'haml'
   gem 'mongoid', github: 'mongoid/mongoid'

data/lib/banter.rb

@@ -32,6 +32,12 @@ module Banter
     Publisher.instance.publish(Banter::Context.instance, routing_key, payload)
   end
 
+  # Delay actual publishing of messages to rabbitmq. Any messages published using Banter.publish will be delayed till
+  # after the block. if any errors happen in this block, then no messages are published to the rabbitmq.
+  # Usage:
+  # Banter.delay_messages do
+  #   Banter.publish('foo.bar', {}) # -> message will not be published here
+  # end # -> message will be published here
   def self.delay_messages
     Publisher.instance.delay_messages{ yield }
   end
@@ -46,4 +52,14 @@ module Banter
   def self.logger=(logger)
     Banter::Configuration.logger = ActiveSupport::TaggedLogging.new(logger)
   end
-end
+
+  # A convenience methods, specially for non-rails applications to configure Banter
+  # Usage:
+  # Banter.configure do |config|
+  #    config.default_queue_ttl = 2.hours
+  # end
+
+  def self.configure
+    yield Banter::Configuration
+  end
+end

data/lib/banter/subscriber.rb

@@ -110,7 +110,7 @@ module Banter
 
     def self.validate_routing_key_name(key)
       return true if key.blank?
-      key.match(/\A([a-z]+\.?)*([a-z]+)\Z/).present?
+      key.match(/\A([a-z]+\.?)*([a-z\_]+)\Z/).present?
     end
 
     def self.generated_queue_name(routing_key, queue_name)

data/lib/banter/version.rb

@@ -1,3 +1,3 @@
 module Banter
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/banter/web/models/banter_worker.rb

@@ -45,7 +45,6 @@ class BanterWorker
   # @param [BanterMessage] banter_message Message that is currently being executed
   def self.record_current!(banter_message)
     current.current_message = banter_message.attributes
-
     current.save!
   end
 

data/lib/banter/web/serializers/banter_worker_serializer.rb

@@ -18,12 +18,22 @@ module Banter
             stopped_at:      worker.stopped_at,
             worker_classes:  Array.wrap(worker.worker_classes),
             hostname:        worker.hostname,
-            current_message: worker.current_message,
+            current_message: current_message_serialized,
             job_count:       worker.job_count,
             success_count:   worker.success_count,
             failed_count:    worker.failed_count
           }
         end
+
+        def current_message_serialized
+          return if worker.current_message.blank?
+          worker.current_message.tap do |hash|
+            _id = hash.delete('_id')
+            if _id
+              hash["id"] = _id.to_s
+            end
+          end
+        end
       end
     end
   end

data/spec/banter/subscriber_spec.rb

@@ -199,6 +199,7 @@ describe Banter::Subscriber do
     it { expect(Klass.send(:validate_routing_key_name, 'abcdef.abcdef.asd')).to eq(true) }
     it { expect(Klass.send(:validate_routing_key_name, 'abcdef.abcdef/')).to eq(false) }
     it { expect(Klass.send(:validate_routing_key_name, 'abcdef.abcdef.a123')).to eq(false) }
+    it { expect(Klass.send(:validate_routing_key_name, 'abcdef.stuff_happened')).to eq(true) }
     it { expect(Klass.send(:validate_routing_key_name, 'abcdef.')).to eq(false) }
     it { expect(Klass.send(:validate_routing_key_name, 'abcAf')).to eq(false) }
   end

data/spec/banter/web/serializers/banter_message_serializer_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe Banter::Web::Serializers::BanterMessageSerializer do
+  describe '#to_hash' do
+    def self.it_should_have_all_the_keys
+      its([:id]) { should eq(banter_message.id.to_s) }
+      its([:subscriber_class]) { should eq(banter_message.subscriber_class) }
+      its([:queue_name]) { should eq(banter_message.queue_name)}
+      its([:subscribed_key]) { should eq(banter_message.subscribed_key)}
+      its([:payload_key]) { should eq(banter_message.payload_key)}
+      its([:context]) { should eq(banter_message.context)}
+      its([:payload_key]) { should eq(banter_message.payload_key)}
+      its([:payload]) { should eq(banter_message.payload)}
+      its([:started_at]) { should eq(banter_message.started_at)}
+      its([:error_message]) { should eq(banter_message.error_message)}
+      its([:worker_id]) { should eq(banter_message.worker_id)}
+      its([:progress_total]) { should eq(banter_message.progress_total)}
+      its([:progress_at]) { should eq(banter_message.progress_at)}
+      its([:progress]) { should eq(banter_message.progress)}
+    end
+
+    subject { Banter::Web::Serializers::BanterMessageSerializer.new(banter_message).to_hash }
+    let(:banter_message) { FactoryGirl.create(:banter_message) }
+
+    context "message is not finished" do
+      it_should_have_all_the_keys
+      its([:done_at])  { should be_nil }
+    end
+
+    context "finished" do
+      let(:banter_message) { FactoryGirl.create(:banter_message, :done) }
+      it_should_have_all_the_keys
+      its([:done_at])  { should_not be_nil }
+      its([:done_at])  { should eq(banter_message.done_at) }
+    end
+
+
+
+  end
+
+
+end

data/spec/banter/web/serializers/banter_worker_serializer_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Banter::Web::Serializers::BanterWorkerSerializer do
+  describe '#to_hash' do
+    def self.it_should_have_all_the_keys
+      its([:id]) { should eq(worker.id.to_s) }
+      its([:process_name]) { should eq(worker.process_name) }
+      its([:pid]) { should eq(worker.pid) }
+      its([:started_at]) { should eq(worker.started_at) }
+      its([:stopped_at]) { should eq(worker.stopped_at) }
+      its([:worker_classes]) { should eq(Array.wrap(worker.worker_classes)) }
+      its([:hostname]) { should eq(worker.hostname) }
+      its([:job_count]) { should eq(worker.job_count) }
+      its([:success_count]) { should eq(worker.success_count) }
+      its([:failed_count]) { should eq(worker.failed_count) }
+    end
+
+    subject { Banter::Web::Serializers::BanterWorkerSerializer.new(worker).to_hash }
+    let(:worker) { FactoryGirl.create(:banter_worker) }
+
+    context "working" do
+      context "without current message" do
+        it_should_have_all_the_keys
+        its([:stopped_at])  { should be_nil }
+        its([:current_message])  { should be_nil }
+      end
+
+      context 'with current message' do
+        let(:message) { FactoryGirl.create(:banter_message)}
+        let(:worker) { FactoryGirl.create(:banter_worker, current_message: message.attributes)}
+        it_should_have_all_the_keys
+        its([:stopped_at])  { should be_nil }
+        it { expect(subject[:current_message]['id']).to eq(message.attributes['id'])}
+      end
+    end
+
+    context "finished" do
+      let(:banter_message) { FactoryGirl.create(:banter_message, :stopped) }
+      it_should_have_all_the_keys
+      its([:stopped_at])  { should be_nil }
+      its([:current_message])  { should be_nil }
+    end
+  end
+end

data/spec/factories/banter_messages.rb

@@ -5,7 +5,7 @@ FactoryGirl.define do
     payload_key "fu.Q.again"
     payload { { a: 1, b: 2 } }
     context {{ app: 'banter' }}
-    started_at Time.now - 2
+    started_at { Time.now - 2 }
     status BanterMessage::STATUS_STARTED
     worker_id { FactoryGirl.create(:banter_worker).id }
 
@@ -22,7 +22,7 @@ FactoryGirl.define do
     end
 
     trait :done do
-      done_at Time.now
+      done_at { Time.now }
     end
   end
 end

data/spec/factories/banter_workers.rb

@@ -9,5 +9,9 @@ FactoryGirl.define do
     trait :stopped do
       stopped_at { Time.now }
     end
+
+    trait :with_current_message do
+      current_message { FactoryGirl.create(:banter_message).attributes }
+    end
   end
 end

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ require 'rack/test'
 require 'banter/web'
 require 'timecop'
 require 'factory_girl'
+require 'rspec/its'
 
 module RSpecMixin
   include Rack::Test::Methods

data/web/assets/javascripts/banter.js

@@ -60,7 +60,7 @@ angular.module("ngPrettyJson",[]).directive("prettyJson",["ngPrettyJsonFunctions
 
 }).call(this);
 (function() {
-  angular.module('dashboardApp').controller('messagesController', function($scope, $rootScope, $http, $routeParams, $timeout, messages, messagesService, commonMethodsService, messageMethodsService, workerMethodsService) {
+  angular.module('dashboardApp').controller('messagesController', function($scope, $rootScope, $http, $routeParams, $timeout, messages, messagesService, workersService, commonMethodsService, messageMethodsService, workerMethodsService) {
     var autoUpdate, fetchMessages, workerId;
     commonMethodsService.setup($scope);
     messageMethodsService.setup($scope);

data/web/assets/javascripts/dashboard_app/controllers/messages_controller.coffee

@@ -1,57 +1,58 @@
-angular.module('dashboardApp').controller 'messagesController', ($scope, $rootScope, $http, $routeParams, $timeout, messages, messagesService, commonMethodsService, messageMethodsService, workerMethodsService) ->
-  commonMethodsService.setup($scope)
-  messageMethodsService.setup($scope)
-  workerMethodsService.setup($scope)
-
-  $scope.messages = messages
-  $scope.page = 1
-  $scope.worker = null
-
-  workerId = $routeParams.worker_id
-  $scope.subscriber = $routeParams.subscriber
-  autoUpdate = true
-
-  if workerId
-    workersService.getWorker(workerId).success (response) ->
-      $scope.worker = response.worker
-
-  fetchMessages = ->
-    messagesService.getMessages($scope.page, workerId, $scope.subscriber).success (response) ->
-      $scope.messages = response.messages
-      $scope.worker = response.worker
-
-  $rootScope.$on 'start-messagesController', ->
-    $scope.resumeUpdating()
-  $rootScope.$on 'stop-messagesController', ->
-    $scope.pauseUpdating()
-
-  $scope.updateMessages = (resumeUpdate = true) ->
-    if autoUpdate
-      fetchMessages()
-      $scope.resumeUpdating()
+angular.module('dashboardApp').controller 'messagesController',
+  ($scope, $rootScope, $http, $routeParams, $timeout, messages, messagesService, workersService, commonMethodsService, messageMethodsService, workerMethodsService) ->
+    commonMethodsService.setup($scope)
+    messageMethodsService.setup($scope)
+    workerMethodsService.setup($scope)
 
-  $scope.pauseUpdating = ->
-    autoUpdate = false
+    $scope.messages = messages
+    $scope.page = 1
+    $scope.worker = null
 
-  $scope.resumeUpdating = ->
+    workerId = $routeParams.worker_id
+    $scope.subscriber = $routeParams.subscriber
     autoUpdate = true
-    $timeout($scope.updateMessages, 5000)
 
-  $scope.resumeUpdating() if autoUpdate
-  $scope.isAutoUpdating = ->
-    autoUpdate
+    if workerId
+      workersService.getWorker(workerId).success (response) ->
+        $scope.worker = response.worker
 
-  $scope.getNextPage = ->
-    $scope.page += 1
-    fetchMessages()
+    fetchMessages = ->
+      messagesService.getMessages($scope.page, workerId, $scope.subscriber).success (response) ->
+        $scope.messages = response.messages
+        $scope.worker = response.worker
 
-  $scope.getPreviousPage = ->
-    $scope.page -= 1
-    $scope.page = 1 if $scope.page < 1
-    fetchMessages()
+    $rootScope.$on 'start-messagesController', ->
+      $scope.resumeUpdating()
+    $rootScope.$on 'stop-messagesController', ->
+      $scope.pauseUpdating()
 
-  $scope.getFirstPage = ->
-    $scope.page = 1
-    fetchMessages()
+    $scope.updateMessages = (resumeUpdate = true) ->
+      if autoUpdate
+        fetchMessages()
+        $scope.resumeUpdating()
+
+    $scope.pauseUpdating = ->
+      autoUpdate = false
+
+    $scope.resumeUpdating = ->
+      autoUpdate = true
+      $timeout($scope.updateMessages, 5000)
+
+    $scope.resumeUpdating() if autoUpdate
+    $scope.isAutoUpdating = ->
+      autoUpdate
+
+    $scope.getNextPage = ->
+      $scope.page += 1
+      fetchMessages()
+
+    $scope.getPreviousPage = ->
+      $scope.page -= 1
+      $scope.page = 1 if $scope.page < 1
+      fetchMessages()
+
+    $scope.getFirstPage = ->
+      $scope.page = 1
+      fetchMessages()
 
-  return
+    return

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - The Honest Company
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -238,6 +238,8 @@ files:
 - 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
@@ -301,6 +303,8 @@ test_files:
 - 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