banter 0.8.0 → 1.0.0

data/web/views/_messages.haml

@@ -0,0 +1,77 @@
+.clearfix
+
+  %div.extra-bold.pull-left.btn.font-size-lg{data: {'ng-show' => "worker", 'ng-class' => "{'bg-danger' : !isWorkerAlive(worker), 'bg-success': isWorkerExecuting(worker) && isWorkerAlive(worker), 'bg-info': !isWorkerExecuting(worker) && isWorkerAlive(worker)}" }}
+    %span{data: { 'ng-show' => 'isWorkerExecuting(worker)'}}
+      %span.glyphicon.glyphicon-refresh.spin
+      WORKING
+    %span{data: { 'ng-show' => '!isWorkerExecuting(worker) && isWorkerAlive(worker)'}}
+      %span.glyphicon.glyphicon-play-circle
+      IDLE
+    %span{data: { 'ng-show' => '!isWorkerAlive(worker)'}}
+      %span.glyphicon.glyphicon-off
+      DEAD
+
+
+  .pull-right
+    .btn-group{data: { 'ng-show' => "!isAutoUpdating()"}}
+      %a.btn.btn-default{data: { 'ng-click' => 'getFirstPage()', 'ng-disabled' => "!isAutoUpdating() && page == 1"}}
+        %span.glyphicon.glyphicon-fast-backward
+      %a.btn.btn-default{data: { 'ng-click' => 'getPreviousPage()', 'ng-disabled' => "!isAutoUpdating() && page == 1"}}
+        %span.glyphicon.glyphicon-backward
+      %a.btn.btn-default{data: { 'ng-click' => 'getNextPage()'}}
+        %span.glyphicon.glyphicon-forward
+
+    %a.btn.btn-primary{data: { 'ng-click' => 'pauseUpdating()', 'ng-show' => "isAutoUpdating()"}}
+      %span.glyphicon.glyphicon-pause
+      Pause Polling
+    %a.btn.btn-primary{data: { 'ng-click' => 'resumeUpdating()', 'ng-show' => "!isAutoUpdating()"}}
+      %span.glyphicon.glyphicon-play
+      Resume Polling
+%h2{data: { 'ng-if' => '!worker && !subscriber'}}
+  Messages
+%h2{data: { 'ng-if' => 'subscriber'}}
+  Messages for {{subscriber}}
+
+.clearfix
+  %div{ data: {'ng-if' => 'worker'}}
+    %h2
+      Messages processed on {{worker.process_name}} (PID: {{worker.pid}} )
+    {{ worker.job_count }}
+     
+    (
+    %span.text-success {{worker.success_count}} Succeeded
+    \/
+    %span.text-warning {{worker.failed_count}} Failed
+    )
+
+.table.table-responsive.margin-top-md
+  %table.table.table-striped.table-bordered.table-hover
+    %thead
+      %tr
+        %th Worker
+        %th Subscriber
+        %th Status
+        %th Time Taken
+        %th Started
+        %th Finished
+        %th
+    %tbody
+      %tr{data: { 'ng-repeat' => 'message in messages', 'ng-class' => "{'danger': isMessageFailed(message)}"}}
+        %td
+          %a{data: { 'ng-href' => dashboard_path("workers/{{message.worker.id}}")}}
+            {{ message.worker.process_name}}\#{{message.worker.pid}}
+        %td
+          %a{data: {'ng-href' => dashboard_path("subscribers/{{message.subscriber_class}}/messages")}}
+            {{ message.subscriber_class }}
+        %td {{ message.status }}
+        %td
+          %div{data: {'ng-if' => 'message.done_at' }}
+            {{ timeElapsed(message) }}ms
+        %td {{ asTime(message.started_at) | amDateFormat:'MM/DD/YYYY, h:mm:ss a' }}
+        %td
+          %div{data: {'ng-if' => 'message.done_at' }}
+            {{ asTime(message.done_at) | amDateFormat:'MM/DD/YYYY, h:mm:ss a' }}
+        %th
+          %a{data: { 'ng-href' => dashboard_path("messages/{{message.id}}") }}
+            View
+            %span.glyphicon.glyphicon-chevron-right

data/web/views/_subscribers.haml

@@ -0,0 +1,22 @@
+%h2 Subscribers
+.table.table-responsive
+  %table.table.table-striped.table-bordered.table-hover
+    %thead
+      %tr
+        %th Subscriber
+        %th Messages Processed
+        %th Processing
+        %th Succeeded
+        %th Errored
+        %th Validation Failed
+    %tbody
+      %tr{data: {'ng-repeat' => 'subscriber in subscribers'}}
+        %td
+          %a{data: { 'ng-href' => dashboard_path("subscribers/{{subscriber.class_name}}/messages")}}
+            {{ subscriber.class_name }}
+        %td {{ subscriber.total }}
+        %td {{ subscriber.started_count }}
+        %td {{ subscriber.success_count }}
+        %td {{ subscriber.errored_count }}
+        %td {{ subscriber.validation_failed_count }}
+

data/web/views/_worker.haml

@@ -0,0 +1,52 @@
+.clearfix
+  %div.extra-bold.pull-right.padding-large.font-size-lg.rounded-corners-md{data: { 'ng-class' => "{'bg-danger' : !isWorkerAlive(worker), 'bg-success': isWorkerExecuting(worker) && isWorkerAlive(worker), 'bg-info': !isWorkerExecuting(worker) && isWorkerAlive(worker)}" }}
+    %span{data: { 'ng-show' => 'isWorkerExecuting(worker)'}}
+      %span.glyphicon.glyphicon-refresh.spin
+      WORKING
+    %span{data: { 'ng-show' => '!isWorkerExecuting(worker)'}}
+      %span.glyphicon.glyphicon-play-circle
+      IDLE
+    %span{data: { 'ng-show' => '!isWorkerAlive(worker)'}}
+      %span.glyphicon.glyphicon-off
+      DEAD
+  %h2
+    Worker
+
+%ul.list-group
+  %li.list-group-item.row
+    .col-sm-3.bold Host Name
+    .col-sm-9 {{ worker.hostname }}
+  %li.list-group-item.row
+    .col-sm-3.bold Process Name
+    .col-sm-9 {{ worker.process_name}} (PID: {{worker.pid}}
+  %li.list-group-item.row
+    .col-sm-3.bold Subscriber Classes
+    .col-sm-9
+      %div{data: { 'ng-repeat' => "worker_class in worker.worker_classes" }}
+        %a{data: {'ng-href' => dashboard_path("subscribers/{{worker_class}}/messages")}} {{worker_class}}
+  %li.list-group-item.row
+    .col-sm-3.bold Started Time
+    .col-sm-9 {{ asTime(worker.started_at)  | amCalendar }}
+  %li.list-group-item.row{data: { 'ng-if' => 'worker.stopped_at'}}
+    .col-sm-3.bold Stopped Time
+    .col-sm-9 {{ asTime(worker.stopped_at)  | amCalendar }}
+  %li.list-group-item.row
+    .col-sm-3.bold
+      %a{data: { 'ng-href' => dashboard_path("workers/{{worker.id}}/messages")}} Messages Processed
+    .col-sm-9
+      %a{data: { 'ng-href' => dashboard_path("workers/{{worker.id}}/messages")}} {{ worker.job_count }}
+       
+      (
+      %span.text-success {{worker.success_count}} Succeeded
+      \/
+      %span.text-warning {{worker.failed_count}} Failed
+      )
+  %li.list-group-item.row{data: { 'ng-if' => "isWorkerExecuting(worker)"}}
+    .col-sm-3.bold
+      %a{href: "#{root_path}messages/{{worker.current_message['_id']}}"} Current Job
+    .col-sm-9
+      {{ worker.current_message.subscriber_class }}
+  %li.list-group-item.row{data: { 'ng-if' => "isWorkerExecuting(worker)"}}
+    .col-sm-3.bold Current Payload
+    .col-sm-9
+      %pre{data: { 'pretty-json' => 'worker.current_message.payload'}}

data/web/views/_workers_list.haml

@@ -0,0 +1,35 @@
+%h2
+  Workers
+
+.table.table-responsive{data: { 'ng-if' => "workers.length > 0"} }
+  %table.table.table-striped.table-bordered.table-hover
+    %thead
+      %tr
+        %th Hostname
+        %th Process Name
+        %th PID
+        %th Started
+        %th Subscribers
+        %th Current Job
+    %tbody
+      %tr{data: {'ng-repeat' => 'worker in workers'}}
+        %td
+          %a{data: { 'ng-href' => dashboard_path("workers/{{worker.id}}")}} {{ worker.hostname }}
+        %td {{ worker.process_name }}
+        %td {{ worker.pid }}
+        %td
+          {{ asTime(worker.started_at) | amCalendar }}
+        %td
+          %div{data: {'ng-if' => 'worker.worker_classes.length > 2'}}
+            {{worker.worker_classes.length}} Subscribers
+          %div{data: {'ng-if' => 'worker.worker_classes.length <= 2'}}
+            %div{data: { 'ng-repeat' => 'worker_class in worker.worker_classes'}}
+              %a{data: { 'ng-href' => dashboard_path("subscribers/{{worker_class}}/messages")}}{{ worker_class }}
+
+        %td
+          %div{data: { 'ng-show' => 'worker.current_message'}}
+            %a{data: { 'ng-href' => dashboard_path("messages/{{worker.current_message.id}}")}}
+              {{ worker.current_message.subscriber_class }}
+            %span.glyphicon.glyphicon-refresh.spin
+          %div{data: { 'ng-show' => '!worker.current_message'}}
+            Idle

data/web/views/index.haml

@@ -1,32 +1,19 @@
-%h2 Workers
+%base{href: "#{root_path}dashboard/"}
+%div{data: { 'ng-app' => "dashboardApp"}}
+  %div{data: { 'ng-view' => ''}}
 
-.table.table-responsive
-  %table.table.table-striped.table-bordered.table-hover
-    %thead
-      %tr
-        %th Hostname
-        %th Process Name
-        %th PID
-        %th Started
-        %th Subscribers
-        %th Current Job
-    %tbody
-      - @workers.each do |worker|
-        %tr{class: (worker.executing? ? 'success' : '')}
-          %td
-            %a{href: "#{root_path}workers/#{worker.id}"}= worker.hostname
-          %td= worker.process_name
-          %td= worker.pid
-          %td= worker.started_at.strftime("%m/%d/%Y %I:%M%p")
-          %td
-            - subscribers= Array.wrap(worker.worker_classes)
-            - if subscribers.size > 2
-              %a{href: "#{root_path}workers/#{worker.id}"}= "#{subscribers.size} subscribers"
-            - else
-              = subscribers.join('<br/>').html_safe
-          %td
-            - if worker.current_message
-              = worker.current_message[:subscriber_class]
-              %span.glyphicon.glyphicon-refresh.spin
+  %script{type: 'text/ng-template', id: 'banter/workers-list.html'}
+    = haml :_workers_list
 
+  %script{type: 'text/ng-template', id: 'banter/worker.html'}
+    = haml :_worker
+
+  %script{type: 'text/ng-template', id: 'banter/message.html'}
+    = haml :_message
+
+  %script{type: 'text/ng-template', id: 'banter/messages.html'}
+    = haml :_messages
+
+  %script{type: 'text/ng-template', id: 'banter/subscribers.html'}
+    = haml :_subscribers
 

data/web/views/layout.haml

@@ -9,13 +9,6 @@
     /[if lt IE 9]
       %script{src: "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js" }
     %link{:href=>"//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css", :rel=>"stylesheet"}
-    -#= favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144'
-    -#= favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114'
-    -#= favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72'
-    -#= favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png'
-    -#= favicon_link_tag 'favicon.ico', :rel => 'shortcut icon'
-    %script{:src=>"//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"}
-    %script{src: '//ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular.min.js' }
     %link{href: 'http://fonts.googleapis.com/css?family=Open+Sans:700,800,400', rel: 'stylesheet', type:'text/css'}
     %link{href: "#{root_path}stylesheets/banter.css", rel: 'stylesheet', type:'text/css'}
 
@@ -32,9 +25,11 @@
         .collapse.navbar-collapse#banter-navbar-collapse
           %ul.nav.navbar-nav
             %li
-              %a{href: root_path} Workers
+              %a{href: dashboard_path} Workers
+            %li
+              %a{href: dashboard_path("subscribers")} Subscribers
             %li
-              %a{href: "#{root_path}subscribers"} Subscribers
+              %a{href: dashboard_path("messages")} Messages
 
     .container{style: 'margin-top: 55px; padding-top: 10px'}
       = yield
@@ -42,4 +37,15 @@
         %p
           Banter © #{Date.today.year} (Developed & Maintained by
           %a{href: 'https://www.honest.com'} The Honest Company
-          )
+          )
+    :javascript
+        window.Banter || (window.Banter = {});
+        window.Banter.rootPath = "#{root_path}";
+
+    %script{:src=>"//code.jquery.com/jquery-2.1.1.min.js"}
+    %script{:src=>"//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"}
+    %script{src: '//ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular.js' }
+    %script{src: '//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.18/angular-route.min.js' }
+    %script{src: '//cdnjs.cloudflare.com/ajax/libs/moment.js/2.7.0/moment.min.js' }
+    %script{src: '//cdnjs.cloudflare.com/ajax/libs/angular-moment/0.7.1/angular-moment.min.js' }
+    %script{src: "#{root_path}javascripts/banter.js" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banter
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.0.0
 platform: ruby
 authors:
 - The Honest Company
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -223,6 +223,9 @@ files:
 - 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
@@ -236,16 +239,33 @@ files:
 - spec/banter/subscriber_spec.rb
 - spec/banter/web/application_spec.rb
 - spec/config.yml
+- spec/factories/banter_messages.rb
 - spec/factories/banter_workers.rb
 - 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
-- web/views/message.haml
-- web/views/messages.haml
-- web/views/subscribers.haml
-- web/views/worker.haml
 homepage: https://github.com/honest/banter
 licenses:
 - MIT
@@ -266,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Library for pub-sub (Message Bus)
@@ -282,6 +302,7 @@ test_files:
 - spec/banter/subscriber_spec.rb
 - spec/banter/web/application_spec.rb
 - spec/config.yml
+- spec/factories/banter_messages.rb
 - spec/factories/banter_workers.rb
 - spec/mongoid.yml
 - spec/spec_helper.rb

data/web/views/message.haml

@@ -1,52 +0,0 @@
-.clearfix
-  %div.extra-bold.pull-right.padding-large.font-size-lg.rounded-corners-md{ class: (message.executing? ? "bg-info" : (message.succeeded? ? "bg-success" : "bg-danger")) }
-    - if message.executing?
-      %span.glyphicon.glyphicon-refresh.spin
-      WORKING
-    - elsif message.succeeded?
-      %span.glyphicon.glyphicon-ok
-      SUCCESSFUL
-    - elsif message.failed?
-      %span.glyphicon.glyphicon-remove
-      FAILED
-  %h2
-    Message
-
-%ul.list-group
-  %li.list-group-item.row
-    .col-sm-3.bold Subscriber
-    .col-sm-9= message.subscriber_class
-
-  - worker = message.worker
-  - if worker
-    %li.list-group-item.row
-      .col-sm-3.bold Worker
-      .col-sm-9
-        %a{href: "#{root_path}workers/#{worker.id}"}= "#{worker.process_name} (PID: #{worker.pid})"
-  %li.list-group-item.row
-    .col-sm-3.bold Subscriber Key
-    .col-sm-9= message.subscribed_key
-
-  %li.list-group-item.row
-    .col-sm-3.bold Payload Key
-    .col-sm-9= message.payload_key
-
-  %li.list-group-item.row
-    .col-sm-3.bold Payload
-    .col-sm-9
-      %pre!= AwesomePrint::Inspector.new(html:true, sort_keys: true, index: false).awesome(message.payload)
-  %li.list-group-item.row
-    .col-sm-3.bold Context
-    .col-sm-9
-      %pre!= AwesomePrint::Inspector.new(html:true, sort_keys: true, index: false).awesome(message.context)
-  %li.list-group-item.row
-    .col-sm-3.bold Started Time
-    .col-sm-9= message.started_at.strftime("%m/%d/%Y %I:%M%p")
-  - if message.done_at
-    %li.list-group-item.row
-      .col-sm-3.bold Finished Time
-      .col-sm-9 #{message.done_at.strftime("%m/%d/%Y %I:%M%p")}. Took #{(message.done_at - message.started_at) * 1000}ms
-  %li.list-group-item.row
-    .col-sm-3.bold Queue
-    .col-sm-9= message.queue_name
-

data/web/views/messages.haml

@@ -1,20 +0,0 @@
-%h2 Messages processed on #{worker.process_name} (PID: #{worker.pid})
-.table.table-responsive
-  %table.table.table-striped.table-bordered.table-hover
-    %thead
-      %tr
-        %th Subscriber
-        %th Started
-        %th Finished
-        %th Status
-    %tbody
-      - messages.each do |message|
-        %tr{class: (message.failed? ? 'danger' : '')}
-          %td
-            %a{href: "#{root_path}messages/#{message.id}"}= message.subscriber_class
-          -#%td
-          -#  %pre!= AwesomePrint::Inspector.new(html:true, sort_keys: true, index: false).awesome(message.payload)
-          %td= message.started_at.strftime("%m/%d/%Y %I:%M%p")
-          %td= message.done_at.strftime("%m/%d/%Y %I:%M%p") if message.done_at
-          %td= message.status.titleize
-

data/web/views/subscribers.haml

@@ -1,17 +0,0 @@
-%h2 Subscribers
-.table.table-responsive
-  %table.table.table-striped.table-bordered.table-hover
-    %thead
-      %tr
-        %th Subscriber
-        %th Messages Processed
-        %th Messages Succeeded
-    %tbody
-      - BanterMessage.distinct("subscriber_class").each do |subscriber|
-        %tr
-          %td
-            %a{href: "#{root_path}subscribers/#{subscriber}"}= subscriber
-          %td= BanterMessage.where(subscriber_class: subscriber).count
-          %td= BanterMessage.where(subscriber_class: subscriber, status: BanterMessage::STATUS_SUCCESS).count
-
-