Merge pull request #462 from Gillespie59/development

2.1.0

Author: EmmanuelDemey

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-angular",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "ESLint rules for AngularJS projects",
   "main": "index.js",
   "scripts": {

rules/file-name.js

@@ -105,6 +105,12 @@ module.exports = {
                 if (typeSeparator !== undefined) {
                     name = name + typeSeparator + type;
                 }
+                if (options.casing === 'camel') {
+                    name = filenameUtil.firstToLower(name);
+                }
+                if (options.casing === 'pascal') {
+                    name = filenameUtil.firstToUpper(name);
+                }
                 return name + fileEnding;
             }
         };

rules/service-name.js

@@ -44,6 +44,31 @@ function getConfig(options) {
     return config;
 }
 
+/**
+ * Used only by `ForDeprecatedBehavior()` for making sure it was run only one time
+ * @type {boolean}
+ */
+var didWarnForDeprecatedBehavior = false;
+
+/**
+ * Warn if API is deprecated
+ * @param {Array.<*>} options
+ */
+function warnForDeprecatedBehavior(options) {
+    if (didWarnForDeprecatedBehavior) {
+        return;
+    }
+    didWarnForDeprecatedBehavior = true;
+
+    var config = getConfig(options);
+
+    /* istanbul ignore if  */
+    if (config.oldBehavior) {
+        // eslint-disable-next-line
+        console.warn('The rule `angular/service-name` will be split up to different rules in the next version. Please read the docs for more information');
+    }
+}
+
 module.exports = {
     meta: {
         schema: [{
@@ -53,6 +78,8 @@ module.exports = {
         }]
     },
     create: function(context) {
+        warnForDeprecatedBehavior(context.options);
+
         return {
 
             CallExpression: function(node) {

test/file-name.js

@@ -227,6 +227,38 @@ angular.module(mod, [mod + '.core.angular', mod + '.thirdparty']);
             },
             typeSeparator: 'dot'
         }]
+    }, {
+        // camel casing, dot typeSeparator, ignoreTypeSuffix of true
+        filename: 'src/app/some.controller.js',
+        code: 'app.controller("SomeController", function() {});',
+        options: [{
+            casing: 'camel',
+            typeSeparator: 'dot',
+            ignoreTypeSuffix: true
+        }]
+    }, {
+        // camel casing
+        filename: 'src/app/someController.js',
+        code: 'app.controller("SomeController", function() {});',
+        options: [{
+            casing: 'camel'
+        }]
+    }, {
+        // pascal casing, dot typeSeparator, ignoreTypeSuffix of true
+        filename: 'src/app/Some.controller.js',
+        code: 'app.controller("SomeController", function() {});',
+        options: [{
+            casing: 'pascal',
+            typeSeparator: 'dot',
+            ignoreTypeSuffix: true
+        }]
+    }, {
+        // pascal casing
+        filename: 'src/app/SomeController.js',
+        code: 'app.controller("SomeController", function() {});',
+        options: [{
+            casing: 'pascal'
+        }]
     }].concat(commonFalsePositives),
     invalid: [{
         filename: 'src/app/filters.js',
@@ -322,5 +354,41 @@ angular.module(mod, [mod + '.core.angular', mod + '.thirdparty']);
             typeSeparator: 'dot'
         }],
         errors: [{message: 'Filename must be "users.provider.js"'}]
+    }, {
+        // camel casing, dot typeSeparator, ignoreTypeSuffix of true
+        filename: 'src/app/SomeController.js',
+        code: 'app.controller("SomeController", function() {});',
+        options: [{
+            casing: 'camel',
+            typeSeparator: 'dot',
+            ignoreTypeSuffix: true
+        }],
+        errors: [{message: 'Filename must be "some.controller.js"'}]
+    }, {
+        // camel casing
+        filename: 'src/app/SomeController.js',
+        code: 'app.controller("SomeController", function() {});',
+        options: [{
+            casing: 'camel'
+        }],
+        errors: [{message: 'Filename must be "someController.js"'}]
+    }, {
+        // pascal casing, dot typeSeparator, ignoreTypeSuffix of true
+        filename: 'src/app/someController.js',
+        code: 'app.controller("SomeController", function() {});',
+        options: [{
+            casing: 'pascal',
+            typeSeparator: 'dot',
+            ignoreTypeSuffix: true
+        }],
+        errors: [{message: 'Filename must be "Some.controller.js"'}]
+    }, {
+        // pascal casing
+        filename: 'src/app/someController.js',
+        code: 'app.controller("SomeController", function() {});',
+        options: [{
+            casing: 'pascal'
+        }],
+        errors: [{message: 'Filename must be "SomeController.js"'}]
     }]
 });