source_route 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcacd3bc9218d3672d3cdc0626d2b57206888278
-  data.tar.gz: 5af21722a04b726215d10135926dd8cce886ea11
+  metadata.gz: 37be5d396bcfb224e69e6e3577f1e71ddeffe4ba
+  data.tar.gz: 544985519acf978873b41219ace7e89e115423f2
 SHA512:
-  metadata.gz: 09033b7fa8966999764624b2de72eba73a9e2ab4060ddf66546f7667b656e69c521864092008612124e7d1f208dedd5fe7cd6235c42ce969cd85979297fd3cbf
-  data.tar.gz: 5ea766d01dec82d33b88649f4fcfb3d635b82746dfb4933abfd4ccac7e5c84615a6c3c666c6876fa49593882e40e090e7236dc09c29fb13d692b8c59e5558c60
+  metadata.gz: c4db59f01f059e29e2ceb2ff78101aaecb7298b66a9503ed2e5d8ebdc2f8c756a1a36165f099877a60ea9e41d9cdd47aa091153121bcb5090550d57c13af2a36
+  data.tar.gz: 57ddfee91d7f69b7295e2b87e1184582934ffd11da00ede3ff9bc7bb32aed2b817330a6e78d5308958b39c3f4b3c83ff9078d5e5bfb1e8642aa336a2a139c72e

data/lib/source_route/formats/html.rb

@@ -11,7 +11,8 @@ module SourceRoute
         slim_template = Slim::Template.new(template_path)
 
         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
+
+        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)

data/lib/source_route/formats/html_template.slim

@@ -6,12 +6,12 @@ html
     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"
 
-  body(ng-app="SourceRoute")
+  body(ng-app="SourceRoute" ng-controller="MainCtrl")
     ruby:
       local_trace_data = @tp_attrs_results.map do |tp_result|
         if tp_result.key?(:defined_class)
           tp_result[:defined_class] = tp_result[:defined_class].inspect
-          tp_result[:return_value] = tp_result[:return_value].inspect
+          tp_result[:return_value] = tp_result[:return_value].inspect if tp_result.key?(:return_value)
         end
         tp_result
       end
@@ -20,22 +20,24 @@ html
       / dont use local_trace_data.to_json, because ActiveSupport override it and can introduce unexpected crash for some data
       #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; margin-top: 2em")
 
-        .pull-right
-          span Current Trace Count
-          span.badge<(ng-bind="currentCounter()")
+    nav.navbar.navbar-default.navbar-static-top
+      .container
+        .container-fluid
+          .navbar-header
+            a.navbar-brand(href="#" ng-click="resetTraceFilter()") ALL
+          ul.nav.navbar-nav
+            li(ng-repeat="event in tpEvents" ng-class="{active: event == traceFilter.event}")
+              a(href="#" ng-click="traceFilter.event = event" ng-bind="event")
+          ul.nav.navbar-nav.navbar-right
+            li
+              a(disabled)
+                span Current Trace Count
+                span.badge<(ng-bind="currentCounter()")
 
-        div(ng-if="tpEvents.length == 1")
-          button.btn.btn-default(ng-click="resetTraceFilter()")
-            span ALL Event :
-            span<(ng-bind="tpEvents[0]")
-
-        .btn-group(ng-if="tpEvents.length > 1")
-          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")
+    .clearfix
 
+    .container
       .trace-flow
         .row
           .left-info.col-sm-4
@@ -51,11 +53,11 @@ html
                 span
                   | .
                 span(ng-bind="trace.method_id")
-
-                span<>(ng-if="trace.return_value")
-                  | =>
-                br
-                span<>(ng-if="trace.return_value" ng-bind="trace.return_value")
+                / workaround for return_value is 'false' and return_value always to be string when existed
+                div(ng-if="isIncludeReturnValue")
+                  span
+                    | =>
+                  span<(ng-bind="trace.return_value")
 
               .details(ng-if="showMoreDetail")
                 .local-vars.well.well-sm(ng-if="trace.local_var" style="color: green")
@@ -64,6 +66,7 @@ html
                     span<>(ng-bind="key")
                     span<>
                       | =>
+                    / to do: could inspect fix it?
                     span<>(ng-bind="value || 'null'")
                 .ins-vars.well.well-sm(ng-if="trace.instance_var" style="color: blue")
                   span Instance Var
@@ -80,10 +83,18 @@ html
     javascript:
       sourceRoute = angular.module('SourceRoute', [])
       sourceRoute.controller('MainCtrl', function($scope, $filter) {
-        $scope.traceFilter = {}
         $scope.traces = angular.element("#trace-data").data('trace')
         $scope.tpEvents = angular.element("#trace-data").data('tp-events')
 
+        $scope.isIncludeReturnValue = !angular.isUndefined($scope.traces[0].return_value)
+
+        $scope.traceFilter = {event: $scope.tpEvents[0]}
+        if ($scope.tpEvents.length == 1 && angular.isUndefined($scope.traces[0].event)) {
+          _.each($scope.traces, function(trace) {
+            trace.event = $scope.tpEvents[0]
+          })
+        }
+
         $scope.definedClasses = _.uniq(_.map($scope.traces, 'defined_class'))
 
         $scope.resetTraceFilter = function() {

data/lib/source_route/version.rb

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

data/test/source_route_test.rb

@@ -184,7 +184,6 @@ class SourceRouteTest < Minitest::Test
       # 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.8
+  version: 0.0.9
 platform: ruby
 authors:
 - raykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print