jsinstrument 0.0.10 → 0.0.11

data/lib/jsinstrument/inserting.js

@@ -6,34 +6,70 @@
 !function(root){
   if (root && (typeof root.%{js_object_name} === 'undefined')) {
     root.%{js_object_name} = {
+      /**
+       * Const for coverage data types
+       */
+      TYPES: ['line', 'func', 'branch'],
       /**
        * Coverage data
+       * data = {
+       *   filename: {
+       *     line: [lines],
+       *     func: [lines],
+       *     branch: [lines]
+       *   }
+       * }
        */
-      _data: {},
+      data: {},
       /**
        * register instrumented lines for the file
        */
-      register: function(file, lines) {
+      register: function(file, lines, func_lines) {
         // replace the dot in the filename by underscore to be competible with mongodb
         file = file.replace(/\./g, '_')
         // can't register twice for one file
-        if(!this._data[file]) {
-          this._data[file] = [];
+        if(!this.data[file]) {
+          this.data[file] = {
+            line: [],
+            func: [],
+            branch: []
+          };
           for (var i in lines) {
-            this._data[file][lines[i]] = 0;
+            this.data[file].line[lines[i]] = 0;
+          }
+          for (var i in func_lines) {
+            this.data[file].func[func_lines[i]] = 0;
+          }
+        }
+      },
+      /**
+       * Hit a data
+       */
+      _hit: function(type, file, line) {
+        if (file && (this.TYPES.indexOf(type) !== -1)) {
+          file = file.replace(/\./g, '_');
+          if (this.data[file] && this.data[file][type]) {
+            this.data[file][type][line] = (this.data[file][type][line]) ? (this.data[file][type][line] + 1) : 1;
           }
         }
       },
       /**
        * Hit a line
        */
-      hit: function(file, line) {
-        // replace the dot in the filename by underscore to be competible with mongodb
-        file = file.replace(/\./g, '_')
-        if(!this._data[file]) this._data[file] = [];
-
-        if(!this._data[file][line]) this._data[file][line] = 1;
-        else this._data[file][line] = this._data[file][line] + 1;
+      hit_line: function(file, line) {
+        this._hit('line', file, line);
+      },
+      /**
+       * Hit a func
+       */
+      hit_func: function(file, line) {
+        this._hit('func', file, line);
+      },
+      /**
+       * Hit a branch
+       */
+      hit_branch: function(file, line) {
+        this._hit('branch', file, line);
       },
       /**
        * Upload coverage data to server
@@ -46,7 +82,7 @@
         this._uploading = true;
 
         try {
-          $.post('%{upload_url}', this._serialize(this._data, mark)).done(function() {
+          $.post('%{upload_url}', this._serialize(mark)).done(function() {
             console.log('Coverage data uploaded!');
           }).always(function() {
             self._uploading = false;
@@ -58,23 +94,30 @@
       /**
        * serialize data for data uploading
        */
-      _serialize: function(data, mark) {
+      _serialize: function(mark) {
+        var data = this.data;
         var json = [];
 
         for (var file in data) {
-          var coverage = data[file];
+          var file_json = [];
+          
+          for (var i in TYPES) {
+            var type = TYPES[i];
+            var type_coverage = data[file][type];
 
-          var array = [];
-          var length = coverage.length;
-          for (var line = 0; line < length; line++) {
-            var value = coverage[line];
-            if (value === undefined || value === null) {
-              value = '';
+            var array = [];
+            var length = type_coverage.length;
+            for (var line = 0; line < length; line++) {
+              var value = type_coverage[line];
+              if (value === undefined || value === null) {
+                value = '';
+              }
+              array.push(value);
             }
-            array.push(value);
+            file_json.push(this._quote(type) + ':[' + array.join(',') + ']');
           }
 
-          json.push(this._quote(file) + ':[' + array.join(',') + ']');
+          json.push(this._quote(file) + ':{' + file_json.join(',') + '}');
         }
 
         var result = '{' + json.join(',') + '}';
@@ -119,7 +162,7 @@
   }
 
   // register the instrumented lines for current file
-  root.%{js_object_name}.register('%{src_filename}', %{instrumented_lines});
+  root.%{js_object_name}.register('%{src_filename}', %{instrumented_lines}, %{instrumented_func_lines});
 }(this);
 
 

data/lib/jsinstrument/instrumenter.rb

@@ -22,7 +22,7 @@ module JSInstrument
       self.src_filename = filename
       ast = RKelly::Parser.new.parse src
       raise 'Parse source failed.' unless ast
-      ast, instrumented_lines = instrument_ast ast
+      ast, instrumented_lines, instrumented_func_lines = instrument_ast ast
       instrumented_src = ast.to_ecma
 
       inserting = File.open(File.dirname(__FILE__) + '/inserting.js').read
@@ -35,7 +35,8 @@ module JSInstrument
         commit_hash: self.commit_hash,
         batch_text: self.batch_text,
         data_compress_method: self.data_compress_method,
-        instrumented_lines: instrumented_lines
+        instrumented_lines: instrumented_lines,
+        instrumented_func_lines: instrumented_func_lines
       }
 
       (inserting % bindings) + instrumented_src
@@ -46,12 +47,16 @@ module JSInstrument
       #
       ast = RKelly::Visitors::ParentBuilder.new.build ast
       instrumented_lines = Set.new
+      instrumented_func_lines = Set.new
       ast.each do |node|
         parent = node.parent
         line = node.line
         node_classname = node.class.name.split(/::/)[-1].sub('Node', '')
         parent_classname = parent.class.name.split(/::/)[-1].sub('Node', '')
+
         # instrument only if we can get the line no. and we haven't instrumented it
+        
+        # line coverage
         #
         if line and not instrumented_lines.member? line
           if ['ExpressionStatement', 'EmptyStatement', 'DoWhile', 'While', 'For', 'ForIn', 'Continue',
@@ -60,7 +65,7 @@ module JSInstrument
             if 'DoWhile' == parent_classname
               if parent.left.eql? node
                 instrumented_lines.add line
-                parent.left = get_inserted_block node
+                parent.left = get_hitline_call_block node
               end
             # in RKelly, ConditionalNode extends IfNode
             # which is so annoying
@@ -68,39 +73,45 @@ module JSInstrument
             elsif ['If', 'While', 'For', 'ForIn', 'With'].index parent_classname
               if parent.value.eql? node
                 instrumented_lines.add line
-                parent.value = get_inserted_block node
+                parent.value = get_hitline_call_block node
               elsif parent.else.eql? node
                 instrumented_lines.add line
-                parent.else = get_inserted_block node
+                parent.else = get_hitline_call_block node
               end
             elsif ['CaseBlock', 'Label'].index parent_classname
               # do nothing here
             elsif 'SourceElements' == parent_classname
-              if insert_func_before node
+              if insert_hitline_before node
                 instrumented_lines.add line
               end
             end
           elsif ['With', 'Try'].index node_classname
             if 'SourceElements' == parent_classname
-              if insert_func_before node
+              if insert_hitline_before node
                 instrumented_lines.add line
               end
             end
-          elsif ['FunctionDecl', 'FunctionExpr'].index node_classname
-            if insert_func_before node
-              instrumented_lines.add line
+          end
+        end
+        # function coverage
+        #
+        if line and not instrumented_func_lines.member? line
+          if ['FunctionDecl', 'FunctionExpr'].index node_classname
+            if node.function_body
+              insert_hitfunc_in node.function_body, line
+              instrumented_func_lines.add line
             end
           end
         end
       end
-      [ast, instrumented_lines.sort]
+      [ast, instrumented_lines.sort, instrumented_func_lines.sort]
     end
 
     private
-    def get_insert_func_call line
+    def get_hit_call line, func
       ExpressionStatementNode.new(
         FunctionCallNode.new(
-          ResolveNode.new("#{self.js_object_name}.hit"),
+          ResolveNode.new("#{self.js_object_name}.#{func}"),
           ArgumentsNode.new([
             StringNode.new("\"#{self.src_filename}\""),
             NumberNode.new(line)
@@ -109,16 +120,16 @@ module JSInstrument
       )
     end
 
-    def get_inserted_block node
+    def get_hitline_call_block node
       BlockNode.new(
         SourceElementsNode.new([
-          get_insert_func_call(node.line),
+          get_hit_call(node.line, "hit_line"),
           node
         ])
       )
     end
 
-    def insert_func_before node
+    def insert_hitline_before node
       # get the original node line
       #
       line = node.line
@@ -131,9 +142,15 @@ module JSInstrument
         false
       else
         index = node.parent.value.index{|x| x.eql? node}
-        node.parent.value.insert index, get_insert_func_call(line)
+        node.parent.value.insert index, get_hit_call(line, "hit_line")
         true
       end
     end
+
+    def insert_hitfunc_in function_body_node, line
+      # FunctionBody.value(SourceElement).value(array).unshift hit_func
+      function_body_node.value.value.unshift get_hit_call(line, "hit_func")
+    end
+
   end
 end

data/lib/jsinstrument/version.rb

@@ -1,3 +1,3 @@
 module JSInstrument
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsinstrument
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rkelly