Add rule.js => angular-validation-rule.js

CONTRIBUTING.md

@@ -18,7 +18,7 @@ grunt dev
 
 **Start coding**
 ```
-open `provider.js`, looking for `var expression` and `var defaultMsg`
+open `rule.js`, looking for `var expression` and `var defaultMsg`
 Adding a new expression and defaultMsg to extend it
 ```
 

Gruntfile.js

@@ -31,14 +31,16 @@ module.exports = function (grunt) {
         concat: {
             basic_and_extras: {
                 files: {
-                    'dist/angular-validation.js': ['src/module.js', 'src/provider.js', 'src/directive.js']
+                    'dist/angular-validation.js': ['src/module.js', 'src/provider.js', 'src/directive.js'],
+                    'dist/angular-validation-rule.js': ['src/rule.js']
                 }
             }
         },
         uglify: {
             my_target: {
                 files: {
-                    'dist/angular-validation.min.js': ['dist/angular-validation.js']
+                    'dist/angular-validation.min.js': ['dist/angular-validation.js'],
+                    'dist/angular-validation-rule.min.js': ['dist/angular-validation-rule.js']
                 }
             }
         },

README.md

@@ -33,8 +33,15 @@ npm install angular-validation
 
 Using angular-validation
 ---
-```javascript
+```html
+<script src="dist/angular-validation.js"></script>
+<script src="dist/angular-validation-rule.js"></script>
+```
+```js
 angular.module('yourApp', ['validation']);
+
+// including your validation rule
+angular.module('yourApp', ['validation', 'validation.rule']);
 ```
 
 Writing your Code
@@ -278,7 +285,7 @@ Easily disable success/error message
 }]);
 ```
 
-Built-in validation <small>in angular-validation</small>
+Built-in validation <small>in angular-validation-rule</small>
 ===
 
 1. Required

config/karma.conf.angular.1.2.js

@@ -10,6 +10,7 @@ module.exports = function(config) {
             'test/lib/angular.1.2.16.js',
             'test/lib/angular-mocks.1.2.16.js',
             'dist/angular-validation.js',
+            'dist/angular-validation-rule.js',
             'test/unit/*.js'
         ],
 

config/karma.conf.angular.1.3.js

@@ -10,6 +10,7 @@ module.exports = function(config) {
             'test/lib/angular.1.3.0-beta.5.js',
             'test/lib/angular-mocks.1.3.0-beta.5.js',
             'dist/angular-validation.js',
+            'dist/angular-validation-rule.js',
             'test/unit/*.js'
         ],
 

demo/demo.js

@@ -1,5 +1,5 @@
 (function () {
-    angular.module('myApp', ['validation'])
+    angular.module('myApp', ['validation', 'validation.rule'])
 
         // -------------------
         // config phase

dist/angular-validation-rule.js

@@ -0,0 +1,35 @@
+(function () {
+    angular.module('validation.rule', ['validation'])
+        .config(['$validationProvider', function ($validationProvider) {
+
+            var expression = {
+                required: /^.+$/,
+                url: /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)/,
+                email: /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
+                number: /^\d+$/
+            };
+
+            var defaultMsg = {
+                required: {
+                    error: 'This should be Required!!',
+                    success: 'It\'s Required'
+                },
+                url: {
+                    error: 'This should be Url',
+                    success: 'It\'s Url'
+                },
+                email: {
+                    error: 'This should be Email',
+                    success: 'It\'s Email'
+                },
+                number: {
+                    error: 'This should be Number',
+                    success: 'It\'s Number'
+                }
+            };
+
+            $validationProvider.setExpression(expression).setDefaultMsg(defaultMsg);
+
+        }]);
+
+}).call(this);

dist/angular-validation.js

@@ -29,38 +29,16 @@
 
             /**
              * Define validation type RegExp
-             * @type {{required: RegExp, url: RegExp, email: RegExp}}
+             * @type {{}}
              */
-            var expression = {
-                required: /^.+$/,
-                url: /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)/,
-                email: /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
-                number: /^\d+$/
-            };
+            var expression = {};
 
 
             /**
              * default error, success message
-             * @type {{required: {error: string, success: string}, url: {error: string, success: string}, email: {error: string, success: string}, number: {error: string, success: string}}}
+             * @type {{}}
              */
-            var defaultMsg = {
-                required: {
-                    error: 'This should be Required!!',
-                    success: 'It\'s Required'
-                },
-                url: {
-                    error: 'This should be Url',
-                    success: 'It\'s Url'
-                },
-                email: {
-                    error: 'This should be Email',
-                    success: 'It\'s Email'
-                },
-                number: {
-                    error: 'This should be Number',
-                    success: 'It\'s Number'
-                }
-            };
+            var defaultMsg = {};
 
 
             /**

index.html

@@ -207,6 +207,7 @@ <h1>Angular Validation.
 <a href="https://github.com/huei90/angular-validation"><img src="demo/iconmonstr-github-10-icon-128.png" id="github-link" alt="Fork me on Github"/></a>
 <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.min.js"></script>
 <script src="dist/angular-validation.js"></script>
+<script src="dist/angular-validation-rule.js"></script>
 <script src="demo/demo.js"></script>
 
 </body>

src/provider.js

@@ -26,38 +26,16 @@
 
             /**
              * Define validation type RegExp
-             * @type {{required: RegExp, url: RegExp, email: RegExp}}
+             * @type {{}}
              */
-            var expression = {
-                required: /^.+$/,
-                url: /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)/,
-                email: /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
-                number: /^\d+$/
-            };
+            var expression = {};
 
 
             /**
              * default error, success message
-             * @type {{required: {error: string, success: string}, url: {error: string, success: string}, email: {error: string, success: string}, number: {error: string, success: string}}}
+             * @type {{}}
              */
-            var defaultMsg = {
-                required: {
-                    error: 'This should be Required!!',
-                    success: 'It\'s Required'
-                },
-                url: {
-                    error: 'This should be Url',
-                    success: 'It\'s Url'
-                },
-                email: {
-                    error: 'This should be Email',
-                    success: 'It\'s Email'
-                },
-                number: {
-                    error: 'This should be Number',
-                    success: 'It\'s Number'
-                }
-            };
+            var defaultMsg = {};
 
 
             /**

src/rule.js

@@ -0,0 +1,35 @@
+(function () {
+    angular.module('validation.rule', ['validation'])
+        .config(['$validationProvider', function ($validationProvider) {
+
+            var expression = {
+                required: /^.+$/,
+                url: /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)/,
+                email: /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
+                number: /^\d+$/
+            };
+
+            var defaultMsg = {
+                required: {
+                    error: 'This should be Required!!',
+                    success: 'It\'s Required'
+                },
+                url: {
+                    error: 'This should be Url',
+                    success: 'It\'s Url'
+                },
+                email: {
+                    error: 'This should be Email',
+                    success: 'It\'s Email'
+                },
+                number: {
+                    error: 'This should be Number',
+                    success: 'It\'s Number'
+                }
+            };
+
+            $validationProvider.setExpression(expression).setDefaultMsg(defaultMsg);
+
+        }]);
+
+}).call(this);

test/unit/directivesSpec.js

@@ -11,7 +11,8 @@ describe('directives', function () {
         element;
 
     beforeEach(module('validation.directive'));
-
+    beforeEach(module('validation.rule'));
+
     describe('Example of Required', function () {
 
         beforeEach(inject(function ($injector) {

test/unit/providerSpec.js

@@ -13,7 +13,7 @@ describe('provider', function () {
         myApp;
 
     beforeEach(function () {
-        myApp = angular.module('myApp', ['validation'])
+        myApp = angular.module('myApp', ['validation', 'validation.rule'])
             .config(function ($validationProvider) {
                 validationProvider = $validationProvider;
             });