simple-validators 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29005c768248d39a784d7cb10a51eaf7b40baa6f
-  data.tar.gz: 0fbed019fe141df5268c24ce1411e6ae083b8a71
+  metadata.gz: 43f6166da95b3801727a71dab732e30e608032de
+  data.tar.gz: 38ba53ecc55e96c4a6d720edd7b2206959b8ea30
 SHA512:
-  metadata.gz: 5bc23d9ad61771be474cc287614eff3eac894b03596613a6a29eef6ecabcd4f645442e580798247ec143cfd1fa6f3caa7bc1088a5ed1f2c703b78888b5b41db1
-  data.tar.gz: d4b1e9de07b62b9a52333710894d58fcc8f6574eb460f11c304d80b17e819e8ec47eec7235a05b70ec779e879c39f015bdf043e91db5c95372bb3309f99536ed
+  metadata.gz: a92331afc9b90a57c21c6e0d13d1f935b216615cb87c736e77a6c81bb1bfe5f3b590ecc38132f60e6f6a70060ac3877e008b34b8f9fb6cbdf4e7510c11e73af7
+  data.tar.gz: 0d16a8c5f853c6ee6cb73595a3ac72dbd21b988ed60a0aef31f1107decae288bc67f679c4910c0afb8d8351eebf7551cb9262e35d13f2130764595c25c0d5359

data/lib/simple/validators.rb

@@ -2,3 +2,4 @@ require 'simple/validators/version'
 
 require 'simple/validators/email_validator'
 require 'simple/validators/username_validator'
+require 'simple/validators/subdomain_validator'

data/lib/simple/validators/subdomain_validator.rb

@@ -0,0 +1,18 @@
+module Simple
+  module Validators
+    class SubdomainValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        return if value.blank?
+
+        reserved_names = options.fetch(:reserved) { %w[www ftp mail pop smtp admin ssl sftp] }
+        if reserved_names.include?(value)
+          record.errors[attribute] << 'cannot be a reserved name'
+        end
+
+        record.errors[attribute] << 'must have between 1 and 63 letters' unless (1..63) === value.length
+        record.errors[attribute] << 'cannot start or end with a hyphen' unless value =~ /^[^-].*[^-]$/i
+        record.errors[attribute] << 'must be alphanumeric; A-Z, 0-9 or hyphen' unless value =~ /^[a-z0-9\-]*$/i
+      end
+    end
+  end
+end

data/lib/simple/validators/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module Validators
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/spec/dummy/app/models/account.rb

@@ -0,0 +1,9 @@
+class Account
+  include ActiveModel::Validations
+  include Simple::Validators
+
+  attr_accessor :subdomain, :host
+
+  validates :host, subdomain: true
+  validates :subdomain, subdomain: { reserved: %w[www test] }
+end

data/spec/validators/subdomain_validator_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Simple::Validators::SubdomainValidator do
+  let(:account) { Account.new }
+
+  context "valid subdomain" do
+    it "marks the record as valid" do
+      account.subdomain = "acme"
+      expect(account).to be_valid
+    end
+  end
+
+  context "invalid subdomain" do
+    it "when reserved marks the record as invalid" do
+      account.host = "www"
+      expect(account).not_to be_valid
+    end
+
+    it "when reserved marks the record as invalid" do
+      account.subdomain = "test"
+      expect(account).not_to be_valid
+    end
+
+    it "when too long marks the record as invalid" do
+      account.subdomain = "really-really-long-subdomain-that-exceeds-the-63-char-limit-keep-going-nearly-there"
+      expect(account).not_to be_valid
+    end
+
+    it "when starts with a hypen marks the record as invalid" do
+      account.subdomain = "-acme"
+      expect(account).not_to be_valid
+    end
+
+    it "when ends with a hypen marks the record as invalid" do
+      account.subdomain = "acme-"
+      expect(account).not_to be_valid
+    end
+
+    it "when it contains invalid chars the record as invalid" do
+      account.subdomain = "acme_test something"
+      expect(account).not_to be_valid
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-validators
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Mytton
@@ -47,6 +47,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/simple/validators/email_validator.rb
+- lib/simple/validators/subdomain_validator.rb
 - lib/simple/validators/username_validator.rb
 - lib/simple/validators/version.rb
 - lib/simple/validators.rb
@@ -56,6 +57,7 @@ files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/account.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config/application.rb
@@ -85,6 +87,7 @@ files:
 - spec/dummy/script/rails
 - spec/spec_helper.rb
 - spec/validators/email_validator_spec.rb
+- spec/validators/subdomain_validator_spec.rb
 - spec/validators/username_validator_spec.rb
 homepage: https://github.com/simpleweb/simple-validators
 licenses: []
@@ -114,6 +117,7 @@ test_files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/account.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config/application.rb
@@ -143,5 +147,6 @@ test_files:
 - spec/dummy/script/rails
 - spec/spec_helper.rb
 - spec/validators/email_validator_spec.rb
+- spec/validators/subdomain_validator_spec.rb
 - spec/validators/username_validator_spec.rb
 has_rdoc: