chartjs-ror 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f2ebce780d9ca9649f2b1fcd39b5fa6fa09db3b
-  data.tar.gz: 1363a9862e86500e3387284e7e43d95ba3cb91be
+  metadata.gz: 70560e2b456473a72835faec8fb3747a4b8ca1c3
+  data.tar.gz: a0ac4716a25acd1fe9c5d982b739147314ded6a4
 SHA512:
-  metadata.gz: 007b7d77f5c06bdd6c18cc782940073624d469e8e4ec00c582d156702c5fee413412baae7f7091e660305aac22a77f8a00ed254eace2ea128d507287954ec06a
-  data.tar.gz: 9030000d33387b7259a27cb871df2d7906867f7f2d9f31b6a6cf636444f7797fed42371f3d0577564f0d70a99077be465b094dd412d174b6e3b051f8bad28737
+  metadata.gz: 2d8bf948ec87c2d2df3e29cae59726cd3613cae13e58d94c5f311c54e8ba2fcafa3db8336c62c642419d984cd023415048ca1e55ad8a5abb5fcf61dc2bd9a5b7
+  data.tar.gz: 41e7684be82798cf71c7698389733507af5477997da92e77c089a566355ee58f2018a1e263c4e4b1f4e41800e1f408375d061f9611790cb1fc82280158fbc508

data/README.md

@@ -5,8 +5,13 @@ Simplifies using [Chart.js][] in Rails views.
 * All of Chart.js's features via one line of Ruby.
 * Renders charts on page load rather than DOMContentReady ([reason][browsersupport]).
 * Animates unless you have Modernizr and it doesn't detect canvas support ([reason][browsersupport]).  You can manually override this.
-* Optional alternative (better?) abscissa scale calculations.
-* Utility method for filling in gaps in integer series.
+* Optional alternative abscissa scale calculations (see [Chart.js#132][calculations]).
+* Optional utility method for filling in gaps in integer series.
+
+
+## Current Chart.js version
+
+This gem includes [Chart.js v1.0.1](https://github.com/nnnick/Chart.js/tree/v1.0.1).
 
 
 ## Installation
@@ -35,12 +40,30 @@ Each chart type has a corresponding helper for your views.  The helper methods t
 
 
 ```erb
-<%= line_chart     data, options %>
-<%= bar_chart      data, options %>
-<%= radar_chart    data, options %>
-<%= polar_chart    data, options %>
-<%= pie_chart      data, options %>
-<%= doughnut_chart data, options %>
+<%= line_chart       data, options %>
+<%= bar_chart        data, options %>
+<%= radar_chart      data, options %>
+<%= polar_area_chart data, options %>
+<%= pie_chart        data, options %>
+<%= doughnut_chart   data, options %>
+```
+
+If you don't want these helpers – perhaps they clash with other methods in your views – add this initializer to your app:
+
+```ruby
+# config/initializers/chartjs.rb
+Chartjs.no_confict!
+```
+
+You can use these helpers instead:
+
+```erb
+<%= chartjs_line_chart       data, options %>
+<%= chartjs_bar_chart        data, options %>
+<%= chartjs_radar_chart      data, options %>
+<%= chartjs_polar_area_chart data, options %>
+<%= chartjs_pie_chart        data, options %>
+<%= chartjs_doughnut_chart   data, options %>
 ```
 
 For example, to render a [line chart][linechart] in Javascript:

data/lib/chartjs.rb

@@ -1,5 +1,14 @@
-require 'chartjs/engine'
-require "chartjs/version"
-
 module Chartjs
+  @@no_conflict = false
+
+  def self.no_conflict!
+    @@no_conflict = true
+  end
+
+  def self.no_conflict
+    @@no_conflict
+  end
 end
+
+require 'chartjs/engine'
+require "chartjs/version"

data/lib/chartjs/chart_helpers.rb

@@ -3,9 +3,9 @@ module Chartjs
 
     %w[ Line Bar Radar PolarArea Pie Doughnut ].each do |type|
       camel_type = type.gsub(/(\w)([A-Z])/, '\1_\2').downcase
-      define_method "#{camel_type}_chart" do |data, options = {}|    # def polar_area_chart(data, options = {})
-        chart type, data, options                                    #   chart 'PolarArea', data, options
-      end                                                            # end
+      define_method "chartjs_#{camel_type}_chart" do |data, options = {}|    # def chartjs_polar_area_chart(data, options = {})
+        chart type, data, options                                            #   chart 'PolarArea', data, options
+      end                                                                    # end
     end
 
     private
@@ -37,6 +37,8 @@ module Chartjs
         <<-END.squish.html_safe
         (function() {
           var initChart = function() {
+            window.Chart && window.Chart[#{element_id.to_json}] && window.Chart[#{element_id.to_json}].destroy();
+
             var data = #{data.to_json};
             var opts = #{options.to_json};
             if (!("animation" in opts)) {

data/lib/chartjs/engine.rb

@@ -5,6 +5,15 @@ module Chartjs
   class Engine < Rails::Engine
     initializer 'chartjs.chart_helpers' do
       ActionView::Base.send :include, Chartjs::ChartHelpers
+
+      unless ::Chartjs.no_conflict
+        ActionView::Base.class_eval do
+          %w[ line bar radar polar_area pie doughnut ].each do |type|
+            alias :"#{type}_chart" :"chartjs_#{type}_chart"
+          end
+        end
+      end
+
       ActionView::Base.send :include, Chartjs::AxisHelpers
     end
   end

data/lib/chartjs/version.rb

@@ -1,3 +1,3 @@
 module Chartjs
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartjs-ror
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Andy Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails