smashing 1.3.0 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8f8fb6bb541b6c3423dbd9a07a5adf9d68c74b1e40631d8adfd9f483bafc71
-  data.tar.gz: 39043eca7120a94098d95d3e90555d81d2bd80189cc172dce62dad8f3c082b4b
+  metadata.gz: '058b11a398a65314e3f1be01b288a294b5ea529135bd249f05a73664cf1670c8'
+  data.tar.gz: 36752e8f83da914912df2a9ac83c27b9f82a6f3c2d19fabe1647916d2ff5bfff
 SHA512:
-  metadata.gz: 8056ec91983755e1d60b80acb8098acc2e4c0cd5bdd568e31bf0d154b44a6c77afaba06dc2e0d447ae2dd84e7f3c2d01aaf254f368b1207fb8d0c91e52b3077c
-  data.tar.gz: 03e3c4e500e57409d98a7cc316fb3f40d829e271f687d7d4076404c4e0e1dd8706c969b2f1cc5b3dc2ed260110df74b045bb4285a7d909046d04b8ce0cdcbb6d
+  metadata.gz: 00a26dbd1912da56c8cf19e9a2a0898ec3d2c50d8b0891a582ec0f89b3d864db153b6828311b6ec62466f3cee919a71ee4f7682a9eb4069c6b065067aa9880b5
+  data.tar.gz: '090f77812bb062f28130fa5e0fdd073c37f5eabb8f123f4eeb609d2c9a6dc90b014379957061d6974c3e08faba27656e40e7da2be0050bad1e4a511b90a5394c'

data/README.md

@@ -1,9 +1,12 @@
+[![Build](https://github.com/Smashing/smashing/actions/workflows/main.yml/badge.svg)](https://github.com/Smashing/smashing/actions/workflows/main.yml)
 [![Gitter chat](https://badges.gitter.im/smashing.svg)](https://gitter.im/Smashing)
 
 # [Smashing](https://github.com/Smashing/smashing/wiki)
 
 Smashing, the spiritual successor to [Dashing](https://github.com/Shopify/dashing), is a Sinatra based framework that lets you build excellent dashboards. It looks especially great on TVs.
 
+![Smashing logo](./.github/docs/assets/screenshot.png)
+
 ## Community
 
 Feel free to submit issues for bugs, new features, and enhancements in [GitHub](https://github.com/Smashing/smashing/issues). For more general questions, or help with widgets, please use the [gitter chatroom](https://gitter.im/Smashing).

data/javascripts/dashing.coffee

@@ -53,8 +53,9 @@ class Dashing.Widget extends Batman.View
     super
 
     @mixin($(@node).data())
-    Dashing.widgets[@id] ||= []
-    Dashing.widgets[@id].push(@)
+    if @id # skip widgets without id
+      Dashing.widgets[@id] ||= []
+      Dashing.widgets[@id].push(@)
 
     type = Batman.Filters.dashize(@view)
     $(@node).addClass("widget widget-#{type} #{@id}")
@@ -120,35 +121,43 @@ Dashing.AnimatedValue =
 Dashing.widgets = widgets = {}
 Dashing.lastEvents = lastEvents = {}
 Dashing.debugMode = false
+Dashing.filterEvents = true
 
-source = new EventSource('events')
-source.addEventListener 'open', (e) ->
-  console.log("Connection opened", e)
-
-source.addEventListener 'error', (e)->
-  console.log("Connection error", e)
-  if (e.currentTarget.readyState == EventSource.CLOSED)
-    console.log("Connection closed")
-    setTimeout (->
-      window.location.reload()
-    ), 5*60*1000
-
-source.addEventListener 'message', (e) ->
-  data = JSON.parse(e.data)
-  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
-      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
+Dashing.on 'run', ->
+  @layout.on 'ready', -> # run only when all widgets are created
+    ids = Object.keys(Dashing.widgets)
+    url = if Dashing.filterEvents
+      'events?ids=' + encodeURIComponent(ids.join(','))
+    else
+      'events'
+    source = new EventSource(url)
+    source.addEventListener 'open', (e) ->
+      console.log("Connection opened", e)
+
+    source.addEventListener 'error', (e)->
+      console.log("Connection error", e)
+      if (e.currentTarget.readyState == EventSource.CLOSED)
+        console.log("Connection closed")
+        setTimeout (->
+          window.location.reload()
+        ), 5*60*1000
+
+    source.addEventListener 'message', (e) ->
+      data = JSON.parse(e.data)
+      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
+          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/app.rb

@@ -25,6 +25,10 @@ helpers do
     # override with auth logic
   end
 
+  def h(text)
+    Rack::Utils.escape_html(text)
+  end
+
   def authenticated?(token)
     return true unless settings.auth_token
     token && Rack::Utils.secure_compare(settings.auth_token, token)
@@ -36,7 +40,7 @@ set :sprockets,     Sprockets::Environment.new(settings.root)
 set :assets_prefix, '/assets'
 set :digest_assets, false
 set :server, 'thin'
-set :connections, []
+set :connections, {}
 set :history_file, 'history.yml'
 set :public_folder, File.join(settings.root, 'public')
 set :views, File.join(settings.root, 'dashboards')
@@ -54,7 +58,7 @@ end
   settings.sprockets.append_path("assets/#{path}")
 end
 
-['widgets', File.expand_path('../../../javascripts', __FILE__)]. each do |path|
+['widgets', File.expand_path('../../../javascripts', __FILE__)].each do |path|
   settings.sprockets.append_path(path)
 end
 
@@ -77,9 +81,12 @@ end
 get '/events', :provides => 'text/event-stream' do
   protected!
   response.headers['X-Accel-Buffering'] = 'no' # Disable buffering for nginx
+  ids = params[:ids] ? params[:ids].split(',').to_set : nil
   stream :keep_open do |out|
-    settings.connections << out
-    out << latest_events
+    settings.connections[out] = ids
+    settings.history.each do |id, event|
+      out << event if ids.nil? || ids.include?(id)
+    end
     out.callback { settings.connections.delete(out) }
   end
 end
@@ -126,12 +133,12 @@ get '/views/:widget?.html' do
     return Tilt[language].new(file).render if File.exist?(file)
   end
 
-  "Drats! Unable to find a widget file named: #{params[:widget]} to render."
+  "Drats! Unable to find a widget file named: #{h(params[:widget])} to render."
 end
 
 Thin::Server.class_eval do
   def stop_with_connection_closing
-    Sinatra::Application.settings.connections.dup.each(&:close)
+    Sinatra::Application.settings.connections.dup.each_key(&:close)
     stop_without_connection_closing
   end
 
@@ -141,10 +148,16 @@ end
 
 def send_event(id, body, target=nil)
   body[:id] = id
-  body[:updatedAt] ||= (Time.now.to_f * 1000.0).to_i 
+  body[:updatedAt] ||= (Time.now.to_f * 1000.0).to_i
   event = format_event(body.to_json, target)
   Sinatra::Application.settings.history[id] = event unless target == 'dashboards'
-  Sinatra::Application.settings.connections.each { |out| out << event }
+  Sinatra::Application.settings.connections.each { |out, ids|
+    begin
+      out << event if target == 'dashboards' || ids.nil? || ids.include?(id)
+    rescue IOError => e # if the socket is closed an IOError is thrown
+      Sinatra::Application.settings.connections.delete(out)
+    end
+  }
 end
 
 def format_event(body, name=nil)
@@ -153,12 +166,6 @@ def format_event(body, name=nil)
   str << "data: #{body}\n\n"
 end
 
-def latest_events
-  settings.history.inject("") do |str, (_id, body)|
-    str << body
-  end
-end
-
 def first_dashboard
   files = Dir[File.join(settings.views, '*')].collect { |f| File.basename(f, '.*') }
   files -= ['layout']

data/lib/dashing/version.rb

@@ -1,3 +1,3 @@
 module Dashing
-  VERSION = "1.3.0".freeze
+  VERSION = "1.3.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smashing
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.5
 platform: ruby
 authors:
 - Daniel Beauchamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-04 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -371,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: The wonderfully excellent dashboard framework.