ngannotate-rails 0.9.5 → 0.9.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTU4MjFkOTczODkxOTFmZjMwYjhiYWJhNzJmNGU2YmU0OTNlZWQ5Yw==
+    MWM2Yzk4NzkwZDA0Zjk3YmU5YTMwYTU5Y2Q0Mzg3NTQxODUyZjdmYg==
   data.tar.gz: !binary |-
-    MDdlMjViMzY1YzgwNmE3MWUxOWZiOTFmMTA0NjgxNWZkMzUyMTA0NQ==
+    ZmUwMWE3MjBlYzA5YTg5NjAzOTIyNmMxYmYxODAyYzUyODUzN2I5NQ==
 SHA512:
   metadata.gz: !binary |-
-    NzNmODlhNjg2MWMwNTJiOWQ2YmViNWUxZTUzZmM0YTAzNTBmYzU5OTE0YTkz
-    OTE5ZDk5N2RlMGFjNTI0ZjQxZTkzNjg0OWE1NDdmNGZjYjk0NjBmNmZmYjU4
-    ZTFhNThhMzkxNTRiZTEwYTYzNzBkNWMzMjZkM2RkOTQxNGUxMjk=
+    NjA0N2RjNDEwODk5NzI4MGI4NjBhYjNmMzQ1MDFjMTFjODI0ZDNlMTM3MDgx
+    MmJhZDNhOGE3OTU4OGFjM2QxZGMwNWYzZTFhNDkwNmNhMmUzNTgzN2FkZmFj
+    NDQ5MTgwNzhiY2RiYjRjMzYyMDIwY2ZmZmNlNjI2YjQ2YjM5YjM=
   data.tar.gz: !binary |-
-    MmQ2N2Q4YzczMjJkMjM3OWM3NDNjYTIwMWRlMjY4YjhmYzhiZDQ3YzM1Mzc4
-    YzhkMzVkYjI4OWVhNTE5ZjgxODhlOTQyYWYyYThiMDczMWEzMjY0MTc1ZjFk
-    M2FkMTg1MTBhMTdmZDUxMDRlYmUxZmExNzE1ZmUzMjY5OTE5Y2E=
+    ZTc4N2RkM2M5N2I3YTY1NTAzMzVhYzUyNjIxZDg4NWI0NjcyMjNkMmY1MDFh
+    Y2Q3ZWEwOGU5ZjY3Y2RmZTg2M2MwMzFiYjZlMmJiZWVjNTg5MTJiMzQ5YzMx
+    ZDE2MzRlYTBjMjNkNTQxZDI4MTFlNjk2M2MyZTM3NmMxNDQ1OTg=

data/lib/ngannotate/rails/version.rb

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

data/vendor/ngannotate.js

@@ -1104,7 +1104,7 @@ var chainedUrlRouterProvider = 2;
 var chainedStateProvider = 3;
 var chainedRegular = 4;
 
-function match(node, re, matchPlugins) {
+function match(node, ctx, matchPlugins) {
     var isMethodCall = (
         node.type === "CallExpression" &&
             node.callee.type === "MemberExpression" &&
@@ -1112,7 +1112,7 @@ function match(node, re, matchPlugins) {
         );
 
     var matchMethodCalls = (isMethodCall &&
-        (matchRegular(node, re) || matchNgRoute(node) || matchNgUi(node) || matchHttpProvider(node)));
+        (matchRegular(node, ctx) || matchNgRoute(node) || matchNgUi(node) || matchHttpProvider(node)));
 
     return matchMethodCalls ||
         (matchPlugins && matchPlugins(node)) ||
@@ -1285,14 +1285,14 @@ function matchHttpProvider(node) {
         node.arguments.length >= 1 && node.arguments);
 }
 
-function matchRegular(node, re) {
+function matchRegular(node, ctx) {
     // we already know that node is a (non-computed) method call
     var callee = node.callee;
     var obj = callee.object; // identifier or expression
     var method = callee.property; // identifier
 
-    var matchAngularModule = (obj.$chained === chainedRegular || isShortDef(obj, re) || isMediumDef(obj, re) || isLongDef(obj)) &&
-        is.someof(method.name, ["provider", "value", "constant", "bootstrap", "config", "factory", "directive", "filter", "run", "controller", "service", "decorator", "animation"]);
+    var matchAngularModule = (obj.$chained === chainedRegular || isReDef(obj, ctx) || isLongDef(obj)) &&
+        is.someof(method.name, ["provider", "value", "constant", "bootstrap", "config", "factory", "directive", "filter", "run", "controller", "service", "decorator", "animation", "invoke"]);
     if (!matchAngularModule) {
         return false;
     }
@@ -1313,17 +1313,14 @@ function matchRegular(node, re) {
     return target;
 }
 
-// Short form: *.controller("MyCtrl", function($scope, $timeout) {});
-function isShortDef(node, re) {
-    return node.type === "Identifier" && is.string(node.name) && (!re || re.test(node.name));
-}
-
-// Medium form: *.*.controller("MyCtrl", function($scope, $timeout) {});
-function isMediumDef(node, re) {
-    if (node.type === "MemberExpression" && is.string(node.object.name) && is.string(node.property.name)) {
-        return (!re || re.test(node.object.name + "." + node.property.name));
-    }
-    return false;
+// matches with default regexp
+//   *.controller("MyCtrl", function($scope, $timeout) {});
+//   *.*.controller("MyCtrl", function($scope, $timeout) {});
+// matches with --regexp "^require(.*)$"
+//   require("app-module").controller("MyCtrl", function($scope) {});
+function isReDef(node, ctx) {
+    var slice = ctx.src.slice(node.range[0], node.range[1]);
+    return ctx.re.test(slice);
 }
 
 // Long form: angular.module(*).controller("MyCtrl", function($scope, $timeout) {});
@@ -1470,7 +1467,7 @@ window.annotate = function ngAnnotate(src, options) {
     }
 
     var quot = options.single_quotes ? "'" : '"';
-    var re = (options.regexp && new RegExp(options.regexp));
+    var re = (options.regexp ? new RegExp(options.regexp) : /^[a-zA-Z0-9_\$\.\s]+$/);
     var ast;
     var stats = {};
     try {
@@ -1524,6 +1521,7 @@ window.annotate = function ngAnnotate(src, options) {
         mode: mode,
         quot: quot,
         src: src,
+        re: re,
         comments: comments,
         fragments: fragments,
         triggers: triggers,
@@ -1573,7 +1571,7 @@ window.annotate = function ngAnnotate(src, options) {
             recentCaller = last(callerIds);
         }
 
-        var targets = match(node, re, matchPluginsOrNull);
+        var targets = match(node, ctx, matchPluginsOrNull);
         if (!targets) {
             return;
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ngannotate-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Kari Ikonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails