rubrowser 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 37e83a67859f66506295f0fdff3237407c2c9a6d
-  data.tar.gz: 2ab42f6e3208468743ad5722f130accf2849d101
+SHA256:
+  metadata.gz: a3f34361f8481fafacdbb4bda6020e92cc031e9e934e934935e36970164dd9f7
+  data.tar.gz: 5e8899befc1456be7326215551b081a061bd9156f754d409c64484bf6797113e
 SHA512:
-  metadata.gz: 2e47b9d43b0e0a71a6a58b678960c6d72b869503e1efddc4221f1ff015631f15883f35e0a76b17c2aa72f7889e730d13339c133791071909e9f2bae3cb4909ef
-  data.tar.gz: eed29f968098beebbe11e6abfd8987be1f2c162d5bda4ab5d389f157895ed6d22dfe52461a6f9d7e1f161e95efd0aef8f7a3adb076542b5f066734084570174c
+  metadata.gz: 2df8b115f261a7bc09bfa296aeeb3b2db77f7f6e6e0bbd00673de377bb473c29e7c95458e42d02b4406a41262c114d3591e21fad96f5103676001989ef09551c
+  data.tar.gz: 752c00be5fb7b1b079895946de617967b2232d6a7f2ea830e118a2076b52d624f545bd6ddc91ebe93e884c536e30e8d1381b4e213fe0dc4b0f7b3e0bcb73d352

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubrowser (2.0.0)
+    rubrowser (2.1.0)
       parser (~> 2.3, >= 2.3.0)
 
 GEM
@@ -52,4 +52,4 @@ DEPENDENCIES
   rubrowser!
 
 BUNDLED WITH
-   1.15.2
+   1.16.1

data/bin/rubrowser

@@ -6,12 +6,16 @@ require 'rubrowser'
 require 'rubrowser/renderer'
 
 options = {
-  files: ARGV.empty? ? ['.'] : ARGV
+  toolbox: true
 }
 
 OptionParser.new do |opts|
   opts.banner = "Usage: #{__FILE__} [options] [file] ..."
 
+  opts.on('-T', '--no-toolbox', 'Don\'t display toolbox on the page') do
+    options[:toolbox] = false
+  end
+
   opts.on('-v', '--version', 'Print Rubrowser version') do
     puts "Rubrowser #{Rubrowser::VERSION}"
     exit
@@ -23,4 +27,6 @@ OptionParser.new do |opts|
   end
 end.parse!
 
+options[:files] = ARGV.empty? ? ['.'] : ARGV
+
 puts Rubrowser::Renderer.call(options)

data/lib/rubrowser/renderer.rb

@@ -6,6 +6,7 @@ module Rubrowser
   class Renderer
     # Accepted options are:
     # files: list of file paths to parse
+    # toolbox: bool, show/hide toolbox
     def self.call(options = {})
       new(options).call
     end
@@ -22,6 +23,11 @@ module Rubrowser
 
     def initialize(options)
       @files = options[:files]
+      @toolbox = options[:toolbox]
+    end
+
+    def toolbox?
+      @toolbox
     end
 
     def data

data/lib/rubrowser/version.rb

@@ -1,3 +1,3 @@
 module Rubrowser
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/public/javascript/application.js

@@ -2,169 +2,164 @@ var classForCircular = function(d) {
   return d.circular ? 'circular' : '';
 };
 
-var parseGraph = function(data){
-  var svg = d3.select(".dependency_graph svg"),
-      $svg = $('.dependency_graph svg'),
-      width = $svg.width(),
-      height = $svg.height(),
-      drag = d3.drag()
-        .on("start", dragstarted)
-        .on("drag", dragged)
-      .on("end", dragended),
-      dup_definitions = data.definitions.map(function(d){ return {id: d.namespace, type: d.type, lines: d.lines, circular: d.circular }; }),
-      definitions = _(dup_definitions).groupBy('id').map(function(group) {
-        return {
-          id: group[0].id,
-          type: group[0].type,
-          lines: _(group).sumBy('lines'),
-          circular: group[0].circular
-        };
-      }).value(),
-      namespaces = definitions.map(function(d){ return d.id; }),
-      relations = data.relations.map(function(d){ return {source: d.caller, target: d.resolved_namespace, circular: d.circular}; }),
-      max_lines = _.maxBy(definitions, 'lines').lines,
-      max_circle_r = 50;
-
-  relations = relations.filter(function(d){
-    return namespaces.indexOf(d.source) >= 0 && namespaces.indexOf(d.target) >= 0;
-  });
-  relations = _.uniqWith(relations, _.isEqual);
-
-  var zoom = d3.zoom()
-        .on("zoom", function () {
-          container.attr("transform", d3.event.transform);
-        });
-
-  svg.call(zoom)
-    .on("dblclick.zoom", null);
-
-  var container = svg.append('g'),
-      simulation = d3.forceSimulation()
-        .force("link", d3.forceLink().id(function(d) { return d.id; }))
-        .force("charge", d3.forceManyBody())
-        .force("center", d3.forceCenter(width / 2, height / 2))
-        .force("forceCollide", d3.forceCollide(80));
-
-  simulation
-    .nodes(definitions)
-    .on("tick", ticked);
-
-  simulation.force("link")
-    .links(relations);
-
-  var link = container.append("g")
-        .attr("class", "links")
-        .selectAll("path")
-        .data(relations)
-        .enter().append("path")
-        .attr("class", function(d) { return 'link ' + classForCircular(d); })
-        .attr("marker-end", function(d){ return "url(#" + d.target.id + ")"; }),
-      node = container.append("g")
-        .attr("class", "nodes")
-        .selectAll("g")
-        .data(definitions)
-        .enter().append("g")
-        .call(drag)
-        .on("dblclick", dblclick),
-      circle = node
-        .append("circle")
-        .attr("r", function(d) { return d.lines / max_lines * max_circle_r + 6; })
-        .attr("class", function (d) { return classForCircular(d) ; }),
-      type = node
-        .append("text")
-        .attr("class", "type")
-        .attr("x", "-0.4em")
-        .attr("y", "0.4em")
-        .text(function(d) { return d.type[0]; }),
-      text = node
-        .append("text")
-        .attr("class", "namespace")
-        .attr("x", function(d) { return d.lines / max_lines * max_circle_r + 8; })
-        .attr("y", ".31em")
-        .text(function(d) { return d.id; });
-
-  container.append("defs").selectAll("marker")
-    .data(definitions)
-    .enter().append("marker")
-    .attr("id", function(d) { return d.id; })
-    .attr("viewBox", "0 -5 10 10")
-    .attr("refX", function(d){ return d.lines / max_lines * max_circle_r + 20; })
-    .attr("refY", 0)
-    .attr("markerWidth", 6)
-    .attr("markerHeight", 6)
-    .attr("orient", "auto")
-    .append("path")
-    .attr("d", "M0,-5L10,0L0,5");
-
-  function ticked() {
-    link.attr("d", linkArc);
-    node.attr("transform", transform);
-  }
-
-  function linkArc(d) {
-    var dx = d.target.x - d.source.x,
-        dy = d.target.y - d.source.y,
-        dr =  0;
-    return "M" + d.source.x + "," + d.source.y + "A" + dr + "," + dr + " 0 0,1 " + d.target.x + "," + d.target.y;
-  }
-
-  function dragstarted(d) {
-    if (!d3.event.active) simulation.alphaTarget(0.3).restart();
-    d3.select(this).classed("fixed", true);
-    d.fx = d.x;
-    d.fy = d.y;
-  }
-
-  function dragged(d) {
-    d.fx = d3.event.x;
-    d.fy = d3.event.y;
-  }
-
-  function dragended(d) {
-    if (!d3.event.active) simulation.alphaTarget(0);
-  }
-
-  function dblclick(d) {
-    d3.select(this).classed("fixed", false);
-    d.fx = null;
-    d.fy = null;
-  }
-
-  function transform(d) {
-    return "translate(" + d.x + "," + d.y + ")";
-  }
-
-
-  node.on('mouseover', function(d) {
-    var relatives = [];
-    link.classed('downlighted', function(l) {
-      if (d === l.source || d === l.target){
-        relatives.push(l.source);
-        relatives.push(l.target);
-        return false;
-      }else{
-        return true;
-      }
+var svg = d3.select(".dependency_graph svg"),
+    $svg = $('.dependency_graph svg'),
+    width = $svg.width(),
+    height = $svg.height(),
+    drag = d3.drag()
+    .on("start", dragstarted)
+    .on("drag", dragged)
+    .on("end", dragended),
+    dup_definitions = data.definitions.map(function(d){ return {id: d.namespace, type: d.type, lines: d.lines, circular: d.circular }; }),
+    definitions = _(dup_definitions).groupBy('id').map(function(group) {
+      return {
+        id: group[0].id,
+        type: group[0].type,
+        lines: _(group).sumBy('lines'),
+        circular: group[0].circular
+      };
+    }).value(),
+    namespaces = definitions.map(function(d){ return d.id; }),
+    relations = data.relations.map(function(d){ return {source: d.caller, target: d.resolved_namespace, circular: d.circular}; }),
+    max_lines = _.maxBy(definitions, 'lines').lines,
+    max_circle_r = 50;
+
+relations = relations.filter(function(d){
+  return namespaces.indexOf(d.source) >= 0 && namespaces.indexOf(d.target) >= 0;
+});
+relations = _.uniqWith(relations, _.isEqual);
+
+var zoom = d3.zoom()
+    .on("zoom", function () {
+      container.attr("transform", d3.event.transform);
     });
-    node.classed('downlighted', function(n) {
-      return !(n == d || relatives.indexOf(n) > -1);
-    });
-  });
 
-  node.on('mouseout', function() {
-    link.classed('downlighted', false);
-    node.classed('downlighted', false);
+svg.call(zoom)
+  .on("dblclick.zoom", null);
+
+var container = svg.append('g'),
+    simulation = d3.forceSimulation()
+    .force("link", d3.forceLink().id(function(d) { return d.id; }))
+    .force("charge", d3.forceManyBody())
+    .force("center", d3.forceCenter(width / 2, height / 2))
+    .force("forceCollide", d3.forceCollide(80));
+
+simulation
+  .nodes(definitions)
+  .on("tick", ticked);
+
+simulation.force("link")
+  .links(relations);
+
+var link = container.append("g")
+    .attr("class", "links")
+    .selectAll("path")
+    .data(relations)
+    .enter().append("path")
+    .attr("class", function(d) { return 'link ' + classForCircular(d); })
+    .attr("marker-end", function(d){ return "url(#" + d.target.id + ")"; }),
+    node = container.append("g")
+    .attr("class", "nodes")
+    .selectAll("g")
+    .data(definitions)
+    .enter().append("g")
+    .call(drag)
+    .on("dblclick", dblclick),
+    circle = node
+    .append("circle")
+    .attr("r", function(d) { return d.lines / max_lines * max_circle_r + 6; })
+    .attr("class", function (d) { return classForCircular(d) ; }),
+    type = node
+    .append("text")
+    .attr("class", "type")
+    .attr("x", "-0.4em")
+    .attr("y", "0.4em")
+    .text(function(d) { return d.type[0]; }),
+    text = node
+    .append("text")
+    .attr("class", "namespace")
+    .attr("x", function(d) { return d.lines / max_lines * max_circle_r + 8; })
+    .attr("y", ".31em")
+    .text(function(d) { return d.id; });
+
+container.append("defs").selectAll("marker")
+  .data(definitions)
+  .enter().append("marker")
+  .attr("id", function(d) { return d.id; })
+  .attr("viewBox", "0 -5 10 10")
+  .attr("refX", function(d){ return d.lines / max_lines * max_circle_r + 20; })
+  .attr("refY", 0)
+  .attr("markerWidth", 6)
+  .attr("markerHeight", 6)
+  .attr("orient", "auto")
+  .append("path")
+  .attr("d", "M0,-5L10,0L0,5");
+
+function ticked() {
+  link.attr("d", linkArc);
+  node.attr("transform", transform);
+}
+
+function linkArc(d) {
+  var dx = d.target.x - d.source.x,
+      dy = d.target.y - d.source.y,
+      dr =  0;
+  return "M" + d.source.x + "," + d.source.y + "A" + dr + "," + dr + " 0 0,1 " + d.target.x + "," + d.target.y;
+}
+
+function dragstarted(d) {
+  if (!d3.event.active) simulation.alphaTarget(0.3).restart();
+  d3.select(this).classed("fixed", true);
+  d.fx = d.x;
+  d.fy = d.y;
+}
+
+function dragged(d) {
+  d.fx = d3.event.x;
+  d.fy = d3.event.y;
+}
+
+function dragended(d) {
+  if (!d3.event.active) simulation.alphaTarget(0);
+}
+
+function dblclick(d) {
+  d3.select(this).classed("fixed", false);
+  d.fx = null;
+  d.fy = null;
+}
+
+function transform(d) {
+  return "translate(" + d.x + "," + d.y + ")";
+}
+
+
+node.on('mouseover', function(d) {
+  var relatives = [];
+  link.classed('downlighted', function(l) {
+    if (d === l.source || d === l.target){
+      relatives.push(l.source);
+      relatives.push(l.target);
+      return false;
+    }else{
+      return true;
+    }
   });
-
-  window.rubrowser = {
-    data: data,
-    definitions: definitions,
-    relations: relations,
-    simulation: simulation,
-    node: node,
-    link: link
-  };
-  $(document).trigger('graph-rendered');
+  node.classed('downlighted', function(n) {
+    return !(n == d || relatives.indexOf(n) > -1);
+  });
+});
+
+node.on('mouseout', function() {
+  link.classed('downlighted', false);
+  node.classed('downlighted', false);
+});
+
+window.rubrowser = {
+  data: data,
+  definitions: definitions,
+  relations: relations,
+  simulation: simulation,
+  node: node,
+  link: link
 };
-
-parseGraph(data);

data/public/javascript/toolbox.js

@@ -5,46 +5,44 @@ $(document).on('click', '.panel .title', function(){
 // --------------------------------
 // Details Panel
 // --------------------------------
-$(document).on('graph-rendered', function(){
-  rubrowser.node.on('click', function(d){
-    var namespace = d.id;
-    var lines = d.lines;
-    var dependents = rubrowser.relations.filter(function(i){ return i.target.id == namespace; });
-    var dependencies = rubrowser.relations.filter(function(i){ return i.source.id == namespace; });
-    var definitions = rubrowser.data.definitions.filter(function(i){ return i.namespace == namespace; });
-    var relations = rubrowser.data.relations.filter(function(i){ return i.resolved_namespace == namespace || i.caller == namespace; });
-
-    var content = $('<div>');
-    content.append('<label><strong>'+namespace+' ('+d.lines+' Lines)</strong></label>');
-
-    content.append('<strong>Defined in:</strong>');
-    var definitions_ol = $("<ol>");
-    for(var i=0; i<definitions.length; i++){
-      definitions_ol.append("<li>"+definitions[i].file+":"+definitions[i].line.toString()+"</li>");
+rubrowser.node.on('click', function(d){
+  var namespace = d.id;
+  var lines = d.lines;
+  var dependents = rubrowser.relations.filter(function(i){ return i.target.id == namespace; });
+  var dependencies = rubrowser.relations.filter(function(i){ return i.source.id == namespace; });
+  var definitions = rubrowser.data.definitions.filter(function(i){ return i.namespace == namespace; });
+  var relations = rubrowser.data.relations.filter(function(i){ return i.resolved_namespace == namespace || i.caller == namespace; });
+
+  var content = $('<div>');
+  content.append('<label><strong>'+namespace+' ('+d.lines+' Lines)</strong></label>');
+
+  content.append('<strong>Defined in:</strong>');
+  var definitions_ol = $("<ol>");
+  for(var i=0; i<definitions.length; i++){
+    definitions_ol.append("<li>"+definitions[i].file+":"+definitions[i].line.toString()+"</li>");
+  }
+  content.append(definitions_ol);
+
+  if( dependents.length > 0 ){
+    content.append('<strong>Dependents:</strong>');
+    var dependents_ol = $("<ol>");
+    for(var i=0; i<dependents.length; i++){
+      dependents_ol.append("<li>"+dependents[i].source.id+"</li>");
     }
-    content.append(definitions_ol);
-
-    if( dependents.length > 0 ){
-      content.append('<strong>Dependents:</strong>');
-      var dependents_ol = $("<ol>");
-      for(var i=0; i<dependents.length; i++){
-        dependents_ol.append("<li>"+dependents[i].source.id+"</li>");
-      }
-      content.append(dependents_ol);
+    content.append(dependents_ol);
+  }
+
+  if( dependencies.length > 0 ){
+    content.append('<strong>Dependencies:</strong>');
+    var dependencies_ol = $("<ol>");
+    for(var i=0; i<dependencies.length; i++){
+      dependencies_ol.append("<li>"+dependencies[i].target.id+"</li>");
     }
+    content.append(dependencies_ol);
+  }
 
-    if( dependencies.length > 0 ){
-      content.append('<strong>Dependencies:</strong>');
-      var dependencies_ol = $("<ol>");
-      for(var i=0; i<dependencies.length; i++){
-        dependencies_ol.append("<li>"+dependencies[i].target.id+"</li>");
-      }
-      content.append(dependencies_ol);
-    }
-
-    $('#information_panel').html(content);
-    return true;
-  });
+  $('#information_panel').html(content);
+  return true;
 });