chartkick 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4ad83e0908f7d19f80e1777c9b06b1bc9bb4e5f
-  data.tar.gz: eae7fc7ec9cb6ae8e1a207ae11fe5e728953cf95
+  metadata.gz: d0dba34a7302ee5f73cba7e55be0014c639431d6
+  data.tar.gz: f72f4d80febb09fd928abdf75c3967bbdeeb6d21
 SHA512:
-  metadata.gz: 1703d7ff64748ebd96aa952e9804f40b7abfeb719a18d4730529612d5fe17513ee95a1d6cb8da5b54f8148c2b0ccdb135c28e5ed2f095ddcb081a3f310390425
-  data.tar.gz: c6e81a464f25d378e64bb8976681e51a2d5b5cdb97eff53379c09874b24d02a0d8b0afa30ea80bbe4f7e78624c37db79c62c7e8b395d085b0d9193e8658768c6
+  metadata.gz: 73351da6753359cb7af17028059d3077788c2f8a6912f79f96243923a58bf0ab64911004661352efaceff634ceff5742eafa98b27a45d7a9e97365933d8b8ab2
+  data.tar.gz: 4cadd3bf93432e26968faf47c822c228ed184e228324cffbaa8b7e4188ec5140647ffd9d87e84f67bf3b2c56376bab7ed0548d7ce076e4954fb2773d13f54e13

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.5
+
+- Added support for multiple groups
+- Added `html` option
+
 ## 1.2.4
 
 - Added global options

data/README.md

@@ -6,9 +6,11 @@ Create beautiful Javascript charts with one line of Ruby. No more fighting with
 
 Works with Rails, Sinatra and most browsers (including IE 6)
 
-:two_hearts: A perfect companion to [groupdate](https://github.com/ankane/groupdate) and [active_median](https://github.com/ankane/active_median)
+:two_hearts: A perfect companion to [groupdate](https://github.com/ankane/groupdate), [hightop](https://github.com/ankane/hightop), and [active_median](https://github.com/ankane/active_median)
 
-## Usage
+:speech_balloon: Get [handcrafted updates](http://chartkick.us7.list-manage.com/subscribe?u=952c861f99eb43084e0a49f98&id=6ea6541e8e&group[0][1]=true) for new features
+
+## Charts
 
 Line chart
 
@@ -46,7 +48,7 @@ Geo chart
 <%= geo_chart Medal.group(:country).count %>
 ```
 
-Multiple series (except pie chart)
+Multiple series
 
 ```erb
 <%= line_chart @goals.map{|goal|
@@ -54,6 +56,12 @@ Multiple series (except pie chart)
 } %>
 ```
 
+or
+
+```erb
+<%= line_chart Feat.group(:goal_id).group_by_week(:created_at).count %>
+```
+
 ### Say Goodbye To Timeouts
 
 Make your pages load super fast and stop worrying about timeouts.  Give each chart its own endpoint.
@@ -74,6 +82,12 @@ end
 
 **Note:** This feature requires [jQuery](http://jquery.com/) or [Zepto](http://zeptojs.com/) at the moment.
 
+For multiple series, add `chart_json` at the end.
+
+```ruby
+render json: Task.group(:goal_id).group_by_day(:completed_at).count.chart_json
+```
+
 ### Options
 
 Id and height
@@ -82,12 +96,14 @@ Id and height
 <%= line_chart data, id: "users-chart", height: "500px" %>
 ```
 
-Min and max values (except pie chart)
+Min and max values
 
 ```erb
 <%= line_chart data, min: 1000, max: 5000 %>
 ```
 
+`min` defaults to 0 for charts with non-negative values. Use `nil` to let the charting library decide.
+
 Colors
 
 ```erb
@@ -114,11 +130,29 @@ You can pass options directly to the charting library with:
 
 See the documentation for [Google Charts](https://developers.google.com/chart/interactive/docs/gallery) and [Highcharts](http://api.highcharts.com/highcharts) for more info.
 
-You can also pass a content_for option, which will put the javascript in a content block.  This is great for including all of your javascript at the bottom of the page.
+### Global Options
+
+To set options for all of your charts, create an initializer `config/initializers/chartkick.rb` with:
 
-```erb
-<%= line_chart data, content_for: :charts_js %>
+```ruby
+Chartkick.options = {
+  height: "400px",
+  colors: ["pink", "#999"]
+}
 ```
+
+Customize the html
+
+```ruby
+Chartkick.options[:html] = '<div id="%{id}" style="height: %{height};">Loading...</div>'
+```
+
+You capture the javascript in a content block with:
+
+```ruby
+Chartkick.options[:content_for] = :charts_js
+```
+
 Then, in your layout:
 
 ```erb
@@ -126,17 +160,7 @@ Then, in your layout:
 <%= yield_content :charts_js %> <%# Padrino %>
 ```
 
-### Global Options
-
-To set options for all of your charts, create an initializer with:
-
-```ruby
-Chartkick.options = {
-  height: "400px",
-  colors: ["pink", "#999"],
-  content_for: :charts_js
-}
-```
+This is great for including all of your javascript at the bottom of the page.
 
 ### Data
 

data/app/assets/javascripts/chartkick.js

@@ -397,7 +397,7 @@
     };
     adapters.push(HighchartsAdapter);
   }
-  if ("google" in window) {
+  if (window.google && window.google.setOnLoadCallback) {
     var GoogleChartsAdapter = new function () {
       var google = window.google;
 

data/lib/chartkick.rb

@@ -10,3 +10,17 @@ module Chartkick
   end
   self.options = {}
 end
+
+# for multiple series
+# use Enumerable so it can be called on arrays
+module Enumerable
+  def chart_json
+    if is_a?(Hash) and (key = keys.first) and key.is_a?(Array) and key.size == 2
+      group_by{|k, v| k[0] }.map do |name, data|
+        {name: name, data: data.map{|k, v| [k[1], v] }}
+      end
+    else
+      self
+    end.to_json
+  end
+end

data/lib/chartkick/helper.rb

@@ -33,19 +33,16 @@ module Chartkick
     def chartkick_chart(klass, data_source, options, &block)
       @chartkick_chart_id ||= 0
       options = chartkick_deep_merge(Chartkick.options, options)
-      element_id = options.delete(:id) || "chart-#{@chartkick_chart_id += 1}"
-      height = options.delete(:height) || "300px"
+      element_id = options[:id] || "chart-#{@chartkick_chart_id += 1}"
+      height = options[:height] || "300px"
       # content_for: nil must override default
       content_for = options.has_key?(:content_for) ? options.delete(:content_for) : Chartkick.content_for
 
-      html = <<HTML
-<div id="#{ERB::Util.html_escape(element_id)}" style="height: #{ERB::Util.html_escape(height)}; text-align: center; color: #999; line-height: #{ERB::Util.html_escape(height)}; font-size: 14px; font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Arial, Helvetica, sans-serif;">
-  Loading...
-</div>
-HTML
-     js = <<JS
+      html = (options[:html] || %[<div id="%{id}" style="height: %{height}; text-align: center; color: #999; line-height: %{height}; font-size: 14px; font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Arial, Helvetica, sans-serif;">Loading...</div>]) % {id: ERB::Util.html_escape(element_id), height: ERB::Util.html_escape(height)}
+
+      js = <<JS
 <script type="text/javascript">
-  new Chartkick.#{klass}(#{element_id.to_json}, #{data_source.to_json}, #{options.to_json});
+  new Chartkick.#{klass}(#{element_id.to_json}, #{data_source.respond_to?(:chart_json) ? data_source.chart_json : data_source.to_json}, #{options.except(:id, :height, :html).to_json});
 </script>
 JS
       if content_for

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler