validates_host 0.3.0 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 145ca9cab05675368ca33a513820cdaca5c50747a197635c48455b94464bf93b
+  data.tar.gz: 9dafd02e5e4481a18c05c475eaea0c70c438886efe13d9cf9ed3735f8fb1016f
+SHA512:
+  metadata.gz: a99df100cd2ec1b958a3462bd8f314a75687f4e0d0949b80cc4d7dcb8b19a7cd8484d2c9c94444aca8c40bd3c1efff3a0ba8fbee0a9086a52d9615093c436507
+  data.tar.gz: d10314be5e20e31cc370d8245b42ce5c976d9ab4a4f4129e2d5de3627dbcf728d79d9819c54e0c95047b40b5b3107d38d8665a585ee3187045838170ac321404

data/.gitignore

@@ -3,7 +3,8 @@
 .bundle
 .config
 .yardoc
-.rvmrc
+.coveralls.yml
+*.swp
 Gemfile.lock
 InstalledFiles
 _yardoc
@@ -13,6 +14,6 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
-test/tmp
-test/version_tmp
-tmp
+tmp
+.*~
+*~

data/.rubocop.yml

@@ -0,0 +1,57 @@
+require: rubocop-rspec
+
+AllCops:
+  TargetRubyVersion: 2.0
+  NewCops: enable
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Layout/LineLength:
+  Max: 150
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Metrics/BlockLength:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/MixinUsage:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true

data/.ruby-gemset

@@ -0,0 +1 @@
+validates_host

data/.travis.yml

@@ -1,4 +1,45 @@
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
+matrix:
+  include:
+    - rvm: 2.0
+      gemfile: gemfiles/Gemfile.rails3
+    - rvm: 2.0
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.1
+      gemfile: gemfiles/Gemfile.rails3
+    - rvm: 2.1
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.2
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.2
+      gemfile: gemfiles/Gemfile.rails5
+    - rvm: 2.3
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.3
+      gemfile: gemfiles/Gemfile.rails5
+    - rvm: 2.4
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.4
+      gemfile: gemfiles/Gemfile.rails5
+    - rvm: 2.5
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.5
+      gemfile: gemfiles/Gemfile.rails5
+    - rvm: 2.5
+      gemfile: gemfiles/Gemfile.rails6
+    - rvm: 2.6
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.6
+      gemfile: gemfiles/Gemfile.rails5
+    - rvm: 2.6
+      gemfile: gemfiles/Gemfile.rails6
+    - rvm: 2.7
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.7
+      gemfile: gemfiles/Gemfile.rails5
+    - rvm: 2.7
+      gemfile: gemfiles/Gemfile.rails6
+    - rvm: 3.0
+      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 3.0
+      gemfile: gemfiles/Gemfile.rails6
+      script: rake complete

data/Gemfile

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in validates_host.gemspec
-gemspec
+gemspec

data/README.md

@@ -1,6 +1,9 @@
-# ValidatesHost [![Build Status](https://secure.travis-ci.org/plribeiro3000/validates_host.png?branch=master)](http://travis-ci.org/plribeiro3000/validates_host)
+# ValidatesHost 
 
-Rails gem to validate Host Related fields.
+[![Gem Version](https://badge.fury.io/rb/validates_host.png)](http://badge.fury.io/rb/validates_host) [![Build Status](https://secure.travis-ci.org/plribeiro3000/validates_host.png?branch=master)](http://travis-ci.org/plribeiro3000/validates_host) [![Coverage Status](https://coveralls.io/repos/plribeiro3000/validates_host/badge.png?branch=master)](https://coveralls.io/r/plribeiro3000/validates_host)  [![Code Climate](https://codeclimate.com/github/plribeiro3000/validates_host.png)](https://codeclimate.com/github/plribeiro3000/validates_host)
+
+Validates host attributes and test it in a simple way.
+Supports ruby 2.0+ and rails 3+
 
 ## Installation
 
@@ -18,23 +21,26 @@ Or install it yourself as:
 
 ## Usage
 
-Lets say you have a model that you want to have valid host fields. Just add this to your model:
+Just use like any other validator:
 
 ```ruby
 class Server < ActiveRecord::Base
-    validates :domain_name, :domain_name => true
-    validates :host_name, :host_name => true
-    validates :ip, :ip => true
+    validates :domain_name, domain_name: true
+    validates :host_name, host_name: true
+    validates :ip, ip: true
 end
 
 class Subnet < ActiveRecord::Base
-    validates :value, :subnet => true
+    validates :value, subnet: true
 end
 ```
 
-## Test
+## Notes
+
+It will load a macher to test automatically if the gem is below shoulda-matchers.
 
-This gem has builtin matchers for shoulda-matchers and remarkable.
+## Mantainers
+[@plribeiro3000](https://github.com/plribeiro3000)
 
 ## Contributing
 

data/Rakefile

@@ -1,7 +1,12 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new
+RuboCop::RakeTask.new
 
-desc "Default Task"
-task :default => [ :spec ]
+desc 'Default Task'
+task default: [:spec]
+task complete: %i[spec rubocop]

data/gemfiles/Gemfile.rails3

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'activesupport', '3.2.14'
+gem 'mime-types', '< 2.0'
+
+gemspec :path => '../'

data/gemfiles/Gemfile.rails4

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activesupport', '>= 4.0.0', '< 5.0.0'
+
+gemspec :path => '../'

data/gemfiles/Gemfile.rails5

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activesupport', '>= 5.0.0', '< 6.0.0'
+
+gemspec :path => '../'

data/gemfiles/Gemfile.rails6

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activesupport', '>= 6.0.0'
+
+gemspec :path => '../'

data/lib/validates_host.rb

@@ -1,12 +1,21 @@
-require "validates_host/version"
+# frozen_string_literal: true
 
-#ActiveModel Validators
+require 'active_support/core_ext/array/wrap'
 require 'validates_host/host_name_validator'
 require 'validates_host/domain_name_validator'
 require 'validates_host/ip_validator'
 require 'validates_host/subnet_validator'
 
+if defined?(::Shoulda)
+  require 'validates_host/require_a_valid_domain_name_matcher'
+  require 'validates_host/require_a_valid_host_name_matcher'
+  require 'validates_host/require_a_valid_ip_matcher'
+  require 'validates_host/require_a_valid_subnet_matcher'
+end
 
-#Rspec Matchers
-require "validates_host/shoulda-matchers" if defined?(::Shoulda)
-require "validates_host/remarkable" if defined?(::Remarkable)
+module ValidatesHost
+  autoload :Subnet, 'validates_host/subnet'
+  autoload :Ip, 'validates_host/ip'
+  autoload :HostName, 'validates_host/host_name'
+  autoload :DomainName, 'validates_host/domain_name'
+end

data/lib/validates_host/domain_name.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ValidatesHost
+  class DomainName
+    def initialize(domain_name)
+      @domain_name = domain_name
+    end
+
+    def valid?
+      return true if @domain_name.blank?
+
+      @domain_name =~ %r{^[a-z0-9]+([\-.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(/.*)?$}
+    end
+  end
+end

data/lib/validates_host/domain_name_validator.rb

@@ -1,23 +1,16 @@
+# frozen_string_literal: true
+
 class DomainNameValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    key = :"activerecord.errors.models.#{record.class.name.downcase}.attributes.#{attribute.to_s}.invalid"
-    record.errors[attribute] << I18n.t(key, :default => :"activerecord.errors.messages.invalid") unless ValidatesHost::DomainName.new(value).valid?
-  end
-end
+    return if ValidatesHost::DomainName.new(value).valid?
 
-module ValidatesHost
-  class DomainName
-    def initialize(domain_name)
-      @domain_name = domain_name
-    end
+    ruby_prior_version_three =
+      Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0.0')
 
-    def valid?
-      return true if @domain_name.nil?
-      @domain_name =~ /^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/
-    end
-
-    def domain_name
-      @domain_name
+    if ruby_prior_version_three
+      record.errors.add(attribute, :invalid, options)
+    else
+      record.errors.add(attribute, :invalid, **options)
     end
   end
-end
+end

data/lib/validates_host/host_name.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ValidatesHost
+  class HostName
+    def initialize(host_name)
+      @host_name = host_name
+    end
+
+    def valid?
+      return true if @host_name.blank?
+
+      @host_name =~ /^[a-z][a-z0-9-]+$/
+    end
+  end
+end

data/lib/validates_host/host_name_validator.rb

@@ -1,23 +1,16 @@
+# frozen_string_literal: true
+
 class HostNameValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    key = :"activerecord.errors.models.#{record.class.name.downcase}.attributes.#{attribute.to_s}.invalid"
-    record.errors[attribute] << I18n.t(key, :default => :"activerecord.errors.messages.invalid") unless ValidatesHost::HostName.new(value).valid?
-  end
-end
+    return if ValidatesHost::HostName.new(value).valid?
 
-module ValidatesHost
-  class HostName
-    def initialize(host_name)
-      @host_name = host_name
-    end
+    ruby_prior_version_three =
+      Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0.0')
 
-    def valid?
-      return true if @host_name.blank?
-      @host_name =~ /^[a-z][a-z0-9-]+$/
-    end
-
-    def host_name
-      @host_name
+    if ruby_prior_version_three
+      record.errors.add(attribute, :invalid, options)
+    else
+      record.errors.add(attribute, :invalid, **options)
     end
   end
-end
+end

data/lib/validates_host/ip.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'resolv'
+
+module ValidatesHost
+  class Ip
+    def initialize(value)
+      @value = value
+    end
+
+    def valid?
+      return true if @value.blank?
+
+      @value =~ Regexp.union(Resolv::IPv4::Regex, Resolv::IPv6::Regex)
+    end
+  end
+end

data/lib/validates_host/ip_validator.rb

@@ -1,23 +1,16 @@
+# frozen_string_literal: true
+
 class IpValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    key = :"activerecord.errors.models.#{record.class.name.downcase}.attributes.#{attribute.to_s}.invalid"
-    record.errors[attribute] << I18n.t(key, :default => :"activerecord.errors.messages.invalid") unless ValidatesHost::Ip.new(value).valid?
-  end
-end
+    return if ValidatesHost::Ip.new(value).valid?
 
-module ValidatesHost
-  class Ip
-    def initialize(ip)
-      @ip = ip
-    end
+    ruby_prior_version_three =
+      Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0.0')
 
-    def valid?
-      return true if @ip.blank?
-      @ip =~ /^([1-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3}$/
-    end
-
-    def ip
-      @ip
+    if ruby_prior_version_three
+      record.errors.add(attribute, :invalid, options)
+    else
+      record.errors.add(attribute, :invalid, **options)
     end
   end
-end
+end

data/lib/validates_host/{shoulda-matchers/domain_name_matcher.rb → require_a_valid_domain_name_matcher.rb}

@@ -1,17 +1,15 @@
-require "shoulda-matchers"
+# frozen_string_literal: true
+
+require 'shoulda-matchers'
 
 module Shoulda
   module Matchers
     module ActiveModel
       def require_a_valid_domain_name(attribute = :domain_name)
-        DomainNameMatcher.new(attribute)
+        RequireAValidDomainNameMatcher.new(attribute)
       end
 
-      class DomainNameMatcher < ValidationMatcher
-        def initialize(attribute)
-          @attribute = attribute
-        end
-
+      class RequireAValidDomainNameMatcher < ValidationMatcher
         def description
           "require #{@attribute} to be a valid domain name"
         end
@@ -19,19 +17,19 @@ module Shoulda
         def matches?(subject)
           super(subject)
 
-          disallows_invalid_value and allows_valid_value
+          disallows_invalid_value && allows_valid_value
         end
 
         private
 
         def disallows_invalid_value
-          disallows_value_of("example")
+          disallows_value_of('example')
         end
 
         def allows_valid_value
-          allows_value_of("example.com")
+          allows_value_of('example.com')
         end
       end
     end
   end
-end
+end