d3_rails 2.9.1 → 2.9.2.rc1

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in d3_rails.gemspec
 gemspec

data/README.md

@@ -16,8 +16,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.9.1** (though for convenience I have left version 2.7.5 in the gem so you can still include your modules manually since rails will compile your javascripts into one file in the end anyway)
-**Last Updated 4-23-2012**
+The current release of this gem is using **D3 v=2.9.2** (though for convenience I have left version 2.7.5 in the gem so you can still include your modules manually since rails will compile your javascripts into one file in the end anyway)
+**Last Updated 5-18-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**
@@ -33,40 +33,7 @@ The current release of this gem is using **D3 v=2.9.1** (though for convenience
 	science.js
 	science.lin.js
 	science.stats.js
-
-## Additional modules:
-
-	There are a few additional modules/js libraries included for convenience in this gem:
-
-	morris.js  
-	tesseract.js
-	d3 charting module
-
-## D3 charting module
-
-** D3 charts can be be included in your rails application by including the following line in your javascripts manifest **
-
-	//= require d3_chart_module
-
-This will include the following javascripts to your application:
-
-	box.js
-	bullet.js
-	chart.js
-	horizon.js
-	qq.js
-
-## Tesseract
-
-** Tesseract can be be included in your rails application by including the following line in your javascripts manifest **
-
-	//= require tesseract
-
-## Morris
-
-** Morris can also be included in your application with the following additional line of code for your javascripts manifest.
-
-  //= require morris
+  d3.v2.js
 
 ### Installation
 

data/lib/d3_rails/version.rb

@@ -1,3 +1,3 @@
 module D3Rails
-  VERSION = "2.9.1"
+  VERSION = "2.9.2.rc1"
 end

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

@@ -10,7 +10,7 @@ try {
     d3_style_setProperty.call(this, name, value + "", priority);
   };
 }
-d3 = {version: "2.9.1"}; // semver
+d3 = {version: "2.9.2"}; // semver
 function d3_class(ctor, properties) {
   try {
     for (var key in properties) {
@@ -661,7 +661,7 @@ d3.format = function(specifier) {
     // Apply the scale, computing it from the value's exponent for si format.
     if (scale < 0) {
       var prefix = d3.formatPrefix(value, precision);
-      value *= prefix.scale;
+      value = prefix.scale(value);
       suffix = prefix.symbol;
     } else {
       value *= scale;
@@ -730,12 +730,12 @@ d3.formatPrefix = function(value, precision) {
 };
 
 function d3_formatPrefix(d, i) {
+  var k = Math.pow(10, Math.abs(8 - i) * 3);
   return {
-    scale: Math.pow(10, (8 - i) * 3),
+    scale: i > 8 ? function(d) { return d / k; } : function(d) { return d * k; },
     symbol: d
   };
 }
-
 /*
  * TERMS OF USE - EASING EQUATIONS
  *
@@ -5564,6 +5564,7 @@ d3.layout.pie = function() {
     // They are stored in the original data's order.
     var arcs = [];
     index.forEach(function(i) {
+      var d;
       arcs[i] = {
         data: data[i],
         value: d = values[i],
@@ -5987,7 +5988,8 @@ d3.layout.hierarchy = function() {
           n,
           c = node.children = [],
           v = 0,
-          j = depth + 1;
+          j = depth + 1,
+          d;
       while (++i < n) {
         d = recurse(childs[i], j, nodes);
         d.parent = node;

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: d3_rails
 version: !ruby/object:Gem::Version
-  version: 2.9.1
-  prerelease: 
+  version: 2.9.2.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Han Kang
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000Z
+date: 2012-05-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70264089371760 !ruby/object:Gem::Requirement
+  requirement: &70217248387960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70264089371760
+  version_requirements: *70217248387960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70264089371020 !ruby/object:Gem::Requirement
+  requirement: &70217248387460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70264089371020
+  version_requirements: *70217248387460
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70264089370340 !ruby/object:Gem::Requirement
+  requirement: &70217248387000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,7 +46,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70264089370340
+  version_requirements: *70217248387000
 description: Gem installation of javascript framework for data visualization, D3
 email:
 - han@logicallsat.com
@@ -63,17 +63,13 @@ files:
 - d3_rails.gemspec
 - lib/.DS_Store
 - lib/d3_rails.rb
+- lib/d3_rails/.DS_Store
 - lib/d3_rails/engine.rb
 - lib/d3_rails/version.rb
 - vendor/.DS_Store
 - vendor/assets/.DS_Store
 - vendor/assets/javascripts/.DS_Store
 - vendor/assets/javascripts/LICENSE
-- vendor/assets/javascripts/chart/box.js
-- vendor/assets/javascripts/chart/bullet.js
-- vendor/assets/javascripts/chart/chart.js
-- vendor/assets/javascripts/chart/horizon.js
-- vendor/assets/javascripts/chart/qq.js
 - vendor/assets/javascripts/colorbrewer.js
 - vendor/assets/javascripts/d3.chart.js
 - vendor/assets/javascripts/d3.geo.js
@@ -82,67 +78,11 @@ files:
 - vendor/assets/javascripts/d3.layout.js
 - vendor/assets/javascripts/d3.time.js
 - vendor/assets/javascripts/d3.v2.js
-- vendor/assets/javascripts/d3_chart_module.js
 - vendor/assets/javascripts/d3_csv.js
 - vendor/assets/javascripts/d3_rails.js
-- vendor/assets/javascripts/morris.js
-- vendor/assets/javascripts/morris/.DS_Store
-- vendor/assets/javascripts/morris/Makefile
-- vendor/assets/javascripts/morris/README.md
-- vendor/assets/javascripts/morris/examples/_template.html
-- vendor/assets/javascripts/morris/examples/days.html
-- vendor/assets/javascripts/morris/examples/decimal.html
-- vendor/assets/javascripts/morris/examples/lib/example.css
-- vendor/assets/javascripts/morris/examples/lib/example.js
-- vendor/assets/javascripts/morris/examples/lib/prettify.css
-- vendor/assets/javascripts/morris/examples/lib/prettify.js
-- vendor/assets/javascripts/morris/examples/months-no-smooth.html
-- vendor/assets/javascripts/morris/examples/negative.html
-- vendor/assets/javascripts/morris/examples/non-date.html
-- vendor/assets/javascripts/morris/examples/quarters.html
-- vendor/assets/javascripts/morris/examples/timestamps.html
-- vendor/assets/javascripts/morris/examples/weeks.html
-- vendor/assets/javascripts/morris/morris.coffee
-- vendor/assets/javascripts/morris/morris.js
-- vendor/assets/javascripts/morris/morris.min.js
 - vendor/assets/javascripts/science.js
 - vendor/assets/javascripts/science.lin.js
 - vendor/assets/javascripts/science.stats.js
-- vendor/assets/javascripts/tesseract.js
-- vendor/assets/javascripts/tesseract/.gitignore
-- vendor/assets/javascripts/tesseract/LICENSE
-- vendor/assets/javascripts/tesseract/Makefile
-- vendor/assets/javascripts/tesseract/README.md
-- vendor/assets/javascripts/tesseract/index.js
-- vendor/assets/javascripts/tesseract/lib/dart/AUTHORS
-- vendor/assets/javascripts/tesseract/lib/dart/LICENSE
-- vendor/assets/javascripts/tesseract/lib/dart/dual_pivot_quicksort.dart
-- vendor/assets/javascripts/tesseract/package.json
-- vendor/assets/javascripts/tesseract/src/array.js
-- vendor/assets/javascripts/tesseract/src/bisect.js
-- vendor/assets/javascripts/tesseract/src/filter.js
-- vendor/assets/javascripts/tesseract/src/heap.js
-- vendor/assets/javascripts/tesseract/src/heapselect.js
-- vendor/assets/javascripts/tesseract/src/identity.js
-- vendor/assets/javascripts/tesseract/src/insertionsort.js
-- vendor/assets/javascripts/tesseract/src/null.js
-- vendor/assets/javascripts/tesseract/src/package.js
-- vendor/assets/javascripts/tesseract/src/permute.js
-- vendor/assets/javascripts/tesseract/src/quicksort.js
-- vendor/assets/javascripts/tesseract/src/reduce.js
-- vendor/assets/javascripts/tesseract/src/tesseract.js
-- vendor/assets/javascripts/tesseract/src/version.js
-- vendor/assets/javascripts/tesseract/src/zero.js
-- vendor/assets/javascripts/tesseract/tesseract.js
-- vendor/assets/javascripts/tesseract/tesseract.min.js
-- vendor/assets/javascripts/tesseract/test/benchmark.js
-- vendor/assets/javascripts/tesseract/test/bisect-test.js
-- vendor/assets/javascripts/tesseract/test/heap-test.js
-- vendor/assets/javascripts/tesseract/test/permute-test.js
-- vendor/assets/javascripts/tesseract/test/select-test.js
-- vendor/assets/javascripts/tesseract/test/sort-test.js
-- vendor/assets/javascripts/tesseract/test/tesseract-test.js
-- vendor/assets/javascripts/tesseract/test/version-test.js
 - vendor/assets/stylesheets/.DS_Store
 - vendor/assets/stylesheets/LICENSE
 - vendor/assets/stylesheets/azimuthal.css
@@ -180,9 +120,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: d3_rails
 rubygems_version: 1.8.6
@@ -190,3 +130,4 @@ signing_key:
 specification_version: 3
 summary: D3 automated install for Rails 3.1+
 test_files: []
+has_rdoc: 

data/vendor/assets/javascripts/chart/box.js

@@ -1,297 +0,0 @@
-// Inspired by http://informationandvisualization.de/blog/box-plot
-d3.chart.box = function() {
-  var width = 1,
-      height = 1,
-      duration = 0,
-      domain = null,
-      value = Number,
-      whiskers = d3_chart_boxWhiskers,
-      quartiles = d3_chart_boxQuartiles,
-      tickFormat = null;
-
-  // For each small multiple…
-  function box(g) {
-    g.each(function(d, i) {
-      d = d.map(value).sort(d3.ascending);
-      var g = d3.select(this),
-          n = d.length,
-          min = d[0],
-          max = d[n - 1];
-
-      // Compute quartiles. Must return exactly 3 elements.
-      var quartileData = d.quartiles = quartiles(d);
-
-      // Compute whiskers. Must return exactly 2 elements, or null.
-      var whiskerIndices = whiskers && whiskers.call(this, d, i),
-          whiskerData = whiskerIndices && whiskerIndices.map(function(i) { return d[i]; });
-
-      // Compute outliers. If no whiskers are specified, all data are "outliers".
-      // We compute the outliers as indices, so that we can join across transitions!
-      var outlierIndices = whiskerIndices
-          ? d3.range(0, whiskerIndices[0]).concat(d3.range(whiskerIndices[1] + 1, n))
-          : d3.range(n);
-
-      // Compute the new x-scale.
-      var x1 = d3.scale.linear()
-          .domain(domain && domain.call(this, d, i) || [min, max])
-          .range([height, 0]);
-
-      // Retrieve the old x-scale, if this is an update.
-      var x0 = this.__chart__ || d3.scale.linear()
-          .domain([0, Infinity])
-          .range(x1.range());
-
-      // Stash the new scale.
-      this.__chart__ = x1;
-
-      // Note: the box, median, and box tick elements are fixed in number,
-      // so we only have to handle enter and update. In contrast, the outliers
-      // and other elements are variable, so we need to exit them! Variable
-      // elements also fade in and out.
-
-      // Update center line: the vertical line spanning the whiskers.
-      var center = g.selectAll("line.center")
-          .data(whiskerData ? [whiskerData] : []);
-
-      center.enter().insert("svg:line", "rect")
-          .attr("class", "center")
-          .attr("x1", width / 2)
-          .attr("y1", function(d) { return x0(d[0]); })
-          .attr("x2", width / 2)
-          .attr("y2", function(d) { return x0(d[1]); })
-          .style("opacity", 1e-6)
-        .transition()
-          .duration(duration)
-          .style("opacity", 1)
-          .attr("y1", function(d) { return x1(d[0]); })
-          .attr("y2", function(d) { return x1(d[1]); });
-
-      center.transition()
-          .duration(duration)
-          .style("opacity", 1)
-          .attr("y1", function(d) { return x1(d[0]); })
-          .attr("y2", function(d) { return x1(d[1]); });
-
-      center.exit().transition()
-          .duration(duration)
-          .style("opacity", 1e-6)
-          .attr("y1", function(d) { return x1(d[0]); })
-          .attr("y2", function(d) { return x1(d[1]); })
-          .remove();
-
-      // Update innerquartile box.
-      var box = g.selectAll("rect.box")
-          .data([quartileData]);
-
-      box.enter().append("svg:rect")
-          .attr("class", "box")
-          .attr("x", 0)
-          .attr("y", function(d) { return x0(d[2]); })
-          .attr("width", width)
-          .attr("height", function(d) { return x0(d[0]) - x0(d[2]); })
-        .transition()
-          .duration(duration)
-          .attr("y", function(d) { return x1(d[2]); })
-          .attr("height", function(d) { return x1(d[0]) - x1(d[2]); });
-
-      box.transition()
-          .duration(duration)
-          .attr("y", function(d) { return x1(d[2]); })
-          .attr("height", function(d) { return x1(d[0]) - x1(d[2]); });
-
-      // Update median line.
-      var medianLine = g.selectAll("line.median")
-          .data([quartileData[1]]);
-
-      medianLine.enter().append("svg:line")
-          .attr("class", "median")
-          .attr("x1", 0)
-          .attr("y1", x0)
-          .attr("x2", width)
-          .attr("y2", x0)
-        .transition()
-          .duration(duration)
-          .attr("y1", x1)
-          .attr("y2", x1);
-
-      medianLine.transition()
-          .duration(duration)
-          .attr("y1", x1)
-          .attr("y2", x1);
-
-      // Update whiskers.
-      var whisker = g.selectAll("line.whisker")
-          .data(whiskerData || []);
-
-      whisker.enter().insert("svg:line", "circle, text")
-          .attr("class", "whisker")
-          .attr("x1", 0)
-          .attr("y1", x0)
-          .attr("x2", width)
-          .attr("y2", x0)
-          .style("opacity", 1e-6)
-        .transition()
-          .duration(duration)
-          .attr("y1", x1)
-          .attr("y2", x1)
-          .style("opacity", 1);
-
-      whisker.transition()
-          .duration(duration)
-          .attr("y1", x1)
-          .attr("y2", x1)
-          .style("opacity", 1);
-
-      whisker.exit().transition()
-          .duration(duration)
-          .attr("y1", x1)
-          .attr("y2", x1)
-          .style("opacity", 1e-6)
-          .remove();
-
-      // Update outliers.
-      var outlier = g.selectAll("circle.outlier")
-          .data(outlierIndices, Number);
-
-      outlier.enter().insert("svg:circle", "text")
-          .attr("class", "outlier")
-          .attr("r", 5)
-          .attr("cx", width / 2)
-          .attr("cy", function(i) { return x0(d[i]); })
-          .style("opacity", 1e-6)
-        .transition()
-          .duration(duration)
-          .attr("cy", function(i) { return x1(d[i]); })
-          .style("opacity", 1);
-
-      outlier.transition()
-          .duration(duration)
-          .attr("cy", function(i) { return x1(d[i]); })
-          .style("opacity", 1);
-
-      outlier.exit().transition()
-          .duration(duration)
-          .attr("cy", function(i) { return x1(d[i]); })
-          .style("opacity", 1e-6)
-          .remove();
-
-      // Compute the tick format.
-      var format = tickFormat || x1.tickFormat(8);
-
-      // Update box ticks.
-      var boxTick = g.selectAll("text.box")
-          .data(quartileData);
-
-      boxTick.enter().append("svg:text")
-          .attr("class", "box")
-          .attr("dy", ".3em")
-          .attr("dx", function(d, i) { return i & 1 ? 6 : -6 })
-          .attr("x", function(d, i) { return i & 1 ? width : 0 })
-          .attr("y", x0)
-          .attr("text-anchor", function(d, i) { return i & 1 ? "start" : "end"; })
-          .text(format)
-        .transition()
-          .duration(duration)
-          .attr("y", x1);
-
-      boxTick.transition()
-          .duration(duration)
-          .text(format)
-          .attr("y", x1);
-
-      // Update whisker ticks. These are handled separately from the box
-      // ticks because they may or may not exist, and we want don't want
-      // to join box ticks pre-transition with whisker ticks post-.
-      var whiskerTick = g.selectAll("text.whisker")
-          .data(whiskerData || []);
-
-      whiskerTick.enter().append("svg:text")
-          .attr("class", "whisker")
-          .attr("dy", ".3em")
-          .attr("dx", 6)
-          .attr("x", width)
-          .attr("y", x0)
-          .text(format)
-          .style("opacity", 1e-6)
-        .transition()
-          .duration(duration)
-          .attr("y", x1)
-          .style("opacity", 1);
-
-      whiskerTick.transition()
-          .duration(duration)
-          .text(format)
-          .attr("y", x1)
-          .style("opacity", 1);
-
-      whiskerTick.exit().transition()
-          .duration(duration)
-          .attr("y", x1)
-          .style("opacity", 1e-6)
-          .remove();
-    });
-    d3.timer.flush();
-  }
-
-  box.width = function(x) {
-    if (!arguments.length) return width;
-    width = x;
-    return box;
-  };
-
-  box.height = function(x) {
-    if (!arguments.length) return height;
-    height = x;
-    return box;
-  };
-
-  box.tickFormat = function(x) {
-    if (!arguments.length) return tickFormat;
-    tickFormat = x;
-    return box;
-  };
-
-  box.duration = function(x) {
-    if (!arguments.length) return duration;
-    duration = x;
-    return box;
-  };
-
-  box.domain = function(x) {
-    if (!arguments.length) return domain;
-    domain = x == null ? x : d3.functor(x);
-    return box;
-  };
-
-  box.value = function(x) {
-    if (!arguments.length) return value;
-    value = x;
-    return box;
-  };
-
-  box.whiskers = function(x) {
-    if (!arguments.length) return whiskers;
-    whiskers = x;
-    return box;
-  };
-
-  box.quartiles = function(x) {
-    if (!arguments.length) return quartiles;
-    quartiles = x;
-    return box;
-  };
-
-  return box;
-};
-
-function d3_chart_boxWhiskers(d) {
-  return [0, d.length - 1];
-}
-
-function d3_chart_boxQuartiles(d) {
-  return [
-    d3.quantile(d, .25),
-    d3.quantile(d, .5),
-    d3.quantile(d, .75)
-  ];
-}