rubrowser 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f94392243bcd5643136643e838c1d43382c9437e
-  data.tar.gz: e8c90eb45c0a7ae4656f0cfc173a58c7f1be89d7
+  metadata.gz: fd6da7e91cc1f4b7e50ba33d062baa579f2054d5
+  data.tar.gz: 400349b68d33f44c42c0b7571318eab0ec675c96
 SHA512:
-  metadata.gz: b0edd936a9bf980e79e3c796546fc25912235bd5038562128ab1e600baf72c8483982a7e8353ab1337762867b94010efd4cd7592bab3417ad9c962d988d05ff3
-  data.tar.gz: 615030ae5b7314b49110e5dfc60141969e414ae3d6d2ae29d319af2edf5d03085801e0d7db1a63c03ddf08a4563114f2fb52377606d0a4ecdea40528dcdf02f6
+  metadata.gz: be689e37c1507f092ad03e735e78e6464b2f63100e42c134e70fda6350277881cb5ab87d812a34504928bd3e6be72db8565712c9b5731261804159d73ff5650a
+  data.tar.gz: b21b259b207cabe0c822012a04b4e6ecdc5070685403c94d35f0712d61c47a8ad74b70465893d33e48f1e599ea91f8c95fa347ab2a273042f103a7edbbb3f9fd

data/.gitignore

@@ -1 +1,2 @@
-tmp/
+tmp/
+pkg/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubrowser (0.2.6)
+    rubrowser (0.2.7)
       parser (~> 2.3, >= 2.3.0)
 
 GEM

data/lib/rubrowser/data.rb

@@ -9,7 +9,7 @@ module Rubrowser
     end
 
     def definitions
-      @_constants ||= parsers.map(&:definitions).reduce(:+).to_a
+      @_definitions ||= parsers.map(&:definitions).reduce(:+).to_a
     end
 
     def relations
@@ -18,15 +18,15 @@ module Rubrowser
 
     private
 
+    attr_reader :files, :parsed
+    alias parsed? parsed
+
     def parse
       return if parsed?
       parsers.each(&:parse)
       @parsed = true
     end
 
-    attr_reader :files, :parsed
-    alias parsed? parsed
-
     def parsers
       @_parsers ||= files.map do |file|
         Rubrowser::Parser::Factory.build(file)

data/lib/rubrowser/formatter/json.rb

@@ -23,7 +23,8 @@ module Rubrowser
           type: demoularize(definition.class.name),
           namespace: definition.to_s,
           file: definition.file,
-          line: definition.line
+          line: definition.line,
+          lines: definition.lines
         }
       end
 

data/lib/rubrowser/parser/definition/base.rb

@@ -2,12 +2,13 @@ module Rubrowser
   module Parser
     module Definition
       class Base
-        attr_reader :namespace, :file, :line
+        attr_reader :namespace, :file, :line, :lines
 
-        def initialize(namespace, file: nil, line: nil)
+        def initialize(namespace, file: nil, line: nil, lines: 0)
           @namespace = Array(namespace)
           @file = file
           @line = line
+          @lines = lines
         end
 
         def name

data/lib/rubrowser/parser/file/builder.rb

@@ -0,0 +1,15 @@
+module Rubrowser
+  module Parser
+    class File
+      # This class is a workaround for this behaviour
+      # https://github.com/whitequark/parser/commit/95401a20e8f4532e32f6361da3918ac8e4bd18c7
+      # the snippet that is using this class in File is copied from:
+      # https://github.com/eapache/starscope/pull/166/files
+      class Builder < ::Parser::Builders::Default
+        def string_value(token)
+          value(token)
+        end
+      end
+    end
+  end
+end

data/lib/rubrowser/parser/file.rb

@@ -2,7 +2,7 @@ require 'parser/current'
 require 'rubrowser/parser/definition/class'
 require 'rubrowser/parser/definition/module'
 require 'rubrowser/parser/relation/base'
-require 'rubrowser/parser/builder'
+require 'rubrowser/parser/file/builder'
 
 module Rubrowser
   module Parser
@@ -18,22 +18,21 @@ module Rubrowser
       end
 
       def parse
-        if valid_file?(file)
-          contents = ::File.read(file)
+        return unless valid_file?(file)
+        contents = ::File.read(file)
 
-          buffer = ::Parser::Source::Buffer.new(file, 1)
-          buffer.source = contents.force_encoding(Encoding::UTF_8)
+        buffer = ::Parser::Source::Buffer.new(file, 1)
+        buffer.source = contents.force_encoding(Encoding::UTF_8)
 
-          parser = ::Parser::CurrentRuby.new(Builder.new)
-          parser.diagnostics.ignore_warnings = true
-          parser.diagnostics.all_errors_are_fatal = false
+        parser = ::Parser::CurrentRuby.new(Builder.new)
+        parser.diagnostics.ignore_warnings = true
+        parser.diagnostics.all_errors_are_fatal = false
 
-          ast = parser.parse(buffer)
-          constants = parse_block(ast)
+        ast = parser.parse(buffer)
+        constants = parse_block(ast)
 
-          @definitions = constants[:definitions]
-          @relations = constants[:relations]
-        end
+        @definitions = constants[:definitions]
+        @relations = constants[:relations]
       rescue ::Parser::SyntaxError
         warn "SyntaxError in #{file}"
       end
@@ -62,7 +61,8 @@ module Rubrowser
         definition = Definition::Module.new(
           namespace,
           file: file,
-          line: node.loc.line
+          line: node.loc.line,
+          lines: node.loc.last_line - node.loc.line + 1
         )
         constants = { definitions: [definition] }
         children_constants = parse_array(node.children[1..-1], namespace)
@@ -75,7 +75,8 @@ module Rubrowser
         definition = Definition::Class.new(
           namespace,
           file: file,
-          line: node.loc.line
+          line: node.loc.line,
+          lines: node.loc.last_line - node.loc.line + 1
         )
         constants = { definitions: [definition] }
         children_constants = parse_array(node.children[1..-1], namespace)

data/lib/rubrowser/parser/relation/base.rb

@@ -35,9 +35,11 @@ module Rubrowser
         private
 
         def possibilities
-          return [
-            Definition::Base.new(@namespace.compact, file: file, line: line)
-          ] if absolute?
+          if absolute?
+            return [
+              Definition::Base.new(@namespace.compact, file: file, line: line)
+            ]
+          end
 
           possible_parent_namespaces
             .map { |possible_parent| possible_parent + @namespace }

data/lib/rubrowser/server.rb

@@ -5,16 +5,23 @@ require 'rubrowser/formatter/json'
 
 module Rubrowser
   class Server < WEBrick::HTTPServer
+    # Accepted options are:
+    # port: port number for the server
+    # files: list of file paths to parse
+    def self.start(options = {})
+      new(options).start
+    end
+
+    private
+
     include ERB::Util
 
     ROUTES = {
       '/' => :root,
       '/data.json' => :data
-    }
+    }.freeze
 
-    def self.start(options = {})
-      new(options).start
-    end
+    attr_reader :files
 
     def initialize(options)
       super Port: options[:port]
@@ -25,10 +32,6 @@ module Rubrowser
       end
     end
 
-    private
-
-    attr_reader :files
-
     def router(path)
       return file(path) if file?(path)
       return send(ROUTES[path]) if ROUTES.key?(path)

data/lib/rubrowser/version.rb

@@ -1,3 +1,3 @@
 module Rubrowser
-  VERSION = '0.2.6'.freeze
+  VERSION = '0.2.7'.freeze
 end

data/public/javascript/application.js

@@ -12,10 +12,19 @@ var parseGraph = function(data){
       drag = d3.drag()
         .on("start", dragstarted)
         .on("drag", dragged)
-        .on("end", dragended),
-      definitions = _.uniqWith(data.definitions.map(function(d){ return {id: d.namespace, type: d.type }; }), _.isEqual),
+      .on("end", dragended),
+      dup_definitions = data.definitions.map(function(d){ return {id: d.namespace, type: d.type, lines: d.lines }; }),
+      definitions = _(dup_definitions).groupBy('id').map(function(group) {
+        return {
+          id: group[0].id,
+          type: group[0].type,
+          lines: _(group).sumBy('lines')
+        };
+      }).value(),
       namespaces = definitions.map(function(d){ return d.id; }),
-      relations = data.relations.map(function(d){ return {source: d.caller, target: d.resolved_namespace }; });
+      relations = data.relations.map(function(d){ return {source: d.caller, target: d.resolved_namespace }; }),
+      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;
@@ -50,7 +59,7 @@ var parseGraph = function(data){
         .data(relations)
         .enter().append("path")
         .attr("class", 'link')
-        .attr("marker-end", "url(#relation)"),
+        .attr("marker-end", function(d){ return "url(#" + d.target.id + ")"; }),
       node = container.append("g")
         .attr("class", "nodes")
         .selectAll("g")
@@ -60,7 +69,7 @@ var parseGraph = function(data){
         .on("dblclick", dblclick),
       circle = node
         .append("circle")
-        .attr("r", 6),
+        .attr("r", function(d) { return d.lines / max_lines * max_circle_r + 6; }),
       type = node
         .append("text")
         .attr("class", "type")
@@ -70,17 +79,17 @@ var parseGraph = function(data){
       text = node
         .append("text")
         .attr("class", "namespace")
-        .attr("x", 8)
+        .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(['relation'])
+    .data(definitions)
     .enter().append("marker")
-    .attr("id", function(d) { return d; })
+    .attr("id", function(d) { return d.id; })
     .attr("viewBox", "0 -5 10 10")
-    .attr("refX", 15)
-    .attr("refY", -1.5)
+    .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")