dashing-rails 2.3.2 → 2.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTI4YTg4M2Y4MzQxZDI2NmFlM2EyNzA1MjE5OWNiYmM5NzI0YmUxMw==
+    ZjU5M2MwMTMxNDA5ODVmOWZhYzY5OTQyYzNhZTA5ZmRiZjAyNDNkNA==
   data.tar.gz: !binary |-
-    ZTQxMGUzZDE4ODRhNDMzMDgzMWFmNzVlMTIxMTJhY2U3NzQyYWY0Mw==
+    M2Y3YTljNTgxYTQ0YWFlNTI3YTQ3NzYyODQ3NTQ5ZmYzYzU1OWJjNA==
 SHA512:
   metadata.gz: !binary |-
-    NzczNWY0NzIwYzhiZWQ3YzA0Njk0MTk3NmE1ZDFhNTVhMDljMTA1MWQ3Mjg0
-    ZWE5OWFhM2E0MTI5NzMwNTQzYjg4NzYyNzUyNWRhNDAxNTVjZDFlOWY4YzQ2
-    MmM5NTMzODllZTBkOGVlYmJhNmQyMGM3YWZhMTNmMjNmNzdhZGI=
+    ZjExNzRmNTcxOTFiMjRkN2YyZjI4ZTAwMTc2NzRmODQzZmQxNmZmYWY3NTY3
+    NzE4ZDJmNTM1ZTQ0MjE0ZGNhYTBhZTMxMmJjMWE3NjA4NDk5NzZiOTFmMjk0
+    OWNkNjNhNzJhYTRkNmM4Yjg1ZWU2NWViZDU4OTcxMGFkYTNmZmM=
   data.tar.gz: !binary |-
-    ZjNjM2IzNDdmNjcwYzlhMDc2OTZjMjdkZDE1OWJlOTI1MmM2ZDkxZmM0NTEy
-    ZjAxY2ZlNzE2YTc5ZDczOTE5ZDQ3MzkzYjlmNTE4M2YwMjQzMjgxODI3ZDM3
-    NjQyYWE1MWUwYWRmNDg4OWFhYjBlM2QxOTk0MWJhMTVlYzM4YTQ=
+    MzhmNjVjMTkwN2MwYmRiN2M5NjVmM2ZkMzM4YjU0ZmE3NGY2NjhiMjAzZjlj
+    OWFmYzFlYTMwYzI2MDlkZTUwMjgxMmMyMjRkNjcyZmZhYzNlZThkOTg1ZDFi
+    N2RjOWE2MWM5ZDFlMjFkMmQ0MWU5NWRmYzRkNDA2OWZmYTEyYWY=

data/.gitignore

@@ -8,3 +8,4 @@ spec/dummy/tmp/
 spec/dummy/.sass-cache
 .coveralls.yml
 coverage/
+test_widget.*

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.4.0
+
+* Update Batman.js using `batman-rails` gem
+* Fixes [#41](https://github.com/gottfrois/dashing-rails/issues/41) for good. We now don't have to use proc or lambdas anymore.
+
 ## 2.3.2
 
 * Fixes [#46](https://github.com/gottfrois/dashing-rails/issues/46)

data/Gemfile

@@ -18,4 +18,5 @@ group :test do
   gem 'simplecov',  require: false
   gem 'rspec-rails', '~> 2.14'
   gem 'pry-rails',   '~> 0.3'
+  gem 'generator_spec'
 end

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    dashing-rails (2.3.2)
+    dashing-rails (2.4.0)
+      batman-rails (~> 0.16.1)
       coffee-script (~> 2.2)
       connection_pool (~> 2.0)
-      jquery-rails (~> 3.0)
+      jquery-rails (~> 3.1)
       rails (~> 4.1)
-      redis (~> 3.0)
+      redis (~> 3.1)
       rufus-scheduler (~> 3.0)
 
 GEM
@@ -39,15 +40,17 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
+    batman-rails (0.16.1)
+      railties (>= 3.2)
     better_errors (1.1.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
     builder (3.2.2)
     coderay (1.1.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.7.1)
     connection_pool (2.0.0)
     coveralls (0.7.0)
       multi_json (~> 1.3)
@@ -58,10 +61,13 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.3)
     erubis (2.7.0)
-    execjs (2.2.0)
+    execjs (2.2.1)
+    generator_spec (0.9.2)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
     hike (1.2.3)
     i18n (0.6.9)
-    jquery-rails (3.1.0)
+    jquery-rails (3.1.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
@@ -70,7 +76,7 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.25.1)
-    minitest (5.3.4)
+    minitest (5.3.5)
     multi_json (1.10.1)
     polyglot (0.3.5)
     pry (0.9.12.6)
@@ -98,7 +104,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
-    redis (3.0.7)
+    redis (3.1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec-core (2.14.8)
@@ -113,7 +119,7 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rufus-scheduler (3.0.7)
+    rufus-scheduler (3.0.8)
       tzinfo
     simplecov (0.8.2)
       docile (~> 1.1.0)
@@ -134,13 +140,13 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     tins (1.3.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (1.1.0)
+    tzinfo (1.2.1)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -150,6 +156,7 @@ DEPENDENCIES
   better_errors (~> 1.0)
   coveralls
   dashing-rails!
+  generator_spec
   jquery-rails (~> 3.0)
   pry-rails (~> 0.3)
   rspec-rails (~> 2.14)

data/app/controllers/dashing/widgets_controller.rb

@@ -34,7 +34,7 @@ module Dashing
     end
 
     def main_app_view_path
-      Dashing.config.widgets_views_path.call
+      Dashing.config.widgets_views_path
     end
 
     def template_not_found

data/dashing.gemspec

@@ -18,10 +18,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'rails',                      '~> 4.1'
-  spec.add_dependency 'jquery-rails',               '~> 3.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.0'
+  spec.add_dependency 'redis',                      '~> 3.1'
   spec.add_dependency 'connection_pool',            '~> 2.0'
 
   spec.add_development_dependency 'rspec-rails',    '~> 2.14'

data/lib/dashing/configuration.rb

@@ -37,9 +37,9 @@ module Dashing
       @dashboard_layout_path  = 'dashing/dashboard'
 
       # Widgets
-      @widgets_views_path     = -> { Rails.root.join('app', 'views', 'dashing', 'widgets') }
-      @widgets_js_path        = 'app/assets/javascripts/dashing'
-      @widgets_css_path       = 'app/assets/stylesheets/dashing'
+      @widgets_views_path     = Rails.root.join('app', 'views', 'dashing', 'widgets')
+      @widgets_js_path        = Rails.root.join('app', 'assets', 'javascripts', 'dashing')
+      @widgets_css_path       = Rails.root.join('app', 'assets', 'stylesheets', 'dashing')
     end
 
     def redis

data/lib/dashing/engine.rb

@@ -1,15 +1,9 @@
+require 'batman-rails'
+
 module Dashing
   class Engine < ::Rails::Engine
     isolate_namespace Dashing
 
-    config.assets.paths.unshift       Dashing::Engine.root.join('vendor', 'assets', 'fonts', 'dashing')
-    config.assets.paths.unshift       Dashing::Engine.root.join('vendor', 'assets', 'javascripts', 'dashing')
-    config.assets.paths.unshift       Dashing::Engine.root.join('vendor', 'assets', 'stylesheets', 'dashing')
-    config.assets.paths.unshift       Dashing.config.widgets_js_path
-    config.assets.paths.unshift       Dashing.config.widgets_css_path
-
-    config.assets.precompile << /\.(?:svg|eot|woff|ttf)$/
-
-    config.paths['app/views'].unshift Dashing::Engine.root.join('app', 'views', 'dashing', 'widgets')
+    paths['app/views'].unshift Dashing::Engine.root.join('app', 'views', 'dashing', 'widgets')
   end
 end

data/lib/dashing/railtie.rb

@@ -1,5 +1,18 @@
 module Dashing
   class Railtie < ::Rails::Railtie
+
+    initializer 'configure assets' do |app|
+      app.configure do
+        config.assets.paths.unshift       Dashing::Engine.root.join('vendor', 'assets', 'fonts', 'dashing')
+        config.assets.paths.unshift       Dashing::Engine.root.join('vendor', 'assets', 'javascripts', 'dashing')
+        config.assets.paths.unshift       Dashing::Engine.root.join('vendor', 'assets', 'stylesheets', 'dashing')
+        config.assets.paths.unshift       Dashing.config.widgets_js_path
+        config.assets.paths.unshift       Dashing.config.widgets_css_path
+
+        config.assets.precompile << /\.(?:svg|eot|woff|ttf)$/
+      end
+    end
+
     initializer 'require dashing jobs' do
       Dir[Dashing.config.jobs_path.call.join('**', '*.rb')].each { |file| require file }
     end

data/lib/dashing/version.rb

@@ -1,3 +1,3 @@
 module Dashing
-  VERSION = '2.3.2'
+  VERSION = '2.4.0'
 end

data/lib/generators/dashing/widget_generator.rb

@@ -7,7 +7,7 @@ module Dashing
       desc 'Creates a new Dashing widget.'
 
       def widget
-        template 'widgets/new.html',    Dashing.config.widgets_views_path.call.join("#{file_name}.html")
+        template 'widgets/new.html',    Dashing.config.widgets_views_path.join("#{file_name}.html")
         template 'widgets/new.scss',    Dashing.config.widgets_css_path.join('widgets', "#{file_name}.scss")
         template 'widgets/new.coffee',  Dashing.config.widgets_js_path.join('widgets', "#{file_name}.coffee")
       end

data/spec/lib/dashing/configuration_spec.rb

@@ -28,9 +28,9 @@ describe Dashing::Configuration do
   it { expect(instance.dashboard_layout_path).to  eq('dashing/dashboard') }
 
   # Widgets
-  it { expect(instance.widgets_views_path.call.to_s).to include('app/views/dashing/widgets') }
-  it { expect(instance.widgets_js_path).to        eq('app/assets/javascripts/dashing') }
-  it { expect(instance.widgets_css_path).to       eq('app/assets/stylesheets/dashing') }
+  it { expect(instance.widgets_views_path.to_s).to include('app/views/dashing/widgets') }
+  it { expect(instance.widgets_js_path.to_s).to    include('app/assets/javascripts/dashing') }
+  it { expect(instance.widgets_css_path.to_s).to   include('app/assets/stylesheets/dashing') }
 
   describe '#request_thread_count' do
 

data/spec/lib/generators/widget_generator_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'generator_spec'
+require 'generators/dashing/widget_generator'
+
+describe Dashing::Generators::WidgetGenerator do
+
+  arguments %w(test_widget)
+
+  before do
+    run_generator
+  end
+
+  after do
+    `find #{Rails.root.join('app')} -name "test_widget.*" -delete`
+  end
+
+  it 'creates widget files' do
+    assert_file Rails.root.join 'app/views/dashing/widgets/test_widget.html'
+    assert_file Rails.root.join 'app/assets/javascripts/dashing/widgets/test_widget.coffee'
+    assert_file Rails.root.join 'app/assets/stylesheets/dashing/widgets/test_widget.scss'
+  end
+end

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

@@ -1,5 +1,5 @@
 Batman.config.pathPrefix = "/"
-Batman.config.viewPrefix = "/dashing/widgets/"
+Batman.config.pathToHTML = "/dashing/widgets/"
 
 Batman.Filters.prettyNumber = (num) ->
   num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") unless isNaN(num)
@@ -26,18 +26,26 @@ class window.Dashing extends Batman.App
 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
 
-    @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
+    @observe 'node', (newValue, oldValue) ->
+      if !oldValue && !@_registeredAtDashing
+        @_registeredAtDashing = true
+
+        @mixin($(@node).data())
+        Dashing.widgets[@id] ||= []
+        Dashing.widgets[@id].push(@)
+
+        # in case the events from the server came
+        # before the widget was rendered
+        @mixin(Dashing.lastEvents[@id]) 
 
-    type = Batman.Filters.dashize(@view)
-    $(@node).addClass("widget widget-#{type} #{@id}")
+        type = Batman.Filters.dashize(@constructor.name)
+        $(@node).addClass("widget widget-#{type} #{@id}")
 
   @accessor 'updatedAtMessage', ->
     if updatedAt = @get('updatedAt')

data/vendor/assets/javascripts/dashing/default_widgets/graph.coffee

@@ -6,13 +6,15 @@ class Dashing.Graph extends Dashing.Widget
     if points
       points[points.length - 1].y
 
-  ready: ->
-    container = $(@node).parent()
+  loadNode: (_node) ->
+    node = super(_node)
+
+    container = $(node).parent()
     # Gross hacks. Let's fix this.
     width = (Dashing.widget_base_dimensions[0] * container.data("sizex")) + Dashing.widget_margins[0] * 2 * (container.data("sizex") - 1)
     height = (Dashing.widget_base_dimensions[1] * container.data("sizey"))
     @graph = new Rickshaw.Graph(
-      element: @node
+      element: node
       width: width
       height: height
       renderer: @get("graphtype")
@@ -30,6 +32,8 @@ class Dashing.Graph extends Dashing.Widget
     y_axis = new Rickshaw.Graph.Axis.Y(graph: @graph, tickFormat: Rickshaw.Fixtures.Number.formatKMBT)
     @graph.render()
 
+    return node
+
   onData: (data) ->
     if @graph
       @graph.series[0].data = data.points

data/vendor/assets/javascripts/dashing/index.js

@@ -17,8 +17,8 @@
 //= require jquery.timeago
 //= require moment.min
 //= require rickshaw-1.4.3.min
-//= require batman
-//= require batman.jquery
+//= require batman/batman
+//= require batman/batman.jquery
 //= require d3-3.2.8.min
-//= require es5-shim
+//= require batman/es5-shim
 //= require dashing-src

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dashing-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: batman-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -249,14 +263,13 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/lib/dashing/configuration_spec.rb
 - spec/lib/dashing_spec.rb
+- spec/lib/generators/widget_generator_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_spec_helpers.rb
 - vendor/assets/fonts/dashing/fontawesome-webfont.eot
 - vendor/assets/fonts/dashing/fontawesome-webfont.svg
 - vendor/assets/fonts/dashing/fontawesome-webfont.ttf
 - vendor/assets/fonts/dashing/fontawesome-webfont.woff
-- vendor/assets/javascripts/dashing/batman.jquery.js
-- vendor/assets/javascripts/dashing/batman.js
 - vendor/assets/javascripts/dashing/d3-3.2.8.min.js
 - vendor/assets/javascripts/dashing/dashing-src.coffee
 - vendor/assets/javascripts/dashing/default_widgets/clock.coffee
@@ -269,7 +282,6 @@ files:
 - vendor/assets/javascripts/dashing/default_widgets/meter.coffee
 - vendor/assets/javascripts/dashing/default_widgets/number.coffee
 - vendor/assets/javascripts/dashing/default_widgets/text.coffee
-- vendor/assets/javascripts/dashing/es5-shim.js
 - vendor/assets/javascripts/dashing/index.js
 - vendor/assets/javascripts/dashing/jquery.gridster.js
 - vendor/assets/javascripts/dashing/jquery.js
@@ -372,5 +384,7 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/lib/dashing/configuration_spec.rb
 - spec/lib/dashing_spec.rb
+- spec/lib/generators/widget_generator_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_spec_helpers.rb
+has_rdoc: