source_route 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53ca6ceb4707f51a82dae6898626acc4d48a833d
-  data.tar.gz: f7195096abe06dbf7be4de3c50ec29cd778be20e
+  metadata.gz: 89e5066f6c1b4590957260ef57b44982b01cf006
+  data.tar.gz: 3ae996d75fa35ba29b45e1afe7a77ae3932984d8
 SHA512:
-  metadata.gz: f53ae0700478709b418e659d4a724a0ef5555a676ba8c8b51388d179467919ada812f5fee3523573943b74fa15ae8f5a3422016ca6e767c30739193b768d48ca
-  data.tar.gz: c54533ac8b57235ca3ef6a92911cf84a8d5cb22e15add32f16769eb0c2148499ce3016d56bf8102efac1d87484fcf9f9bafff9321fe5a1f2aca851de99c53254
+  metadata.gz: 332fe83850831d9c872bdbfdf05a3d1fc3eb047704a7308a18ad93f6308beba1332b63164261917fe51468e7a128f1769a509e5061c218868723a0990a78728c
+  data.tar.gz: aa108ff2d48aee83a49c45d5d2a65152512a7a94a7fd33f7614939cd771a0f97949efe9d09761e2cf6d12c5cac6578aab3680497a67f5a621761547fdd5e05e4

data/README.md

@@ -41,7 +41,10 @@ you will get a different trace file.
 
 #### In your ruby application
 
-    SourceRoute.enable :wanted_method_name
+    SourceRoute.enable do
+      method_id :wanted_method_name
+      full_feature
+    end
     .... # here is your code
     ....
     ....
@@ -65,7 +68,7 @@ see full usage in examples/callback_in_activesupport.rb
 
 ## Why
 
-I always wanna upgrade my ruby(rails) skills. But everytime when I look for workaround from stack overflow I feel frustration.
+I always wanna upgrade my ruby(rails) skills. But everytime when I looking for workaround from stack overflow I feel frustration.
 
 To get solution or workaround from google or stack overflow is suitable when I'm a ruby starter or deadline is urgent. But it's not really helpful for my skills.
 
@@ -92,14 +95,12 @@ Finally, I expect my working style can change from searching workaround from int
 
 ### TODO
 
-Add debug option to provider more verbose messages of what has happened
+Dynamic indent when new child level comes.
 
-Open File directly from browser(chrome) by plugin?
+Animation when child was click.
 
-Apply https://github.com/a5hik/ng-sortable
+Show loading when click clear. (when $apply() take more than 1 seconds to run)
 
-Add vertical timeline.
-(see http://tympanus.net/codrops/2013/05/02/vertical-timeline/
-http://stackoverflow.com/questions/20896240/responsive-timeline-ui-with-bootstrap3)
+Add debug option to provide more verbose messages of what has happened
 
-Hide defined class filter.
+Open File directly from browser(chrome) by plugin?

data/lib/source_route/formats/html_template.slim

@@ -2,9 +2,12 @@ doctype html
 html
   head
     title Source Route Result
-    link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css"
+    link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css"
+    link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/styles/github.min.css"
+    link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css"
+    script src="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/highlight.min.js"
     script src="http://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"
-    script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"
+    script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"
 
     css:
       .call-level-0 {}
@@ -15,7 +18,8 @@ html
       .call-level-5 { margin-left: 250px }
       .call-level-6 { margin-left: 300px }
       .call-level-7 { margin-left: 300px }
-  body(ng-app="SourceRoute" ng-controller="MainCtrl")
+      .details .well { margin-bottom: 0; color: green }
+  body(ng-app="SourceRoute" ng-controller="MainCtrl" ng-cloak)
 
     nav.navbar.navbar-default.navbar-static-top
       .container
@@ -34,13 +38,12 @@ html
     .clearfix
 
     .container
-      .level-header(ng-if="parentLengthList" style="padding-bottom: 10px")
+      .level-header(ng-if="::traces[0].hasOwnProperty('parent_ids')" style="padding-bottom: 10px")
         .btn-group>
-          button.btn.btn-default>(ng-click="traceFilter.parent_length = length" ng-repeat="length in parentLengthList")
-            span> Level
-            span(ng-bind="::length")
+          button.btn.btn-default>(ng-click="outlineTrace()")
+            span> OutLine
         span
-          button.btn.btn-primary(ng-click="traceFilter.parent_length = undefined") Clear
+          button.btn.btn-primary(ng-click="removeOutlineTrace()") Clear
 
       .trace-flow
         .row
@@ -50,9 +53,17 @@ html
                 ng-click="traceFilter.defined_class = klass" style="height: 60px")
                 span(ng-bind="klass.substring(0, 40)" popover="{{klass}}" popover-trigger="mouseenter" popover-placement="bottom")
           .traces.center-info.col-sm-12(ng-class="{{traceFilter.event}}")
-            .trace.well.well-lg.call-level.call-level(ng-repeat="trace in traces | filter:traceFilter:true"
-              ng-class="callLevelClass(trace)")
-              .header(ng-click="showMoreDetail = !showMoreDetail")
+            .trace.well(ng-repeat="trace in traces | filter:traceFilter:true | filter:childParentFilterFn"
+              ng-class="callLevelClass(trace)" ng-controller="TpTraceCtrl")
+              .header(ng-init="showMoreDetail = false")
+                .btn-group.pull-right
+                  button.btn.btn-info.btn-sm(ng-if="::hasChild()" ng-click="toggleChild()")
+                    span(ng-hide="trace.childClosed")
+                      i.fa.fa-angle-down
+                    span(ng-show="trace.childClosed")
+                      i.fa.fa-angle-right
+                    span Child
+                  button.btn.btn-info.btn-sm(ng-show="::containsDetail(trace)" ng-click="showMoreDetail = !showMoreDetail") Details
                 span(ng-bind="trace.defined_class")
                 span
                   | .
@@ -61,46 +72,54 @@ html
                 div(ng-if="trace.hasOwnProperty('return_value')")
                   span
                     | =>
-                  span<(ng-bind="trace.return_value.substring(0, 150)")
+                  span<(ng-bind="trace.return_value.substring(0, 200) | json")
 
               .details(ng-if="showMoreDetail")
-                .local-vars.well.well-sm(ng-if="trace.local_var" style="color: green; margin-bottom: 0")
+                .attrs.well.well-sm(ng-if="containsOtherAttrs(trace)")
+                  span Attrs
+                  div(hljs source="::combinedAttrs(trace) | json")
+                .local-vars.well.well-sm(ng-if="trace.local_var")
                   span Local Var
-                  .local-values(ng-repeat="(key, value) in trace.local_var")
-                    span<>(ng-bind="key")
-                    span<>
-                      | =>
-                    / ? could inspect repaire it ?
-                    span<>(ng-bind="value | json")
-                .ins-vars.well.well-sm(ng-if="trace.instance_var" style="color: blue; margin-bottom: 0")
+                  .local-values(hljs source="::trace.local_var | json")
+                .ins-vars.well.well-sm(ng-if="trace.instance_var")
                   span Instance Var
-                  .ins-values(ng-repeat="(key, value) in trace.instance_var")
-                    span<>(ng-bind="key")
-                    span<>
-                      | =>
-                    span<>(ng-bind="value | json")
-                .self-obj.well.well-sm(ng-if="trace.hasOwnProperty('tp_self')" style="color: red; margin-bottom: 0")
-                  span Self
-                  div
-                    span(ng-bind="tpSelfList[trace.tp_self] | json")
-                .path-value.well.well-sm(ng-if="trace.path")
-                  span Path
-                  div
-                    span<>(ng-bind="trace.path")
-                    span<>(ng-bind="trace.lineno")
+                  .ins-values(hljs source="::trace.instance_var | json")
 
           .right-info.col-sm-2
 
-    script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.min.js"
+    script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.6/angular.min.js"
     script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.11.2/ui-bootstrap-tpls.min.js"
+    script src="http://pc035860.github.io/angular-highlightjs/angular-highlightjs.min.js"
 
     javascript:
-      sourceRoute = angular.module('SourceRoute', ['ui.bootstrap'])
+      sourceRoute = angular.module('SourceRoute', ['ui.bootstrap', 'hljs'])
       sourceRoute.controller('MainCtrl', function($scope, $filter) {
         $scope.traces = angular.element("#trace-data").data('trace')
         $scope.tpSelfList = angular.element("#trace-data").data('tp-self-caches')
         $scope.tpEvents = angular.element("#trace-data").data('tp-events')
-        $scope.parentLengthList = angular.element("#trace-data").data('tp-parent-length-list')
+        $scope.childParentFilter = { hide_parent_ids: [] }
+
+        $scope.childParentFilterFn = function(trace) {
+          if ($scope.childParentFilter.hide_parent_ids.length == 0) {
+            return true;
+          } else {
+            var shared_parents = _.intersection(trace.parent_ids, $scope.childParentFilter.hide_parent_ids);
+            if (shared_parents.length == 0) {
+              return true;
+            }
+          }
+        }
+
+        $scope.removeOutlineTrace = function() {
+          _.each($scope.traces, function(trace) { trace.childClosed = false; });
+          $scope.childParentFilter.hide_parent_ids = [];
+        }
+
+        $scope.outlineTrace = function() {
+          $scope.childParentFilter.hide_parent_ids = [];
+          _.chain($scope.traces).filter({parent_length: 0})
+            .each(function(trace) { trace.childClosed = true; $scope.childParentFilter.hide_parent_ids.push(trace.order_id) })
+        }
 
         $scope.traceFilter = {event: $scope.tpEvents[0]}
         if ($scope.tpEvents.length == 1 && angular.isUndefined($scope.traces[0].event)) {
@@ -113,24 +132,73 @@ html
 
         $scope.callLevelClass = function(trace) {
           if (trace.parent_length > 7) {
-            return 'call-level-7'
+            return 'call-level-7';
           } else {
-            return 'call-level-' + trace.parent_length
+            return 'call-level-' + trace.parent_length;
           }
         }
 
         $scope.resetTraceFilter = function() {
-          $scope.traceFilter = {}
+          $scope.traceFilter = {};
         }
+
         $scope.currentCounter = function() {
-          return $filter('filter')($scope.traces, $scope.traceFilter, true).length
+          return $filter('filter')($scope.traces, $scope.traceFilter, true).length;
+        }
+
+        $scope.containsOtherAttrs = function(trace) {
+          return trace.hasOwnProperty('path') || trace.hasOwnProperty('lineno') ||
+            trace.hasOwnProperty('tp_self');
+        }
+
+        $scope.containsDetail = function(trace) {
+          return $scope.containsOtherAttrs(trace) || trace.hasOwnProperty('local_var') ||
+            trace.hasOwnProperty('instance_var')
+        }
+
+        $scope.combinedAttrs = function(trace) {
+          var attrs = {}
+          if (trace.hasOwnProperty('lineno') && trace.hasOwnProperty('path')) {
+            attrs.path = trace.path + ":" + trace.lineno;
+          } else if (trace.hasOwnProperty('path')) {
+            attrs.path = trace.path;
+          }
+          if (trace.hasOwnProperty('tp_self')) {
+            attrs.self = $scope.tpSelfList[trace.tp_self];
+          }
+          return attrs;
+        }
+
+      })
+
+      sourceRoute.controller('TpTraceCtrl', function($scope) {
+        $scope.toggleChild = function() {
+          if ($scope.trace.childClosed) {
+            $scope.showChild();
+          } else {
+            $scope.hideChild();
+          }
+        }
+
+        $scope.showChild = function() {
+          $scope.trace.childClosed = false;
+          _.pull($scope.childParentFilter.hide_parent_ids, $scope.trace.order_id);
         }
 
+        $scope.hideChild = function() {
+          $scope.trace.childClosed = true;
+          $scope.childParentFilter.hide_parent_ids.push($scope.trace.order_id);
+        }
+
+        $scope.hasChild = function() {
+          return _.find($scope.traces, function(trace) {
+            return _.contains(trace.parent_ids, $scope.trace.order_id)
+          });
+        }
       })
 
     .data-collect
       / dont use local_trace_data.to_json, because ActiveSupport override it and can introduce unexpected crash for some data
       #trace-data(data-trace="#{jsonify_tp_result_chain}"
         data-tp-events="#{jsonify_events}"
-        data-tp-self-caches="#{jsonify_tp_self_caches}"
-        data-tp-parent-length-list="#{JSON.dump(parent_length_list)}")
+        data-tp-self-caches="#{jsonify_tp_self_caches}")

data/lib/source_route/tp_result_chain.rb

@@ -1,6 +1,8 @@
 module SourceRoute
 
   class TpResultChain
+    attr_reader :chain
+
     extend Forwardable
     def_delegators :@chain, :each, :index, :first, :last, :size, :push, :values_at, :pop, :[]
 
@@ -23,9 +25,11 @@ module SourceRoute
         matched_return_tp = return_chain.detect do |rtp|
           rtp[:tp_self] == ctp[:tp_self] and rtp[:method_id] == ctp[:method_id] and rtp[:defined_class] == ctp[:defined_class]
         end
-        ctp[:return_value] = matched_return_tp[:return_value]
-        ctp[:local_var] = matched_return_tp[:local_var] if matched_return_tp.key? :local_var
-        ctp[:instance_var] = matched_return_tp[:instance_var] if matched_return_tp.key? :instance_var
+        unless matched_return_tp.nil?
+          ctp[:return_value] = matched_return_tp[:return_value]
+          ctp[:local_var] = matched_return_tp[:local_var] if matched_return_tp.key? :local_var
+          ctp[:instance_var] = matched_return_tp[:instance_var] if matched_return_tp.key? :instance_var
+        end
       end
     end
 
@@ -35,11 +39,12 @@ module SourceRoute
         return_tpr = return_chain.find do |rtpr|
           rtpr[:defined_class] == tpr[:defined_class] and rtpr[:method_id] == tpr[:method_id]
         end
-
-        start_index, end_index = tpr[:order_id], return_tpr[:order_id]
-        unless end_index == start_index + 1
-          values_at(start_index+1 ... end_index).select { |tpr| tpr[:event] == :call }.each do |tpr|
-            tpr[:parent_ids].push start_index
+        unless return_tpr.nil?
+          start_index, end_index = tpr[:order_id], return_tpr[:order_id]
+          unless end_index == start_index + 1
+            values_at(start_index+1 ... end_index).select { |tpr| tpr[:event] == :call }.each do |tpr|
+              tpr[:parent_ids].push start_index
+            end
           end
         end
       end
@@ -51,6 +56,26 @@ module SourceRoute
       call_chain.map { |tp| tp[:parent_length] }.uniq.sort
     end
 
+    def deep_cloned
+      chain.map { |r| r.clone }
+    end
+
+    def stringify
+      deep_cloned.map do |tr|
+        # to_s is safer than inspect
+        # ex: inspect on ActiveRecord_Relation may crash
+        tr[:defined_class] = tr[:defined_class].to_s if tr.key?(:defined_class)
+        if tr.key?(:return_value)
+          if tr[:return_value].nil? or tr[:return_value] == ''
+            tr[:return_value] = tr[:return_value].inspect
+          else
+            tr[:return_value] = tr[:return_value].to_s
+          end
+        end
+        tr
+      end
+    end
+
     private
     def init_order_id_and_parent_ids
       each_with_index do |tpr, index|

data/lib/source_route/version.rb

@@ -1,3 +1,3 @@
 module SourceRoute
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/source_route/wrapper.rb

@@ -50,8 +50,12 @@ module SourceRoute
 
         result_config.show_additional_attrs = [:path, :lineno]
         # JSON serialize trigger many problems when handle complicated object
-        # result_config.include_instance_var = true
-        # result_config.include_local_var = true
+
+        # a Back Door to open more data. but be care it could trigger weird crash when Jsonify these vars
+        if value == 10
+          result_config.include_instance_var = true
+          result_config.include_local_var = true
+        end
       end
     end
 
@@ -87,40 +91,16 @@ module SourceRoute
       self.tp = track
     end
 
-    # TODO: move this into chain self
-    def stringify_tp_self_caches
-      tp_self_caches.clone.map(&:to_s)
-    end
-
-    def stringify_tp_result_chain
-      deep_cloned = tp_result_chain.map do |tp_result|
-        tp_result.clone
-      end
-      deep_cloned.map do |tr|
-        # to_s is safer than inspect
-        # ex: inspect on ActiveRecord_Relation may crash
-        tr[:defined_class] = tr[:defined_class].to_s if tr.key?(:defined_class)
-        if tr.key?(:return_value)
-          if tr[:return_value].nil? or tr[:return_value] == ''
-            tr[:return_value] = tr[:return_value].inspect
-          else
-            tr[:return_value] = tr[:return_value].to_s
-          end
-        end
-        tr
-      end
-    end
-
     def jsonify_events
       JSON.dump(@condition.events.map(&:to_s))
     end
 
     def jsonify_tp_result_chain
-      JSON.dump(stringify_tp_result_chain)
+      JSON.dump(tp_result_chain.stringify)
     end
 
     def jsonify_tp_self_caches
-      JSON.dump(stringify_tp_self_caches)
+      JSON.dump(tp_self_caches.clone.map(&:to_s))
     end
   end # END Wrapper
 

data/test/sample_app.rb

@@ -26,7 +26,7 @@ class SampleApp
     def initialize
       @cool = ['test', 'data']
       # todo: cant display on html easily
-      @cool_hash = {first: :run, second: :halt, third: :stop}
+      @cool_hash = {first: :run, second: :halt, third: {new: true, updated: false}}
       cool_in_init = 'init data in cool app'
 
     end

data/test/source_route/wrapper_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class SourceRoute::WrapperTest < Minitest::Test
+
+  def setup
+    @wrapper = SourceRoute::Wrapper.instance
+  end
+
+end

data/test/source_route_test.rb

@@ -118,7 +118,6 @@ class SourceRouteTest < Minitest::Test
       SampleApp.new.nonsense
     end
     assert_equal 1, @wrapper.tp_self_caches.size
-    assert @wrapper.stringify_tp_self_caches.first.is_a? String
     assert @wrapper.tp_self_caches.first.is_a? SampleApp
   end
 
@@ -127,7 +126,7 @@ class SourceRouteTest < Minitest::Test
       SampleApp.new.nonsense
     end
     origin_tp_result_chain = @wrapper.tp_result_chain
-    assert @wrapper.stringify_tp_result_chain.first[:defined_class].is_a? String
+    assert @wrapper.tp_result_chain.stringify.first[:defined_class].is_a? String
     assert_equal origin_tp_result_chain, @wrapper.tp_result_chain
   end
 
@@ -225,6 +224,9 @@ class SourceRouteTest < Minitest::Test
       event :call, :return
       result_config.include_instance_var = true
       result_config.include_local_var = true
+      result_config.show_additional_attrs = [:path, :lineno]
+      result_config.include_tp_self = true
+
       result_config.filename = 'call_and_return_in_sample_app.html'
       result_config.import_return_to_call = true
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: source_route
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - raykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -136,9 +136,10 @@ files:
 - source_route.gemspec
 - test/fake_app.rb
 - test/sample_app.rb
+- test/source_route/tp_filter_test.rb
+- test/source_route/wrapper_test.rb
 - test/source_route_test.rb
 - test/test_helper.rb
-- test/tp_filter_test.rb
 homepage: http://github.com/raykin/source-route
 licenses:
 - MIT
@@ -166,7 +167,8 @@ summary: Wrapper of TracePoint.
 test_files:
 - test/fake_app.rb
 - test/sample_app.rb
+- test/source_route/tp_filter_test.rb
+- test/source_route/wrapper_test.rb
 - test/source_route_test.rb
 - test/test_helper.rb
-- test/tp_filter_test.rb
 has_rdoc: