can_has_validations 0.4.3 → 0.5.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjBjODY1MTlkYjZlYzA1NmU4MWI3NWRlZWU2OWMxNzE2MDI1OTA2OA==
-  data.tar.gz: !binary |-
-    YzJiYzNiYmMyMjZmOWNlNjNlN2JkOTI2ODRhMWI5YmFlMjJhZTY0Yg==
+SHA1:
+  metadata.gz: 9fedcbc24847be3ea9133d3b6fd4f46f5d702ad1
+  data.tar.gz: 296690743c12db64dacef74b96ac251289c9b3b1
 SHA512:
-  metadata.gz: !binary |-
-    OWYzMDhjMTc3MjgxMjBhMDY4M2MwYTQ5ZTI1MjIzNmU4MTcxNjg1NGZhNWFm
-    ZjRmOWNlYjc4YTkxNjNmYThiZTkyODA4NzA0YTU4ZjhmOTVhYzhkM2Q1MWZh
-    ZGFhNTdmNThhMjZmMDkwMTcyY2FkYzRiYWM4YTMyOThjNmZjMWM=
-  data.tar.gz: !binary |-
-    M2ZlYTc5OWJjODNlMGEzNDZjZjBlMzk0ZGM0NzljYzA2NjZiODg3YTNiMWY2
-    OGIzOTAzY2Y1M2E5MTEwOWU1M2FmOTNiMjNlOTM4MTU3YzliYjVhMTYyY2U4
-    ZDliMTUzNzFjNmM3NTRmNjgxYmZlZTY5N2EyMzcxY2JhOTE3NzE=
+  metadata.gz: 370506abcb60fc6a0ff4f8df9b36782927604c0604e95cdd9b8fcec48368114a4bb0e8b1dbe70a97ee9a154f03ab34752e6a4d05c7f44ef7b54fd9f1fa29118f
+  data.tar.gz: 1fccf97fd21b2c20c45f5dff224bd98325c0f7e662049489cea0c4b642be1ec858580c2aa575758f59055d33a856b47d5d00ec586fa995b55a56b09878dc0bc4

data/README.md

@@ -8,6 +8,7 @@ Validations provided:
 * Email
 * Existence
 * Grandparent
+* Hostname
 * Ordering
 * URL
 * Write Once
@@ -103,6 +104,27 @@ or the database foreign key (`:user_id`). You can also use any other field. The
 test is merely that they match, not that they are associations.
 
 
+## Hostname validator ##
+
+Ensures an attribute is generally formatted as a hostname. It allows for any
+TLD, so as to not fail as ICANN continues to add TLDs.
+
+    validates :domain, hostname: true
+
+    # allows '*.example.com'
+    validates :domain, hostname: {allow_wildcard: true}
+
+    # allows '_abc.example.com'
+    validates :domain, hostname: {allow_underscore: true}
+
+    # allows 'a.example.com', but not 'example.com'
+    validates :domain, hostname: {segments: 3..100}
+
+    # allows '1.2.3.4' or 'a.example.com'
+    validates :domain, hostname: {allow_ip: true}
+    # use 4 or 6 for ipv4 or ipv6 only
+
+
 ## Ordering validators ##
 
 Ensures two attribute values maintain a relative order to one another. This is
@@ -125,16 +147,18 @@ Always skips over nil values; use `:presence` to validate those.
 ## URL validator ##
 
 Ensure an attribute is generally formatted as a URL. If `addressable/uri` is
-already loaded, it will be used to parse IDN's.
+already loaded, it will be used to parse IDN's. Additionally, allowed schemes
+can be specified; they default to ['http','https'].
 
     validates :website, url: true
+    validates :secure_url, url: {scheme: 'https'}
 
     # With IDN parsing:
     require 'addressable/uri'
     validates :website, url: true
 
     # Or, as part of your Gemfile:
-    gem 'addressable', require: 'addressable/uri'
+    gem 'addressable'
     gem 'can_has_validations'
 
 
@@ -166,6 +190,7 @@ Default messages are as follows:
       errors:
         messages:
           invalid_email: "is an invalid email"
+          invalid_hostname: "is an invalid hostname"
           invalid_url: "is an invalid URL"
           unchangeable: "cannot be changed"
           before: "must be before %{attribute2}"
@@ -174,4 +199,4 @@ Default messages are as follows:
 
 ## Compatibility ##
 
-Tested with Ruby 2.1 and ActiveSupport and ActiveModel 4.2.
+Tested with Ruby 2.3-2.4 and ActiveSupport and ActiveModel 4.2-5.1.

data/lib/can_has_validations.rb

@@ -1,4 +1,4 @@
-%w(email existence grandparent ordering url write_once).each do |validator|
+%w(email existence grandparent hostname ordering url write_once).each do |validator|
   require "can_has_validations/validators/#{validator}_validator"
 end
 

data/lib/can_has_validations/locale/en.yml

@@ -2,6 +2,7 @@ en:
   errors:
     messages:
       invalid_email: "is an invalid email"
+      invalid_hostname: "is an invalid hostname"
       invalid_url: "is an invalid URL"
       unchangeable: "cannot be changed"
       before: "must be before %{attribute2}"

data/lib/can_has_validations/validators/email_validator.rb

@@ -1,5 +1,5 @@
 # Ensure an attribute is generally formatted as an email.
-# eg: validates :user_email, :email=>true
+# eg: validates :user_email, email: true
 
 module ActiveModel::Validations
   class EmailValidator < ActiveModel::EachValidator

data/lib/can_has_validations/validators/grandparent_validator.rb

@@ -1,8 +1,8 @@
 # Ensure two (or more) associations share a common parent
 #   :allow_nil will not only allow the attribute/association to be nil, but
 #     also any of the :scope's.
-# eg: validates :user, :grandparent=>{:scope=>:org, :parent=>:realm}
-#     validates :user, :grandparent=>{:scope=>[:phone, :address], :parent=>:account_id}
+# eg: validates :user, grandparent: {scope: :org, parent: :realm}
+#     validates :user, grandparent: {scope: [:phone, :address], parent: :account_id}
 
 module ActiveModel::Validations
   class GrandparentValidator < ActiveModel::EachValidator

data/lib/can_has_validations/validators/hostname_validator.rb

@@ -0,0 +1,73 @@
+# Ensure an attribute is generally formatted as a hostname/domain.
+# What's validated and not:
+#   max length of entire hostname is 255
+#   max length of each label within the hostname is 63
+#   characters allowed: a-z, A-Z, 0-9, hyphen
+#   underscore is also allowed with allow_underscore: true
+#   the final label must be a-z,A-Z or an IDN
+#   labels may not begin with a hyphen
+#   labels may not end with a hyphen or underscore
+#   labels may be entirely numeric
+#     note: this is more common that you think (reverse dns, etc)
+# If the addressable gem is present, will automatically turn unicode domains
+#   into their punycode (xn--) equivalent. Otherwise, unicode characters will
+#   cause the validation to fail.
+#   
+# eg: validates :domain, hostname: true
+#     validates :domain, hostname: {allow_wildcard: true}
+#       allows '*.example.com'
+#     validates :domain, hostname: {allow_underscore: true}
+#       allows '_abc.example.com'
+#     validates :domain, hostname: {segments: 3..100}
+#       allows 'a.example.com', but not 'example.com'
+#     validates :domain, hostname: {allow_ip: true}  # or 4 or 6 for ipv4 or ipv6 only
+#       allows '1.2.3.4' or 'a.example.com'
+
+require 'resolv'
+
+module ActiveModel::Validations
+  class HostnameValidator < ActiveModel::EachValidator
+
+    LABEL_REGEXP = /\A([a-zA-Z0-9_]([a-zA-Z0-9_-]+)?)?[a-zA-Z0-9]\z/
+    FINAL_LABEL_REGEXP = /\A(xn--[a-zA-Z0-9]{2,}|[a-zA-Z]{2,})\z/
+
+    def validate_each(record, attribute, value)
+      case options[:allow_ip]
+      when 4, '4'
+        return if value =~ Resolv::IPv4::Regex
+      when 6, '6'
+        return if value =~ Resolv::IPv6::Regex
+      when true
+        return if value =~ Resolv::IPv4::Regex || value =~ Resolv::IPv6::Regex
+      end
+
+      segments = options[:segments] || (2..100)
+      segments = segments..segments if segments.is_a?(Integer)
+      if defined?(Addressable::IDNA)
+        value &&= Addressable::IDNA.to_ascii(value)
+      end
+      labels = value.split('.')
+
+      is_valid = true
+      is_valid &&= value.length <= 255
+      is_valid &&= value !~ /\.\./
+      is_valid &&= value !~ /_/ unless options[:allow_underscore]
+      is_valid &&= labels.size.in? segments
+      labels.each_with_index do |label, idx|
+        is_valid &&= label.length <= 63
+        if idx+1==labels.size
+          is_valid &&= label =~ FINAL_LABEL_REGEXP
+        elsif options[:allow_wildcard] && idx==0
+          is_valid &&= label=='*' || label =~ LABEL_REGEXP
+        else
+          is_valid &&= label =~ LABEL_REGEXP
+        end
+      end
+
+      unless is_valid
+        record.errors.add(attribute, :invalid_hostname, options)
+      end
+    end
+
+  end
+end

data/lib/can_has_validations/validators/ordering_validator.rb

@@ -1,10 +1,10 @@
 # Attribute ordering
 #   Ensures one value is greater or lesser than another (set of) value(s).
 #   Always skips over nil values; use :presence to validate those.
-# eg: validates :start_at, :before=>:finish_at
-#     validates :start_at, :before=>{:value_of=>:finish_at, :if=>... }
-#     validates :finish_at, :after => [:start_at, :alt_start_at]
-#     validates :finish_at, :after=>{:values_of => [:start_at, :alt_start_at], :if=>... }
+# eg: validates :start_at, before: :finish_at
+#     validates :start_at, before: {value_of: :finish_at, if: ... }
+#     validates :finish_at, after: [:start_at, :alt_start_at]
+#     validates :finish_at, after: {values_of: [:start_at, :alt_start_at], if: ... }
 
 module ActiveModel::Validations
   class BeforeValidator < ActiveModel::EachValidator
@@ -16,7 +16,7 @@ module ActiveModel::Validations
         next unless value && greater
         unless value < greater
           attr2 = record.class.human_attribute_name attr_name
-          record.errors.add(attribute, :before, options.except(:before).merge!(:attribute2=>attr2))
+          record.errors.add(attribute, :before, options.except(:before).merge!(attribute2: attr2))
         end
       end
     end
@@ -30,7 +30,7 @@ module ActiveModel::Validations
         next unless value && lesser
         unless value > lesser
           attr2 = record.class.human_attribute_name attr_name
-          record.errors.add(attribute, :after, options.except(:after).merge!(:attribute2=>attr2))
+          record.errors.add(attribute, :after, options.except(:after).merge!(attribute2: attr2))
         end
       end
     end

data/lib/can_has_validations/validators/url_validator.rb

@@ -1,17 +1,21 @@
 # Ensure an attribute is generally formatted as a URL. If addressable/uri is
 #   already loaded, will use it to parse IDN's.
-# eg: validates :website, :url=>true
+# eg: validates :website, url: true
+#     validates :redis, url: {scheme: 'redis'}
+#     validates :database, url: {scheme: %w(postgres mysql)}
 
 module ActiveModel::Validations
   class UrlValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
+      allowed_schemes = Array.wrap(options[:scheme] || %w(http https))
+      
       if defined?(Addressable::URI)
         u = Addressable::URI.parse(value) rescue nil
         u2 = u && URI.parse(u.normalize.to_s) rescue nil
       else
         u2 = u = URI.parse(value) rescue nil
       end
-      if !u || !u2 || u.relative? || %w(http https).exclude?(u.scheme)
+      if !u || !u2 || u.relative? || allowed_schemes.exclude?(u.scheme)
         record.errors.add(attribute, :invalid_url, options)
       end
     end

data/lib/can_has_validations/validators/write_once_validator.rb

@@ -1,6 +1,6 @@
 # write-once, read-many
 #   Allows a value to be set to a non-nil value once, and then makes it immutable.
-#   Combine with :existence=>true to accomplish the same thing as attr_readonly,
+#   Combine with existence: true to accomplish the same thing as attr_readonly,
 #   except with error messages (instead of silently refusing to save the change).
 # eg: validates :user_id, write_once: true
 #   Optionally refuses changing from nil => non-nil, always making field immutable.
@@ -8,7 +8,7 @@
 
 module ActiveModel::Validations
   class WriteOnceValidator < ActiveModel::EachValidator
-    # as of ActiveModel 4, :allow_nil=>true causes a change from a value back to
+    # as of ActiveModel 4, allow_nil: true causes a change from a value back to
     #   nil to be allowed. prevent this.
     def validate(record)
       attributes.each do |attribute|

data/lib/can_has_validations/version.rb

@@ -1,3 +1,3 @@
 module CanHasValidations
-  VERSION = '0.4.3'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,47 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: can_has_validations
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - thomas morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2017-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Assorted Rails 4.x-5.x validators.
@@ -59,6 +59,7 @@ files:
 - lib/can_has_validations/validators/email_validator.rb
 - lib/can_has_validations/validators/existence_validator.rb
 - lib/can_has_validations/validators/grandparent_validator.rb
+- lib/can_has_validations/validators/hostname_validator.rb
 - lib/can_has_validations/validators/ordering_validator.rb
 - lib/can_has_validations/validators/url_validator.rb
 - lib/can_has_validations/validators/write_once_validator.rb
@@ -103,17 +104,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Assorted Rails 4.x-5.x validators