validators 2.5.4 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 239b1fb222056d2e4b90c6a67f067bf75b013090
-  data.tar.gz: 9ebe96f85ffd7515c30fe17ad82d0302cf792e92
+  metadata.gz: a8737099eb2305ac923c29c1e2848b629f5a3f3a
+  data.tar.gz: 801137ecb014fcbf664e10a5a32899b19ac97a68
 SHA512:
-  metadata.gz: 8510fc2a25f03d90a36ac81b0d051d903863235fccdce381347c6e64831ca1c89d243c8b1c310d4b7933916bf93f3770c19002fd05412f1cc895714197f04720
-  data.tar.gz: f728920d75be8ba9d104db10e5d17a2e9f3919e8015aa70f54519fa67fb45222b729f0bff5093ebe40a09e23710c0a4e1af563ff463eb41163ad4e52018f277f
+  metadata.gz: 96b81484e99d3dbc9094e4915510a72e5a00400089ae8c8ea0db75ae3e0d93f5310e6f28663b3c918d27084aa8c6b3d5c33e5f6fe97fdae5ebe286ac08666423
+  data.tar.gz: 511a3e0fbfbc6c9aea01c7286bdc0cd99e7a5de5ef98dc03d6e08509e86c49c27a09e094d475e745456755bdf88881d75b7640c40f674148ca1053f3cdccd775

data/README.md

@@ -135,6 +135,22 @@ class Server < ActiveRecord::Base
 end
 ```
 
+### validates_subdomain
+
+Rules:
+
+- maximum length is 63 characters
+- characters allowed are a-z, A-Z, 0-9 and hyphen
+- labels do not begin or end with a hyphen
+- labels do not consist of numeric values only
+
+
+```ruby
+class Site < ActiveRecord::Base
+  validates_subdomain :slug
+end
+```
+
 ## Maintainer
 
 * [Nando Vieira](http://simplesideias.com.br)

data/lib/validators.rb

@@ -15,4 +15,5 @@ module Validators
   require "validators/validates_ssh_private_key"
   require "validators/validates_ssh_public_key"
   require "validators/validates_hostname_format_of"
+  require "validators/validates_subdomain_format_of"
 end

data/lib/validators/validates_subdomain_format_of.rb

@@ -0,0 +1,38 @@
+module ActiveModel
+  module Validations
+    class SubdomainValidator < EachValidator
+      # Rules taken from http://www.zytrax.com/books/dns/apa/names.html
+      def validate_each(record, attribute, value)
+        return if value.blank? && options[:allow_blank]
+        return if value.nil? && options[:allow_nil]
+        return if valid_label?(value.to_s)
+
+        record.errors.add(attribute, :invalid_subdomain,
+          message: options[:message],
+          value: value
+        )
+      end
+
+      def valid_label?(label)
+        !label.start_with?("-") &&
+        !label.match(/\A\d+\z/) &&
+        label.match(/\A[a-z0-9-]{1,63}\z/i)
+      end
+    end
+
+    module ClassMethods
+      # Validates whether or not the specified URL is valid.
+      #
+      #   class User < ActiveRecord::Base
+      #     validates_subdomain_format_of :subdomain
+      #     validates_subdomain :subdomain
+      #   end
+      #
+      def validates_subdomain_format_of(*attr_names)
+        validates_with SubdomainValidator, _merge_attributes(attr_names)
+      end
+
+      alias_method :validates_subdomain, :validates_subdomain_format_of
+    end
+  end
+end

data/lib/validators/version.rb

@@ -1,8 +1,8 @@
 module Validators
   module Version
     MAJOR = 2
-    MINOR = 5
-    PATCH = 4
+    MINOR = 6
+    PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/test/support/models.rb

@@ -57,3 +57,14 @@ class ServerWithTLD
     @host = host
   end
 end
+
+class Site
+  include ActiveModel::Validations
+  attr_accessor :slug
+
+  validates_subdomain :slug
+
+  def initialize(slug)
+    @slug = slug
+  end
+end

data/test/support/subdomains.rb

@@ -0,0 +1,18 @@
+VALID_SUBDOMAINS = %W[
+  #{'a'*63}
+  mysite
+  my-site
+  mysite-
+  mysite1234
+  1234mysite
+  MYSITE
+  MYSITE1234
+  1234MYSITE
+  mysite--
+]
+
+INVALID_SUBDOMAINS = %W[
+  -mysite
+  1234
+  #{'a'*64}
+]

data/test/validators/validates_datetime/before_option_test.rb

@@ -4,11 +4,14 @@ class ValidatesDatetimeBeforeOptionTest < Minitest::Test
   let(:user) { User.new }
 
   test "rejects when date is set to after :before option" do
-    User.validates_datetime :registered_at, :before => 1.week.ago
-    user.registered_at = Time.now
+    week_ago = 1.week.ago
+    now = Time.now
+
+    User.validates_datetime :registered_at, :before => week_ago
+    user.registered_at = now
 
     refute user.valid?
-    assert_includes user.errors[:registered_at], "needs to be before #{I18n.l(1.week.ago)}"
+    assert_includes user.errors[:registered_at], "needs to be before #{I18n.l(week_ago)}"
   end
 
   test "accepts when date is set accordingly to the :before option" do

data/test/validators/validates_subdomain_test.rb

@@ -0,0 +1,17 @@
+require "test_helper"
+
+class ValidatesSubdomainTest < Minitest::Test
+  VALID_SUBDOMAINS.each do |subdomain|
+    test "accepts #{subdomain}" do
+      site = Site.new(subdomain)
+      assert site.valid?
+    end
+  end
+
+  INVALID_SUBDOMAINS.each do |subdomain|
+    test "rejects #{subdomain}" do
+      site = Site.new(subdomain)
+      refute site.valid?
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validators
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.6.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -154,6 +154,7 @@ files:
 - lib/validators/validates_ownership_of.rb
 - lib/validators/validates_ssh_private_key.rb
 - lib/validators/validates_ssh_public_key.rb
+- lib/validators/validates_subdomain_format_of.rb
 - lib/validators/validates_url_format_of.rb
 - lib/validators/version.rb
 - test/schema.rb
@@ -162,6 +163,7 @@ files:
 - test/support/hostnames.rb
 - test/support/ips.rb
 - test/support/models.rb
+- test/support/subdomains.rb
 - test/support/translations.yml
 - test/support/urls.rb
 - test/test_helper.rb
@@ -184,6 +186,7 @@ files:
 - test/validators/validates_ssh_private_key/dsa_test.rb
 - test/validators/validates_ssh_private_key/rsa_test.rb
 - test/validators/validates_ssh_public_key_test.rb
+- test/validators/validates_subdomain_test.rb
 - test/validators/validates_url_format_of/with_tld_validation_test.rb
 - test/validators/validates_url_format_of/without_tld_validation_test.rb
 - validators.gemspec
@@ -218,6 +221,7 @@ test_files:
 - test/support/hostnames.rb
 - test/support/ips.rb
 - test/support/models.rb
+- test/support/subdomains.rb
 - test/support/translations.yml
 - test/support/urls.rb
 - test/test_helper.rb
@@ -240,5 +244,6 @@ test_files:
 - test/validators/validates_ssh_private_key/dsa_test.rb
 - test/validators/validates_ssh_private_key/rsa_test.rb
 - test/validators/validates_ssh_public_key_test.rb
+- test/validators/validates_subdomain_test.rb
 - test/validators/validates_url_format_of/with_tld_validation_test.rb
 - test/validators/validates_url_format_of/without_tld_validation_test.rb