rorschart 0.7.2 → 0.8.0

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 (6) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/app/assets/javascripts/rorschart.js +40 -11
  4. data/lib/rorschart/helper.rb +2 -2
  5. data/lib/rorschart/version.rb +1 -1
  6. metadata +16 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 207eb5f790581640bb554a961024807eeb918303
4
- data.tar.gz: dbdce40762ccce890b98f80d6d1f34d69d9efebc
3
+ metadata.gz: f6a2558e7dd34bd3e76bb9e5c5c4dfc80ffacf9e
4
+ data.tar.gz: 8bca368a3db203c73ba44763cf973bb60ee22276
5
5
  SHA512:
6
- metadata.gz: d2a3b6948b0e7f94186fa15c54d66a9dcbdf7a5803951b60ae937a39d73c6046c68c5684e1ece067b41900581d82a447d9e941ac09c8d8956d223b70478f0cac
7
- data.tar.gz: 55da3d85a93e7987a55a76b194fa50d48d37cd86263e4fcb1581b4b5c89b2422ac24fd42bdd0fdfcaf27fc205236c609dfb0a55703d757657502f36bad19db23
6
+ metadata.gz: 605bf5e4478c349e5902af090fb50823b4e9c5122c056c139e46bf132582f93857a3094ecacd7b6bf8b27530e9a28c85099a73e03cdcaa406e9fba77112a219d
7
+ data.tar.gz: eefa5361b9c557f37e79372084f46442d96677181af5ddd9951d873ab89bb00c6a4e52821ec3b5dd090e3ce18a41cdb1583ea1790405c475b1ab486e18ae0a69
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rorschart (0.7.1)
4
+ rorschart (0.8.0)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
data/app/assets/javascripts/rorschart.js CHANGED
@@ -4,7 +4,7 @@
4
4
  (function () {
5
5
  'use strict';
6
6
 
7
- var rorschart, resize;
7
+ var Rorschart, resize, refresh;
8
8
 
9
9
  if (window.hasOwnProperty('google')) {
10
10
  google.load('visualization', '1.0', {'packages': ['corechart', 'table']});
@@ -56,7 +56,7 @@
56
56
  return dataTable;
57
57
  }
58
58
 
59
- function drawChart(ChartClass, element, dataSource, options) {
59
+ function drawChart(chart, chartClass, element, dataSource, options) {
60
60
 
61
61
  var dataTable, type;
62
62
 
@@ -78,10 +78,10 @@
78
78
  throw err;
79
79
  }
80
80
 
81
- var chart = new ChartClass(element);
81
+ chart.chart = new chartClass(element);
82
82
 
83
83
  resize(function () {
84
- chart.draw(dataTable, options);
84
+ chart.chart.draw(dataTable, options);
85
85
  });
86
86
  }
87
87
 
@@ -106,17 +106,46 @@
106
106
  });
107
107
  }
108
108
 
109
- rorschart = function (chartClass, element, dataSource, options) {
110
- element = getElement(element);
111
- if (typeof dataSource === "string") {
112
- retrieveRemoteData(element, dataSource, function (data) {
113
- google.setOnLoadCallback(drawChart(chartClass, element, data, options));
109
+ refresh = function (chart, klass_name, hideRefreshMessage) {
110
+
111
+ if (!hideRefreshMessage) {
112
+ setText(chart.element, 'Loading Chart data...');
113
+ }
114
+
115
+ chart.chartClass = klass_name || chart.chartClass
116
+
117
+ if (typeof chart.dataSource === "string") {
118
+ retrieveRemoteData(chart.element, chart.dataSource, function (data) {
119
+ google.setOnLoadCallback(drawChart(chart, chart.chartClass, chart.element, data, chart.options));
114
120
  });
115
121
  } else {
116
- google.setOnLoadCallback(drawChart(chartClass, element, dataSource, options));
122
+ google.setOnLoadCallback(drawChart(chart, chart.chartClass, chart.element, chart.dataSource, chart.options));
117
123
  }
124
+ }
125
+
126
+ function setElement(chart, chartClass, element, dataSource, options) {
127
+
128
+ if (typeof element === "string") {
129
+ element = document.getElementById(element);
130
+ }
131
+
132
+ chart.chartClass = chartClass
133
+ chart.element = element;
134
+ chart.options = options || {};
135
+ chart.dataSource = dataSource;
136
+ Rorschart.charts[element.id] = chart;
137
+ refresh(chart);
138
+ }
139
+
140
+ Rorschart = {
141
+ GoogleChart: function (chartClass, element, dataSource, options) {
142
+ setElement(this, chartClass, element, dataSource, options);
143
+ },
144
+ charts: {}
118
145
  };
119
146
 
120
- window.Rorschart = rorschart;
147
+
148
+ window.Rorschart = Rorschart;
149
+ window.Rorschart.refresh = refresh;
121
150
 
122
151
  }());
data/lib/rorschart/helper.rb CHANGED
@@ -120,13 +120,13 @@ module Rorschart
120
120
 
121
121
  html = <<HTML
122
122
  <div id="#{ERB::Util.html_escape(element_id)}" style="height: #{ERB::Util.html_escape(height)}; width:100%;">
123
- Loading Chart data...
123
+ Rorchart is not initialized.
124
124
  </div>
125
125
  HTML
126
126
 
127
127
  js = <<JS
128
128
  <script type="text/javascript">
129
- Rorschart(google.visualization.#{klass_name}, #{element_id.to_json}, #{dataSource.to_json}, #{options.to_json});
129
+ new Rorschart.GoogleChart(google.visualization.#{klass_name}, #{element_id.to_json}, #{dataSource.to_json}, #{options.to_json});
130
130
  </script>
131
131
  JS
132
132
 
data/lib/rorschart/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Rorschart
2
- VERSION = "0.7.2"
2
+ VERSION = "0.8.0"
3
3
  end
metadata CHANGED
@@ -1,83 +1,83 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rorschart
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.2
4
+ version: 0.8.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eric Pantera
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-15 00:00:00.000000000 Z
11
+ date: 2014-10-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: '1.3'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '1.3'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: minitest
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: activerecord
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '>='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - '>='
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: sqlite3
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '>='
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - '>='
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  description: Interprates Rails data structures for you to generate beautiful Google
@@ -88,7 +88,7 @@ executables: []
88
88
  extensions: []
89
89
  extra_rdoc_files: []
90
90
  files:
91
- - .gitignore
91
+ - ".gitignore"
92
92
  - Gemfile
93
93
  - Gemfile.lock
94
94
  - LICENSE
@@ -114,17 +114,17 @@ require_paths:
114
114
  - lib
115
115
  required_ruby_version: !ruby/object:Gem::Requirement
116
116
  requirements:
117
- - - '>='
117
+ - - ">="
118
118
  - !ruby/object:Gem::Version
119
119
  version: '0'
120
120
  required_rubygems_version: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - '>='
122
+ - - ">="
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  requirements: []
126
126
  rubyforge_project:
127
- rubygems_version: 2.0.14
127
+ rubygems_version: 2.2.2
128
128
  signing_key:
129
129
  specification_version: 4
130
130
  summary: Beautiful Google Charts from Rails data structures