chartjs-ror 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 916dcc5fbe72ead60e7f25633252f0413ad66bf2
-  data.tar.gz: fe51adc790f27e02ff23664b8b4b9145f97777e5
+  metadata.gz: 1698b08968a158347859a536e4a29b93284df938
+  data.tar.gz: 9b72390f0e1793e186d89c66cdca001777faee8b
 SHA512:
-  metadata.gz: 5aa1fde76053c8e5b315e927b3edcf5b1250b5dcffa79fa038fac39bf4134202fa4ab4aef3625a0ce24e9cb634a38443396d2b86381538d1a624d79a945c9f28
-  data.tar.gz: 2135bb7d26129e632559d26c4d98b4236621ba94e5918bb9bd15a1bd88964cc8306866037f33d2ac47d6275ba9288329c9dcad8a115c2ecfd90ecd1017556a47
+  metadata.gz: 4df9989001bf288c89d9b397cc30dddcdf32225473033343c77194ddd572b20725df71c6df51dab436a4e353c5b0f8a0a966ab87651ef1e0aed0e35c370400d4
+  data.tar.gz: c5c332161770825d90134ebfc9ec42c2a02ad49ac888a7fce9ed0b787a04f2e34d1941ef802e0869d792521018b372fbafe8fb37ec3d064d6b20588f845aafca

data/CHANGELOG

@@ -1,6 +1,11 @@
 # CHANGELOG
 
 
+## 3.3.1 - 2017-01-27
+
+- Improve conversion of data and options hashes to JavaScript.
+
+
 ## 3.3.0 - 2017-01-26
 
 - Use Chart.js v2.4.0.

data/README.md

@@ -125,6 +125,31 @@ options = { ... }
 <%= line_chart data, options %>
 ```
 
+You can also use underscored symbols for keys, instead of the camelcase versions.
+They will be converted to their lower camelcase counterparts on output.
+
+```ruby
+data = {
+  labels: ["January", "February", "March", "April", "May", "June", "July"],
+  datasets: [
+    {
+        label: "My First dataset",
+        background_color: "rgba(220,220,220,0.2)",
+        border_color: "rgba(220,220,220,1)",
+        data: [65, 59, 80, 81, 56, 55, 40]
+    },
+    {
+        label: "My Second dataset",
+        background_color: "rgba(151,187,205,0.2)",
+        border_color: "rgba(151,187,205,1)",
+        data: [28, 48, 40, 19, 86, 27, 90]
+    }
+  ]
+}
+options = { ... }
+<%= line_chart data, options %>
+```
+
 ### Options
 
 You can put anything in the `options` hash that Chart.js recognises.  To pass a JavaScript function as an option value, wrap it in quotation marks to make it a string.

data/lib/chartjs/chart_helpers.rb

@@ -1,3 +1,6 @@
+require 'json'
+require 'bigdecimal'
+
 module Chartjs
   module ChartHelpers
 
@@ -33,16 +36,14 @@ module Chartjs
       canvas = content_tag :canvas, '', id: element_id, class: css_class, width: width, height: height
 
       script = javascript_tag do
-        # Ensure option string values which are actually JavaScript functions
-        # are treated as functions.
         <<-END.squish.html_safe
         (function() {
           var initChart = function() {
             var ctx = document.getElementById(#{element_id.to_json});
             var chart = new Chart(ctx, {
               type:    "#{camel_case type}",
-              data:    #{data.to_json},
-              options: #{options.to_json.gsub /"(function.*?})"/, '\1'}
+              data:    #{to_javascript_string data},
+              options: #{to_javascript_string options}
             });
           };
 
@@ -68,7 +69,35 @@ module Chartjs
 
     # polar_area -> polarArea
     def camel_case(string)
-      string.sub(/_([a-z])/) { $1.upcase }
+      string.gsub(/_([a-z])/) { $1.upcase }
+    end
+
+    def to_javascript_string(element)
+      case element
+      when Hash
+        hash_elements = []
+        element.each do |key, value|
+          hash_elements << camel_case(key.to_s).to_json + ':' + to_javascript_string(value)
+        end
+        '{' + hash_elements.join(',') + '}'
+      when Array
+        array_elements = []
+        element.each do |value|
+          array_elements << to_javascript_string(value)
+        end
+        '[' + array_elements.join(',') + ']'
+      when String
+        if element.match(/^\s*function.*}\s*$/m)
+          # Raw-copy function definitions to the output without surrounding quotes.
+          element
+        else
+          element.to_json
+        end
+      when BigDecimal
+        element.to_s
+      else
+        element.to_json
+      end
     end
 
   end

data/lib/chartjs/version.rb

@@ -1,3 +1,3 @@
 module Chartjs
-  VERSION = "3.3.0"
+  VERSION = "3.3.1"
 end

data/test/chart_helpers_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+
+require 'chartjs/chart_helpers'
+
+class ChartHelpersTest < Minitest::Test
+
+  class Foo
+    include Chartjs::ChartHelpers
+
+    def to_js(element)
+      to_javascript_string element
+    end
+  end
+
+  def setup
+    @subject = Foo.new
+  end
+
+  def test_to_javascript_string
+    assert_equal '"foo"', @subject.to_js('foo')
+
+    assert_equal '["a",42]', @subject.to_js(['a', 42])
+
+    assert_equal '{"a":42}', @subject.to_js({'a' => 42})
+
+    assert_equal '{"a":function(x) { blah; }}', @subject.to_js({'a' => 'function(x) { blah; }'})
+
+    expected = \
+'{"a":function(x) {
+  if (x) {
+    foo();
+  }
+  else {
+    bar();
+  }
+}
+}'
+
+    assert_equal expected, @subject.to_js({'a' => <<END})
+function(x) {
+  if (x) {
+    foo();
+  }
+  else {
+    bar();
+  }
+}
+END
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,3 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'minitest/autorun'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartjs-ror
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Andy Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -57,6 +57,8 @@ files:
 - lib/chartjs/chart_helpers.rb
 - lib/chartjs/engine.rb
 - lib/chartjs/version.rb
+- test/chart_helpers_test.rb
+- test/test_helper.rb
 - vendor/assets/javascripts/Chart.bundle.min.js
 - vendor/assets/javascripts/Chart.min.js
 homepage: https://github.com/airblade/chartjs-ror
@@ -82,4 +84,6 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simplifies using Chart.js in Rails
-test_files: []
+test_files:
+- test/chart_helpers_test.rb
+- test/test_helper.rb