source_route 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f25a60a8b061a03a9fccfb948f95a1e1407f0b
-  data.tar.gz: 7d134d77f00101e616a453c654489f93ed62930d
+  metadata.gz: dcacd3bc9218d3672d3cdc0626d2b57206888278
+  data.tar.gz: 5af21722a04b726215d10135926dd8cce886ea11
 SHA512:
-  metadata.gz: fd5cc4be1f8da6ca6040b902c8c77ae2945ce64ebffc4dffdf42f25279068bd20093a393488344a72efa1c4d0e32c03e4315746c651376b8b2b31151588b4517
-  data.tar.gz: 99cf2f120257158951289d5cd755915c3ec9ceffbfad25d711413abe974d5267ab4b26a08355291a02ee473aa4042798eafb33c4795f3b4da139c9825a4d0641
+  metadata.gz: 09033b7fa8966999764624b2de72eba73a9e2ab4060ddf66546f7667b656e69c521864092008612124e7d1f208dedd5fe7cd6235c42ce969cd85979297fd3cbf
+  data.tar.gz: 5ea766d01dec82d33b88649f4fcfb3d635b82746dfb4933abfd4ccac7e5c84615a6c3c666c6876fa49593882e40e090e7236dc09c29fb13d692b8c59e5558c60

data/README.md

@@ -77,8 +77,4 @@ see more usage in examples.
 
 ### TODO
 
-Reorganize the call and return in html template. maybe make some additional work to insert return data of call when return event is open.
-
 Add debug option to provider more verbose messages of what has happened
-
-When we record both call end return event, it's better to combine them togother into one, so we can get call order from call event and also get return value from return event

data/lib/source_route/formats/html.rb

@@ -5,14 +5,16 @@ module SourceRoute
   module Formats
     module Html
 
-      # results is instance of Wrapper
-      def self.slim_render(results)
+      def self.slim_render(wrapper)
+        result_config = wrapper.condition.result_config
         template_path = File.expand_path "../html_template.slim", __FILE__
         slim_template = Slim::Template.new(template_path)
 
-        filename = results.condition.result_config[:filename] ||
-          "#{Time.now.strftime('%H%M')}-source-route.html"
-        html_output_str = slim_template.render(results)
+        filename = result_config[:filename] || "#{Time.now.strftime('%H%M')}-source-route.html"
+        if result_config[:import_return_to_call] and wrapper.condition.has_call_and_return_event
+          wrapper.import_return_value_to_call_results
+        end
+        html_output_str = slim_template.render(wrapper)
         File.open(filename, 'w') do |f|
           f << html_output_str
         end

data/lib/source_route/formats/html_template.slim

@@ -7,12 +7,11 @@ html
     script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"
 
   body(ng-app="SourceRoute")
-    / workaround for following case:
-    / pry(main)> ActiveRecord::Inheritance::ClassMethods.to_json => {} # Dont know why
     ruby:
       local_trace_data = @tp_attrs_results.map do |tp_result|
-        if tp_result.has_key?(:defined_class)
-          tp_result[:defined_class] = tp_result[:defined_class].to_s
+        if tp_result.key?(:defined_class)
+          tp_result[:defined_class] = tp_result[:defined_class].inspect
+          tp_result[:return_value] = tp_result[:return_value].inspect
         end
         tp_result
       end
@@ -22,7 +21,11 @@ html
       #trace-data(data-trace="#{JSON.dump(local_trace_data)}" data-tp-events="#{JSON.dump(@condition.events)}")
 
     .container(ng-controller="MainCtrl")
-      .top-header(style="margin-bottom: 2em")
+      .top-header(style="margin-bottom: 2em; margin-top: 2em")
+
+        .pull-right
+          span Current Trace Count
+          span.badge<(ng-bind="currentCounter()")
 
         div(ng-if="tpEvents.length == 1")
           button.btn.btn-default(ng-click="resetTraceFilter()")
@@ -30,20 +33,18 @@ html
             span<(ng-bind="tpEvents[0]")
 
         .btn-group(ng-if="tpEvents.length > 1")
-          button(ng-click="traceFilter = {}") ALL
-          button.btn-link(ng-bind="event" ng-click="traceFilter.event = event" ng-repeat="event in tpEvents")
-        .pull-right
-          span Current Trace Count
-          span<(ng-bind="currentCounter()")
+          button.btn.btn-default(ng-click="resetTraceFilter()") ALL
+          button.btn.btn-primary(ng-bind="event" ng-click="traceFilter.event = event" ng-repeat="event in tpEvents")
 
       .trace-flow
         .row
           .left-info.col-sm-4
-            .well.well-sm(ng-repeat="klass in definedClasses")
-              button.btn.btn-default(ng-click="traceFilter.defined_class = klass")
+            .btn-group-vertical
+              button.btn.btn-default(ng-repeat="klass in definedClasses"
+                ng-click="traceFilter.defined_class = klass" style="height: 60px")
                 span(ng-bind="klass")
-          .center-info.col-sm-6
-            .well.well-lg(ng-repeat="trace in traces | filter:traceFilter")
+          .traces.center-info.col-sm-6(ng-class="{{traceFilter.event}}")
+            .trace.well.well-lg(ng-repeat="trace in traces | filter:traceFilter:true")
 
               .header(ng-click="showMoreDetail = !showMoreDetail")
                 span(ng-bind="trace.defined_class")
@@ -53,6 +54,7 @@ html
 
                 span<>(ng-if="trace.return_value")
                   | =>
+                br
                 span<>(ng-if="trace.return_value" ng-bind="trace.return_value")
 
               .details(ng-if="showMoreDetail")
@@ -88,7 +90,7 @@ html
           $scope.traceFilter = {}
         }
         $scope.currentCounter = function() {
-          return $filter('filter')($scope.traces, $scope.traceFilter).length
+          return $filter('filter')($scope.traces, $scope.traceFilter, true).length
         }
 
       })

data/lib/source_route/tp_result.rb

@@ -3,7 +3,11 @@ module SourceRoute
   class TpResult
 
     Config = Struct.new(:format, :show_additional_attrs,
-                        :include_local_var, :include_instance_var, :filename)
+                        :include_local_var, :include_instance_var, :filename, :import_return_to_call) do
+      def initialize(f="silence", s=[], ilr=false, iiv=false)
+        super(f, s, ilr, iiv)
+      end
+    end
 
     # see event description in TracePoint API Doc
     DEFAULT_ATTRS = {
@@ -116,6 +120,7 @@ module SourceRoute
     def console_stack_overflow
       ap "#{@collect_data[:defined_class].inspect}##{@collect_data[:method_id]}"
     end
+
   end # END TpResult
 
 end

data/lib/source_route/version.rb

@@ -1,3 +1,3 @@
 module SourceRoute
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/source_route/wrapper.rb

@@ -7,7 +7,11 @@ module SourceRoute
 
     attr_accessor :condition, :tp, :tp_attrs_results
 
-    Condition = Struct.new(:events, :negatives, :positive, :result_config)
+    Condition = Struct.new(:events, :negatives, :positive, :result_config) do
+      def initialize(e=[:call], n={}, p={}, r=TpResult::Config.new)
+        super(e, n, p, r)
+      end
+    end
 
     class Condition
 
@@ -30,6 +34,9 @@ module SourceRoute
         result_config.format = block_given? ? block : data
       end
 
+      def has_call_and_return_event
+        events.include? :return and events.include? :call
+      end
     end
 
     def initialize
@@ -38,8 +45,7 @@ module SourceRoute
 
     def reset
       @tp.disable if @tp
-      @condition = Condition.new([:call], {}, {},
-                                 TpResult::Config.new('silence', [], false, false))
+      @condition = Condition.new
       @tp_attrs_results = []
       self
     end
@@ -65,6 +71,21 @@ module SourceRoute
       track
     end
 
+    def import_return_value_to_call_results
+      call_tp_results.each do |ctp|
+        ctp[:return_value] = return_tp_results.detect do |rtp|
+          rtp[:defined_class] == ctp[:defined_class] and rtp[:method_id] == ctp[:method_id]
+        end[:return_value]
+      end
+    end
+
+    def call_tp_results
+      tp_attrs_results.select { |tpr| tpr[:event] == :call }
+    end
+
+    def return_tp_results
+      tp_attrs_results.select { |tpr| tpr[:event] == :return }
+    end
   end # Wrapper
 
 end

data/test/source_route_test.rb

@@ -154,20 +154,37 @@ class SourceRouteTest < Minitest::Test
     assert_equal 'ins sure', ret_value[:instance_var][:@sample]
   end
 
+  def test_import_return_to_call
+    @source_route = SourceRoute.enable 'SampleApp' do
+      event :call, :return
+      result_config.include_instance_var = true
+      result_config.include_local_var = true
+      result_config.import_return_to_call = true
+    end
+    SampleApp.new.init_cool_app
+    @wrapper.import_return_value_to_call_results
+    assert @wrapper.call_tp_results[0].key?(:return_value), 'call results should contain return_value'
+  end
+
   # Nothing has tested really when run rake cause ENV['ignore_html_generation'] was set to true
-  def test_html_format_output_only
+  def test_html_format_output_with_two_events_and_filename
     @source_route = SourceRoute.enable do
       defined_class 'SampleApp'
+      event :call, :return
       result_config.include_instance_var = true
       result_config.include_local_var = true
+      result_config.filename = 'call_and_return_in_sample_app.html'
+      result_config.import_return_to_call = true
     end
 
     SampleApp.new.init_cool_app
 
     if ENV['ignore_html_generation'] == 'true'
-      # do nothing. it was set in Rakefile, so rake test will not generate html file
+      # do nothing. cause it was set to false in Rakefile.
+      # So Run rake test will not generate html file, run ruby -Itest test/source_route.rb will generate output file
     else
       SourceRoute.build_html_output
+      puts @wrapper.tp_attrs_results.inspect
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: source_route
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - raykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print