Upstream changes

.gitignore

@@ -2,4 +2,7 @@
 /Gemfile.lock
 *.gem
 coverage/
+log/
+tmp/
 .ruby-version
+history.yml

.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 2.1.2
-  - 2.0.0
-  - 1.9.3
+  - 2.3.0
+  - 2.2.4
+  - 2.1.8
 
 script: "rake test"

CONTRIBUTING.md

@@ -0,0 +1,16 @@
+<a name="issues"></a>
+## Have an Issue?
+
+Dashing is no longer being actively maintained.
+
+1. Check the [Troubleshooting Guide](https://github.com/Shopify/dashing/wiki#how-tos) in the wiki.
+2. Use the [GitHub Issue Search](https://help.github.com/articles/searching-issues/) to check if the issue has already been reported.
+3. You can ask your issue on the tracker, but your best bet is to go to [Stack Overflow](http://stackoverflow.com/questions/tagged/dashing)
+
+
+<a name="features"></a>
+
+If you feel that you have a really amazing, super neato idea that should be a part of Dashing, it may be a good candidate for an external Gem which supercharges a project. An excellent example of this is
+[dashing-contrib](https://github.com/QubitProducts/dashing-contrib). If you
+do create a third-party extension for Dashing, please add it [here](https://github.com/Shopify/dashing/wiki/Additional-Widgets#other-third-party-tools).
+

MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Shopify
+Copyright (c) 2016 Shopify
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -5,5 +5,7 @@ Dashing is a Sinatra based framework that lets you build beautiful dashboards. I
 
 [Check out the homepage](http://shopify.github.com/dashing).
 
+Note: Dashing is no longer being actively maintained. Read about it [here](https://github.com/Shopify/dashing/issues/711). There is a fork of the project being maintained at at [https://github.com/dashing-io/dashing](https://github.com/dashing-io/dashing)
+
 # License
 Distributed under the [MIT license](MIT-LICENSE)

dashing.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name        = 'dashing'
-  s.version     = '1.3.4'
-  s.date        = '2014-05-30'
+  s.version     = '1.3.7'
+  s.date        = '2016-04-11'
   s.executables = %w(dashing)
 
 
@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.author      = "Daniel Beauchamp"
   s.email       = '[email protected]'
   s.homepage    = 'http://shopify.github.com/dashing'
+  s.license     = "MIT"
 
   s.files = Dir['README.md', 'javascripts/**/*', 'templates/**/*','templates/**/.[a-z]*', 'lib/**/*']
 
@@ -22,14 +23,14 @@ Gem::Specification.new do |s|
   s.add_dependency('sinatra-contrib', '~> 1.4.2')
   s.add_dependency('thin', '~> 1.6.1')
   s.add_dependency('rufus-scheduler', '~> 2.0.24')
-  s.add_dependency('thor', '~> 0.18.1')
+  s.add_dependency('thor', '> 0.18.1')
   s.add_dependency('sprockets', '~> 2.10.1')
-  s.add_dependency('rack', '~> 1.5.2')
+  s.add_dependency('rack', '~> 1.5.4')
 
   s.add_development_dependency('rake', '~> 10.1.0')
   s.add_development_dependency('haml', '~> 4.0.4')
   s.add_development_dependency('minitest', '~> 5.2.0')
   s.add_development_dependency('mocha', '~> 0.14.0')
   s.add_development_dependency('fakeweb', '~> 1.3.0')
   s.add_development_dependency('simplecov', '~> 0.8.2')
-end
+end

javascripts/dashing.coffee

@@ -40,7 +40,6 @@ class Dashing.Widget extends Batman.View
     @mixin($(@node).data())
     Dashing.widgets[@id] ||= []
     Dashing.widgets[@id].push(@)
-    @mixin(Dashing.lastEvents[@id]) # in case the events from the server came before the widget was rendered
 
     type = Batman.Filters.dashize(@view)
     $(@node).addClass("widget widget-#{type} #{@id}")
@@ -55,6 +54,12 @@ class Dashing.Widget extends Batman.View
   @::on 'ready', ->
     Dashing.Widget.fire 'ready'
 
+    # In case the events from the server came before the widget was rendered
+    lastData = Dashing.lastEvents[@id]
+    if lastData
+      @mixin(lastData)
+      @onData(lastData)
+
   receiveData: (data) =>
     @mixin(data)
     @onData(data)
@@ -109,8 +114,8 @@ source.addEventListener 'message', (e) ->
   if lastEvents[data.id]?.updatedAt != data.updatedAt
     if Dashing.debugMode
       console.log("Received data for #{data.id}", data)
+    lastEvents[data.id] = data
     if widgets[data.id]?.length > 0
-      lastEvents[data.id] = data
       for widget in widgets[data.id]
         widget.receiveData(data)
 

lib/dashing/app.rb

@@ -23,6 +23,11 @@ def production?
   def protected!
     # override with auth logic
   end
+
+  def authenticated?(token)
+    return true unless settings.auth_token
+    token && Rack::Utils.secure_compare(settings.auth_token, token)
+  end
 end
 
 set :root, Dir.pwd
@@ -89,8 +94,7 @@ def protected!
   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
+  if authenticated?(body.delete("auth_token"))
     send_event(params['id'], body, 'dashboards')
     204 # response without entity body
   else
@@ -102,8 +106,7 @@ def protected!
 post '/widgets/:id' do
   request.body.rewind
   body = JSON.parse(request.body.read)
-  auth_token = body.delete("auth_token")
-  if !settings.auth_token || settings.auth_token == auth_token
+  if authenticated?(body.delete("auth_token"))
     send_event(params['id'], body)
     204 # response without entity body
   else

lib/dashing/cli.rb

@@ -38,12 +38,12 @@ def generate(type, name)
       puts "Invalid generator. Either use widget, dashboard, or job"
     end
 
-    desc "install GIST_ID", "Installs a new widget from a gist."
-    def install(gist_id)
+    desc "install GIST_ID [--skip]", "Installs a new widget from a gist (skip overwrite)."
+    def install(gist_id, *args)
       gist = Downloader.get_gist(gist_id)
       public_url = "https://gist.github.com/#{gist_id}"
 
-      install_widget_from_gist(gist)
+      install_widget_from_gist(gist, args.include?('--skip'))
 
       print set_color("Don't forget to edit the ", :yellow)
       print set_color("Gemfile ", :yellow, :bold)
@@ -89,15 +89,15 @@ def run_command(command)
       system(command)
     end
 
-    def install_widget_from_gist(gist)
+    def install_widget_from_gist(gist, skip_overwrite)
       gist['files'].each do |file, details|
         if file =~ /\.(html|coffee|scss)\z/
           widget_name = File.basename(file, '.*')
           new_path = File.join(Dir.pwd, 'widgets', widget_name, file)
-          create_file(new_path, details['content'])
+          create_file(new_path, details['content'], :skip => skip_overwrite)
         elsif file.end_with?('.rb')
           new_path = File.join(Dir.pwd, 'jobs', file)
-          create_file(new_path, details['content'])
+          create_file(new_path, details['content'], :skip => skip_overwrite)
         end
       end
     end