Adding subdomain validator

app/mixins/validator.js

@@ -9,6 +9,7 @@ export default Ember.Mixin.create({
   mailMessage: 'is not a valid email',
   formatMessage: 'is invalid',
   colorMessage: 'must be a valid CSS hex color code',
+  subdomainMessage: 'must be a valid CSS hex color code',
 
 	validationErrors: {},
   isValidNow: true,
@@ -76,8 +77,20 @@ export default Ember.Mixin.create({
   },
   _validateColor: function(property, validation) {
     var errors = this.get('validationErrors'),
+        propertyValue = this.get(property),
         message = this._getCustomMessage(validation.color, this.colorMessage);
-    if (!this.get(property) || String(this.get(property)).match(/([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i) === null){
+    if (!propertyValue || String(propertyValue).match(/([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i) === null){
+      if (!Ember.isArray(errors[property])) {errors[property] = [];}
+      this.set('isValidNow',false);
+      errors[property].push([message]);
+    }
+  },
+  _validateSubdomain: function(property, validation) {
+    var errors = this.get('validationErrors'),
+        message = this._getCustomMessage(validation.subdomain, this.subdomainMessage),
+        propertyValue = this.get(property),
+        reserved = validation.subdomain.reserved || [];
+    if (!propertyValue || String(propertyValue).match(/^[a-z\d]+([-_][a-z\d]+)*$/i) === null || reserved.indexOf(propertyValue) !== -1){
       if (!Ember.isArray(errors[property])) {errors[property] = [];}
       this.set('isValidNow',false);
       errors[property].push([message]);

tests/dummy/app/models/fake-model.js

@@ -12,6 +12,8 @@ export default DS.Model.extend(Validator,{
   lotteryNumber: DS.attr('number'),
   alibabaNumber: DS.attr('number'),
 
+  mySubdomain: DS.attr('number'),
+
   otherFakes: DS.hasMany('other-model'),
 
   validations: {
@@ -33,6 +35,9 @@ export default DS.Model.extend(Validator,{
       presence: true,
       email: true
     },
+    mySubdomain:{
+      subdomain:{ reserved:['admin','blog'], message: 'this subdomain is super invalid' }
+    },
     mainstreamCode: {
       format: { with: /^[a-zA-Z]+$/, message: 'nu nu, that\'s not the format' }
     },

tests/unit/mixins/validator-test.js

@@ -63,6 +63,15 @@ describe('ValidatorMixin', function() {
 	      expect(model.get('errors').errorsFor('lotteryNumber').mapBy('message')[0][0]).to.equal(model.numericalityMessage);
 		  });
 
+      it('validates the subdomain format of the attributes set on `validations.subdomain`', function() {
+        var model = this.subject({subdomain:'with space'}),
+            message = model.validations.mySubdomain.subdomain.message;
+        delete model.validations.mySubdomain.subdomain.message;
+        expect(model.validate()).to.equal(false);
+        expect(model.get('errors').errorsFor('mySubdomain').mapBy('message')[0][0]).to.equal(model.subdomainMessage);
+        model.validations.mySubdomain.subdomain['message'] = message;
+      });
+
       it('validates the inclusion of the attributes set on `validations.inclusion`', function() {
         var model = this.subject({name:'adsfasdf$'}),
             message = model.validations.name.inclusion.message;
@@ -121,6 +130,22 @@ describe('ValidatorMixin', function() {
           });
         });
 
+        it('validates the subdomain format of the attributes set on `validations.subdomain` and use the correct message', function() {
+          var model = this.subject({mySubdomain:'with space'});
+          Ember.run(function() {
+            expect(model.validate()).to.equal(false);
+            expect(model.get('errors').errorsFor('mySubdomain').mapBy('message')[0][0]).to.equal(model.validations.mySubdomain.subdomain.message);
+          });
+        });
+
+        it('validates the subdomain reserved words of the attributes set on `validations.subdomain` and use the correct message', function() {
+          var model = this.subject({mySubdomain:'admin'});
+          Ember.run(function() {
+            expect(model.validate()).to.equal(false);
+            expect(model.get('errors').errorsFor('mySubdomain').mapBy('message')[0][0]).to.equal(model.validations.mySubdomain.subdomain.message);
+          });
+        });
+
         it('validates the format of the attributes set on `validations.format` and use the correct message', function() {
           var model = this.subject({mainstreamCode: 3123123});
           Ember.run(function() {
@@ -165,6 +190,7 @@ describe('ValidatorMixin', function() {
             model.set('bussinessEmail','[email protected]');
             model.set('mainstreamCode','hiphopBachatudo');
             model.set('favoritColor','423abb');
+            model.set('mySubdomain','fake_subdomain');
 		      	expect(model.validate()).to.equal(true);
 		      });
 			  });