mac_address 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85c5c73e4237d5d8ae0e79dcaa3008c021ae94c1
-  data.tar.gz: b0acba3a3c515f8fce3466d4db8f7b252e8a3069
+  metadata.gz: c118549679a92fcacaa8390c4a1c0d95357440f3
+  data.tar.gz: e42d4ebbc91d2139d88f7a86923ba1f01f7eaa94
 SHA512:
-  metadata.gz: 15e18c1a43dc7f7c576f3b9102c6baea3a7745382672f9472a5ba8ff277dd49920e367746e1df2aa6c8e3d39c6e1ea42ac48014a988b4e31422d3520dce15ea1
-  data.tar.gz: 56bef829c38938e0cb93f360a10b5e1849affad14a3b75da4782d4e0a6c0866b19a44724bc41233253e0b219c0f9213d74b0f4f91ef79a88cc17e3ff4b336762
+  metadata.gz: 5976c405c52eaf7f046cdcadd42f7d3b0cdce02fef264cc8831618811af3a30928eff7972d1fec4c0d8252f0cf557645b7d8f70ecf2281cf6c825b4628828a91
+  data.tar.gz: ca5f8859ddb7f018310fb2a28c7343276f7a2cfb35eb1d15032acc64cb2547e0eae4927e13b17bd80e6d5f60ecac7edc0578b87d7914dc7d1473d7558ac4abbb

data/lib/mac_address.rb

@@ -9,29 +9,40 @@ class MacAddress
       @mac_str = @mac_str.split(':')[0]
     end
     @mac_str = @mac_str.downcase.gsub(/^0[xX]/,'').gsub(/[^0-9a-f]/,'')
-    
+
     raise ArgumentError.new("Invalid MAC address: #{str}") if @mac_str.length != 12
   end
+
   def to_s
     @mac_str
   end
+
   def to_i
     @mac_str.hex
   end
+
+  def self.validate_strict(mac)
+    !!(mac =~ /^([0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2}$/i)
+  end
+
+  def self.validate(mac)
+    MacAddress.new(mac).to_s
+    true
+  rescue ArgumentError
+    false
+  end
 end
 
 class String
   def to_mac
     MacAddress.new(self).to_s
   end
-  
-  def valid_mac?
-    begin
-      MacAddress.new(self).to_s
-    rescue ArgumentError => e
-      return false
+
+  def valid_mac?(options = {})
+    if options[:strict]
+      MacAddress.validate_strict(self)
+    else
+      MacAddress.validate(self)
     end
-    
-    true
   end
 end

data/lib/mac_address/version.rb

@@ -1,3 +1,3 @@
 class MacAddress
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/mac_address/version.rb~

@@ -1,3 +1,3 @@
 class MacAddress
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/mac_address_test.rb

@@ -5,8 +5,28 @@ class MacAddressTest < Test::Unit::TestCase
   def test_truth
     assert_kind_of Module, MacAddress
   end
-  
+
   def test_mac
     assert_equal 'aabbccddeeff', 'AA-BB-CC-DD-EE-FF:hello world'.to_mac
   end
+
+  VALID_MACS          = %w[aa:bb:cc:dd:ee:ff 00:11:22:33:44:55]
+  INVALID_MACS        = %w[invalid aabbccddeeffff aa:bb:cc:dd:ee:ff:11]
+  INVALID_MACS_STRICT = %w[aabbccddeeff aabbccddeeffxx aa:bb:cc:dd:ee:ff:xx 00:55:56:82:11::38 0011.2233.445566]
+
+  def test_valid_mac?
+    VALID_MACS.each do |valid_mac|
+      assert_equal valid_mac.valid_mac?, true
+      assert_equal valid_mac.valid_mac?(strict: true), true
+    end
+
+    INVALID_MACS.each do |invalid_mac|
+      assert_equal invalid_mac.valid_mac?, false
+      assert_equal invalid_mac.valid_mac?(strict: true), false
+    end
+
+    INVALID_MACS_STRICT.each do |invalid_mac|
+      assert_equal invalid_mac.valid_mac?(strict: true), false
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mac_address
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Doug Wiegley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: str_quote