documented 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eed131baa88c812dcc5e2d7539e11a422b40903854ab07f20ee594979537e87b
-  data.tar.gz: 4222dd37097a675c37304d4a539bfe3d92c563e3aeb97732ce47246d6bc0f7e3
+  metadata.gz: a10abe36f1e6d26018072c76ea6b41b88f9be3644f0d26927a267333e9014e44
+  data.tar.gz: 4168f759f3270a5ab41a046538659d2a62d354bfd1936105a2c8083030089e96
 SHA512:
-  metadata.gz: da326d596f66a75475b00be099299b04f997fa88077811f361b3b1e2228b9c0ec79a51f7f7df25f66282fa6cd6d21b466845a29c80c30c86831b1b3a5e4e10aa
-  data.tar.gz: 16fe5d6fc344069bf61423b569472332ec4eef9e81374688630887480423321afac84832b3daa6981827b15d177a5eca6a24ef9248b8eaecf165b60d912a1f04
+  metadata.gz: '097512514d08ab602efa443ea5a9d8a15ebc5986048924bc512c64a66d4fc7fe61e03360a0403a3b6affb90e847b1ae685149673c47954df11f697c709f01b46'
+  data.tar.gz: d118c24f9032da6851c5f1508db97cc55bd4dac37e930bd452e5ef82a5f09b313b43425e200c68db7f6152946b9552efda940a202b87d11a56ea3b16c789add9

data/bin/documented

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
-require lib_path = File.expand_path('../lib/documented')
-require '../lib/rewriter'
+
+gem_path = File.expand_path('../../', __FILE__)
+require File.join(gem_path, 'lib/documented')
+require File.join(gem_path, 'lib/rewriter')
 
 ################################################################################
 # Usage:
@@ -13,7 +15,7 @@ require '../lib/rewriter'
 file_path = File.join(Dir.pwd, ARGV.first)
 
 rewriter = Documented::Rewriter.new(file_path)
-rewriter.require_library(lib_path)
+rewriter.require_library(gem_path)
 rewriter.replace_comments
 rewriter.write
 rewriter.execute

data/lib/rewriter.rb

@@ -13,9 +13,9 @@ module Documented
       @tree = Parser::Source::TreeRewriter.new(@source.buffer)
     end
 
-    def require_library(lib_path)
+    def require_library(gem_path)
       setup = <<-RUBY
-        \n require "#{lib_path}"
+        \n require "#{gem_path}/lib/documented"
         Documented.setup("#{@file_path}")
       RUBY
       @tree.insert_after(@source.ast.children.first.loc.expression, setup)

data/lib/tracer.rb

@@ -26,28 +26,36 @@ module Documented
     private
 
     def create_trace_point
-      calls = ['Start']
+      calls = []
 
       return TracePoint.new(:call, :return) do |trace_point|
+        callee = trace_point.self.class.to_s
+
+        next if @blocklist.any? do |class_name|
+          callee.start_with?(class_name) || trace_point.defined_class.to_s.start_with?(class_name)
+        end
+
+        calls << callee if calls.empty?
         caller = calls.last.to_s
-        callee = trace_point.defined_class.to_s
+        next if trace_point.method_id == :initialize && caller == callee && !@sequence.empty?
+
         event = trace_point.event
-    
-        unless @blocklist.any? { |e| callee.to_s.start_with? e }
-          unless calls.last == callee
-            if event == :return
-              calls.pop
-            elsif calls.last != callee
-              calls << callee
-            end
-          end
-    
-          unless callee == caller
-            caller = caller.gsub('::','.')
-            callee = callee.gsub('::','.')
-            @sequence << "#{caller}->>#{callee}: #{trace_point.method_id}"
+
+        unless calls.last == callee
+          if event == :return
+            calls.pop
+          elsif calls.last != callee
+            calls << callee
           end
         end
+  
+        caller.gsub!('::','.')
+        callee.gsub!('::','.')
+        event = "#{caller}->>#{callee}: #{trace_point.method_id}"
+
+        next if @sequence.last == event
+
+        @sequence << event
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: documented
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Maedi Prichard