Merge branch 'release/0.1.1'

mmjmanders · Aug 21, 2014 · 5c02ef8 · 5c02ef8
2 parents c18c735 + 1bdc8cb
commit 5c02ef8
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 48 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -94,13 +94,14 @@ module.exports = function (grunt) {
   });
 
   grunt.registerTask('test', [
-    'clean',
+    'clean:tmp',
     'coffee',
     'connect:test',
     'karma'
   ]);
 
   grunt.registerTask('default', [
+    'clean:dist',
     'test',
     'ngAnnotate',
     'uglify'

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-iban",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "authors": [
     "Mark Manders <[email protected]>"
   ],
@@ -22,9 +22,9 @@
     "Gruntfile.js"
   ],
   "dependencies": {
-    "angular": "~1.2.0"
+    "angular": ">=1.0.0"
   },
   "devDependencies": {
-    "angular-mocks": "~1.2.0"
+    "angular-mocks": ">=1.0.0"
   }
 }
diff --git a/dist/ng-iban.js b/dist/ng-iban.js
@@ -6,30 +6,43 @@ angular.module('mm.iban', ['ng']).directive('ngIban', function() {
     restrict: 'A',
     require: 'ngModel',
     link: function(scope, elem, attrs, ctrl) {
-      var A, Z;
-      A = 'A'.charCodeAt(0);
-      Z = 'Z'.charCodeAt(0);
-      return scope.$watch(attrs.ngModel, function() {
-        var block, iban, remainder;
-        ctrl.$setValidity('iban', (!ctrl.$error.hasOwnProperty('required') || !!!ctrl.$error.required) && (!ctrl.$modelValue || ctrl.$modelValue === ''));
-        if (ctrl.$modelValue && ctrl.$modelValue !== '') {
-          iban = ctrl.$modelValue.toUpperCase().replace(/\s/g, '');
-          iban = iban.substr(4) + iban.substr(0, 4);
-          remainder = iban.split('').map(function(n) {
-            var code;
-            code = n.charCodeAt(0);
-            if (code >= A && code <= Z) {
-              return code - A + 10;
-            } else {
-              return n;
-            }
-          }).join('');
-          while (remainder.length > 2) {
-            block = remainder.slice(0, 9);
-            remainder = __modulo(parseInt(block, 10), 97) + remainder.slice(block.length);
+      var isValidIban;
+      isValidIban = function(value) {
+        var A, Z, block, iban, remainder;
+        A = 'A'.charCodeAt(0);
+        Z = 'Z'.charCodeAt(0);
+        iban = value.toUpperCase().replace(/\s/g, '');
+        iban = iban.substr(4) + iban.substr(0, 4);
+        remainder = iban.split('').map(function(n) {
+          var code;
+          code = n.charCodeAt(0);
+          if (code >= A && code <= Z) {
+            return code - A + 10;
+          } else {
+            return n;
           }
-          return ctrl.$setValidity('iban', __modulo(parseInt(remainder, 10), 97) === 1);
+        }).join('');
+        while (remainder.length > 2) {
+          block = remainder.slice(0, 9);
+          remainder = __modulo(parseInt(block, 10), 97) + remainder.slice(block.length);
         }
+        return __modulo(parseInt(remainder, 10), 97) === 1;
+      };
+      ctrl.$parsers.unshift(function(value) {
+        var valid;
+        valid = value != null ? isValidIban(value) : true;
+        ctrl.$setValidity('iban', valid);
+        if (valid) {
+          return value;
+        } else {
+          return void 0;
+        }
+      });
+      return ctrl.$formatters.unshift(function(value) {
+        var valid;
+        valid = value != null ? isValidIban(value) : true;
+        ctrl.$setValidity('iban', valid);
+        return value;
       });
     }
   };

diff --git a/dist/ng-iban.min.js b/dist/ng-iban.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-iban",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "IBAN directive for AngularJS",
   "main": "./dist/ng-iban.js",
   "scripts": {

diff --git a/src/ng-iban.coffee b/src/ng-iban.coffee
@@ -6,22 +6,30 @@ angular
     restrict: 'A'
     require: 'ngModel'
     link: (scope, elem, attrs, ctrl) ->
-      A = 'A'.charCodeAt 0
-      Z = 'Z'.charCodeAt 0
-      scope.$watch attrs.ngModel, ->
-        ctrl.$setValidity 'iban', (not ctrl.$error.hasOwnProperty('required') or not !!ctrl.$error.required) and (not ctrl.$modelValue or ctrl.$modelValue is '')
+      isValidIban = (value) ->
+        A = 'A'.charCodeAt 0
+        Z = 'Z'.charCodeAt 0
 
-        if ctrl.$modelValue and ctrl.$modelValue isnt ''
-          iban = ctrl.$modelValue.toUpperCase().replace /\s/g, ''
-          iban = iban.substr(4) + iban.substr 0, 4
+        iban = value.toUpperCase().replace /\s/g, ''
+        iban = iban.substr(4) + iban.substr 0, 4
 
-          remainder = iban.split('').map (n) ->
-            code = n.charCodeAt 0
-            if code >= A and code <= Z then code - A + 10 else n
-          .join ''
+        remainder = iban.split('').map (n) ->
+          code = n.charCodeAt 0
+          if code >= A and code <= Z then code - A + 10 else n
+        .join ''
 
-          while remainder.length > 2
-            block = remainder.slice 0, 9
-            remainder = parseInt(block, 10) %% 97 + remainder.slice block.length
+        while remainder.length > 2
+          block = remainder.slice 0, 9
+          remainder = parseInt(block, 10) %% 97 + remainder.slice block.length
 
-          ctrl.$setValidity 'iban', parseInt(remainder, 10) %% 97 is 1
+        parseInt(remainder, 10) %% 97 is 1
+
+      ctrl.$parsers.unshift (value) ->
+        valid = if value? then isValidIban value else true
+        ctrl.$setValidity 'iban', valid
+        if valid then value else undefined
+
+      ctrl.$formatters.unshift (value) ->
+        valid = if value? then isValidIban value else true
+        ctrl.$setValidity 'iban', valid
+        value
diff --git a/test/spec/ng-iban.coffee b/test/spec/ng-iban.coffee
@@ -17,9 +17,9 @@ describe 'Directive: iban', ->
     form = scope.form
 
   it 'optional should pass with empty IBAN', ->
-    form.optional.$setViewValue ''
+    form.optional.$setViewValue undefined
     scope.$digest()
-    expect(scope.optional).toEqual ''
+    expect(scope.optional).toEqual undefined
     expect(form.optional.$valid).toBe true
 
   it 'optional should pass with valid IBAN', ->
@@ -31,11 +31,11 @@ describe 'Directive: iban', ->
   it 'optional should fail with invalid IBAN', ->
     form.optional.$setViewValue 'NL87 INGB 0002 4455 88'
     scope.$digest()
-    expect(scope.optional).toEqual 'NL87 INGB 0002 4455 88'
+    expect(scope.optional).toEqual undefined
     expect(form.optional.$valid).toBe false
 
   it 'required should fail with empty IBAN', ->
-    form.iban.$setViewValue ''
+    form.iban.$setViewValue undefined
     scope.$digest()
     expect(scope.iban).toEqual undefined
     expect(form.iban.$valid).toBe false
@@ -49,5 +49,5 @@ describe 'Directive: iban', ->
   it 'required should fail with invalid IBAN', ->
     form.iban.$setViewValue 'NL87 INGB 0002 4455 88'
     scope.$digest()
-    expect(scope.iban).toEqual 'NL87 INGB 0002 4455 88'
+    expect(scope.iban).toEqual undefined
     expect(form.iban.$valid).toBe false