d3_rails 0.1.7 → 0.1.8

data/README.md

@@ -14,8 +14,8 @@ or you can use it to build dynamic pages (like jQuery).
 
 # D3 Version
 
-The current release of this gem is using **D3 v=2.7.3**
-**Last Updated 2-1-2012**
+The current release of this gem is using **D3 v=2.7.4**
+**Last Updated 2-2-2012**
 
 # Included Javascripts
 **minified js files are not included, since the rails asset pipeline sorta necessitates the compiling (and likely minifying) your js files for production**

data/lib/d3_rails/version.rb

@@ -1,3 +1,3 @@
 module D3Rails
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/vendor/assets/javascripts/d3.geom.js

@@ -192,16 +192,16 @@ d3.geom.polygon = function(coordinates) {
 
   coordinates.centroid = function(k) {
     var i = -1,
-        n = coordinates.length - 1,
+        n = coordinates.length,
         x = 0,
         y = 0,
         a,
-        b,
+        b = coordinates[n - 1],
         c;
     if (!arguments.length) k = -1 / (6 * coordinates.area());
     while (++i < n) {
-      a = coordinates[i];
-      b = coordinates[i + 1];
+      a = b;
+      b = coordinates[i];
       c = a[0] * b[1] - b[0] * a[1];
       x += (a[0] + b[0]) * c;
       y += (a[1] + b[1]) * c;

data/vendor/assets/javascripts/d3.js

@@ -10,7 +10,7 @@ try {
     d3_style_setProperty.call(this, name, value + "", priority);
   };
 }
-d3 = {version: "2.7.3"}; // semver
+d3 = {version: "2.7.4"}; // semver
 var d3_array = d3_arraySlice; // conversion for NodeLists
 
 function d3_arrayCopy(pseudoarray) {
@@ -489,7 +489,7 @@ d3.dispatch = function() {
   var dispatch = new d3_dispatch(),
       i = -1,
       n = arguments.length;
-  while (++i < n) dispatch[arguments[i]] = d3_dispatch_event();
+  while (++i < n) dispatch[arguments[i]] = d3_dispatch_event(dispatch);
   return dispatch;
 };
 
@@ -507,22 +507,23 @@ d3_dispatch.prototype.on = function(type, listener) {
 
   return arguments.length < 2
       ? this[type].on(name)
-      : (this[type].on(name, listener), this);
+      : this[type].on(name, listener);
 };
 
-function d3_dispatch_event() {
+function d3_dispatch_event(dispatch) {
   var listeners = [],
       listenerByName = {};
 
-  function dispatch() {
+  function event() {
     var z = listeners, // defensive reference
         i = -1,
         n = z.length,
         l;
     while (++i < n) if (l = z[i].on) l.apply(this, arguments);
+    return dispatch;
   }
 
-  dispatch.on = function(name, listener) {
+  event.on = function(name, listener) {
     var l, i;
 
     // return the current listener, if any
@@ -543,7 +544,7 @@ function d3_dispatch_event() {
     return dispatch;
   };
 
-  return dispatch;
+  return event;
 };
 // TODO align
 d3.format = function(specifier) {
@@ -894,7 +895,54 @@ d3.interpolateString = function(a, b) {
 };
 
 d3.interpolateTransform = function(a, b) {
-  return d3.interpolateString(d3.transform(a) + "", d3.transform(b) + "");
+  var s = [], // string constants and placeholders
+      q = [], // number interpolators
+      n,
+      A = d3.transform(a),
+      B = d3.transform(b),
+      ta = A.translate,
+      tb = B.translate,
+      ra = A.rotate,
+      rb = B.rotate,
+      wa = A.skew,
+      wb = B.skew,
+      ka = A.scale,
+      kb = B.scale;
+
+  if (ta[0] != tb[0] || ta[1] != tb[1]) {
+    s.push("translate(", null, ",", null, ")");
+    q.push({i: 1, x: d3.interpolateNumber(ta[0], tb[0])}, {i: 3, x: d3.interpolateNumber(ta[1], tb[1])});
+  } else if (tb[0] || tb[1]) {
+    s.push("translate(" + tb + ")");
+  } else {
+    s.push("");
+  }
+
+  if (ra != rb) {
+    q.push({i: s.push(s.pop() + "rotate(", null, ")") - 2, x: d3.interpolateNumber(ra, rb)});
+  } else if (rb) {
+    s.push(s.pop() + "rotate(" + rb + ")");
+  }
+
+  if (wa != wb) {
+    q.push({i: s.push(s.pop() + "skewX(", null, ")") - 2, x: d3.interpolateNumber(wa, wb)});
+  } else if (wb) {
+    s.push(s.pop() + "skewX(" + wb + ")");
+  }
+
+  if (ka[0] != kb[0] || ka[1] != kb[1]) {
+    n = s.push(s.pop() + "scale(", null, ",", null, ")");
+    q.push({i: n - 4, x: d3.interpolateNumber(ka[0], kb[0])}, {i: n - 2, x: d3.interpolateNumber(ka[1], kb[1])});
+  } else if (kb[0] != 1 || kb[1] != 1) {
+    s.push(s.pop() + "scale(" + kb + ")");
+  }
+
+  n = q.length;
+  return function(t) {
+    var i = -1, o;
+    while (++i < n) s[(o = q[i]).i] = o.x(t);
+    return s.join("");
+  };
 };
 
 d3.interpolateRgb = function(a, b) {
@@ -2458,7 +2506,6 @@ function d3_scale_linearNice(dx) {
   };
 }
 
-// TODO Dates? Ugh.
 function d3_scale_linearTickRange(domain, m) {
   var extent = d3_scaleExtent(domain),
       span = extent[1] - extent[0],

data/vendor/assets/javascripts/d3.time.js

@@ -552,13 +552,15 @@ function d3_time_scale(linear, methods, format) {
     if (typeof m !== "function") {
       var span = extent[1] - extent[0],
           target = span / m,
-          i = d3.bisect(d3_time_scaleSteps, target, 1, d3_time_scaleSteps.length - 1);
+          i = d3.bisect(d3_time_scaleSteps, target);
+      if (i == d3_time_scaleSteps.length) return methods.year(extent, m);
+      if (!i) return linear.ticks(m).map(d3_time_scaleDate);
       if (Math.log(target / d3_time_scaleSteps[i - 1]) < Math.log(d3_time_scaleSteps[i] / target)) --i;
       m = methods[i];
       k = m[1];
       m = m[0];
     }
-    return m(extent[0], extent[1], k);
+    return m(extent[0], new Date(+extent[1] + 1), k); // inclusive upper bound
   };
 
   scale.tickFormat = function() {
@@ -591,6 +593,19 @@ function d3_time_scaleFormat(formats) {
   };
 }
 
+function d3_time_scaleSetYear(y) {
+  var d = new Date(y, 0, 1);
+  d.setFullYear(y); // Y2K fail
+  return d;
+}
+
+function d3_time_scaleGetYear(d) {
+  var y = d.getFullYear(),
+      d0 = d3_time_scaleSetYear(y),
+      d1 = d3_time_scaleSetYear(y + 1);
+  return y + (d - d0) / (d1 - d0);
+}
+
 var d3_time_scaleSteps = [
   1e3,    // 1-second
   5e3,    // 5-second
@@ -640,10 +655,16 @@ var d3_time_scaleLocalFormats = [
   [d3.time.format("%a %d"), function(d) { return d.getDay() && d.getDate() != 1; }],
   [d3.time.format("%I %p"), function(d) { return d.getHours(); }],
   [d3.time.format("%I:%M"), function(d) { return d.getMinutes(); }],
-  [d3.time.format(":%S"), function(d) { return d.getSeconds() || d.getMilliseconds(); }]
+  [d3.time.format(":%S"), function(d) { return d.getSeconds(); }],
+  [d3.time.format(".%L"), function(d) { return d.getMilliseconds(); }]
 ];
 
-var d3_time_scaleLocalFormat = d3_time_scaleFormat(d3_time_scaleLocalFormats);
+var d3_time_scaleLinear = d3.scale.linear(),
+    d3_time_scaleLocalFormat = d3_time_scaleFormat(d3_time_scaleLocalFormats);
+
+d3_time_scaleLocalMethods.year = function(extent, m) {
+  return d3_time_scaleLinear.domain(extent.map(d3_time_scaleGetYear)).ticks(m).map(d3_time_scaleSetYear);
+};
 
 d3.time.scale = function() {
   return d3_time_scale(d3.scale.linear(), d3_time_scaleLocalMethods, d3_time_scaleLocalFormat);
@@ -676,11 +697,29 @@ var d3_time_scaleUTCFormats = [
   [d3.time.format.utc("%a %d"), function(d) { return d.getUTCDay() && d.getUTCDate() != 1; }],
   [d3.time.format.utc("%I %p"), function(d) { return d.getUTCHours(); }],
   [d3.time.format.utc("%I:%M"), function(d) { return d.getUTCMinutes(); }],
-  [d3.time.format.utc(":%S"), function(d) { return d.getUTCSeconds() || d.getUTCMilliseconds(); }]
+  [d3.time.format.utc(":%S"), function(d) { return d.getUTCSeconds(); }],
+  [d3.time.format.utc(".%L"), function(d) { return d.getUTCMilliseconds(); }]
 ];
 
 var d3_time_scaleUTCFormat = d3_time_scaleFormat(d3_time_scaleUTCFormats);
 
+function d3_time_scaleUTCSetYear(y) {
+  var d = new Date(Date.UTC(y, 0, 1));
+  d.setUTCFullYear(y); // Y2K fail
+  return d;
+}
+
+function d3_time_scaleUTCGetYear(d) {
+  var y = d.getUTCFullYear(),
+      d0 = d3_time_scaleUTCSetYear(y),
+      d1 = d3_time_scaleUTCSetYear(y + 1);
+  return y + (d - d0) / (d1 - d0);
+}
+
+d3_time_scaleUTCMethods.year = function(extent, m) {
+  return d3_time_scaleLinear.domain(extent.map(d3_time_scaleUTCGetYear)).ticks(m).map(d3_time_scaleUTCSetYear);
+};
+
 d3.time.scale.utc = function() {
   return d3_time_scale(d3.scale.linear(), d3_time_scaleUTCMethods, d3_time_scaleUTCFormat);
 };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: d3_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000Z
+date: 2012-02-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70232689810580 !ruby/object:Gem::Requirement
+  requirement: &70233621458080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70232689810580
+  version_requirements: *70233621458080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70232689810080 !ruby/object:Gem::Requirement
+  requirement: &70233621457580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70232689810080
+  version_requirements: *70233621457580
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70232689809620 !ruby/object:Gem::Requirement
+  requirement: &70233621457120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70232689809620
+  version_requirements: *70233621457120
 description: Gem installation of javascript framework for data visualization, D3
 email:
 - han@logicallsat.com