dashing 1.1.0 → 1.2.0

data/bin/dashing

@@ -92,6 +92,12 @@ module Dashing
     end
     map "s" => :start
 
+    desc "stop", "Stops the thin server"
+    def stop
+      command = "bundle exec thin stop"
+      system(command)
+    end
+    
     desc "job JOB_NAME AUTH_TOKEN(optional)", "Runs the specified job. Make sure to supply your auth token if you have one set."
     def job(name, auth_token = "")
       Dir[File.join(Dir.pwd, 'lib/**/*.rb')].each {|file| require file }

data/javascripts/dashing.coffee

@@ -25,6 +25,9 @@ Batman.Filters.shortenedNumber = (num) ->
     num
 
 class window.Dashing extends Batman.App
+  @on 'reload', (data) ->
+    window.location.reload(true)
+
   @root ->
 Dashing.params = Batman.URI.paramsFromQuery(window.location.search.slice(1));
 
@@ -98,7 +101,7 @@ source.addEventListener 'error', (e)->
   if (e.readyState == EventSource.CLOSED)
     console.log("Connection closed")
 
-source.addEventListener 'message', (e) =>
+source.addEventListener 'message', (e) ->
   data = JSON.parse(e.data)
   if lastEvents[data.id]?.updatedAt != data.updatedAt
     if Dashing.debugMode
@@ -108,6 +111,12 @@ source.addEventListener 'message', (e) =>
       for widget in widgets[data.id]
         widget.receiveData(data)
 
+source.addEventListener 'dashboards', (e) ->
+  data = JSON.parse(e.data)
+  if Dashing.debugMode
+    console.log("Received data for dashboards", data)
+  if data.dashboard is '*' or window.location.pathname is "/#{data.dashboard}"
+    Dashing.fire data.event, data
 
 $(document).ready ->
   Dashing.run()

data/lib/dashing.rb

@@ -81,9 +81,23 @@ get '/views/:widget?.html' do
   end
 end
 
+post '/dashboards/:id' do
+  request.body.rewind
+  body = JSON.parse(request.body.read)
+  body['dashboard'] ||= params['id']
+  auth_token = body.delete("auth_token")
+  if !settings.auth_token || settings.auth_token == auth_token
+    send_event(params['id'], body, 'dashboards')
+    204 # response without entity body
+  else
+    status 401
+    "Invalid API key\n"
+  end
+end
+
 post '/widgets/:id' do
   request.body.rewind
-  body =  JSON.parse(request.body.read)
+  body = JSON.parse(request.body.read)
   auth_token = body.delete("auth_token")
   if !settings.auth_token || settings.auth_token == auth_token
     send_event(params['id'], body)
@@ -106,16 +120,18 @@ def production?
   ENV['RACK_ENV'] == 'production'
 end
 
-def send_event(id, body)
+def send_event(id, body, target=nil)
   body[:id] = id
   body[:updatedAt] ||= Time.now.to_i
-  event = format_event(body.to_json)
-  Sinatra::Application.settings.history[id] = event
+  event = format_event(body.to_json, target)
+  Sinatra::Application.settings.history[id] = event unless target == 'dashboards'
   Sinatra::Application.settings.connections.each { |out| out << event }
 end
 
-def format_event(body)
-  "data: #{body}\n\n"
+def format_event(body, name=nil)
+  str = ""
+  str << "event: #{name}\n" if name
+  str << "data: #{body}\n\n"
 end
 
 def latest_events
@@ -141,5 +157,5 @@ Dir[File.join(settings.root, 'lib', '**', '*.rb')].each {|file| require file }
 {}.to_json # Forces your json codec to initialize (in the event that it is lazily loaded). Does this before job threads start.
 
 job_path = ENV["JOB_PATH"] || 'jobs'
-files = Dir[File.join(settings.root, job_path, '/*.rb')]
+files = Dir[File.join(settings.root, job_path, '**', '/*.rb')]
 files.each { |job| require(job) }

metadata

@@ -2,14 +2,14 @@
 name: dashing
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel Beauchamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement