chartkick 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30de4fc2979a15f05f88ea0b616f62165f44af98
-  data.tar.gz: 3ce7c4dcc8cc46808a071beb0893631f2a21c2ea
+  metadata.gz: 2d0f0bc351764e3b7e4667d14958ba9672d72949
+  data.tar.gz: 4d063d2c8ed4d3e6443f8d7ed39c8b2bca48636a
 SHA512:
-  metadata.gz: c112540f2ab9e67a2a0438f034c3297c7b328e73a9c693e3ce84460a9e089735e20d7273fff294ab6e9d4693d74fa2619ae6352fb74aaf2288a3b3c602197ca1
-  data.tar.gz: 19460f79f6cfdd72025902fb2816167878356f8bf7b01c4b22dbfad9ae024a5ffe0e095d3d5dd4eda719eb98ff5db46d441360a4f060e4ce8631e0b305af5753
+  metadata.gz: 747033c51547a541ce97c4e0c193cd5049484e7cc918df5df3e1c29c453b87f3ac61f0a19e6024f39e9e688bb9f6b419c0267d991491dd5f3d06ef7a6d85907b
+  data.tar.gz: fa38a2827ad09bb112307fa9ba9d8dd4ce7f7560dc3d6b6927c7954941567f90e1f53e0f5b1a7069821ad758b049a5bcfa6852424beb5c4ee5992edacd3f9281

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.2
+
+- Updated chartkick.js to v1.0.1
+
 ## 1.1.1
 
 - Added support for Sinatra

data/README.md

@@ -58,18 +58,24 @@ end
 
 ### Options
 
-id and height
+Id and height
 
 ```erb
 <%= line_chart User.group_by_day(:created_at).count, :id => "users-chart", :height => "500px" %>
 ```
 
-min and max values (except pie chart)
+Min and max values (except pie chart)
 
 ```erb
 <%= line_chart User.group_by_day(:created_at).count, :min => 1000, :max => 5000 %>
 ```
 
+You can pass options directly to the charting library with:
+
+```erb
+<%= line_chart User.group_by_day(:created_at).count, :library => {:backgroundColor => "#eee"} %>
+```
+
 ### Data
 
 Pass data as a Hash or Array

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+task :default => :test
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+end

data/app/assets/javascripts/chartkick.js

@@ -2,7 +2,7 @@
  * Chartkick.js
  * Create beautiful Javascript charts with minimal code
  * https://github.com/ankane/chartkick.js
- * v1.0.1
+ * v1.0.2
  * MIT License
  */
 
@@ -12,43 +12,40 @@
 (function() {
   'use strict';
 
-  // http://stackoverflow.com/questions/728360/most-elegant-way-to-clone-a-javascript-object
-  function clone(obj) {
-    var copy, i, attr, len;
-
-    // Handle the 3 simple types, and null or undefined
-    if (null === obj || "object" !== typeof obj) {
-      return obj;
-    }
+  // helpers
 
-    // Handle Date
-    if (obj instanceof Date) {
-      copy = new Date();
-      copy.setTime(obj.getTime());
-      return copy;
-    }
+  function isArray(variable) {
+    return Object.prototype.toString.call(variable) === "[object Array]";
+  }
 
-    // Handle Array
-    if (obj instanceof Array) {
-      copy = [];
-      for (i = 0, len = obj.length; i < len; i++) {
-        copy[i] = clone(obj[i]);
-      }
-      return copy;
-    }
+  function isPlainObject(variable) {
+    return variable instanceof Object;
+  }
 
-    // Handle Object
-    if (obj instanceof Object) {
-      copy = {};
-      for (attr in obj) {
-        if (obj.hasOwnProperty(attr)) {
-          copy[attr] = clone(obj[attr]);
+  // https://github.com/madrobby/zepto/blob/master/src/zepto.js
+  function extend(target, source) {
+    var key;
+    for (key in source) {
+      if (isPlainObject(source[key]) || isArray(source[key])) {
+        if (isPlainObject(source[key]) && !isPlainObject(target[key])) {
+          target[key] = {};
+        }
+        if (isArray(source[key]) && !isArray(target[key])) {
+          target[key] = [];
         }
+        extend(target[key], source[key]);
+      }
+      else if (source[key] !== undefined) {
+        target[key] = source[key];
       }
-      return copy;
     }
+  }
 
-    throw new Error("Unable to copy obj! Its type isn't supported.");
+  function merge(obj1, obj2) {
+    var target = {};
+    extend(target, obj1);
+    extend(target, obj2);
+    return target;
   }
 
   // https://github.com/Do/iso8601.js
@@ -101,7 +98,7 @@
 
   function jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax) {
     return function(series, opts) {
-      var options = clone(defaultOptions);
+      var options = merge({}, defaultOptions);
 
       // hide legend
       // this is *not* an external option!
@@ -122,6 +119,9 @@
         setMax(options, opts.max);
       }
 
+      // merge library last
+      options = merge(options, opts.library || {});
+
       return options;
     };
   }
@@ -196,7 +196,7 @@
     };
 
     renderPieChart = function(element, series, opts) {
-      var options = clone(defaultOptions);
+      var options = merge(defaultOptions, opts.library || {});
       options.chart = {renderTo: element.id};
       options.series = [{
         type: "pie",
@@ -314,10 +314,6 @@
 
     var jsOptions = jsOptionsFunc(defaultOptions, hideLegend, setMin, setMax);
 
-    var sortByNumber = function(a, b) {
-      return a[0] - b[0];
-    };
-
     // cant use object as key
     var createDataTable = function(series, columnType) {
       var data = new google.visualization.DataTable();
@@ -345,7 +341,7 @@
         }
       }
       if (columnType === "datetime") {
-        rows2.sort(sortByNumber);
+        rows2.sort(sortByTime);
       }
       data.addRows(rows2);
 
@@ -363,7 +359,7 @@
 
     renderPieChart = function(element, series, opts) {
       waitForLoaded(function() {
-        var options = clone(defaultOptions);
+        var options = merge(defaultOptions, opts.library || {});
         options.chartArea = {
           top: "10%",
           height: "80%"
@@ -437,12 +433,6 @@
     }
   }
 
-  // helpers
-
-  function isArray(variable) {
-    return Object.prototype.toString.call(variable) === "[object Array]";
-  }
-
   // type conversions
 
   function toStr(n) {
@@ -535,7 +525,7 @@
     if (typeof element === "string") {
       element = document.getElementById(element);
     }
-    fetchDataSource(element, data, clone(opts || {}), callback);
+    fetchDataSource(element, data, opts || {}, callback);
   }
 
   // define classes

data/chartkick.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
 end

data/lib/chartkick/helper.rb

@@ -1,4 +1,5 @@
 require "json"
+require "erb"
 
 module Chartkick
   module Helper

data/lib/chartkick/version.rb

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

data/test/chartkick_test.rb

@@ -0,0 +1,24 @@
+require "test_helper"
+
+class TestChartkick < Minitest::Test
+  include Chartkick::Helper
+
+  # TODO actual tests
+
+  def setup
+    @data = [[34, 42], [56, 49]]
+  end
+
+  def test_line_chart
+    assert line_chart(@data)
+  end
+
+  def test_pie_chart
+    assert pie_chart(@data)
+  end
+
+  def test_column_chart
+    assert column_chart(@data)
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+require "bundler/setup"
+Bundler.require(:default)
+require "minitest/autorun"
+require "minitest/pride"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !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
 email:
 - acekane1@gmail.com
@@ -59,6 +73,8 @@ files:
 - lib/chartkick/rails.rb
 - lib/chartkick/sinatra.rb
 - lib/chartkick/version.rb
+- test/chartkick_test.rb
+- test/test_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -83,4 +99,6 @@ rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Create beautiful Javascript charts with one line of Ruby
-test_files: []
+test_files:
+- test/chartkick_test.rb
+- test/test_helper.rb