d3_rails 2.7.4 → 2.7.5.v2

Sign up to get free protection for your applications and to get access to all the features.
File without changes
File without changes
File without changes
@@ -10,7 +10,7 @@ try {
10
10
  d3_style_setProperty.call(this, name, value + "", priority);
11
11
  };
12
12
  }
13
- d3 = {version: "2.7.4"}; // semver
13
+ d3 = {version: "2.7.5"}; // semver
14
14
  var d3_array = d3_arraySlice; // conversion for NodeLists
15
15
 
16
16
  function d3_arrayCopy(pseudoarray) {
@@ -391,11 +391,6 @@ function d3_splitter(d) {
391
391
  function d3_collapse(s) {
392
392
  return s.replace(/(^\s+)|(\s+$)/g, "").replace(/\s+/g, " ");
393
393
  }
394
- /**
395
- * @param {number} start
396
- * @param {number=} stop
397
- * @param {number=} step
398
- */
399
394
  d3.range = function(start, stop, step) {
400
395
  if (arguments.length < 3) {
401
396
  step = 1;
@@ -404,14 +399,22 @@ d3.range = function(start, stop, step) {
404
399
  start = 0;
405
400
  }
406
401
  }
407
- if ((stop - start) / step == Infinity) throw new Error("infinite range");
402
+ if ((stop - start) / step === Infinity) throw new Error("infinite range");
408
403
  var range = [],
404
+ k = d3_range_integerScale(Math.abs(step)),
409
405
  i = -1,
410
406
  j;
411
- if (step < 0) while ((j = start + step * ++i) > stop) range.push(j);
412
- else while ((j = start + step * ++i) < stop) range.push(j);
407
+ start *= k, stop *= k, step *= k;
408
+ if (step < 0) while ((j = start + step * ++i) > stop) range.push(j / k);
409
+ else while ((j = start + step * ++i) < stop) range.push(j / k);
413
410
  return range;
414
411
  };
412
+
413
+ function d3_range_integerScale(x) {
414
+ var k = 1;
415
+ while (x * k % 1) k *= 10;
416
+ return k;
417
+ }
415
418
  d3.requote = function(s) {
416
419
  return s.replace(d3_requote_re, "\\$&");
417
420
  };
@@ -545,7 +548,7 @@ function d3_dispatch_event(dispatch) {
545
548
  };
546
549
 
547
550
  return event;
548
- };
551
+ }
549
552
  // TODO align
550
553
  d3.format = function(specifier) {
551
554
  var match = d3_format_re.exec(specifier),
@@ -2430,7 +2433,7 @@ function d3_scale_linear(domain, range, interpolate, clamp) {
2430
2433
  input;
2431
2434
 
2432
2435
  function rescale() {
2433
- var linear = domain.length == 2 ? d3_scale_bilinear : d3_scale_polylinear,
2436
+ var linear = Math.min(domain.length, range.length) > 2 ? d3_scale_polylinear : d3_scale_bilinear,
2434
2437
  uninterpolate = clamp ? d3_uninterpolateClamp : d3_uninterpolateNumber;
2435
2438
  output = linear(domain, range, uninterpolate, interpolate);
2436
2439
  input = linear(range, domain, uninterpolate, d3.interpolate);
@@ -2492,7 +2495,7 @@ function d3_scale_linear(domain, range, interpolate, clamp) {
2492
2495
  };
2493
2496
 
2494
2497
  return rescale();
2495
- };
2498
+ }
2496
2499
 
2497
2500
  function d3_scale_linearRebind(scale, linear) {
2498
2501
  return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
@@ -2542,7 +2545,7 @@ function d3_scale_polylinear(domain, range, uninterpolate, interpolate) {
2542
2545
  var u = [],
2543
2546
  i = [],
2544
2547
  j = 0,
2545
- k = domain.length - 1;
2548
+ k = Math.min(domain.length, range.length) - 1;
2546
2549
 
2547
2550
  // Handle descending domains.
2548
2551
  if (domain[k] < domain[0]) {
@@ -2626,7 +2629,7 @@ function d3_scale_log(linear, log) {
2626
2629
  };
2627
2630
 
2628
2631
  return d3_scale_linearRebind(scale, linear);
2629
- };
2632
+ }
2630
2633
 
2631
2634
  var d3_scale_logFormat = d3.format(".0e");
2632
2635
 
@@ -2692,7 +2695,7 @@ function d3_scale_pow(linear, exponent) {
2692
2695
  };
2693
2696
 
2694
2697
  return d3_scale_linearRebind(scale, linear);
2695
- };
2698
+ }
2696
2699
 
2697
2700
  function d3_scale_powPow(e) {
2698
2701
  return function(x) {
@@ -2782,7 +2785,7 @@ function d3_scale_ordinal(domain, ranger) {
2782
2785
  };
2783
2786
 
2784
2787
  return scale.domain(domain);
2785
- };
2788
+ }
2786
2789
  /*
2787
2790
  * This product includes color specifications and designs developed by Cynthia
2788
2791
  * Brewer (http://colorbrewer.org/). See lib/colorbrewer for more information.
@@ -2879,7 +2882,7 @@ function d3_scale_quantile(domain, range) {
2879
2882
  };
2880
2883
 
2881
2884
  return rescale();
2882
- };
2885
+ }
2883
2886
  d3.scale.quantize = function() {
2884
2887
  return d3_scale_quantize(0, 1, [0, 1]);
2885
2888
  };
@@ -2915,7 +2918,7 @@ function d3_scale_quantize(x0, x1, range) {
2915
2918
  };
2916
2919
 
2917
2920
  return rescale();
2918
- };
2921
+ }
2919
2922
  d3.svg = {};
2920
2923
  d3.svg.arc = function() {
2921
2924
  var innerRadius = d3_svg_arcInnerRadius,
@@ -255,6 +255,9 @@ d3.layout.force = function() {
255
255
  }
256
256
 
257
257
  function tick() {
258
+ // simulated annealing, basically
259
+ if ((alpha *= .99) < .005) return true;
260
+
258
261
  var n = nodes.length,
259
262
  m = links.length,
260
263
  q,
@@ -319,9 +322,6 @@ d3.layout.force = function() {
319
322
  }
320
323
 
321
324
  event.tick({type: "tick", alpha: alpha});
322
-
323
- // simulated annealing, basically
324
- return (alpha *= .99) < .005;
325
325
  }
326
326
 
327
327
  force.nodes = function(x) {
@@ -1346,7 +1346,8 @@ function d3_layout_packPlace(a, b, c) {
1346
1346
  c.y = a.y;
1347
1347
  }
1348
1348
  }
1349
- // Implements a hierarchical layout using the cluster (or dendogram) algorithm.
1349
+ // Implements a hierarchical layout using the cluster (or dendrogram)
1350
+ // algorithm.
1350
1351
  d3.layout.cluster = function() {
1351
1352
  var hierarchy = d3.layout.hierarchy().sort(null).value(null),
1352
1353
  separation = d3_layout_treeSeparation,
File without changes
@@ -0,0 +1 @@
1
+ //= require_directory ./chart
File without changes
@@ -1 +1 @@
1
- //= require self
1
+ //= require_self
metadata CHANGED
@@ -1,19 +1,19 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: d3_rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.7.4
5
- prerelease:
4
+ version: 2.7.5.v2
5
+ prerelease: 6
6
6
  platform: ruby
7
7
  authors:
8
8
  - Han
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-02-03 00:00:00.000000000Z
12
+ date: 2012-02-24 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &70259585166860 !ruby/object:Gem::Requirement
16
+ requirement: &70273002369920 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.1.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70259585166860
24
+ version_requirements: *70273002369920
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: bundler
27
- requirement: &70259585166360 !ruby/object:Gem::Requirement
27
+ requirement: &70273002369380 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.0.0
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70259585166360
35
+ version_requirements: *70273002369380
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rails
38
- requirement: &70259585165900 !ruby/object:Gem::Requirement
38
+ requirement: &70273002368800 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,7 +43,7 @@ dependencies:
43
43
  version: '3.1'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70259585165900
46
+ version_requirements: *70273002368800
47
47
  description: Gem installation of javascript framework for data visualization, D3
48
48
  email:
49
49
  - han@logicallsat.com
@@ -61,8 +61,14 @@ files:
61
61
  - lib/d3_rails.rb
62
62
  - lib/d3_rails/engine.rb
63
63
  - lib/d3_rails/version.rb
64
+ - vendor/.DS_Store
64
65
  - vendor/assets/javascripts/.DS_Store
65
66
  - vendor/assets/javascripts/LICENSE
67
+ - vendor/assets/javascripts/chart/box.js
68
+ - vendor/assets/javascripts/chart/bullet.js
69
+ - vendor/assets/javascripts/chart/chart.js
70
+ - vendor/assets/javascripts/chart/horizon.js
71
+ - vendor/assets/javascripts/chart/qq.js
66
72
  - vendor/assets/javascripts/colorbrewer.js
67
73
  - vendor/assets/javascripts/d3.chart.js
68
74
  - vendor/assets/javascripts/d3.geo.js
@@ -70,9 +76,9 @@ files:
70
76
  - vendor/assets/javascripts/d3.js
71
77
  - vendor/assets/javascripts/d3.layout.js
72
78
  - vendor/assets/javascripts/d3.time.js
79
+ - vendor/assets/javascripts/d3_chart_module.js
73
80
  - vendor/assets/javascripts/d3_csv.js
74
81
  - vendor/assets/javascripts/d3_rails.js
75
- - vendor/assets/javascripts/package.json
76
82
  - vendor/assets/javascripts/science.js
77
83
  - vendor/assets/javascripts/science.lin.js
78
84
  - vendor/assets/javascripts/science.stats.js
@@ -112,9 +118,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
112
118
  required_rubygems_version: !ruby/object:Gem::Requirement
113
119
  none: false
114
120
  requirements:
115
- - - ! '>='
121
+ - - ! '>'
116
122
  - !ruby/object:Gem::Version
117
- version: '0'
123
+ version: 1.3.1
118
124
  requirements: []
119
125
  rubyforge_project: d3_rails
120
126
  rubygems_version: 1.8.6
@@ -1,33 +0,0 @@
1
- {
2
- "name": "d3",
3
- "version": "2.7.3",
4
- "description": "A small, free JavaScript library for manipulating documents based on data.",
5
- "keywords": [
6
- "dom",
7
- "w3c",
8
- "visualization",
9
- "svg",
10
- "animation",
11
- "canvas"
12
- ],
13
- "homepage": "http://mbostock.github.com/d3/",
14
- "author": {
15
- "name": "Mike Bostock",
16
- "url": "http://bost.ocks.org/mike"
17
- },
18
- "repository": {
19
- "type": "git",
20
- "url": "http://github.com/mbostock/d3.git"
21
- },
22
- "main": "d3.js",
23
- "dependencies": {
24
- "jsdom": "0.2.10"
25
- },
26
- "devDependencies": {
27
- "uglify-js": "1.2.3",
28
- "vows": "0.6.x"
29
- },
30
- "scripts": {
31
- "test": "./node_modules/vows/bin/vows"
32
- }
33
- }