chartkick 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea705341b63c82aef63f8da9e1f98d8caad46097
-  data.tar.gz: 955115a1463d433fa2c14d70541ff7ac9f62c3eb
+  metadata.gz: ca7e47f1dbaaa98f3c7e1ca1e4dc52ab6cb4262b
+  data.tar.gz: de76a0f1276d12212b37f2a8366649ff22f187e8
 SHA512:
-  metadata.gz: 48540e759da663290d91093ce58ef3e59258682f441401c1cde301057b83f8bcefda8a62a9d76ea8efbf4661eb9998c6d4463f8b4d239de75fd720d9a41d3f57
-  data.tar.gz: 845ca4aee7e2262a14dd46dfb73d5b975955f7bf86fd19de7f7407ea3889b9829789752b16441f9fb24b5b9e041650c8aca5821b172cc69034fb7b61ef8b1317
+  metadata.gz: 7d4f116d8ac99364ef648f5ee4f9416327c8ea77e647d5606028fe549c2c771c9245676b09b8032ac2df9b9b41e3bc47209911a7daecc562c73742077af8be96
+  data.tar.gz: c67bdceab693294cb60867edaf7d467a0ea2c46f05791bc1f294b1b35ace97aa9290851117e90eeda336ac0ebe08a8e7cec0af4bd09e525effc496ca19053385

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.2
+
+- Added global `content_for` option
+- Added `stacked` option
+
 ## 1.2.1
 
 - Added localization for Google Charts

data/README.md

@@ -82,6 +82,12 @@ Min and max values (except pie chart)
 <%= line_chart data, :min => 1000, :max => 5000 %>
 ```
 
+Stacked columns or bars
+
+```erb
+<%= column_chart data, :stacked => true %>
+```
+
 You can pass options directly to the charting library with:
 
 ```erb
@@ -91,13 +97,19 @@ You can pass options directly to the charting library with:
 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.
 
 ```erb
-<%= line_chart data, :content_for => :js_initialization %>
+<%= line_chart data, :content_for => :charts_js %>
 ```
 Then, in your layout:
 
 ```erb
-<%= yield :js_initialization %> <%# Rails %>
-<%= yield_content :js_initialization %> <%# Padrino %>
+<%= yield :charts_js %> <%# Rails %>
+<%= yield_content :charts_js %> <%# Padrino %>
+```
+
+To make this the default, create an initializer with:
+
+```ruby
+Chartkick.content_for = :charts_js
 ```
 
 ### Data
@@ -154,6 +166,12 @@ If you prefer Highcharts, use:
 
 You must include `chartkick.js` manually.  [Download it here](https://raw.github.com/ankane/chartkick/master/app/assets/javascripts/chartkick.js)
 
+For Rails 2.3, you must use a script tag for Google Charts due to [this bug](https://rails.lighthouseapp.com/projects/8994/tickets/1664-javascript_include_tag-shouldnt-append-a-js-onto-external-urls).
+
+```html
+<script src="//www.google.com/jsapi"></script>
+```
+
 ### For Sinatra
 
 You must include `chartkick.js` manually.  [Download it here](https://raw.github.com/ankane/chartkick/master/app/assets/javascripts/chartkick.js)

data/app/assets/javascripts/chartkick.js

@@ -13,7 +13,7 @@
   'use strict';
 
   var Chartkick, ISO8601_PATTERN, DECIMAL_SEPARATOR, defaultOptions, hideLegend,
-    setMin, setMax, jsOptions, loaded, waitForLoaded, setBarMin, setBarMax, createDataTable, resize;
+    setMin, setMax, setStacked, jsOptions, loaded, waitForLoaded, setBarMin, setBarMax, createDataTable, resize;
 
   // only functions that need defined specific to charting library
   var renderLineChart, renderPieChart, renderColumnChart, renderBarChart, renderAreaChart;
@@ -105,7 +105,7 @@
     return false;
   }
 
-  function jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax) {
+  function jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax, setStacked) {
     return function (series, opts, chartOptions) {
       var options = merge({}, defaultOptions);
       options = merge(options, chartOptions || {});
@@ -128,6 +128,10 @@
         setMax(options, opts.max);
       }
 
+      if (opts.stacked) {
+        setStacked(options);
+      }
+
       // merge library last
       options = merge(options, opts.library || {});
 
@@ -149,7 +153,7 @@
   }
 
   function getJSON(element, url, success) {
-    $.ajax({
+    jQuery.ajax({
       dataType: "json",
       url: url,
       success: success,
@@ -275,7 +279,11 @@
       options.yAxis.max = max;
     };
 
-    jsOptions = jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax);
+    setStacked = function (options) {
+      options.plotOptions.series.stacking = "normal";
+    };
+
+    jsOptions = jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax, setStacked);
 
     renderLineChart = function (element, series, opts, chartType) {
       chartType = chartType || "spline";
@@ -452,7 +460,11 @@
       options.hAxis.viewWindow.max = max;
     };
 
-    jsOptions = jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax);
+    setStacked = function (options) {
+      options.isStacked = true;
+    };
+
+    jsOptions = jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax, setStacked);
 
     // cant use object as key
     createDataTable = function (series, columnType) {
@@ -550,7 +562,7 @@
             }
           }
         };
-        var options = jsOptionsFunc(defaultOptions, hideLegend, setBarMin, setBarMax)(series, opts, chartOptions);
+        var options = jsOptionsFunc(defaultOptions, hideLegend, setBarMin, setBarMax, setStacked)(series, opts, chartOptions);
         var data = createDataTable(series, "string");
         var chart = new google.visualization.BarChart(element);
         resize(function () {

data/lib/chartkick.rb

@@ -2,3 +2,9 @@ require "chartkick/version"
 require "chartkick/helper"
 require "chartkick/rails" if defined?(Rails)
 require "chartkick/sinatra" if defined?(Sinatra)
+
+module Chartkick
+  class << self
+    attr_accessor :content_for
+  end
+end

data/lib/chartkick/helper.rb

@@ -31,6 +31,8 @@ module Chartkick
       options = options.dup
       element_id = options.delete(:id) || "chart-#{@chartkick_chart_id += 1}"
       height = options.delete(: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;">
@@ -42,8 +44,8 @@ HTML
   new Chartkick.#{klass}(#{element_id.to_json}, #{data_source.to_json}, #{options.to_json});
 </script>
 JS
-      if options[:content_for]
-        content_for(options[:content_for]) { js.respond_to?(:html_safe) ? js.html_safe : js }
+      if content_for
+        content_for(content_for) { js.respond_to?(:html_safe) ? js.html_safe : js }
       else
         html += js
       end

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Create beautiful Javascript charts with one line of Ruby
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -85,17 +85,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Create beautiful Javascript charts with one line of Ruby