missing_validators 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a753662765a4f524c5b48aa7319306c92be6723
-  data.tar.gz: 6728c6fcfeeb1e4e10fe55170de856997f146064
+  metadata.gz: 0159cef9b69c14ee7dd355533505e1155a3aa165
+  data.tar.gz: 22c6951ea90afc0a8241897dd5f32a118926beea
 SHA512:
-  metadata.gz: f1bec22de6521794354b4e3eaba07352523045e948ad31525c69c4e638ca85e13273f3312d3ad56574b6c4bffdb4d30140ffcafd7dba0fe0c0736f756f1fa4a8
-  data.tar.gz: c63f5eab4501058232e58300fc81e8fded0443289bba356018ef0affe597cc8b705f575062c84fd96a1446bf954e50228e576cb8881464c48386c7c311227574
+  metadata.gz: ed060b1d326b04e7e5d9e459c61b09dc3b13d5f5a47c4f91f05cfe4fe263f912011c34f44ea601a9290d30c790477aa72c56a59e879a5e40f976627093e5da91
+  data.tar.gz: 81742ca17ed623845bdee2b20c432a3cfe83a5569f50af1855bcf6b298884632639cf4dd7be86dc269c60b5e8e7639c2743b168104e0dc8fa39bb40abad3ae18

data/.rspec

@@ -1,4 +1,4 @@
 --order random
 --colour
 --backtrace
---format progress
+--format progress

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 gemspec
-gem 'rake'
+gem 'rake'

data/LICENSE

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -5,4 +5,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new('spec')
 
-task :default => :spec
+task :default => :spec

data/lib/missing_validators/validators/email_validator.rb

@@ -20,19 +20,20 @@ class EmailValidator < ActiveModel::EachValidator
     end
   end
 
-  private
-
-  def valid?(email, options)
-    validate_format(email) \
-      && validate_domain(email, Array.wrap(options[:domain]))
-  end
-
-  def validate_format(email)
+  def self.validate_format(email)
     !!(email =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i)
   end
 
-  def validate_domain(email, domains)
+  def self.validate_domain(email, domains)
     email_downcased = email.to_s.downcase
     domains.empty? || domains.any? { |domain| email_downcased.end_with?(".#{domain.downcase}") }
   end
+
+  private
+
+  def valid?(email, options)
+    self.class.validate_format(email) \
+      && self.class.validate_domain(email, Array.wrap(options[:domain]))
+  end
+
 end

data/lib/missing_validators/validators/mac_address_validator.rb

@@ -15,18 +15,12 @@ class MacAddressValidator < ActiveModel::EachValidator
     allow_blank = options[:allow_blank] || false
     return if allow_blank && value.blank?
 
-    unless valid?(value, options)
+    unless self.class.valid?(value, options)
       record.errors[attribute] << (options[:message] || I18n.t('errors.messages.mac_address'))
     end
   end
 
-  private
-
-  def valid?(mac_address, options)
-    validate_format(mac_address)
-  end
-
-  def validate_format(mac_address)
+  def self.validate_format(mac_address)
     !!(mac_address =~ /^([A-Fa-f0-9]{2}[:]){5}[A-Fa-f0-9]{2}?$/i) ||    # 08:00:2b:01:02:03
       !!(mac_address =~ /^([A-Fa-f0-9]{2}[-]){5}[A-Fa-f0-9]{2}?$/i) ||  # 08-00-2b-01-02-03
       !!(mac_address =~ /^([A-Fa-f0-9]{6}):[A-Fa-f0-9]{6}?$/i) ||       # 08002b:010203
@@ -34,4 +28,11 @@ class MacAddressValidator < ActiveModel::EachValidator
       !!(mac_address =~ /^([A-Fa-f0-9]{4}[\.]){2}[A-Fa-f0-9]{4}?$/i) || # 0800.2b01.0203
       !!(mac_address =~ /^[A-Fa-f0-9]{12}?$/i)                          # 08002b010203
   end
+
+  private
+
+  def self.valid?(mac_address, options)
+    validate_format(mac_address)
+  end
+
 end

data/lib/missing_validators/validators/url_validator.rb

@@ -19,29 +19,29 @@ class UrlValidator < ActiveModel::EachValidator
     record.errors[attribute] << (options[:message] || I18n.t('errors.messages.url'))
   end
 
-  private
-
-  DEFAULT_SCHEMES = [:http, :https]
-
-  def valid?(uri, options)
-    uri.kind_of?(URI::Generic) \
-      && validate_domain(uri, Array.wrap(options[:domain])) \
-      && validate_scheme(uri, Array.wrap(options[:scheme] || UrlValidator::DEFAULT_SCHEMES)) \
-      && validate_root(uri, !!options[:root])
-  end
-
-  def validate_domain(uri, domains)
+  def self.validate_domain(uri, domains)
     host_downcased = uri.host.to_s.downcase
     domains.empty? || domains.any? { |domain| host_downcased.end_with?(".#{domain.downcase}") }
   end
 
-  def validate_scheme(uri, schemes)
+  def self.validate_scheme(uri, schemes)
     scheme_downcased = uri.scheme.to_s.downcase
     schemes.empty? || schemes.any? { |scheme| scheme_downcased == scheme.to_s.downcase }
   end
 
-  def validate_root(uri, should_validate)
-    return true unless should_validate
+  def self.validate_root(uri)
     ['/', ''].include?(uri.path) && uri.query.blank? && uri.fragment.blank?
   end
+
+  private
+
+  DEFAULT_SCHEMES = [:http, :https]
+
+  def valid?(uri, options)
+    uri.kind_of?(URI::Generic) \
+      && self.class.validate_domain(uri, Array.wrap(options[:domain])) \
+      && self.class.validate_scheme(uri, Array.wrap(options[:scheme] || UrlValidator::DEFAULT_SCHEMES)) \
+      && (!!options[:root] ? self.class.validate_root(uri) : true)
+  end
+
 end

data/lib/missing_validators/version.rb

@@ -1,5 +1,5 @@
 # Provides a collection of custom validators that are often required in Rails applications.
 module MissingValidators
   # Gem version.
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/missing_validators.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'shoulda-matchers'
 
-  gem.add_dependency 'activemodel', '~> 3.0.0'
-  gem.add_dependency 'activesupport', '~> 3.0.0'
+  gem.add_dependency 'activemodel', '> 3.0.0'
+  gem.add_dependency 'activesupport', '> 3.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: missing_validators
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Andrew Gridnev
@@ -42,28 +42,28 @@ dependencies:
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: Validates email addresses, URLs, MAC addresses and inequality of attributes.