rubrowser 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98a6e065af01c9315496133bd1de3108a6c304c8
-  data.tar.gz: 666779a8c170e5b9fb52a7d67435fb28124991fa
+  metadata.gz: 0be17d7b269962a4124e4c71d0960ee14612f32d
+  data.tar.gz: 8b24607f58b580bae77e5e9d39b0fe71ab6fd2cc
 SHA512:
-  metadata.gz: 07db9f0754f43387becd50c5a1facb1872e76b1e982de3b6f06bc7a36949642982c76b64e5bc94e5c44648e5974ec78542911fcf79226e8cc40cbe99a1dd6f17
-  data.tar.gz: 12e93089491077c8fd52feed738b2169ceced4941eb2f154489ecc7af721e06ae66c6309300894d6be8c63bf021b5c9bdba26a4663b7897d4c99e164365dafee
+  metadata.gz: a4eef0ad580d87429db8b111dedca2a9e7258e094adf0694f9243a3ec2e7b323c4f47cf21458f300cbaaf594dc849eb6ab1c4f9b6d2b3f4c130d8a7b8815a83a
+  data.tar.gz: 5849d5b884678343377d5c670f0055bdbd42865a637f983da412a39ef9e6b4d4b06b628be8690fc4f4c1de5090b80a60ebdcbf53d3d0059f4bdea9fa822e988c

data/Gemfile.lock

@@ -1,21 +1,15 @@
 PATH
   remote: .
   specs:
-    rubrowser (0.1.3)
-      haml (~> 4.0, >= 4.0.0)
-      parallel (~> 1.9, >= 1.9.0)
+    rubrowser (0.1.4)
       parser (~> 2.3, >= 2.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.3.0)
-    haml (4.0.7)
-      tilt
-    parallel (1.9.0)
     parser (2.3.1.2)
       ast (~> 2.2)
-    tilt (2.0.5)
 
 PLATFORMS
   ruby

data/lib/parser/directory.rb

@@ -1,6 +1,3 @@
-require 'parser/factory'
-require 'parallel'
-
 module Rubrowser
   module Parser
     class Directory
@@ -8,37 +5,25 @@ module Rubrowser
 
       def initialize(directory)
         @directory = directory
-        @parsers = []
-        read
+        files = Dir.glob(::File.join(directory, '**', '*.rb'))
+        @parsers = files.map { |f| File.new(f) }
       end
 
       def parse
-        self.parsers = Parallel.map(parsers){ |parser| parser.parse }
-        self
+        parsers.each(&:parse)
       end
 
       def definitions
-        parsers.map(&:definitions).map(&:to_a).reduce(:+) || []
+        parsers.map(&:definitions).map(&:to_a).reduce(:+)
       end
 
       def occurences
-        parsers.map(&:occurences).map(&:to_a).reduce(:+) || []
-      end
-
-      def count
-        parsers.map(&:count).reduce(:+)
+        parsers.map(&:occurences).map(&:to_a).reduce(:+)
       end
 
       private
 
-      attr_accessor :parsers
-
-      def read
-        files = Dir.glob(::File.join(directory, '**', '*.rb'))
-        self.parsers = Parallel.map(files) do |file|
-          Factory.build(file)
-        end.compact
-      end
+      attr_reader :parsers
     end
   end
 end

data/lib/parser/file.rb

@@ -9,7 +9,7 @@ module Rubrowser
 
       def initialize(file)
         @file = file
-        @definitions = Set.new
+        @definitions = []
         @occurences = []
       end
 
@@ -19,25 +19,20 @@ module Rubrowser
             code = f.read
             ast = ::Parser::CurrentRuby.parse(code)
             constants = parse_block(ast)
-            self.definitions = constants[:definitions].uniq
-            self.occurences = constants[:occurences].uniq
+            @definitions = constants[:definitions].uniq
+            @occurences = constants[:occurences].uniq
           end
         end
-        self
       end
 
       def file_valid?(file)
-        !::File.symlink?(file) && ::File.file?(file) && ::File.size(file) <= FILE_SIZE_LIMIT
-      end
-
-      def count
-        1
+        !::File.symlink?(file) &&
+          ::File.file?(file) &&
+          ::File.size(file) <= FILE_SIZE_LIMIT
       end
 
       private
 
-      attr_writer :definitions, :occurences
-
       def parse_block(node, parents = [])
         return { definitions: [], occurences: [] } unless node.is_a?(::Parser::AST::Node)
 
@@ -85,10 +80,10 @@ module Rubrowser
         { definitions: [], occurences: constants }
       end
 
-      def merge_constants(constants1, constants2)
+      def merge_constants(c1, c2)
         {
-          definitions: constants1[:definitions] + constants2[:definitions],
-          occurences: constants1[:occurences] + constants2[:occurences]
+          definitions: c1[:definitions] + c2[:definitions],
+          occurences: c1[:occurences] + c2[:occurences]
         }
       end
 

data/lib/rubrowser.rb

@@ -1,3 +1,3 @@
 module Rubrowser
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

data/lib/server.rb

@@ -1,10 +1,12 @@
 require 'webrick'
-require 'haml'
 require 'data'
 require 'json'
+require 'erb'
 
 module Rubrowser
   class Server < WEBrick::HTTPServer
+    include ERB::Util
+
     def self.start(paths)
       new(paths).start
     end
@@ -28,12 +30,7 @@ module Rubrowser
 
     def root(path)
       return file(path) if file?(path)
-
-      haml :index,
-           locals: {
-             constants: data.constants,
-             occurences: data.occurences
-           }
+      erb :index
     end
 
     def file?(path)
@@ -45,11 +42,10 @@ module Rubrowser
       File.read(resolve_file_path("/public#{path}"))
     end
 
-    def haml(template, options = {})
-      path = resolve_file_path("/views/#{template}.haml")
+    def erb(template)
+      path = resolve_file_path("/views/#{template}.erb")
       file = File.open(path).read
-      locals = options.delete(:locals) || {}
-      Haml::Engine.new(file, options).render(self, locals)
+      ERB.new(file).result binding
     end
 
     def resolve_file_path(path)

data/rubrowser.gemspec

@@ -16,6 +16,4 @@ Gem::Specification.new do |s|
   s.executables << 'rubrowser'
 
   s.add_runtime_dependency 'parser', '~> 2.3', '>= 2.3.0'
-  s.add_runtime_dependency 'parallel', '~> 1.9', '>= 1.9.0'
-  s.add_runtime_dependency 'haml', '~> 4.0', '>= 4.0.0'
 end

data/views/index.erb

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'>
+    <title>Rubrowser</title>
+    <link href='/css/application.css' media='all' rel='stylesheet'>
+    <script src='/javascript/d3.js' type='text/javascript'></script>
+    <script src='/javascript/jquery.js' type='text/javascript'></script>
+    <script src='/javascript/application.js' type='text/javascript'></script>
+  </head>
+  <body>
+    <div class='dependency_graph'>
+      <svg data-constants="<%=h data.constants.to_json%>" data-occurences="<%=h data.occurences.to_json%>"></svg>
+    </div>
+  </body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubrowser
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Emad Elsaid
@@ -30,46 +30,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.0
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
 description: A ruby interactive dependency graph visualizer
 email:
 - blazeeboy@gmail.com
@@ -96,7 +56,7 @@ files:
 - public/javascript/jquery.js
 - readme.md
 - rubrowser.gemspec
-- views/index.haml
+- views/index.erb
 homepage: https://github.com/blazeeboy/rubrowser
 licenses:
 - MIT

data/views/index.haml

@@ -1,12 +0,0 @@
-!!!
-%html
-  %head
-    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
-    %title Rubrowser
-    %link{ rel: "stylesheet", media: "all", href: "/css/application.css"}
-    %script{:src => "/javascript/d3.js", :type => "text/javascript"}
-    %script{:src => "/javascript/jquery.js", :type => "text/javascript"}
-    %script{:src => "/javascript/application.js", :type => "text/javascript"}
-  %body
-    .dependency_graph
-      %svg{ data: { constants: constants.to_json, occurences: occurences.to_json } }