dashing-rails 2.3.1 → 2.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjY4MGE0ZTJjN2U2YmQ0ZWQxNDJhN2NlM2M4OTE0YjhkM2VlMGE5Mw==
+    NTI4YTg4M2Y4MzQxZDI2NmFlM2EyNzA1MjE5OWNiYmM5NzI0YmUxMw==
   data.tar.gz: !binary |-
-    NmI4OGZiODc3ZjQzMzE3YzdjZmNhMjc4YWYwNGQ5OGFiMjg1YzBhMw==
+    ZTQxMGUzZDE4ODRhNDMzMDgzMWFmNzVlMTIxMTJhY2U3NzQyYWY0Mw==
 SHA512:
   metadata.gz: !binary |-
-    ZTQ1YjNjOGJhY2JjM2FiZjUwN2VkODQzODJmOGUxMDZiMDMxNTEwNDBmMTlj
-    OTY1MDkxMGFkNGNiNGUwNDUyMWY0ZmE3NmIzMWQwNWJlMjliZmYxYmJiNGFj
-    M2YwMzU5MDcyMGY3MjI2Y2ZiODRlNWM4ZTgxNjM5NjI3MzU2NmE=
+    NzczNWY0NzIwYzhiZWQ3YzA0Njk0MTk3NmE1ZDFhNTVhMDljMTA1MWQ3Mjg0
+    ZWE5OWFhM2E0MTI5NzMwNTQzYjg4NzYyNzUyNWRhNDAxNTVjZDFlOWY4YzQ2
+    MmM5NTMzODllZTBkOGVlYmJhNmQyMGM3YWZhMTNmMjNmNzdhZGI=
   data.tar.gz: !binary |-
-    ZTNkMTI0NzU2ZTIzZjA0ODFkMDllZTM5MzUzNTIzYTcyY2VmM2FkMDYwOTE3
-    NmI0YzZhZmEzNzk4MjE0YWM3MjcyNjgxOTM2YTdjMjI1ZGJjZjAzM2JlMGQ3
-    YWNkODRlM2RiMTU1ZGE1ZTM2NjZkZjYzZDA4OWQwMTE2ZWE2ODk=
+    ZjNjM2IzNDdmNjcwYzlhMDc2OTZjMjdkZDE1OWJlOTI1MmM2ZDkxZmM0NTEy
+    ZjAxY2ZlNzE2YTc5ZDczOTE5ZDQ3MzkzYjlmNTE4M2YwMjQzMjgxODI3ZDM3
+    NjQyYWE1MWUwYWRmNDg4OWFhYjBlM2QxOTk0MWJhMTVlYzM4YTQ=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.3.2
+
+* Fixes [#46](https://github.com/gottfrois/dashing-rails/issues/46)
+
 ## 2.3.1
 
 * Patch redis child connection when using passenger

data/Gemfile.lock

@@ -1,53 +1,54 @@
 PATH
   remote: .
   specs:
-    dashing-rails (2.3.1)
+    dashing-rails (2.3.2)
       coffee-script (~> 2.2)
-      connection_pool (~> 1.1)
+      connection_pool (~> 2.0)
       jquery-rails (~> 3.0)
-      rails (~> 4.0)
+      rails (~> 4.1)
       redis (~> 3.0)
       rufus-scheduler (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.2)
-      actionpack (= 4.0.2)
+    actionmailer (4.1.1)
+      actionpack (= 4.1.1)
+      actionview (= 4.1.1)
       mail (~> 2.5.4)
-    actionpack (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.1)
+      actionview (= 4.1.1)
+      activesupport (= 4.1.1)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-    activerecord (4.0.2)
-      activemodel (= 4.0.2)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.2)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      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)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.1)
-    atomic (1.1.14)
-    better_errors (1.0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    better_errors (1.1.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
-    builder (3.1.4)
-    coderay (1.0.9)
+    builder (3.2.2)
+    coderay (1.1.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
-    connection_pool (1.2.0)
+    coffee-script-source (1.7.0)
+    connection_pool (2.0.0)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
@@ -55,23 +56,25 @@ GEM
       term-ansicolor
       thor
     diff-lcs (1.2.5)
+    docile (1.1.3)
     erubis (2.7.0)
-    execjs (2.0.2)
+    execjs (2.2.0)
     hike (1.2.3)
     i18n (0.6.9)
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.0)
       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)
     method_source (0.8.2)
     mime-types (1.25.1)
-    minitest (4.7.5)
-    multi_json (1.8.2)
-    polyglot (0.3.4)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    minitest (5.3.4)
+    multi_json (1.10.1)
+    polyglot (0.3.5)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     pry-rails (0.3.2)
@@ -79,29 +82,32 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.2)
-      actionmailer (= 4.0.2)
-      actionpack (= 4.0.2)
-      activerecord (= 4.0.2)
-      activesupport (= 4.0.2)
+    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)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.2)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.2)
-      actionpack (= 4.0.2)
-      activesupport (= 4.0.2)
+      railties (= 4.1.1)
+      sprockets-rails (~> 2.0)
+    railties (4.1.1)
+      actionpack (= 4.1.1)
+      activesupport (= 4.1.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
+    rake (10.3.2)
     redis (3.0.7)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rspec-rails (2.14.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.14.0)
@@ -109,32 +115,33 @@ GEM
       rspec-mocks (~> 2.14.0)
     rufus-scheduler (3.0.7)
       tzinfo
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.6)
-    sprockets (2.10.1)
+    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 (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.1.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.8)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    sqlite3 (1.3.9)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    thread_safe (0.3.3)
     tilt (1.4.1)
-    tins (0.13.0)
+    tins (1.3.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -4,6 +4,7 @@
 [![Coverage Status](https://coveralls.io/repos/gottfrois/dashing-rails/badge.png?branch=master)](https://coveralls.io/r/gottfrois/dashing-rails?branch=master)
 [![Build Status](https://travis-ci.org/gottfrois/dashing-rails.png?branch=master)](https://travis-ci.org/gottfrois/dashing-rails)
 [![Flattr Button](http://api.flattr.com/button/button-compact-static-100x17.png "Flattr This!")](https://flattr.com/thing/2339949/gottfroisdashing-rails-on-GitHub)
+[![Dependency Status](https://gemnasium.com/gottfrois/dashing-rails.svg)](https://gemnasium.com/gottfrois/dashing-rails)
 [![codementor-button](https://www.codementor.io/d/images/badge-dark.png "Codementor")](https://www.codementor.io/gottfrois?utm_campaign=profile&utm_source=button-gottfrois&utm_medium=dark)
 
 Dashing-rails is the Rails Engine version of [Dashing by Shopify](http://shopify.github.io/dashing/).

data/dashing.gemspec

@@ -17,12 +17,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rails',                      '~> 4.0'
+  spec.add_dependency 'rails',                      '~> 4.1'
   spec.add_dependency 'jquery-rails',               '~> 3.0'
   spec.add_dependency 'coffee-script',              '~> 2.2'
   spec.add_dependency 'rufus-scheduler',            '~> 3.0'
   spec.add_dependency 'redis',                      '~> 3.0'
-  spec.add_dependency 'connection_pool',            '~> 1.1'
+  spec.add_dependency 'connection_pool',            '~> 2.0'
 
   spec.add_development_dependency 'rspec-rails',    '~> 2.14'
   spec.add_development_dependency 'pry-rails',      '~> 0.3'

data/lib/dashing/configuration.rb

@@ -6,7 +6,7 @@ module Dashing
   class Configuration
 
     attr_reader   :redis
-    attr_accessor :redis_host, :redis_port, :redis_password, :redis_namespace
+    attr_accessor :redis_host, :redis_port, :redis_password, :redis_namespace, :redis_timeout
     attr_accessor :auth_token, :devise_allowed_models
     attr_accessor :jobs_path
     attr_accessor :default_dashboard, :dashboards_views_path, :dashboard_layout_path
@@ -22,6 +22,7 @@ module Dashing
       @redis_port             = '6379'
       @redis_password         = nil
       @redis_namespace        = 'dashing_events'
+      @redis_timeout          = 3
 
       # Authorization
       @auth_token             = nil
@@ -42,7 +43,7 @@ module Dashing
     end
 
     def redis
-      @redis ||= ::ConnectionPool::Wrapper.new(size: request_thread_count, timeout: 3) { new_redis_connection }
+      @redis ||= ::ConnectionPool::Wrapper.new(size: request_thread_count, timeout: redis_timeout) { new_redis_connection }
     end
 
     def new_redis_connection

data/lib/dashing/version.rb

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

data/lib/generators/dashing/widget_generator.rb

@@ -7,9 +7,9 @@ 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.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')
+        template 'widgets/new.html',    Dashing.config.widgets_views_path.call.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
 
     end

data/lib/generators/templates/initializer.rb

@@ -8,6 +8,7 @@ Dashing.configure do |config|
   # config.redis_host     = '127.0.0.1'
   # config.redis_port     = '6379'
   # config.redis_password = nil
+  # config.redis_timeout  = 3
 
   # Redis namespace when pushing new data.
   # config.redis_namespace = 'dashing_events'

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

@@ -8,6 +8,7 @@ Dashing.configure do |config|
   # config.redis_host     = '127.0.0.1'
   # config.redis_port     = '6379'
   # config.redis_password = nil
+  # config.redis_timeout  = 3
 
   # Redis namespace when pushing new data.
   # config.redis_namespace = 'dashing_events'

data/spec/lib/dashing/configuration_spec.rb

@@ -12,6 +12,7 @@ describe Dashing::Configuration do
   it { expect(instance.redis_host).to             eq('127.0.0.1') }
   it { expect(instance.redis_port).to             eq('6379') }
   it { expect(instance.redis_password).to         be_nil }
+  it { expect(instance.redis_timeout).to          eq(3) }
   it { expect(instance.redis_namespace).to        eq('dashing_events') }
 
   # Authorization

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dashing-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement