Merge branch 'release/v1.2.0'

Author: Kamil Kisiela

.gitignore

@@ -0,0 +1,31 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Node template
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
+node_modules
+

CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.2.0] - 2015-11-26
+### Added
+- **match** validator
+- **notmatch** validator
+
 ## [1.1.1] - 2015-11-18
 ### Changed
 - Refactor all files to use Strict Dependency Injection
@@ -53,6 +58,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## 0.0.1 - 2015-11-09
 
+[1.2.0]: https://github.com/wieldo/angular-formly-validator/compare/v1.1.1...v1.2.0
 [1.1.1]: https://github.com/wieldo/angular-formly-validator/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/wieldo/angular-formly-validator/compare/v1.0.0...v1.1.0
 [1.0.0]: https://github.com/wieldo/angular-formly-validator/compare/v0.0.4...v1.0.0

README.md

@@ -21,8 +21,7 @@ meteor add wieldo:angular-formly-validator
 ## Getting Started
 
 1. Add package using `meteor add` (see above)
-2. Add angular-formly files to your project
-3. Add the following dependencies to your AngularJS module:
+2. Add the following dependencies to your AngularJS module:
 
 ```javascript
 angular.module('myApp', [
@@ -45,7 +44,7 @@ formlyValidator.register('required', function(config, $viewValue, $modelValue, s
 
 ### Set validator for formly field
 
-In field configuration, use structure below:
+In field configuration, use structure as in example below:
 
 ```
 {
@@ -140,6 +139,30 @@ Check if model does not match pattern (negation of pattern)
 }
 ```
 
+### match
+
+Check if model matches the other model.
+
+Field's key as a value.
+
+```
+{
+    match: <string>
+}
+```
+
+### notmatch
+
+Check if model does not match the other model (negation of match)
+
+Field's key as a value.
+
+```
+{
+    notmatch: <string>
+}
+```
+
 -
 
 ## Example

lib/client/validators/match.js

@@ -0,0 +1,20 @@
+var {SetModule} = angular2now;
+
+SetModule('formlyValidator')
+    .run(['formlyValidator', (formlyValidator) => {
+
+        formlyValidator.register('match', (fieldKey, $viewValue, $modelValue, $scope) => {
+            const value = $viewValue || $modelValue;
+            
+            if (!angular.isString(fieldKey)) {
+                throw formlyValidator.createError('match value has to be a string');
+            }
+            const field = _.find($scope.fields, (field) => field.key === fieldKey);
+
+            // force this setting
+            $scope.options.extras.validateOnModelChange = true;
+
+            return formlyValidator.isEmpty($viewValue) || field.formControl.$viewValue === value;
+        });
+
+    }]);

lib/client/validators/notmatch.js

@@ -0,0 +1,20 @@
+var {SetModule} = angular2now;
+
+SetModule('formlyValidator')
+    .run(['formlyValidator', (formlyValidator) => {
+
+        formlyValidator.register('notmatch', (fieldKey, $viewValue, $modelValue, $scope) => {
+            const value = $viewValue || $modelValue;
+            
+            if (!angular.isString(fieldKey)) {
+                throw formlyValidator.createError('match value has to be a string');
+            }
+            const field = _.find($scope.fields, (field) => field.key === fieldKey);
+
+            // force this setting
+            $scope.options.extras.validateOnModelChange = true;
+            
+            return formlyValidator.isEmpty($viewValue) || field.formControl.$viewValue !== value;
+        });
+
+    }]);

package.js

@@ -3,7 +3,7 @@ var client = 'client';
 Package.describe({
     name: "wieldo:angular-formly-validator",
     summary: "Use set of built-in validators in your project. This module extends angular-formly-transformer.",
-    version: "1.1.1",
+    version: "1.2.0",
 
     documentation: 'README.md',
     git: 'https://github.com/wieldo/angular-formly-validator.git'
@@ -43,7 +43,9 @@ Package.onUse(function (api) {
         'lib/client/validators/minnumber.js',
         'lib/client/validators/maxnumber.js',
         'lib/client/validators/pattern.js',
-        'lib/client/validators/notpattern.js'
+        'lib/client/validators/notpattern.js',
+        'lib/client/validators/match.js',
+        'lib/client/validators/notmatch.js'
     ], client);
 
 });