ngannotate-rails 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eb1737fcf0afa5ea00f1e82a330c7ab64770225
-  data.tar.gz: fcfe26fd09d2ac827928d8474dc75dc89b4b6f44
+  metadata.gz: 7b20b739c3e3030db5fc4395a6a6da23f276ef70
+  data.tar.gz: 35c93f520f66479af352d0598c47de066ebe5c2e
 SHA512:
-  metadata.gz: 732565bc3e8b91bf37ef22829345cb1c1543ae7cdca342dcd3983d696d17947728cbeddaf71a82b8e84cc5fbce1a9ffb38c5526c08bd19a304ae511718e69d25
-  data.tar.gz: 136e610aaa587d154244d5ec10d40398081d34d1e1988c4a7ed89ef611c25a327ad7bbc7fae44c2ba9cd2e50830bf831a2aea407e1bbd4f82d825d497027336a
+  metadata.gz: 8e5613df37f327ef44ae601650a71c88cef6aa7617805e4fba78062be0bde33f264389d02dae4e4e70b79fa9ffd570d8aaf9183bcb4f2769eff5f3583545a0db
+  data.tar.gz: 6b4b6bc7939dd8423538c2df551fbf7f16b9419398a7d0608f563a9c64bc6c7d608b75926d90aaa96384768cc8813d7f4dee501e1ab166c77437ee43a8eeacb9

data/lib/ngannotate/rails/version.rb

@@ -1,5 +1,5 @@
 module Ngannotate
   module Rails
-    VERSION = "0.12.1"
+    VERSION = "0.13.0"
   end
 end

data/vendor/ngannotate.js

@@ -1598,8 +1598,10 @@ function match(node, ctx, matchPlugins) {
 
     // matchInjectorInvoke must happen before matchRegular
     // to prevent false positive ($injector.invoke() outside module)
+    // matchProvide must happen before matchRegular
+    // to prevent regular from matching it as a short-form
     var matchMethodCalls = (isMethodCall &&
-        (matchInjectorInvoke(node) || matchRegular(node, ctx) || matchNgRoute(node) || matchNgUi(node) || matchHttpProvider(node)));
+        (matchInjectorInvoke(node) || matchProvide(node, ctx) || matchRegular(node, ctx) || matchNgRoute(node) || matchMaterialShowModalOpen(node) || matchNgUi(node) || matchHttpProvider(node)));
 
     return matchMethodCalls ||
         (matchPlugins && matchPlugins(node)) ||
@@ -1607,6 +1609,29 @@ function match(node, ctx, matchPlugins) {
         matchProviderGet(node);
 }
 
+function matchMaterialShowModalOpen(node) {
+    // $mdDialog.show({.. controller: fn, resolve: {f: function($scope) {}, ..}});
+    // $mdToast.show({.. controller: fn, resolve: {f: function($scope) {}, ..}});
+    // $mdBottomSheet.show({.. controller: fn, resolve: {f: function($scope) {}, ..}});
+    // $modal.open({.. controller: fn, resolve: {f: function($scope) {}, ..}});
+
+    // 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 args = node.arguments;
+
+    if (obj.type === "Identifier" &&
+        ((obj.name === "$modal" && method.name === "open") || (is.someof(obj.name, ["$mdDialog", "$mdToast", "$mdBottomSheet"]) && method.name === "show")) &&
+        args.length === 1 && args[0].type === "ObjectExpression") {
+        var props = args[0].properties;
+        var res = [matchProp("controller", props)];
+        res.push.apply(res, matchResolve(props));
+        return res.filter(Boolean);
+    }
+    return false;
+}
+
 function matchDirectiveReturnObject(node) {
     // only matches inside directives
     // return { .. controller: function($scope, $timeout), ...}
@@ -1693,7 +1718,7 @@ function matchNgUi(node) {
     //
     // $urlRouterProvider.when(.., function($scope) {})
     //
-    // $modal.open({.. controller: fn, resolve: {f: function($scope) {}, ..}});
+    // $modal.open see matchMaterialShowModalOpen
 
     // we already know that node is a (non-computed) method call
     var callee = node.callee;
@@ -1701,15 +1726,6 @@ function matchNgUi(node) {
     var method = callee.property; // identifier
     var args = node.arguments;
 
-    // shortcut for $modal.open({.. controller: fn, resolve: {f: function($scope) {}, ..}});
-    if (obj.type === "Identifier" && obj.name === "$modal" && method.name === "open" &&
-        args.length === 1 && args[0].type === "ObjectExpression") {
-        var props = args[0].properties;
-        var res$0 = [matchProp("controller", props)];
-        res$0.push.apply(res$0, matchResolve(props));
-        return res$0.filter(Boolean);
-    }
-
     // shortcut for $urlRouterProvider.when(.., function($scope) {})
     if (obj.$chained === chainedUrlRouterProvider || (obj.type === "Identifier" && obj.name === "$urlRouterProvider")) {
         node.$chained = chainedUrlRouterProvider;
@@ -1820,6 +1836,33 @@ function matchHttpProvider(node) {
         node.arguments.length >= 1 && node.arguments);
 }
 
+function matchProvide(node, ctx) {
+    // $provide.decorator("foo", function($scope) {});
+    // $provide.service("foo", function($scope) {});
+    // $provide.factory("foo", function($scope) {});
+    // $provide.provider("foo", function($scope) {});
+
+    // 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 args = node.arguments;
+
+    var target = obj.type === "Identifier" && obj.name === "$provide" &&
+        is.someof(method.name, ["decorator", "service", "factory", "provider"]) &&
+        args.length === 2 && args[1];
+
+    if (target) {
+        target.$methodName = method.name;
+
+        if (ctx.rename) {
+            // for eventual rename purposes
+            return args;
+        }
+    }
+    return target;
+}
+
 function matchRegular(node, ctx) {
     // we already know that node is a (non-computed) method call
     var callee = node.callee;
@@ -1837,7 +1880,7 @@ function matchRegular(node, ctx) {
     }
 
     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"]);
+        is.someof(method.name, ["provider", "value", "constant", "bootstrap", "config", "factory", "directive", "filter", "run", "controller", "service", "animation", "invoke"]);
     if (!matchAngularModule) {
         return false;
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ngannotate-rails
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Kari Ikonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails