dashing-rails 2.3.1 → 2.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. checksums.yaml +8 -8
  2. data/CHANGELOG.md +4 -0
  3. data/Gemfile.lock +74 -67
  4. data/README.md +1 -0
  5. data/dashing.gemspec +2 -2
  6. data/lib/dashing/configuration.rb +3 -2
  7. data/lib/dashing/version.rb +1 -1
  8. data/lib/generators/dashing/widget_generator.rb +3 -3
  9. data/lib/generators/templates/initializer.rb +1 -0
  10. data/spec/dummy/config/initializers/dashing.rb +1 -0
  11. data/spec/lib/dashing/configuration_spec.rb +1 -0
  12. metadata +6 -6
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MjY4MGE0ZTJjN2U2YmQ0ZWQxNDJhN2NlM2M4OTE0YjhkM2VlMGE5Mw==
4
+ NTI4YTg4M2Y4MzQxZDI2NmFlM2EyNzA1MjE5OWNiYmM5NzI0YmUxMw==
5
5
  data.tar.gz: !binary |-
6
- NmI4OGZiODc3ZjQzMzE3YzdjZmNhMjc4YWYwNGQ5OGFiMjg1YzBhMw==
6
+ ZTQxMGUzZDE4ODRhNDMzMDgzMWFmNzVlMTIxMTJhY2U3NzQyYWY0Mw==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- ZTQ1YjNjOGJhY2JjM2FiZjUwN2VkODQzODJmOGUxMDZiMDMxNTEwNDBmMTlj
10
- OTY1MDkxMGFkNGNiNGUwNDUyMWY0ZmE3NmIzMWQwNWJlMjliZmYxYmJiNGFj
11
- M2YwMzU5MDcyMGY3MjI2Y2ZiODRlNWM4ZTgxNjM5NjI3MzU2NmE=
9
+ NzczNWY0NzIwYzhiZWQ3YzA0Njk0MTk3NmE1ZDFhNTVhMDljMTA1MWQ3Mjg0
10
+ ZWE5OWFhM2E0MTI5NzMwNTQzYjg4NzYyNzUyNWRhNDAxNTVjZDFlOWY4YzQ2
11
+ MmM5NTMzODllZTBkOGVlYmJhNmQyMGM3YWZhMTNmMjNmNzdhZGI=
12
12
  data.tar.gz: !binary |-
13
- ZTNkMTI0NzU2ZTIzZjA0ODFkMDllZTM5MzUzNTIzYTcyY2VmM2FkMDYwOTE3
14
- NmI0YzZhZmEzNzk4MjE0YWM3MjcyNjgxOTM2YTdjMjI1ZGJjZjAzM2JlMGQ3
15
- YWNkODRlM2RiMTU1ZGE1ZTM2NjZkZjYzZDA4OWQwMTE2ZWE2ODk=
13
+ ZjNjM2IzNDdmNjcwYzlhMDc2OTZjMjdkZDE1OWJlOTI1MmM2ZDkxZmM0NTEy
14
+ ZjAxY2ZlNzE2YTc5ZDczOTE5ZDQ3MzkzYjlmNTE4M2YwMjQzMjgxODI3ZDM3
15
+ NjQyYWE1MWUwYWRmNDg4OWFhYjBlM2QxOTk0MWJhMTVlYzM4YTQ=
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ ## 2.3.2
2
+
3
+ * Fixes [#46](https://github.com/gottfrois/dashing-rails/issues/46)
4
+
1
5
  ## 2.3.1
2
6
 
3
7
  * Patch redis child connection when using passenger
data/Gemfile.lock CHANGED
@@ -1,53 +1,54 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- dashing-rails (2.3.1)
4
+ dashing-rails (2.3.2)
5
5
  coffee-script (~> 2.2)
6
- connection_pool (~> 1.1)
6
+ connection_pool (~> 2.0)
7
7
  jquery-rails (~> 3.0)
8
- rails (~> 4.0)
8
+ rails (~> 4.1)
9
9
  redis (~> 3.0)
10
10
  rufus-scheduler (~> 3.0)
11
11
 
12
12
  GEM
13
13
  remote: https://rubygems.org/
14
14
  specs:
15
- actionmailer (4.0.2)
16
- actionpack (= 4.0.2)
15
+ actionmailer (4.1.1)
16
+ actionpack (= 4.1.1)
17
+ actionview (= 4.1.1)
17
18
  mail (~> 2.5.4)
18
- actionpack (4.0.2)
19
- activesupport (= 4.0.2)
20
- builder (~> 3.1.0)
21
- erubis (~> 2.7.0)
19
+ actionpack (4.1.1)
20
+ actionview (= 4.1.1)
21
+ activesupport (= 4.1.1)
22
22
  rack (~> 1.5.2)
23
23
  rack-test (~> 0.6.2)
24
- activemodel (4.0.2)
25
- activesupport (= 4.0.2)
26
- builder (~> 3.1.0)
27
- activerecord (4.0.2)
28
- activemodel (= 4.0.2)
29
- activerecord-deprecated_finders (~> 1.0.2)
30
- activesupport (= 4.0.2)
31
- arel (~> 4.0.0)
32
- activerecord-deprecated_finders (1.0.3)
33
- activesupport (4.0.2)
34
- i18n (~> 0.6, >= 0.6.4)
35
- minitest (~> 4.2)
36
- multi_json (~> 1.3)
24
+ actionview (4.1.1)
25
+ activesupport (= 4.1.1)
26
+ builder (~> 3.1)
27
+ erubis (~> 2.7.0)
28
+ activemodel (4.1.1)
29
+ activesupport (= 4.1.1)
30
+ builder (~> 3.1)
31
+ activerecord (4.1.1)
32
+ activemodel (= 4.1.1)
33
+ activesupport (= 4.1.1)
34
+ arel (~> 5.0.0)
35
+ activesupport (4.1.1)
36
+ i18n (~> 0.6, >= 0.6.9)
37
+ json (~> 1.7, >= 1.7.7)
38
+ minitest (~> 5.1)
37
39
  thread_safe (~> 0.1)
38
- tzinfo (~> 0.3.37)
39
- arel (4.0.1)
40
- atomic (1.1.14)
41
- better_errors (1.0.1)
40
+ tzinfo (~> 1.1)
41
+ arel (5.0.1.20140414130214)
42
+ better_errors (1.1.0)
42
43
  coderay (>= 1.0.0)
43
44
  erubis (>= 2.6.6)
44
- builder (3.1.4)
45
- coderay (1.0.9)
45
+ builder (3.2.2)
46
+ coderay (1.1.0)
46
47
  coffee-script (2.2.0)
47
48
  coffee-script-source
48
49
  execjs
49
- coffee-script-source (1.6.3)
50
- connection_pool (1.2.0)
50
+ coffee-script-source (1.7.0)
51
+ connection_pool (2.0.0)
51
52
  coveralls (0.7.0)
52
53
  multi_json (~> 1.3)
53
54
  rest-client
@@ -55,23 +56,25 @@ GEM
55
56
  term-ansicolor
56
57
  thor
57
58
  diff-lcs (1.2.5)
59
+ docile (1.1.3)
58
60
  erubis (2.7.0)
59
- execjs (2.0.2)
61
+ execjs (2.2.0)
60
62
  hike (1.2.3)
61
63
  i18n (0.6.9)
62
- jquery-rails (3.0.4)
64
+ jquery-rails (3.1.0)
63
65
  railties (>= 3.0, < 5.0)
64
66
  thor (>= 0.14, < 2.0)
67
+ json (1.8.1)
65
68
  mail (2.5.4)
66
69
  mime-types (~> 1.16)
67
70
  treetop (~> 1.4.8)
68
71
  method_source (0.8.2)
69
72
  mime-types (1.25.1)
70
- minitest (4.7.5)
71
- multi_json (1.8.2)
72
- polyglot (0.3.4)
73
- pry (0.9.12.2)
74
- coderay (~> 1.0.5)
73
+ minitest (5.3.4)
74
+ multi_json (1.10.1)
75
+ polyglot (0.3.5)
76
+ pry (0.9.12.6)
77
+ coderay (~> 1.0)
75
78
  method_source (~> 0.8)
76
79
  slop (~> 3.4)
77
80
  pry-rails (0.3.2)
@@ -79,29 +82,32 @@ GEM
79
82
  rack (1.5.2)
80
83
  rack-test (0.6.2)
81
84
  rack (>= 1.0)
82
- rails (4.0.2)
83
- actionmailer (= 4.0.2)
84
- actionpack (= 4.0.2)
85
- activerecord (= 4.0.2)
86
- activesupport (= 4.0.2)
85
+ rails (4.1.1)
86
+ actionmailer (= 4.1.1)
87
+ actionpack (= 4.1.1)
88
+ actionview (= 4.1.1)
89
+ activemodel (= 4.1.1)
90
+ activerecord (= 4.1.1)
91
+ activesupport (= 4.1.1)
87
92
  bundler (>= 1.3.0, < 2.0)
88
- railties (= 4.0.2)
89
- sprockets-rails (~> 2.0.0)
90
- railties (4.0.2)
91
- actionpack (= 4.0.2)
92
- activesupport (= 4.0.2)
93
+ railties (= 4.1.1)
94
+ sprockets-rails (~> 2.0)
95
+ railties (4.1.1)
96
+ actionpack (= 4.1.1)
97
+ activesupport (= 4.1.1)
93
98
  rake (>= 0.8.7)
94
99
  thor (>= 0.18.1, < 2.0)
95
- rake (10.1.0)
100
+ rake (10.3.2)
96
101
  redis (3.0.7)
97
102
  rest-client (1.6.7)
98
103
  mime-types (>= 1.16)
99
- rspec-core (2.14.7)
100
- rspec-expectations (2.14.4)
104
+ rspec-core (2.14.8)
105
+ rspec-expectations (2.14.5)
101
106
  diff-lcs (>= 1.1.3, < 2.0)
102
- rspec-mocks (2.14.4)
103
- rspec-rails (2.14.0)
107
+ rspec-mocks (2.14.6)
108
+ rspec-rails (2.14.2)
104
109
  actionpack (>= 3.0)
110
+ activemodel (>= 3.0)
105
111
  activesupport (>= 3.0)
106
112
  railties (>= 3.0)
107
113
  rspec-core (~> 2.14.0)
@@ -109,32 +115,33 @@ GEM
109
115
  rspec-mocks (~> 2.14.0)
110
116
  rufus-scheduler (3.0.7)
111
117
  tzinfo
112
- simplecov (0.7.1)
113
- multi_json (~> 1.0)
114
- simplecov-html (~> 0.7.1)
115
- simplecov-html (0.7.1)
116
- slop (3.4.6)
117
- sprockets (2.10.1)
118
+ simplecov (0.8.2)
119
+ docile (~> 1.1.0)
120
+ multi_json
121
+ simplecov-html (~> 0.8.0)
122
+ simplecov-html (0.8.0)
123
+ slop (3.5.0)
124
+ sprockets (2.12.1)
118
125
  hike (~> 1.2)
119
126
  multi_json (~> 1.0)
120
127
  rack (~> 1.0)
121
128
  tilt (~> 1.1, != 1.3.0)
122
- sprockets-rails (2.0.1)
129
+ sprockets-rails (2.1.3)
123
130
  actionpack (>= 3.0)
124
131
  activesupport (>= 3.0)
125
132
  sprockets (~> 2.8)
126
- sqlite3 (1.3.8)
127
- term-ansicolor (1.2.2)
128
- tins (~> 0.8)
129
- thor (0.18.1)
130
- thread_safe (0.1.3)
131
- atomic
133
+ sqlite3 (1.3.9)
134
+ term-ansicolor (1.3.0)
135
+ tins (~> 1.0)
136
+ thor (0.19.1)
137
+ thread_safe (0.3.3)
132
138
  tilt (1.4.1)
133
- tins (0.13.0)
139
+ tins (1.3.0)
134
140
  treetop (1.4.15)
135
141
  polyglot
136
142
  polyglot (>= 0.3.1)
137
- tzinfo (0.3.38)
143
+ tzinfo (1.1.0)
144
+ thread_safe (~> 0.1)
138
145
 
139
146
  PLATFORMS
140
147
  ruby
data/README.md CHANGED
@@ -4,6 +4,7 @@
4
4
  [![Coverage Status](https://coveralls.io/repos/gottfrois/dashing-rails/badge.png?branch=master)](https://coveralls.io/r/gottfrois/dashing-rails?branch=master)
5
5
  [![Build Status](https://travis-ci.org/gottfrois/dashing-rails.png?branch=master)](https://travis-ci.org/gottfrois/dashing-rails)
6
6
  [![Flattr Button](http://api.flattr.com/button/button-compact-static-100x17.png "Flattr This!")](https://flattr.com/thing/2339949/gottfroisdashing-rails-on-GitHub)
7
+ [![Dependency Status](https://gemnasium.com/gottfrois/dashing-rails.svg)](https://gemnasium.com/gottfrois/dashing-rails)
7
8
  [![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)
8
9
 
9
10
  Dashing-rails is the Rails Engine version of [Dashing by Shopify](http://shopify.github.io/dashing/).
data/dashing.gemspec CHANGED
@@ -17,12 +17,12 @@ Gem::Specification.new do |spec|
17
17
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
18
18
  spec.require_paths = ["lib"]
19
19
 
20
- spec.add_dependency 'rails', '~> 4.0'
20
+ spec.add_dependency 'rails', '~> 4.1'
21
21
  spec.add_dependency 'jquery-rails', '~> 3.0'
22
22
  spec.add_dependency 'coffee-script', '~> 2.2'
23
23
  spec.add_dependency 'rufus-scheduler', '~> 3.0'
24
24
  spec.add_dependency 'redis', '~> 3.0'
25
- spec.add_dependency 'connection_pool', '~> 1.1'
25
+ spec.add_dependency 'connection_pool', '~> 2.0'
26
26
 
27
27
  spec.add_development_dependency 'rspec-rails', '~> 2.14'
28
28
  spec.add_development_dependency 'pry-rails', '~> 0.3'
data/lib/dashing/configuration.rb CHANGED
@@ -6,7 +6,7 @@ module Dashing
6
6
  class Configuration
7
7
 
8
8
  attr_reader :redis
9
- attr_accessor :redis_host, :redis_port, :redis_password, :redis_namespace
9
+ attr_accessor :redis_host, :redis_port, :redis_password, :redis_namespace, :redis_timeout
10
10
  attr_accessor :auth_token, :devise_allowed_models
11
11
  attr_accessor :jobs_path
12
12
  attr_accessor :default_dashboard, :dashboards_views_path, :dashboard_layout_path
@@ -22,6 +22,7 @@ module Dashing
22
22
  @redis_port = '6379'
23
23
  @redis_password = nil
24
24
  @redis_namespace = 'dashing_events'
25
+ @redis_timeout = 3
25
26
 
26
27
  # Authorization
27
28
  @auth_token = nil
@@ -42,7 +43,7 @@ module Dashing
42
43
  end
43
44
 
44
45
  def redis
45
- @redis ||= ::ConnectionPool::Wrapper.new(size: request_thread_count, timeout: 3) { new_redis_connection }
46
+ @redis ||= ::ConnectionPool::Wrapper.new(size: request_thread_count, timeout: redis_timeout) { new_redis_connection }
46
47
  end
47
48
 
48
49
  def new_redis_connection
data/lib/dashing/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Dashing
2
- VERSION = '2.3.1'
2
+ VERSION = '2.3.2'
3
3
  end
data/lib/generators/dashing/widget_generator.rb CHANGED
@@ -7,9 +7,9 @@ module Dashing
7
7
  desc 'Creates a new Dashing widget.'
8
8
 
9
9
  def widget
10
- template 'widgets/new.html', Dashing.config.widgets_views_path.call.join(file_name, '.html')
11
- template 'widgets/new.scss', Dashing.config.widgets_css_path.join('widgets', file_name, '.scss')
12
- template 'widgets/new.coffee', Dashing.config.widgets_js_path.join('widgets', file_name, '.coffee')
10
+ template 'widgets/new.html', Dashing.config.widgets_views_path.call.join("#{file_name}.html")
11
+ template 'widgets/new.scss', Dashing.config.widgets_css_path.join('widgets', "#{file_name}.scss")
12
+ template 'widgets/new.coffee', Dashing.config.widgets_js_path.join('widgets', "#{file_name}.coffee")
13
13
  end
14
14
 
15
15
  end
data/lib/generators/templates/initializer.rb CHANGED
@@ -8,6 +8,7 @@ Dashing.configure do |config|
8
8
  # config.redis_host = '127.0.0.1'
9
9
  # config.redis_port = '6379'
10
10
  # config.redis_password = nil
11
+ # config.redis_timeout = 3
11
12
 
12
13
  # Redis namespace when pushing new data.
13
14
  # config.redis_namespace = 'dashing_events'
data/spec/dummy/config/initializers/dashing.rb CHANGED
@@ -8,6 +8,7 @@ Dashing.configure do |config|
8
8
  # config.redis_host = '127.0.0.1'
9
9
  # config.redis_port = '6379'
10
10
  # config.redis_password = nil
11
+ # config.redis_timeout = 3
11
12
 
12
13
  # Redis namespace when pushing new data.
13
14
  # config.redis_namespace = 'dashing_events'
data/spec/lib/dashing/configuration_spec.rb CHANGED
@@ -12,6 +12,7 @@ describe Dashing::Configuration do
12
12
  it { expect(instance.redis_host).to eq('127.0.0.1') }
13
13
  it { expect(instance.redis_port).to eq('6379') }
14
14
  it { expect(instance.redis_password).to be_nil }
15
+ it { expect(instance.redis_timeout).to eq(3) }
15
16
  it { expect(instance.redis_namespace).to eq('dashing_events') }
16
17
 
17
18
  # Authorization
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dashing-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.1
4
+ version: 2.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pierre-Louis Gottfrois
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-11 00:00:00.000000000 Z
11
+ date: 2014-06-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - ~>
18
18
  - !ruby/object:Gem::Version
19
- version: '4.0'
19
+ version: '4.1'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ~>
25
25
  - !ruby/object:Gem::Version
26
- version: '4.0'
26
+ version: '4.1'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: jquery-rails
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
86
86
  requirements:
87
87
  - - ~>
88
88
  - !ruby/object:Gem::Version
89
- version: '1.1'
89
+ version: '2.0'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - ~>
95
95
  - !ruby/object:Gem::Version
96
- version: '1.1'
96
+ version: '2.0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rspec-rails
99
99
  requirement: !ruby/object:Gem::Requirement