smashing 1.2.0 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 489df6284b7c807ceeaa8491046cc8e83844442877ed423b87c3ce5033de379b
-  data.tar.gz: b9fc9ba27fd0f7031f45a3eead80a39566e907e0d4cc05e99423d4ba2ef6b1e6
+  metadata.gz: 721d40877762d848822b6bc0de8dfa8597074035af92afc3bea7d4aca9fc4bdc
+  data.tar.gz: 579de5e911ffeb05986481ed0e41b676856b43fa78e639e1d2b661082c983c9f
 SHA512:
-  metadata.gz: 1a1a8ef4a2edf551efe3da624afea0656d37148f938a7c4fa9f1c29776745f276c4f3bc748cdeee3a4dc6db74d5e015314af27d9f3e0dd88ce35295ee254d1a6
-  data.tar.gz: 992126548cc51c8c24d558c3f4fde25412f665d016c3022941a069e560e27a77eb6931193ceb47837b463250d13119f399b314052a756d0d890900f26e9496b4
+  metadata.gz: a338ddf3e7e4fc0c6b630d9e1b710cbfdac91deb711a8a738e5bda229e79310669a035407f0fb5ebe5395e7ee2eec7de9b1dbb41a7204bd91d321644ac1dd3ea
+  data.tar.gz: f08c1b7bdd36c315e88acee22512c5c2066ed2c55a375726631f7053e35f7ab416b2723691a1e043afcc4a55f32d00684b46730f48814637cf0bbd553c1450a9

data/README.md

@@ -1,3 +1,4 @@
+[![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)

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}")
@@ -96,7 +97,10 @@ Dashing.AnimatedValue =
     else
       timer = "interval_#{k}"
       num = if (!isNaN(@[k]) && @[k]?) then @[k] else 0
-      unless @[timer] || num == to
+      # NOTE: We are using backticks in the num == to below as that is a comparison with string
+      # and float and CoffeeScript compiles it to ===, causing it to always fail - see issue #155
+      # https://github.com/Smashing/smashing/pull/155
+      unless @[timer] || `num == to`
         to = parseFloat(to)
         num = parseFloat(num)
         up = to > num
@@ -117,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.rb

@@ -1,6 +1,7 @@
 require 'dashing/cli'
 require 'dashing/downloader'
 require 'dashing/app'
+require 'dashing/version'
 
 module Dashing
 end

data/lib/dashing/app.rb

@@ -3,7 +3,8 @@ require 'sprockets'
 require 'sinatra/content_for'
 require 'rufus/scheduler'
 require 'coffee-script'
-require 'sass'
+require 'sass' if RUBY_VERSION < "2.5.0"
+require 'sassc' if RUBY_VERSION >= "2.5.0"
 require 'json'
 require 'yaml'
 require 'thin'
@@ -35,7 +36,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')
@@ -53,7 +54,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
 
@@ -76,9 +77,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
@@ -130,7 +134,7 @@ 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
 
@@ -140,10 +144,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)
@@ -152,12 +162,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/cli.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'open-uri'
+require 'dashing/version'
 
 module Dashing
   class CLI < Thor
@@ -25,6 +26,12 @@ module Dashing
       end
     end
 
+    desc "--version, -v", "Prints the version"
+    map %w[--version -v] => :__print_version
+    def __print_version
+      say "#{Dashing::VERSION}"
+    end
+
     desc "new PROJECT_NAME", "Sets up ALL THE THINGS needed for your dashboard project."
     def new(name)
       @name = Thor::Util.snake_case(name)

data/lib/dashing/version.rb

@@ -0,0 +1,3 @@
+module Dashing
+  VERSION = "1.3.4".freeze
+end

data/templates/project/Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gem 'smashing'
 
-## Remove this if you don't need a twitter widget.
-gem 'twitter', '>= 5.9.0'
+## Uncomment this if you want to see use the twitter widget.
+# gem 'twitter', '>= 5.9.0'

metadata

@@ -1,155 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: smashing
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.4
 platform: ruby
 authors:
 - Daniel Beauchamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.24
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.24
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: coffee-script
+  name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: execjs
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  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: sinatra-contrib
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: rufus-scheduler
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -271,6 +271,7 @@ files:
 - lib/dashing/app.rb
 - lib/dashing/cli.rb
 - lib/dashing/downloader.rb
+- lib/dashing/version.rb
 - templates/dashboard/%name%.erb.tt
 - templates/job/%name%.rb
 - templates/project/.gitignore
@@ -311,7 +312,7 @@ files:
 - templates/project/jobs/buzzwords.rb
 - templates/project/jobs/convergence.rb
 - templates/project/jobs/sample.rb
-- templates/project/jobs/twitter.rb
+- templates/project/jobs/twitter.rb.disabled
 - templates/project/lib/.empty_directory
 - templates/project/public/404.html
 - templates/project/public/favicon.ico
@@ -370,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.1.4
 signing_key: 
 specification_version: 4
 summary: The wonderfully excellent dashboard framework.