swagchart 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0b90ec9a585d353f053ee64cf5c3e7cfa4f11fa
-  data.tar.gz: 9d6698e336db48e4f0bdd24664331c203b8f7b94
+  metadata.gz: 361389686191b4ccf09b4bee58c0b4a36425ffad
+  data.tar.gz: 7ce73f89b87c6523c36c19eb8a0644108c9774d1
 SHA512:
-  metadata.gz: f4f9bf2efd57e5d1b14249918b8580982f23754890f07aaec7b958b82720bad7e31f1777ca73ba2e9df1197da870740e0244d2af9e84dd6756b518fb729950d5
-  data.tar.gz: b6517a1a50e024544766edb7af8b893f53555dc2bcc00c133bae3e244da98496c3e6f8c46dd7ba77c4b0baba960cc4842a6428af72c85ddd5daf30375d7c9b3f
+  metadata.gz: 16ea22dbb261db396b6471ac711a73c719dd7fa68c10331e8dc95e0803391d0a14e18eb72ba7e3504568c2af3fb38824417adfa2978e20a82daa83c7a916d1ba
+  data.tar.gz: 60d37cea617ff2eba35961424dbb7c95e46aa552a8077ea4c186544f3df429d65daab374a8348ea58efb7b136f6d420eedafd6e35c3825779c1954d35c6dd747

data/README.md

@@ -14,61 +14,23 @@ Works with Rails, Sinatra and most browsers (including IE 6).
 
 ## Usage examples
 
-Line chart
-
-```erb
-<%= chart :line_chart, User.group_by_day(:created_at).count %>
-```
-
-Pie chart
-
-```erb
-<%= chart 'PieChart', Goal.group(:name).count %>
-```
-
-### Data
-
-Pass data as a Array, Hash or "DataTable"
-
-```erb
-<%= chart :pie_chart, [["Football", 10], ["Basketball", 5]] %>
-```
-
-```erb
-<%= chart :pie_chart, {"Football" => 10, "Basketball" => 5} %>
-```
-
-```erb
-<%= chart :pie_chart, [["Sport", "Popularity"], ["Football", 10], ["Basketball", 5]] %>
-```
-
-Multiple series just work automatically
-
-```erb
-<%= chart :line_chart, [[1,2,4],[2,3,8],[3,4,16],[4,5,32]], columns: ['x', 'Series 1', 'Series 2'] %>
-```
-
-No need to define columns if you don't want to
-
-```erb
-<%= chart :line_chart, [[1,2,4],[2,3,8],[3,4,16],[4,5,32]] %>
-```
-
-:sparkles: Now brand new: Instead of actual data you can just provide an URL from where the data will be retrieved via an Ajax Get request
-
-```erb
-<%= chart :line_chart, '/api/line-chart-data' %>
-```
-
-If you want to use times or dates, do so. They have to be a time or date object!
-
-
-```erb
-<%= line_chart({20.day.ago => 5, Time.at(1368174456) => 4, Time.parse("2013-05-07 00:00:00 UTC") => 7, Date.new(1999,12,24) => 9}) %>
+```ruby
+chart :line_chart, [{y: 23, x: 42}, {y: 666, x: 999}]
+chart :line_chart, [[23, 42], [666, 999]], columns: ['x', 'y']
+chart :line_chart, [[23, 42], [666, 999]], columns: ['x', 'y'], style: 'width:100%;'
+chart :line_chart, [[1,2,4],[2,3,8],[3,4,16],[4,5,32]]
+chart :line_chart, User.group_by_day(:created_at).count
+chart :bar_chart, [['x', 'y'],[23, 42], [666, 999]]
+chart :pie_chart, Goal.group(:name).count
+chart :geo_map, [{'Country'=>'Germany', 'Population'=>8600000}, {'Country'=>'France', 'Population'=>6500000}]
+chart :line_chart,
+      [[0, nil, nil, 5], [1, 'foo', 'Foobar', 2], [2, nil, nil, 6], [3, 'bar', 'Barfoo', 3], [4, nil, nil, 8]],
+      columns: ['y', {type: 'string', role: 'annotation'}, {type: 'string', role: 'annotationText'}, 'foo'],
+      options: {annotations: {style: 'line'}}
+chart :pie_chart, '/api/pie-chart-data'
 
 ```
 
-
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/swagchart/helper.rb

@@ -19,7 +19,7 @@ module Swagchart
       data = data.to_a if data.is_a?(Hash)
       if opts[:columns]
         opts[:columns] = opts[:columns].split(',').map(&:strip) if opts[:columns].is_a?(String)
-        data.unshift opts[:columns]
+        data.unshift opts[:columns] unless data.is_a?(String)
       end
       chart_id = ERB::Util.html_escape(opts.delete(:chart_id) || "chart_#{SecureRandom.uuid}")
       style = 'height:320px;' # dirty hack right here .. you can override that with your style though
@@ -40,16 +40,14 @@ module Swagchart
       str.split('_').each(&:capitalize!).join('')
     end
 
-    def autocast_data_template(opts = {})
-      js = ''
-      js << 'if(Array.isArray(data) && !Array.isArray(data[0])){'
-      js << 'var keys=[], vals=[], row=[]; for(var k in data[0]){keys.push(k)}; for(var d in data){row=[]; for(var k in keys){row.push(data[d][keys[k]])}; vals.push(row)}; vals.unshift(keys); data = vals;'
-      js << '}'
-      js << 'else{data.unshift(Array(data[0].length).join(".").split("."));}' unless opts[:columns]
-      js << "for(var i=0;i<data.length;i++){for(var j=0;j<data[i].length;j++){if(typeof data[i][j] === 'string'){"
-      js << 'var pd = Date.parse(data[i][j]); if(!isNaN(pd)){data[i][j] = new Date(pd)};'
-      js << '}}};console.log(data);'
-      js
+    def jsapi_includes_template
+      html =  "<script type='text/javascript'>"
+      html << "google.load('visualization', '1');"
+      html << "google.load('visualization', '1', {packages: ["
+      html << "'corechart', 'geochart', 'map', 'treemap', 'annotatedtimeline','sankey', 'orgchart', 'calendar', 'gauge', 'timeline'"
+      html << ']});'
+      html << '</script>'
+      html
     end
 
     def chart_template(opts = {})
@@ -82,14 +80,17 @@ module Swagchart
       js
     end
 
-    def jsapi_includes_template
-      html =  "<script type='text/javascript'>"
-      html << "google.load('visualization', '1');"
-      html << "google.load('visualization', '1', {packages: ["
-      html << "'corechart', 'geochart', 'map', 'treemap', 'annotatedtimeline','sankey', 'orgchart', 'calendar', 'gauge', 'timeline'"
-      html << ']});'
-      html << '</script>'
-      html
+    def autocast_data_template(opts = {})
+      js = ''
+      js << 'if(Array.isArray(data) && !Array.isArray(data[0])){'
+      js << 'var keys=[], vals=[], row=[]; for(var k in data[0]){keys.push(k)}; for(var d in data){row=[]; for(var k in keys){row.push(data[d][keys[k]])}; vals.push(row)}; vals.unshift(keys); data = vals;'
+      js << '}'
+      js << 'else{data.unshift(Array(data[0].length).join(".").split("."));}' unless opts[:columns]
+      js << "data.unshift(#{opts[:columns].to_json});" if opts[:columns]
+      js << "for(var i=0;i<data.length;i++){for(var j=0;j<data[i].length;j++){if(typeof data[i][j] === 'string'){"
+      js << 'var pd = Date.parse(data[i][j]); if(!isNaN(pd)){data[i][j] = new Date(pd)};'
+      js << '}}};'
+      js
     end
   end
 end

data/lib/swagchart/version.rb

@@ -1,3 +1,3 @@
 module Swagchart
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagchart
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - pachacamac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - lib/swagchart/rails.rb
 - lib/swagchart/sinatra.rb
 - lib/swagchart/version.rb
+- swagchart-1.2.0.gem
 - swagchart.gemspec
 - test/swagchart_test.rb
 - test/test_helper.rb