dashing-rails 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ce6e2cd46ff8f40f2f30dbafafa37ca1f2edc78
-  data.tar.gz: fe0b9bacd1d469d3b93c75d954276aed098ba9e7
+  metadata.gz: 2661d20ae32a6b777115b87bbc26728ee7a25706
+  data.tar.gz: 97882dbe34d2eeb3a528b625c278f5d28b7670a7
 SHA512:
-  metadata.gz: fa6f88787044305580c92ba337e1b2ebae3d27227c36ea832468e2b8b55a69dec3c244f0c34cf90c871638a8ce3989bb67424e2efc2bfa57ca743dd3cb9c21b9
-  data.tar.gz: 5533d93a76b01520d0b4a3744e55027be9c7310d003c69745ad0a92a58d0c889247bbc96e520ce9c93ae398748a9cd70ec594df41407e708946872906d8b3a0b
+  metadata.gz: e7e68029ad43f664e400b78ef263f3b3f00c52cae146baa306a9ca0d30cba5e75cea1939d09548ee424bc5134e65f51b3a8d7f6d6d128ec540cc8ec34240e76a
+  data.tar.gz: 2d5d061026e1d57ff21421ae46254c47e72dc682f62801a53d4c4d64fab1d7c78c8dbb6c5c7f5cd9d2c256eb1622bcd1bb80da89c4aa7fc365c742149017d2b1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.4.2
+
+* Update dashing js src file from dashing sinatra version
+* Update dashing css src file from dashing sinatra version
+* Update gem dependencies
+* Fix rails lock versioning to allow `>= 4.0`
+* Remove `respond_to` reference in events controller
+
 ## 2.4.1
 
 * Update graph widget coffee code

data/Gemfile

@@ -11,12 +11,3 @@ gemspec
 # your gem to rubygems.org.
 
 gem 'sqlite3'
-gem 'jquery-rails', '~> 3.0'
-
-group :test do
-  gem 'coveralls',  require: false
-  gem 'simplecov',  require: false
-  gem 'rspec-rails', '~> 2.14'
-  gem 'pry-rails',   '~> 0.3'
-  gem 'generator_spec'
-end

data/Gemfile.lock

@@ -1,45 +1,54 @@
 PATH
   remote: .
   specs:
-    dashing-rails (2.4.1)
+    dashing-rails (2.4.2)
       batman-rails (~> 0.16.1)
       coffee-script (~> 2.2)
-      connection_pool (~> 2.0)
+      connection_pool (~> 2.1)
       jquery-rails (~> 3.1)
-      rails (~> 4.1)
-      redis (~> 3.1)
+      rails (>= 4.0)
+      redis (~> 3.2)
       rufus-scheduler (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.1)
-      actionpack (= 4.1.1)
-      actionview (= 4.1.1)
-      mail (~> 2.5.4)
-    actionpack (4.1.1)
-      actionview (= 4.1.1)
-      activesupport (= 4.1.1)
-      rack (~> 1.5.2)
+    actionmailer (4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.0)
+      actionview (= 4.2.0)
+      activesupport (= 4.2.0)
+      rack (~> 1.6.0)
       rack-test (~> 0.6.2)
-    actionview (4.1.1)
-      activesupport (= 4.1.1)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.1)
-      activesupport (= 4.1.1)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.0)
+      activesupport (= 4.2.0)
+      globalid (>= 0.3.0)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-    activerecord (4.1.1)
-      activemodel (= 4.1.1)
-      activesupport (= 4.1.1)
-      arel (~> 5.0.0)
-    activesupport (4.1.1)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
+    arel (6.0.0)
     batman-rails (0.16.1)
       railties (>= 3.2)
     better_errors (1.1.0)
@@ -65,45 +74,59 @@ GEM
     generator_spec (0.9.2)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
+    globalid (0.3.3)
+      activesupport (>= 4.1.0)
     hike (1.2.3)
-    i18n (0.6.9)
-    jquery-rails (3.1.1)
+    i18n (0.7.0)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    json (1.8.2)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (1.25.1)
-    minitest (5.3.5)
-    multi_json (1.10.1)
-    polyglot (0.3.5)
+    mime-types (2.4.3)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
+    multi_json (1.11.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.6.0)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.1)
-      actionmailer (= 4.1.1)
-      actionpack (= 4.1.1)
-      actionview (= 4.1.1)
-      activemodel (= 4.1.1)
-      activerecord (= 4.1.1)
-      activesupport (= 4.1.1)
+    rails (4.2.0)
+      actionmailer (= 4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      activemodel (= 4.2.0)
+      activerecord (= 4.2.0)
+      activesupport (= 4.2.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.1)
-      sprockets-rails (~> 2.0)
-    railties (4.1.1)
-      actionpack (= 4.1.1)
-      activesupport (= 4.1.1)
+      railties (= 4.2.0)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.5)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.0)
+      actionpack (= 4.2.0)
+      activesupport (= 4.2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     redis (3.2.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -140,25 +163,21 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     tins (1.3.0)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  better_errors (~> 1.0)
+  better_errors
   coveralls
   dashing-rails!
   generator_spec
-  jquery-rails (~> 3.0)
-  pry-rails (~> 0.3)
+  pry-rails
   rspec-rails (~> 2.14)
   simplecov
   sqlite3

data/app/controllers/dashing/events_controller.rb

@@ -2,8 +2,6 @@ module Dashing
   class EventsController < ApplicationController
     include ActionController::Live
 
-    respond_to :html
-
     def index
       response.headers['Content-Type']      = 'text/event-stream'
       response.headers['X-Accel-Buffering'] = 'no'

data/dashing.gemspec

@@ -17,15 +17,18 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rails',                      '~> 4.1'
+  spec.add_dependency 'rails',                      '>= 4.0'
   spec.add_dependency 'jquery-rails',               '~> 3.1'
   spec.add_dependency 'coffee-script',              '~> 2.2'
   spec.add_dependency 'batman-rails',               '~> 0.16.1'
   spec.add_dependency 'rufus-scheduler',            '~> 3.0'
-  spec.add_dependency 'redis',                      '~> 3.1'
-  spec.add_dependency 'connection_pool',            '~> 2.0'
+  spec.add_dependency 'redis',                      '~> 3.2'
+  spec.add_dependency 'connection_pool',            '~> 2.1'
 
   spec.add_development_dependency 'rspec-rails',    '~> 2.14'
-  spec.add_development_dependency 'pry-rails',      '~> 0.3'
-  spec.add_development_dependency 'better_errors',  '~> 1.0'
+  spec.add_development_dependency 'pry-rails'
+  spec.add_development_dependency 'better_errors'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'generator_spec'
 end

data/lib/dashing/version.rb

@@ -1,3 +1,3 @@
 module Dashing
-  VERSION = '2.4.1'
+  VERSION = '2.4.2'
 end

data/spec/controllers/dashing/dashboards_controller_spec.rb

@@ -2,10 +2,14 @@ require 'spec_helper'
 
 describe Dashing::DashboardsController do
 
+  before do
+    @routes = Dashing::Engine.routes
+  end
+
   describe 'GET "index"' do
 
     def action
-      get :index, use_route: :dashing
+      get :index
     end
 
     it 'responds success' do
@@ -18,7 +22,7 @@ describe Dashing::DashboardsController do
   describe 'GET "show"' do
 
     def action(params = {})
-      get :show, params.merge(use_route: :dashing)
+      get :show, params
     end
 
     context 'when template exists' do

data/spec/controllers/dashing/widgets_controller_spec.rb

@@ -6,12 +6,13 @@ describe Dashing::WidgetsController do
 
   before do
     stub_redis(redis)
+    @routes = Dashing::Engine.routes
   end
 
   describe 'GET "show"' do
 
     def action(params = {})
-      get :show, params.merge(use_route: :dashing)
+      get :show, params
     end
 
     context 'when default template exists' do
@@ -44,7 +45,7 @@ describe Dashing::WidgetsController do
   describe 'PUT "update"' do
 
     def action(params = {})
-      put :update, params.merge(use_route: :dashing)
+      put :update, params
     end
 
     context 'when valid' do

data/spec/dummy/config/environments/production.rb

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.

data/spec/lib/dashing_spec.rb

@@ -15,13 +15,13 @@ describe Dashing do
     let(:configuration) { Dashing::Configuration.new }
 
     before do
-      Dashing.stub(:config).and_return(:configuration)
+      allow(Dashing).to receive(:config).and_return(:configuration)
     end
 
     context 'when block given' do
 
       it 'yields configuration' do
-        Dashing.should_receive(:configure).and_yield(configuration)
+        expect(Dashing).to receive(:configure).and_yield(configuration)
         Dashing.configure {|config|}
       end
 
@@ -29,9 +29,7 @@ describe Dashing do
 
     context 'when no block given' do
 
-      it 'does nothing' do
-        Dashing.configure.should be_nil
-      end
+      it { expect(Dashing.configure).to be_nil }
 
     end
 
@@ -43,7 +41,7 @@ describe Dashing do
     let(:dirs)  { [dir] }
 
     before do
-      Dir.stub(:[]).and_return(dirs)
+      allow(Dir).to receive(:[]).and_return(dirs)
     end
 
     it { expect(Dashing.first_dashboard).to eq(dir) }

data/vendor/assets/javascripts/dashing/dashing-src.coffee

@@ -22,30 +22,25 @@ 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));
 
 class Dashing.Widget extends Batman.View
-  constructor: ->
+  constructor:  ->
     # Set the view path
     @constructor::source = Batman.Filters.underscore(@constructor.name)
-
     super
 
-    @observe 'node', (newValue, oldValue) ->
-      if !oldValue && !@_registeredAtDashing
-        @_registeredAtDashing = true
-
-        @mixin($(@node).data())
-        Dashing.widgets[@id] ||= []
-        Dashing.widgets[@id].push(@)
+    @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
 
-        # in case the events from the server came
-        # before the widget was rendered
-        @mixin(Dashing.lastEvents[@id]) 
-
-        type = Batman.Filters.dashize(@constructor.name)
-        $(@node).addClass("widget widget-#{type} #{@id}")
+    type = Batman.Filters.dashize(@view)
+    $(@node).addClass("widget widget-#{type} #{@id}")
 
   @accessor 'updatedAtMessage', ->
     if updatedAt = @get('updatedAt')
@@ -104,18 +99,24 @@ source.addEventListener 'error', (e)->
     console.log("Connection closed")
     setTimeout (->
       window.location.reload()
-    ), 5 * 60 * 1000
+    ), 5*60*1000
 
-source.addEventListener 'message', (e) =>
+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
+      lastEvents[data.id] = data
       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/vendor/assets/stylesheets/dashing/dashing-src.scss

@@ -113,6 +113,7 @@ h3 {
 }
 
 .icon-background {
+  pointer-events: none;
   width: 100%!important;
   height: 100%;
   position: absolute;
@@ -121,6 +122,7 @@ h3 {
   opacity: 0.1;
   font-size: 275px;
   text-align: center;
+  margin-top: 82px;
 }
 
 .list-nostyle {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dashing-rails
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
@@ -14,16 +14,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -126,30 +126,72 @@ dependencies:
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: better_errors
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: generator_spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 description: The exceptionally handsome dashboard framework for Rails.
 email:
 - pierrelouis.gottfrois@gmail.com