dashing-rails 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04f337d7ba9d83c8e94f400f9eb0143b94146586
-  data.tar.gz: 02c7e52a179c50554814b5a6f41ddc8d570bae19
+  metadata.gz: 0c4f2ac2b83de93b59cde2a8a721ff3c1da134ff
+  data.tar.gz: f5fcc3a0285c077218d15c4142e4389649b65ddf
 SHA512:
-  metadata.gz: 32e4edd027476b3563bdcaef09f4ef23f5e8b077e0ef397e9e7f441b04c338a9116d241e0b6d308dc4bc71ec1309ff0756f4188420edead6be7890aefb5c5cd5
-  data.tar.gz: ce57e8508175d92aa27e0d342b855ace973bb46a048a1a6dc3177971d1b1c2b61358221cfbe3fd32a4ad24c0b6fcaaafe2b764325c59b4f37613b286249d521d
+  metadata.gz: 88dc2c0fd8d2763013d8055edc89801283a0bbfb9ab8a694f026d253a49f077db7afb46cfe7bbfbb2ad1e95029928c6a728005f3369d199da5289dfe7930ae5b
+  data.tar.gz: 393ec5fc545d3a31a3feb0b84444847abe82ee9605af6cac7f0482b93e53882d2d5c10b049e9b794121e1cbc458946c2e8adcd08fb26c284ae65d6e6052f2792

data/.rspec

@@ -1 +1,3 @@
 --color
+--require spec_helper
+--require rails_helper

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.6.0
+
+* Upgrade assets based on [Dashing](https://github.com/Shopify/dashing) repo
+* Upgrade gems
+
 ## 2.5.0
 
 * Saves last event on redis to be sent on first connection (@scambra)

data/Gemfile

@@ -12,8 +12,6 @@ gemspec
 
 group :test, :development do
   gem 'sqlite3'
-  gem 'rspec-rails', '~> 2.14'
-  gem 'simplecov', require: false
-  gem 'coveralls', require: false
+  gem 'rspec-rails', '~> 3.5'
   gem 'generator_spec', require: false
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dashing-rails (2.5.0)
+    dashing-rails (2.6.0)
       coffee-script (>= 2.0)
       connection_pool (~> 2.2)
       jquery-rails (>= 3.0)
@@ -12,156 +12,151 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
+    actioncable (5.0.1)
+      actionpack (= 5.0.1)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.1)
+      actionpack (= 5.0.1)
+      actionview (= 5.0.1)
+      activejob (= 5.0.1)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.3)
-      actionview (= 4.2.3)
-      activesupport (= 4.2.3)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.1)
+      actionview (= 5.0.1)
+      activesupport (= 5.0.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.3)
-      activesupport (= 4.2.3)
+    actionview (5.0.1)
+      activesupport (= 5.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.3)
-      activesupport (= 4.2.3)
-      globalid (>= 0.3.0)
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
-      builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
-      arel (~> 6.0)
-    activesupport (4.2.3)
+    activejob (5.0.1)
+      activesupport (= 5.0.1)
+      globalid (>= 0.3.6)
+    activemodel (5.0.1)
+      activesupport (= 5.0.1)
+    activerecord (5.0.1)
+      activemodel (= 5.0.1)
+      activesupport (= 5.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
-    better_errors (1.1.0)
+    arel (7.1.4)
+    better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
-    builder (3.2.2)
-    coderay (1.1.0)
+      rack (>= 0.9.0)
+    builder (3.2.3)
+    coderay (1.1.1)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.1)
-    connection_pool (2.2.0)
-    coveralls (0.7.0)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.4)
+    connection_pool (2.2.1)
     diff-lcs (1.2.5)
-    docile (1.1.3)
     erubis (2.7.0)
-    execjs (2.6.0)
-    generator_spec (0.9.2)
+    execjs (2.7.0)
+    generator_spec (0.9.3)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
-    jquery-rails (4.1.1)
+    jquery-rails (4.2.2)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
-    loofah (2.0.2)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.7.0)
-    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)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    nio4r (1.2.1)
+    nokogiri (1.7.0.1)
+      mini_portile2 (~> 2.1.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-rails (0.3.2)
+    pry-rails (0.3.4)
       pry (>= 0.9.10)
-    rack (1.6.4)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.3)
-      actionmailer (= 4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
-      activemodel (= 4.2.3)
-      activerecord (= 4.2.3)
-      activesupport (= 4.2.3)
+    rails (5.0.1)
+      actioncable (= 5.0.1)
+      actionmailer (= 5.0.1)
+      actionpack (= 5.0.1)
+      actionview (= 5.0.1)
+      activejob (= 5.0.1)
+      activemodel (= 5.0.1)
+      activerecord (= 5.0.1)
+      activesupport (= 5.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.3)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+      railties (= 5.0.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.2)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.3)
-      actionpack (= 4.2.3)
-      activesupport (= 4.2.3)
+    railties (5.0.1)
+      actionpack (= 5.0.1)
+      activesupport (= 5.0.1)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    redis (3.2.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-rails (2.14.2)
+    rake (12.0.0)
+    redis (3.3.2)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
-      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rufus-scheduler (3.2.0)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.5.0)
-    sprockets (3.5.2)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rufus-scheduler (3.3.2)
+      tzinfo
+    slop (3.6.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    thor (0.19.1)
+    sqlite3 (1.3.13)
+    thor (0.19.4)
     thread_safe (0.3.5)
-    tins (1.3.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
@@ -169,10 +164,11 @@ PLATFORMS
 DEPENDENCIES
   better_errors
   bundler (>= 1.8)
-  coveralls
   dashing-rails!
   generator_spec
   pry-rails
-  rspec-rails (~> 2.14)
-  simplecov
+  rspec-rails (~> 3.5)
   sqlite3
+
+BUNDLED WITH
+   1.11.2

data/app/controllers/dashing/application_controller.rb

@@ -1,13 +1,13 @@
 module Dashing
   class ApplicationController < ActionController::Base
 
-    before_filter :authentication_with_devise
+    before_action :authentication_with_devise
 
     private
 
     def authentication_with_devise
       Dashing.config.devise_allowed_models.each do |model|
-        self.send("authenticate_#{model.to_s}!")
+        send("authenticate_#{model.to_s}!")
       end
     end
 

data/app/controllers/dashing/dashboards_controller.rb

@@ -1,7 +1,7 @@
 module Dashing
   class DashboardsController < ApplicationController
 
-    before_filter :check_dashboard_name, only: :show
+    before_action :check_dashboard_name, only: :show
 
     rescue_from ActionView::MissingTemplate, with: :template_not_found
 

data/app/controllers/dashing/widgets_controller.rb

@@ -1,9 +1,9 @@
 module Dashing
   class WidgetsController < ApplicationController
 
-    before_filter :check_accessibility, only: :update
-    before_filter :check_widget_name,   only: [:show, :update]
-    before_filter :prepend_view_paths,  only: :show
+    before_action :check_accessibility, only: :update
+    before_action :check_widget_name,   only: [:show, :update]
+    before_action :prepend_view_paths,  only: :show
 
     rescue_from ActionView::MissingTemplate, with: :template_not_found
 

data/lib/assets/javascripts/dashing.gridster.coffee

@@ -6,26 +6,10 @@ Dashing.gridsterLayout = (positions) ->
   Dashing.customGridsterLayout = true
   positions = positions.replace(/^"|"$/g, '')
   positions = $.parseJSON(positions)
-  widgets = $("[data-row]")
-  maxRow = 1
-  maxCol = 1
-  numColumns = Dashing.numColumns || 1
+  widgets = $("[data-row^=]")
   for widget, index in widgets
-    if positions? and index < positions.length
-      $(widget).attr('data-row', positions[index].row)
-      $(widget).attr('data-col', positions[index].col)
-      if positions[index].row > maxRow
-        maxRow = positions[index].row
-        maxCol = positions[index].col + 1
-      else if positions[index].row == maxRow and positions[index].col >= maxCol
-        maxCol = positions[index].col + 1
-    else
-      if maxCol > numColumns
-        maxRow += 1
-        maxCol = 1
-      $(widget).attr('data-row', maxRow)
-      $(widget).attr('data-col', maxCol)
-      maxCol += 1
+    $(widget).attr('data-row', positions[index].row)
+    $(widget).attr('data-col', positions[index].col)
 
 Dashing.getWidgetPositions = ->
   $(".gridster ul:first").gridster().data('gridster').serialize()
@@ -40,9 +24,7 @@ Dashing.showGridsterInstructions = ->
       <script type='text/javascript'>\n
       $(function() {\n
       \ \ Dashing.gridsterLayout('#{JSON.stringify(Dashing.currentWidgetPositions)}')\n
-      });\n
-      </script>
-    ")
+      });\n</script>")
 
 $ ->
   $('#save-gridster').leanModal()

data/lib/dashing/configuration.rb

@@ -53,11 +53,7 @@ module Dashing
     private
 
     def request_thread_count
-      if defined?(::Puma) && ::Puma.respond_to?(:cli_config)
-        ::Puma.cli_config.options.fetch(:max_threads, 5).to_i
-      else
-        5
-      end
+      Integer(ENV['RAILS_MAX_THREADS'] || 5)
     end
   end
 end

data/lib/dashing/version.rb

@@ -1,3 +1,3 @@
 module Dashing
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

data/spec/controllers/dashing/application_controller_spec.rb

@@ -1,18 +1,23 @@
-require 'spec_helper'
-
-describe Dashing::ApplicationController do
+RSpec.describe Dashing::ApplicationController do
 
   describe '#authentication_with_devise' do
 
     let(:models) { [:user, :admin] }
+    let!(:devise_instances) do
+      module DeviseInstances
+        def authenticate_user!; end
+        def authenticate_admin!; end
+      end
+    end
 
     before do
-      Dashing.stub_chain(:config, :devise_allowed_models).and_return(models)
+      controller.extend(DeviseInstances)
+      allow(Dashing).to receive_message_chain(:config, :devise_allowed_models).and_return(models)
     end
 
     it 'calls devise authenticate method' do
-      expect(controller).to receive("authenticate_#{models.first.to_s}!")
-      expect(controller).to receive("authenticate_#{models.last.to_s}!")
+      expect(controller).to receive("authenticate_user!")
+      expect(controller).to receive("authenticate_admin!")
       controller.send(:authentication_with_devise)
     end