missing_validators 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28a7af981a1a7fdb56740a472e9ece734cc2246d
-  data.tar.gz: 76aa9c1a9ada749f079041f2f6fa8f09e09151ca
+  metadata.gz: c8965924e44993f7bfad6dcfd4a63917f544e417
+  data.tar.gz: 3a114c7b78f19d3384012dcefc5d7656514a5613
 SHA512:
-  metadata.gz: 23ed45c14ba0c9339194e9e0ac9c143903dc07ef275fd8a59e54ce3e4787fa7054e3d99d5b655dc4b48ab5dfd3d442b0f5b3b6e7f56b91e1ce7807252c322a0d
-  data.tar.gz: 57d9ac4dd04bc1a57f54139cad40a70fe8584aadd3a7674509e66c697c09775f646d0f436d4092a0a70f4987096f9a27e3f5d2fca004664c9eb1bb673f33b4a0
+  metadata.gz: 3a6b1635cb5c6980b98cca25389c6f1b1a903197684d20ee4adb1de3e50674c50749d3dab2619cc50d3b31e05e353e44ee3f8fe3fa2dd262617a8e69b0edfaf3
+  data.tar.gz: 455faa6aa3d3a22b9ed992dc6d2a6bf4e9e67aff8391eca21e3ea86da435d9d0e14777cffe1841ddada8f1112557d5cf4edb999a002340148e270ec3145799d8

data/lib/missing_validators/validators/mac_address_validator.rb

@@ -21,12 +21,12 @@ class MacAddressValidator < ActiveModel::EachValidator
   end
 
   def self.validate_format(mac_address)
-    !!(mac_address =~ /^([\h]{2}[:]){5}[\h]{2}?$/i) ||    # 08:00:2b:01:02:03
-      !!(mac_address =~ /^([\h]{2}[-]){5}[\h]{2}?$/i) ||  # 08-00-2b-01-02-03
-      !!(mac_address =~ /^([\h]{6}):[\h]{6}?$/i) ||       # 08002b:010203
-      !!(mac_address =~ /^([\h]{6})-[\h]{6}?$/i) ||       # 08002b-010203
-      !!(mac_address =~ /^([\h]{4}[\.]){2}[\h]{4}?$/i) || # 0800.2b01.0203
-      !!(mac_address =~ /^[\h]{12}?$/i)                          # 08002b010203
+    !!(mac_address =~ /^([\h]{2}:){5}[\h]{2}?$/i) ||            # 08:00:2b:01:02:03
+      !!(mac_address =~ /^([\h]{2}[-|\.|\s]){5}[\h]{2}?$/i) ||  # 08-00-2b-01-02-03 or 08.00.2b.01.02.03
+      !!(mac_address =~ /^([\h]{6})[-|\.][\h]{6}?$/i) ||        # 08002b-010203 or 08002b.010203
+      !!(mac_address =~ /^([\h]{6}):[\h]{6}?$/i) ||             # 08002b:010203
+      !!(mac_address =~ /^([\h]{4}[-|\.|\s]){2}[\h]{4}?$/i) ||  # 0800.2b01.0203 or 0800-2b01-0203 0800 2b01 0203
+      !!(mac_address =~ /^[\h]{12}?$/i)                         # 08002b010203
   end
 
   private

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.8.2"
+  VERSION = "0.8.3"
 end

data/lib/missing_validators.rb

@@ -1,4 +1,5 @@
 require 'active_model'
+require 'rspec/matchers'
 require 'missing_validators/version'
 require 'missing_validators/validators/inequality_validator'
 require 'missing_validators/matchers/ensure_inequality_of_matcher' if defined?(RSpec)

data/spec/validators/mac_address_spec.rb

@@ -15,18 +15,36 @@ describe MacAddressValidator do
     it { should ensure_valid_mac_address_format_of(:mac) }
     it { should_not ensure_valid_mac_address_format_of(:name) }
 
+    # Valid formats
     it { should allow_value("08:00:2b:01:02:03").for(:mac) }
     it { should allow_value("08-00-2b-01-02-03").for(:mac) }
+    it { should allow_value("08.00.2b.01.02.03").for(:mac) }
+    it { should allow_value("08 00 2b 01 02 03").for(:mac) }
     it { should allow_value("08002b:010203").for(:mac) }
+    it { should allow_value("08002b.010203").for(:mac) }
     it { should allow_value("08002b-010203").for(:mac) }
     it { should allow_value("0800.2b01.0203").for(:mac) }
+    it { should allow_value("0800-2b01-0203").for(:mac) }
+    it { should allow_value("0800 2b01 0203").for(:mac) }
     it { should allow_value("08002b010203").for(:mac) }
 
+    # Mixed Separators
+    it { should_not allow_value("08-00:2b:01:02:03").for(:mac) }
+    it { should_not allow_value("08.00:2b:01:02:03").for(:mac) }
+    it { should_not allow_value("08 00:2b:01:02:03").for(:mac) }
+    it { should_not allow_value("0800-2b01:0203").for(:mac) }
+    it { should_not allow_value("0800 2b01:0203").for(:mac) }
+
+    # Too Short
     it { should_not allow_value("08:00:2b:01:02").for(:mac) }
+    it { should_not allow_value("08-00-2b-01-02").for(:mac) }
+
+    # Too Long
     it { should_not allow_value("08:00:2b:01:02:03:04").for(:mac) }
+
+    # Non-Hex Characters
     it { should_not allow_value("qq:00:00:00:00:00").for(:mac) }
 
-    it { should_not allow_value("08-00-2b-01-02").for(:mac) }
 
     it { should_not allow_value("invalid").for(:mac) }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: missing_validators
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Andrew Gridnev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec