ngannotate-rails 0.9.2 → 0.9.5

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 2dd7c00767bd1657fbdda31a2b51ceba108b0e24
-  data.tar.gz: 31b2eb5ae4c37392f5f907da4eec8d3052114a3f
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTU4MjFkOTczODkxOTFmZjMwYjhiYWJhNzJmNGU2YmU0OTNlZWQ5Yw==
+  data.tar.gz: !binary |-
+    MDdlMjViMzY1YzgwNmE3MWUxOWZiOTFmMTA0NjgxNWZkMzUyMTA0NQ==
 SHA512:
-  metadata.gz: 1783b877d258c6fa88d1aa9a4999e8e7484857c3965777972ec9f896f5f7ce16a63ed355919503d3ea279e234426ec3b1804a8c5d67444dcb54bf55ff7f57feb
-  data.tar.gz: 7bd95be1b3cb4bc7a4229124bc5a1a05c8ddbde5a66f575b0da6df832207bbbdc8c44639b7f3c20de8dc514aab46b5eedad933afbeb3510e887173c5a3108e24
+  metadata.gz: !binary |-
+    NzNmODlhNjg2MWMwNTJiOWQ2YmViNWUxZTUzZmM0YTAzNTBmYzU5OTE0YTkz
+    OTE5ZDk5N2RlMGFjNTI0ZjQxZTkzNjg0OWE1NDdmNGZjYjk0NjBmNmZmYjU4
+    ZTFhNThhMzkxNTRiZTEwYTYzNzBkNWMzMjZkM2RkOTQxNGUxMjk=
+  data.tar.gz: !binary |-
+    MmQ2N2Q4YzczMjJkMjM3OWM3NDNjYTIwMWRlMjY4YjhmYzhiZDQ3YzM1Mzc4
+    YzhkMzVkYjI4OWVhNTE5ZjgxODhlOTQyYWYyYThiMDczMWEzMjY0MTc1ZjFk
+    M2FkMTg1MTBhMTdmZDUxMDRlYmUxZmExNzE1ZmUzMjY5OTE5Y2E=

data/lib/ngannotate/processor.rb

@@ -7,13 +7,37 @@ module Ngannotate
     end
 
     def prepare
+      return if skip
       ngannotate_source = File.open(File.join(File.dirname(__FILE__), '../../vendor/ngannotate.js')).read
       @context = ExecJS.compile "window = {};" + ngannotate_source
     end
 
+    #
+    # Skip processing in environments where it does not make sense
+    #
+    def skip
+      ::Rails.env.development? || ::Rails.env.test?
+    end
+
     def evaluate(context, locals)
-      r = @context.call 'window.annotate', data, { add: true }
+      return data if skip
+
+      opt = { add: true }.merge!(parse_opt)
+      r = @context.call 'window.annotate', data, opt
       r['src']
     end
+
+    def parse_opt
+      opt = {}
+      opt_str = ENV['NG_OPT']
+      if opt_str
+        opt = Hash[opt_str.split(',').map { |e| e.split('=') }]
+        opt.symbolize_keys!
+      end
+      if ENV['NG_REGEXP']
+        opt[:regexp] = ENV['NG_REGEXP']
+      end
+      opt
+    end
   end
 end

data/lib/ngannotate/rails/version.rb

@@ -1,5 +1,5 @@
 module Ngannotate
   module Rails
-    VERSION = "0.9.2"
+    VERSION = "0.9.5"
   end
 end

data/vendor/ngannotate.js

@@ -1121,8 +1121,6 @@ function match(node, re, matchPlugins) {
 }
 
 function matchDirectiveReturnObject(node) {
-    // TODO make these more strict by checking that we're inside an angular module?
-
     // return { .. controller: function($scope, $timeout), ...}
 
     return node.type === "ReturnStatement" &&
@@ -1131,8 +1129,6 @@ function matchDirectiveReturnObject(node) {
 }
 
 function matchProviderGet(node) {
-    // TODO make these more strict by checking that we're inside an angular module?
-
     // (this|self|that).$get = function($scope, $timeout)
     // { ... $get: function($scope, $timeout), ...}
     var memberExpr;
@@ -1194,7 +1190,7 @@ function matchNgUi(node) {
     //     onExit: function($scope)
     // });
     // $stateProvider.state("myState", {... resolve: {f: function($scope) {}, ..} ..})
-    // $stateProvider.state("myState", {... views: {... somename: {... controller: fn, templateProvider: fn, resolve: {f: fn}}}})
+    // $stateProvider.state("myState", {... views: {... somename: {... controller: fn, controllerProvider: fn, templateProvider: fn, resolve: {f: fn}}}})
     //
     // $urlRouterProvider.when(.., function($scope) {})
     //
@@ -1263,6 +1259,7 @@ function matchNgUi(node) {
         viewObject.properties.forEach(function(prop) {
             if (prop.value.type === "ObjectExpression") {
                 res.push(matchProp("controller", prop.value.properties));
+                res.push(matchProp("controllerProvider", prop.value.properties));
                 res.push(matchProp("templateProvider", prop.value.properties));
                 res.push.apply(res, matchResolve(prop.value.properties));
             }
@@ -1306,9 +1303,14 @@ function matchRegular(node, re) {
     }
 
     var args = node.arguments;
-    return (is.someof(method.name, ["config", "run"]) ?
+    var target = (is.someof(method.name, ["config", "run"]) ?
         args.length === 1 && args[0] :
         args.length === 2 && args[0].type === "Literal" && is.string(args[0].value) && args[1]);
+
+    if (target) {
+        target.$always = true;
+    }
+    return target;
 }
 
 // Short form: *.controller("MyCtrl", function($scope, $timeout) {});
@@ -1406,21 +1408,46 @@ function removeArray(array, fragments) {
     });
 }
 
-function replaceRemoveOrInsertArrayForTarget(target, ctx) {
+function judgeSuspects(ctx) {
+    var suspects = ctx.suspects;
     var mode = ctx.mode;
     var fragments = ctx.fragments;
     var quot = ctx.quot;
 
-    if (mode === "rebuild" && isAnnotatedArray(target)) {
-        replaceArray(target, fragments, quot);
-    } else if (mode === "remove" && isAnnotatedArray(target)) {
-        removeArray(target, fragments);
-    } else if (is.someof(mode, ["add", "rebuild"]) && isFunctionExpressionWithArgs(target)) {
-        insertArray(target, fragments, quot);
-    } else {
-        return false;
+    for (var i = 0; i < suspects.length; i++) {
+        var target = suspects[i];
+
+        if (target.$once) {
+            continue;
+        }
+        target.$once = true;
+
+        if (!target.$always) {
+            var $caller = target.$caller;
+            for (; $caller && $caller.$chained !== chainedRegular; $caller = $caller.$caller) {
+            }
+            if (!$caller) {
+                continue;
+            }
+        }
+
+        if (mode === "rebuild" && isAnnotatedArray(target)) {
+            replaceArray(target, fragments, quot);
+        } else if (mode === "remove" && isAnnotatedArray(target)) {
+            removeArray(target, fragments);
+        } else if (is.someof(mode, ["add", "rebuild"]) && isFunctionExpressionWithArgs(target)) {
+            insertArray(target, fragments, quot);
+        }
     }
-    return true;
+}
+
+function addModuleContextDependentSuspect(target, ctx) {
+    ctx.suspects.push(target);
+}
+
+function addModuleContextIndependentSuspect(target, ctx) {
+    target.$always = true;
+    ctx.suspects.push(target);
 }
 
 function isAnnotatedArray(node) {
@@ -1485,6 +1512,14 @@ window.annotate = function ngAnnotate(src, options) {
     // first node at (or after) a certain pos
     var triggers = new Heap();
 
+    // suspects is built up with suspect nodes by match.
+    // A suspect node will get annotations added / removed if it
+    // fulfills the arrayexpression or functionexpression look,
+    // and if it is in the correct context (inside an angular
+    // module definition) - alternatively is forced to ignore
+    // context with node.$always = true
+    var suspects = [];
+
     var ctx = {
         mode: mode,
         quot: quot,
@@ -1492,10 +1527,12 @@ window.annotate = function ngAnnotate(src, options) {
         comments: comments,
         fragments: fragments,
         triggers: triggers,
+        suspects: suspects,
         isFunctionExpressionWithArgs: isFunctionExpressionWithArgs,
         isFunctionDeclarationWithArgs: isFunctionDeclarationWithArgs,
         isAnnotatedArray: isAnnotatedArray,
-        replaceRemoveOrInsertArrayForTarget: replaceRemoveOrInsertArrayForTarget,
+        addModuleContextDependentSuspect: addModuleContextDependentSuspect,
+        addModuleContextIndependentSuspect: addModuleContextIndependentSuspect,
         stringify: stringify,
     };
 
@@ -1516,13 +1553,26 @@ window.annotate = function ngAnnotate(src, options) {
         plugin.init(ctx);
     });
 
+    var recentCaller = undefined; // micro-optimization
+    var callerIds = [];
     traverse(ast, {pre: function(node) {
+        node.$caller = recentCaller;
+        if (node.type === "CallExpression") {
+            callerIds.push(node);
+            recentCaller = node;
+        }
+
         var pos = node.range[0];
         while (pos >= triggers.pos) {
             var trigger = triggers.getAndRemoveNext();
             trigger.fn.call(null, node, trigger.ctx);
         }
     }, post: function(node) {
+        if (node === recentCaller) {
+            callerIds.pop();
+            recentCaller = last(callerIds);
+        }
+
         var targets = match(node, re, matchPluginsOrNull);
         if (!targets) {
             return;
@@ -1531,12 +1581,13 @@ window.annotate = function ngAnnotate(src, options) {
             targets = [targets];
         }
 
-        // TODO add something to know that node has been altered so it won't happen again
         for (var i = 0; i < targets.length; i++) {
-            replaceRemoveOrInsertArrayForTarget(targets[i], ctx);
+            addModuleContextDependentSuspect(targets[i], ctx);
         }
     }});
 
+    judgeSuspects(ctx);
+
     var out = alter(src, fragments);
 
     return {
@@ -1573,27 +1624,59 @@ function ngInjectCommentsInit(ctx) {
     ctx.triggers.addMany(triggers);
 }
 
+function nestedObjectValues(node, res) {
+    res = res || [];
+
+    node.properties.forEach(function(prop) {
+        var v = prop.value;
+        if (is.someof(v.type, ["FunctionExpression", "ArrayExpression"])) {
+            res.push(v);
+        } else if (v.type === "ObjectExpression") {
+            nestedObjectValues(v, res);
+        }
+    });
+
+    return res;
+}
+
 function visitNodeFollowingNgInjectComment(node, ctx) {
-    // TODO objectliteral (if add or remove)
+    // handle most common case: /*@ngInject*/ prepended to an array or function expression
+    if (node.type === "ArrayExpression" || node.type === "FunctionExpression") {
+        ctx.addModuleContextIndependentSuspect(node, ctx);
+        return;
+    }
 
-    if (ctx.replaceRemoveOrInsertArrayForTarget(node, ctx)) {
+    if (node.type === "ObjectExpression") {
+        nestedObjectValues(node).forEach(function(n) {
+            ctx.addModuleContextIndependentSuspect(n, ctx);
+        });
         return;
     }
 
-    // var foo = function($scope) {}
+    // /*@ngInject*/ var foo = function($scope) {} and
+    // /*@ngInject*/ function foo($scope) {}
     var d0 = null;
     var nr1 = node.range[1];
     if (node.type === "VariableDeclaration" && node.declarations.length === 1 &&
         (d0 = node.declarations[0]).init && ctx.isFunctionExpressionWithArgs(d0.init)) {
         var isSemicolonTerminated = (ctx.src[nr1 - 1] === ";");
-        addRemoveInjectsArray(d0.init.params, isSemicolonTerminated ? nr1 : d0.init.range[1], d0.id.name);
+        addRemoveInjectArray(d0.init.params, isSemicolonTerminated ? nr1 : d0.init.range[1], d0.id.name);
     } else if (ctx.isFunctionDeclarationWithArgs(node)) {
-        addRemoveInjectsArray(node.params, nr1, node.id.name);
+        addRemoveInjectArray(node.params, nr1, node.id.name);
     }
 
+    function getIndent(pos) {
+        var src = ctx.src;
+        var lineStart = src.lastIndexOf("\n", pos - 1) + 1;
+        var i = lineStart;
+        for (; src[i] === " " || src[i] === "\t"; i++) {
+        }
+        return src.slice(lineStart, i);
+    }
 
-    function addRemoveInjectsArray(params, posAfterFunctionDeclaration, name) {
-        var str = fmt("\n{0}.$injects = {1};", name, ctx.stringify(params, ctx.quot));
+    function addRemoveInjectArray(params, posAfterFunctionDeclaration, name) {
+        var indent = getIndent(posAfterFunctionDeclaration);
+        var str = fmt("\n{0}{1}.$inject = {2};", indent, name, ctx.stringify(params, ctx.quot));
 
         ctx.triggers.add({
             pos: posAfterFunctionDeclaration,
@@ -1603,24 +1686,24 @@ function visitNodeFollowingNgInjectComment(node, ctx) {
         function visitNodeFollowingFunctionDeclaration(nextNode) {
             var assignment = nextNode.expression;
             var lvalue;
-            var hasInjectsArray = (nextNode.type === "ExpressionStatement" && assignment.type === "AssignmentExpression" &&
+            var hasInjectArray = (nextNode.type === "ExpressionStatement" && assignment.type === "AssignmentExpression" &&
                 assignment.operator === "=" &&
                 (lvalue = assignment.left).type === "MemberExpression" &&
-                lvalue.computed === false && lvalue.object.name === name && lvalue.property.name === "$injects");
+                lvalue.computed === false && lvalue.object.name === name && lvalue.property.name === "$inject");
 
-            if (ctx.mode === "rebuild" && hasInjectsArray) {
+            if (ctx.mode === "rebuild" && hasInjectArray) {
                 ctx.fragments.push({
                     start: posAfterFunctionDeclaration,
                     end: nextNode.range[1],
                     str: str,
                 });
-            } else if (ctx.mode === "remove" && hasInjectsArray) {
+            } else if (ctx.mode === "remove" && hasInjectArray) {
                 ctx.fragments.push({
                     start: posAfterFunctionDeclaration,
                     end: nextNode.range[1],
                     str: "",
                 });
-            } else if (is.someof(ctx.mode, ["add", "rebuild"]) && !hasInjectsArray) {
+            } else if (is.someof(ctx.mode, ["add", "rebuild"]) && !hasInjectArray) {
                 ctx.fragments.push({
                     start: posAfterFunctionDeclaration,
                     end: posAfterFunctionDeclaration,
@@ -3196,8 +3279,6 @@ parseStatement: true, parseSourceElement: true */
                 }
             }
 
-            peek();
-
             if (extra.trailingComments.length > 0) {
                 if (extra.trailingComments[0].range[0] >= node.range[1]) {
                     trailingComments = extra.trailingComments;
@@ -5521,7 +5602,7 @@ parseStatement: true, parseSourceElement: true */
     }
 
     // Sync with *.json manifests.
-    exports.version = '1.2.1';
+    exports.version = '1.2.2';
 
     exports.tokenize = tokenize;
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ngannotate-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.5
 platform: ruby
 authors:
 - Kari Ikonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
@@ -42,14 +42,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Use ngannotate in the Rails asset pipeline.
@@ -82,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Use ngannotate in the Rails asset pipeline.