smashing 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c534242cb7bac124489f31c70f75cd75eff163a
-  data.tar.gz: d25e17f9119cc4537e76877ff5e69386c57130e3
+  metadata.gz: 9aeb7121836db6b2b12d73f508a9aeb7f32896c0
+  data.tar.gz: 03c723a8612aadb44e17c5e42a7c589fafddd193
 SHA512:
-  metadata.gz: ede468db168174eba4dd1a0dd82c28d068d5d0f94b5d06ee40ac5e739afde0432783b01024e7537b4b24ab1cd412f730e18e5ce372d73e2d525053b128472b9e
-  data.tar.gz: 70f13a2dc3d8ea89c3ca12a02d7b44a6d0b0867cee479e0e41b450df02cd82b86ea1cac69e25e3d255d26bb6aba343f2bca40fa3bdab9434db5f3c5f9643497f
+  metadata.gz: 82b667fe353297d9a1167e0e0d5e582d4da2087fea4ba3122f2b7dd7be1210c5222f7bea4f89a1e67dbd6364be1af3744816aa16473e0ad504581a4b528594b0
+  data.tar.gz: d4137491e1bdaec6aeb234fc5a8de24bf3294bc618831ada85868a7a31d4a75947b9a13ba800db8b2c05c438d8567bf78e140dcf93a8df403aba79f2bfb98a05

data/README.md

@@ -1,10 +1,33 @@
-# [Smashing](https://github.com/dashing-io/dashing/wiki)
+[![Gitter chat](https://badges.gitter.im/smashing.svg)](https://gitter.im/Smashing)
 
-Smashing, the spiritual successor to Dashing, is a Sinatra based framework that lets you build excellent dashboards. It looks especially great on TVs.
+# [Smashing](https://github.com/Smashing/smashing/wiki)
 
-[Check out our wiki](https://github.com/dashing-io/dashing/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.
+
+## 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).
+
+## Installation
+
+```bash
+# Install bundler
+$ gem install bundler
+# Install smashing
+$ gem install smashing
+# Create a new project
+$ smashing new my-project
+# Change Directory into the project
+$ cd my-project
+# Install the bundle of project specific gems
+$ bundle
+# Start the example dashboard!
+$ smashing start
+```
+
+[Check out our wiki](https://github.com/Smashing/smashing/wiki).
 
 Note: This is a fork of the Dashing project, which is no longer being maintained. Read about that [here](https://github.com/Shopify/dashing/issues/711).
 
-# License
+## License
 Distributed under the [MIT license](MIT-LICENSE).

data/javascripts/dashing.coffee

@@ -46,7 +46,7 @@ class Dashing.Widget extends Batman.View
 
   @accessor 'updatedAtMessage', ->
     if updatedAt = @get('updatedAt')
-      timestamp = new Date(updatedAt * 1000)
+      timestamp = new Date(updatedAt)
       hours = timestamp.getHours()
       minutes = ("0" + timestamp.getMinutes()).slice(-2)
       "Last updated at #{hours}:#{minutes}"
@@ -57,16 +57,22 @@ class Dashing.Widget extends Batman.View
     # In case the events from the server came before the widget was rendered
     lastData = Dashing.lastEvents[@id]
     if lastData
+      lastData = @select(lastData)
       @mixin(lastData)
       @onData(lastData)
 
   receiveData: (data) =>
+    data = @select(data)
     @mixin(data)
     @onData(data)
 
   onData: (data) =>
     # Widgets override this to handle incoming data
 
+  select: (data) =>
+    # Widgets override this to transform data before it is applied to the model
+    return data
+
 Dashing.AnimatedValue =
   get: Batman.Property.defaultAccessor.get
   set: (k, to) ->

data/lib/dashing/app.rb

@@ -34,16 +34,19 @@ set :root, Dir.pwd
 set :sprockets,     Sprockets::Environment.new(settings.root)
 set :assets_prefix, '/assets'
 set :digest_assets, false
-set server: 'thin', connections: [], history_file: 'history.yml'
+set :server, 'thin'
+set :connections, []
+set :history_file, 'history.yml'
 set :public_folder, File.join(settings.root, 'public')
 set :views, File.join(settings.root, 'dashboards')
 set :default_dashboard, nil
 set :auth_token, nil
+set :template_languages, %i[html erb]
 
-if File.exists?(settings.history_file)
-  set history: YAML.load_file(settings.history_file)
+if File.exist?(settings.history_file)
+  set :history, YAML.load_file(settings.history_file)
 else
-  set history: {}
+  set :history, {}
 end
 
 %w(javascripts stylesheets fonts images).each do |path|
@@ -55,7 +58,7 @@ end
 end
 
 not_found do
-  send_file File.join(settings.public_folder, '404.html'), status: 404
+  send_file File.join(settings.public_folder, '404.html'), :status => 404
 end
 
 at_exit do
@@ -70,7 +73,7 @@ get '/' do
   redirect "/" + dashboard
 end
 
-get '/events', provides: 'text/event-stream' do
+get '/events', :provides => 'text/event-stream' do
   protected!
   response.headers['X-Accel-Buffering'] = 'no' # Disable buffering for nginx
   stream :keep_open do |out|
@@ -82,9 +85,9 @@ end
 
 get '/:dashboard' do
   protected!
-  tilt_html_engines.each do |suffix, _|
-    file = File.join(settings.views, "#{params[:dashboard]}.#{suffix}")
-    return render(suffix.to_sym, params[:dashboard].to_sym) if File.exist? file
+  settings.template_languages.each do |language|
+    file = File.join(settings.views, "#{params[:dashboard]}.#{language}")
+    return render(language, params[:dashboard].to_sym) if File.exist?(file)
   end
 
   halt 404
@@ -117,10 +120,12 @@ end
 
 get '/views/:widget?.html' do
   protected!
-  tilt_html_engines.each do |suffix, engines|
-    file = File.join(settings.root, "widgets", params[:widget], "#{params[:widget]}.#{suffix}")
-    return engines.first.new(file).render if File.exist? file
+  settings.template_languages.each do |language|
+    file = File.join(settings.root, "widgets", params[:widget], "#{params[:widget]}.#{language}")
+    return Tilt[language].new(file).render if File.exist?(file)
   end
+
+  "Drats! Unable to find a widget file named: #{params[:widget]} to render."
 end
 
 Thin::Server.class_eval do
@@ -135,7 +140,7 @@ end
 
 def send_event(id, body, target=nil)
   body[:id] = id
-  body[:updatedAt] ||= Time.now.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 }
@@ -159,13 +164,6 @@ def first_dashboard
   files.sort.first
 end
 
-def tilt_html_engines
-  Tilt.mappings.select do |_, engines|
-    default_mime_type = engines.first.default_mime_type
-    default_mime_type.nil? || default_mime_type == 'text/html'
-  end
-end
-
 def require_glob(relative_glob)
   Dir[File.join(settings.root, relative_glob)].each do |file|
     require file
@@ -173,7 +171,7 @@ def require_glob(relative_glob)
 end
 
 settings_file = File.join(settings.root, 'config/settings.rb')
-require settings_file if File.exists?(settings_file)
+require settings_file if File.exist?(settings_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'

data/lib/dashing/cli.rb

@@ -86,7 +86,11 @@ module Dashing
     private
 
     def run_command(command)
-      system(command)
+      begin
+        system(command)
+      rescue Interrupt => e
+        say "Exiting..."
+      end
     end
 
     def install_widget_from_gist(gist, skip_overwrite)

data/templates/project/README.md

@@ -1 +1 @@
-Check out http://smashing.github.io/ for more information.
+Check out http://smashing.github.io/smashing for more information.

data/templates/project/assets/stylesheets/application.scss

@@ -8,14 +8,14 @@
 $background-color: #222;
 $text-color: #fff;
 
-$background-warning-color-1: #e82711;
-$background-warning-color-2: #9b2d23;
-$text-warning-color: #fff;
-
-$background-danger-color-1: #eeae32;
-$background-danger-color-2: #ff9618;
+$background-danger-color-1: #e82711;
+$background-danger-color-2: #9b2d23;
 $text-danger-color: #fff;
 
+$background-warning-color-1: #eeae32;
+$background-warning-color-2: #ff9618;
+$text-warning-color: #fff;
+
 @-webkit-keyframes status-warning-background {
   0%   { background-color: $background-warning-color-1; }
   50%  { background-color: $background-warning-color-2; }

data/templates/project/config.ru

@@ -3,6 +3,10 @@ require 'dashing'
 configure do
   set :auth_token, 'YOUR_AUTH_TOKEN'
 
+  # See http://www.sinatrarb.com/intro.html > Available Template Languages on
+  # how to add additional template languages.
+  set :template_languages, %i[html erb]
+
   helpers do
     def protected!
       # Put any authentication code you want in here.

data/templates/project/dashboards/layout.erb

@@ -13,7 +13,7 @@
   <link rel="stylesheet" href="/assets/application.css">
 
   <link href='//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700' rel='stylesheet' type='text/css'>
-  <link rel="icon" href="/assets/favicon.ico">
+  <link rel="icon" href="/public/favicon.ico">
 
 </head>
   <body>
@@ -29,4 +29,4 @@
       <a href="#saving-instructions" id="save-gridster">Save this layout</a>
     <% end %>
   </body>
-</html>
+</html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smashing
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
-- Daniel Beauchamp
+- 'Smashing Org (Inherited from: Daniel Beauchamp)'
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-23 00:00:00.000000000 Z
+date: 2017-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -16,196 +16,210 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.4.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.4.24
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.24
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.24
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.19.4
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: 3.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 5.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 5.0.1
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.10.2
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.14.1
 description: A framework for pulling together an overview of data that is important
   to your team and displaying it easily on TVs around the office. You write a bit
   of ruby code to gather data from some services and let Smashing handle the rest
@@ -320,7 +334,7 @@ files:
 - templates/widget/%name%/%name%.coffee.tt
 - templates/widget/%name%/%name%.html
 - templates/widget/%name%/%name%.scss.tt
-homepage: http://smashing.github.io
+homepage: http://smashing.github.io/smashing
 licenses:
 - MIT
 metadata: {}