dashing-rails 2.4.0 → 2.4.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjU5M2MwMTMxNDA5ODVmOWZhYzY5OTQyYzNhZTA5ZmRiZjAyNDNkNA==
-  data.tar.gz: !binary |-
-    M2Y3YTljNTgxYTQ0YWFlNTI3YTQ3NzYyODQ3NTQ5ZmYzYzU1OWJjNA==
+SHA1:
+  metadata.gz: 8ce6e2cd46ff8f40f2f30dbafafa37ca1f2edc78
+  data.tar.gz: fe0b9bacd1d469d3b93c75d954276aed098ba9e7
 SHA512:
-  metadata.gz: !binary |-
-    ZjExNzRmNTcxOTFiMjRkN2YyZjI4ZTAwMTc2NzRmODQzZmQxNmZmYWY3NTY3
-    NzE4ZDJmNTM1ZTQ0MjE0ZGNhYTBhZTMxMmJjMWE3NjA4NDk5NzZiOTFmMjk0
-    OWNkNjNhNzJhYTRkNmM4Yjg1ZWU2NWViZDU4OTcxMGFkYTNmZmM=
-  data.tar.gz: !binary |-
-    MzhmNjVjMTkwN2MwYmRiN2M5NjVmM2ZkMzM4YjU0ZmE3NGY2NjhiMjAzZjlj
-    OWFmYzFlYTMwYzI2MDlkZTUwMjgxMmMyMjRkNjcyZmZhYzNlZThkOTg1ZDFi
-    N2RjOWE2MWM5ZDFlMjFkMmQ0MWU5NWRmYzRkNDA2OWZmYTEyYWY=
+  metadata.gz: fa6f88787044305580c92ba337e1b2ebae3d27227c36ea832468e2b8b55a69dec3c244f0c34cf90c871638a8ce3989bb67424e2efc2bfa57ca743dd3cb9c21b9
+  data.tar.gz: 5533d93a76b01520d0b4a3744e55027be9c7310d003c69745ad0a92a58d0c889247bbc96e520ce9c93ae398748a9cd70ec594df41407e708946872906d8b3a0b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.4.1
+
+* Update graph widget coffee code
+
 ## 2.4.0
 
 * Update Batman.js using `batman-rails` gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dashing-rails (2.4.0)
+    dashing-rails (2.4.1)
       batman-rails (~> 0.16.1)
       coffee-script (~> 2.2)
       connection_pool (~> 2.0)
@@ -50,8 +50,8 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.1)
-    connection_pool (2.0.0)
+    coffee-script-source (1.9.1)
+    connection_pool (2.1.2)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
@@ -61,7 +61,7 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.3)
     erubis (2.7.0)
-    execjs (2.2.1)
+    execjs (2.4.0)
     generator_spec (0.9.2)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
@@ -104,7 +104,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
-    redis (3.1.0)
+    redis (3.2.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec-core (2.14.8)
@@ -119,7 +119,7 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rufus-scheduler (3.0.8)
+    rufus-scheduler (3.0.9)
       tzinfo
     simplecov (0.8.2)
       docile (~> 1.1.0)
@@ -127,15 +127,15 @@ GEM
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.5.0)
-    sprockets (2.12.1)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.9)
     term-ansicolor (1.3.0)
       tins (~> 1.0)

data/README.md

@@ -18,10 +18,6 @@ A huge thanks to Shopify for their great work with the Sinatra version.
 
 Dashing is a Rails engine that lets you build beautiful dashboards.
 
-[Click here for a video tutorial on how to use this gem:](http://devcasts.co/dashing-rails-making-dashingly-handsome-dashboards/)
-
-[![dashing-rails-devcast](http://devcasts.co/wp-content/uploads/2014/03/dashing-rails.png)](http://devcasts.co/dashing-rails-making-dashingly-handsome-dashboards/)
-
 Check out a demo over [here](http://dashingdemo.herokuapp.com/sample). [Here's another one](http://dashingdemo.herokuapp.com/sampletv), optimized for 1080p screens.
 
 Key features:
@@ -44,45 +40,45 @@ Key features:
 
 1. Install the gem by adding the following in your `Gemfile`:
 
-```ruby
-gem 'dashing-rails'
-```
+  ```ruby
+  gem 'dashing-rails'
+  ```
 
 2. Install puma server by adding the following in your `Gemfile`:
 
-```ruby
-gem 'puma'
-```
+  ```ruby
+  gem 'puma'
+  ```
 
 3. Bundle install
 
-```
-$ bundle
-```
+  ```
+  $ bundle
+  ```
 
 4. Install the dependencies using the following command:
 
-```
-$ rails g dashing:install
-```
+  ```
+  $ rails g dashing:install
+  ```
 
 5. Start redis server:
 
-```
-$ redis-server
-```
+  ```
+  $ redis-server
+  ```
 
 6. Open `config/environments/development.rb` and add:
 
-```ruby
-config.allow_concurrency = true
-```
+  ```ruby
+  config.allow_concurrency = true
+  ```
 
 7. Start your server (must be a multi threaded server - See [Requirements](https://github.com/gottfrois/dashing-rails#requirements))
 
-```
-$ rails s
-```
+  ```
+  $ rails s
+  ```
 
 8. Point your browser at [http://localhost:3000/dashing/dashboards](http://localhost:3000/dashing/dashboards) and have fun!
 

data/app/controllers/dashing/dashboards_controller.rb

@@ -20,7 +20,7 @@ module Dashing
     end
 
     def dashboard_path(name)
-      Dashing.config.dashboards_views_path.call.join(name)
+      Dashing.config.dashboards_views_path.join(name)
     end
 
     def template_not_found

data/app/controllers/dashing/widgets_controller.rb

@@ -8,7 +8,7 @@ module Dashing
     rescue_from ActionView::MissingTemplate, with: :template_not_found
 
     def show
-      render file: widget_path
+      render file: widget_path, layout: false
     end
 
     def update

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

@@ -6,10 +6,26 @@ Dashing.gridsterLayout = (positions) ->
   Dashing.customGridsterLayout = true
   positions = positions.replace(/^"|"$/g, '')
   positions = $.parseJSON(positions)
-  widgets = $("[data-row^=]")
+  widgets = $("[data-row]")
+  maxRow = 1
+  maxCol = 1
+  numColumns = Dashing.numColumns || 1
   for widget, index in widgets
-    $(widget).attr('data-row', positions[index].row)
-    $(widget).attr('data-col', positions[index].col)
+    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
 
 Dashing.getWidgetPositions = ->
   $(".gridster ul:first").gridster().data('gridster').serialize()

data/lib/dashing.rb

@@ -14,7 +14,7 @@ module Dashing
     end
 
     def first_dashboard
-      files = Dir[config.dashboards_views_path.call.join('*')].collect { |f| File.basename(f, '.*') }
+      files = Dir[config.dashboards_views_path.join('*')].collect { |f| File.basename(f, '.*') }
       files.sort.first
     end
 

data/lib/dashing/configuration.rb

@@ -29,11 +29,11 @@ module Dashing
       @devise_allowed_models  = []
 
       # Jobs
-      @jobs_path              = -> { Rails.root.join('app', 'jobs') }
+      @jobs_path              = Rails.root.join('app', 'jobs')
 
       # Dashboards
       @default_dashboard      = nil
-      @dashboards_views_path  = -> { Rails.root.join('app', 'views', 'dashing', 'dashboards') }
+      @dashboards_views_path  = Rails.root.join('app', 'views', 'dashing', 'dashboards')
       @dashboard_layout_path  = 'dashing/dashboard'
 
       # Widgets

data/lib/dashing/railtie.rb

@@ -14,7 +14,7 @@ module Dashing
     end
 
     initializer 'require dashing jobs' do
-      Dir[Dashing.config.jobs_path.call.join('**', '*.rb')].each { |file| require file }
+      Dir[Dashing.config.jobs_path.join('**', '*.rb')].each { |file| require file }
     end
 
     initializer 'fix redis child connection' do

data/lib/dashing/version.rb

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

data/lib/generators/templates/initializer.rb

@@ -27,19 +27,19 @@ Dashing.configure do |config|
   #
   # You can change default views and assets paths with the following config:
   #
-  # config.widgets_views_path = -> { Rails.root.join('app', 'views', 'dashing', 'widgets') }
-  # config.widgets_js_path    = 'app/assets/javascripts/dashing'
-  # config.widgets_css_path   = 'app/assets/stylesheets/dashing'
+  # config.widgets_views_path = Rails.root.join('app', 'views', 'dashing', 'widgets')
+  # config.widgets_js_path    = Rails.root.join('app', 'assets', 'javascripts', 'dashing')
+  # config.widgets_css_path   = Rails.root.join('app', 'assets', 'stylesheets', 'dashing')
 
   # rufus-scheduler worker path
-  # config.jobs_path = -> { Rails.root.join('app', 'jobs') }
+  # config.jobs_path = Rails.root.join('app', 'jobs')
 
   # Engine path to use for accessing engine's routes.
   # Ex: http://your_app/dashing/dashboard/my_dashboard_name
   # config.engine_path = '/dashing'
 
   # The dashboards views path used to find dashboards.
-  # config.dashboards_views_path = -> { Rails.root.join('app', 'views', 'dashing', 'dashboards') }
+  # config.dashboards_views_path = Rails.root.join('app', 'views', 'dashing', 'dashboards')
 
   # The Dashing layout used to display metrics.
   # config.dashboard_layout_path = 'dashing/dashboard'

data/spec/dummy/config/initializers/dashing.rb

@@ -32,7 +32,7 @@ Dashing.configure do |config|
   # config.widgets_css_path   = 'app/assets/stylesheets/dashing'
 
   # rufus-scheduler worker path
-  # config.jobs_path = 'app/jobs/'
+  # config.jobs_path = Rails.root.join('app', 'jobs')
 
   # Engine path to use for accessing engine's routes.
   # Ex: http://your_app/dashing/dashboard/my_dashboard_name

data/spec/lib/dashing/configuration_spec.rb

@@ -20,11 +20,11 @@ describe Dashing::Configuration do
   it { expect(instance.devise_allowed_models).to  be_empty }
 
   # Jobs
-  it { expect(instance.jobs_path.call.to_s).to    include('app/jobs') }
+  it { expect(instance.jobs_path.to_s).to    include('app/jobs') }
 
   # Dashboards
   it { expect(instance.default_dashboard).to      be_nil }
-  it { expect(instance.dashboards_views_path.call.to_s).to include('app/views/dashing/dashboards') }
+  it { expect(instance.dashboards_views_path.to_s).to include('app/views/dashing/dashboards') }
   it { expect(instance.dashboard_layout_path).to  eq('dashing/dashboard') }
 
   # Widgets

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

@@ -6,15 +6,13 @@ class Dashing.Graph extends Dashing.Widget
     if points
       points[points.length - 1].y
 
-  loadNode: (_node) ->
-    node = super(_node)
-
-    container = $(node).parent()
+  ready: ->
+    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")
@@ -24,6 +22,7 @@ class Dashing.Graph extends Dashing.Widget
         data: [{x:0, y:0}]
         }
       ]
+      padding: {top: 0.02, left: 0.02, right: 0.02, bottom: 0.02}
     )
 
     @graph.series[0].data = @get('points') if @get('points')
@@ -32,8 +31,6 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dashing-rails
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -314,12 +314,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -387,4 +387,3 @@ test_files:
 - spec/lib/generators/widget_generator_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_spec_helpers.rb
-has_rdoc: