chartkick 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d0f0bc351764e3b7e4667d14958ba9672d72949
-  data.tar.gz: 4d063d2c8ed4d3e6443f8d7ed39c8b2bca48636a
+  metadata.gz: 128a490e06abdcd32d0c7b941b4b087b3a633827
+  data.tar.gz: fa41e91b74b5d857a5c4037a95795e975a911aa0
 SHA512:
-  metadata.gz: 747033c51547a541ce97c4e0c193cd5049484e7cc918df5df3e1c29c453b87f3ac61f0a19e6024f39e9e688bb9f6b419c0267d991491dd5f3d06ef7a6d85907b
-  data.tar.gz: fa38a2827ad09bb112307fa9ba9d8dd4ce7f7560dc3d6b6927c7954941567f90e1f53e0f5b1a7069821ad758b049a5bcfa6852424beb5c4ee5992edacd3f9281
+  metadata.gz: e05a9b51baa1528c89fcc92c23c94b6f010b86e30554552e306ad4f2b502cf95e146b346b716f9dcd08faa3a85bab087fa14410c16ff7a912a7b43dec591c3ef
+  data.tar.gz: 2530a2f68acc7c21eb1f653a3b0a7719c2dc0dd41dbaa675402a1e1214b67c78eb08a3aefd27bb5b14231adc8faefa9686be4941ceeea18375a4758e153aa8e7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.3
+
+- Added content_for option
+
 ## 1.1.2
 
 - Updated chartkick.js to v1.0.1

data/README.md

@@ -76,6 +76,18 @@ You can pass options directly to the charting library with:
 <%= line_chart User.group_by_day(:created_at).count, :library => {:backgroundColor => "#eee"} %>
 ```
 
+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 User.group_by_day(:created_at).count, :content_for => :js_initialization %>
+```
+Then, in your layout:
+
+```erb
+<%= yield :js_initialization # Rails %>
+<%= yield_content :js_initialization # Padrino %>
+```
+
 ### Data
 
 Pass data as a Hash or Array
@@ -108,7 +120,7 @@ Add this line to your application's Gemfile:
 gem "chartkick"
 ```
 
-And add the javascript files to your views.  These files must be included **before** the helper methods.
+And add the javascript files to your views.  These files must be included **before** the helper methods, unless using the `:content_for` option.
 
 For Google Charts, use:
 

data/lib/chartkick/helper.rb

@@ -28,10 +28,17 @@ module Chartkick
 <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
 <script type="text/javascript">
   new Chartkick.#{klass}(#{element_id.to_json}, #{data_source.to_json}, #{options.to_json});
 </script>
-HTML
+JS
+      if options[:content_for]
+        content_for(options[:content_for]) { js.respond_to?(:html_safe) ? js.html_safe : js }
+      else
+        html += js
+      end
 
       html.respond_to?(:html_safe) ? html.html_safe : html
     end

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler