louis 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adaad7bd50934cb9c07640c6337cd7ee05d3482f
-  data.tar.gz: 28014330bbdde67d3aae4fabd5eff3580ee21d6b
+  metadata.gz: 599752611cd04820508d6abd1882363d761fd72b
+  data.tar.gz: 821d6e0521c95e8d78642c6706b3380755785b42
 SHA512:
-  metadata.gz: 941bd810af19878ceb73521ba89592f4089b11832675a48aeac97cbd95f3c3aa0350ad8c8022754eb8856c71a39ccef114d596d66fb9a4b8f2c56822a8dacfe4
-  data.tar.gz: de5e80da9bea9b268ead29368866ca43fbcba49b4df353d146629f1538068d14b35eb3fe581755217d88ae21799f5a0af70c64202ba878f75881bfd5b77510f9
+  metadata.gz: 8b08cf751a853525381aa1cf6ed285b871ecf37ba180ef49310ba83640def6561bc9f244fe15e852520dc4363d2be1f7a1695206846411cbda733d8574a18602
+  data.tar.gz: 82ea902ffabc8047ee7f73a469dc86858cdecbcf84a812e109f2493d9d366aff6a25456f9e946bbb550e87c0ee08632b49f5674533fd78da20c169abe05d14da

data/lib/louis/version.rb

@@ -1,3 +1,3 @@
 module Louis
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/lib/louis.rb

@@ -32,19 +32,16 @@ module Louis
   # @param [String] mac
   # @return [String]
   def self.lookup(mac)
-    match = nil
-
-    mask_keys.each do |mask|
-      prefix = mac_to_num(mac) & IGNORED_BITS_MASK & calculate_mask(nil, mask)
-      match = lookup_table[mask.to_s][prefix.to_s]
-
-      break if match
-    end
-
-    if match
-      {'long_vendor' => match['l'], 'short_vendor' => match['s']}
-    else
-      {'long_vendor' => 'Unknown', 'short_vendor' => 'Unknown'}
+    encoded_mac = mac_to_num(mac) & IGNORED_BITS_MASK
+
+    lookup_table.each do |mask, table|
+      prefix = (encoded_mac & calculate_mask(nil, mask)).to_s
+      if table.include?(prefix)
+        vendor = table[prefix]
+        return {'long_vendor' => vendor['l'], 'short_vendor' => vendor['s']}
+      end
     end
+    
+    {'long_vendor' => 'Unknown', 'short_vendor' => 'Unknown'}
   end
 end

data/spec/louis_spec.rb

@@ -5,11 +5,11 @@ RSpec.describe Louis do
     expect(Louis::VERSION).not_to be nil
   end
 
-  it "it should have it's source data file" do
+  it "it should have its source data file" do
     expect(File.readable?(Louis::ORIGINAL_OUI_FILE)).to be(true)
   end
 
-  it "it should have it's parsed data file" do
+  it "it should have its parsed data file" do
     expect(File.readable?(Louis::PARSED_DATA_FILE)).to be(true)
   end
 
@@ -74,4 +74,10 @@ RSpec.describe Louis do
       expect(Louis.lookup(unknown_mac)['long_vendor']).to eq('Unknown')
     end
   end
+
+  describe '#mask_keys' do
+    it 'should return a list of integers: [48, 45, 44, 40, 36, 32, 28, 25, 24, 16]' do
+      expect(Louis.mask_keys).to eq([48, 45, 44, 40, 36, 32, 28, 25, 24, 16])
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: louis
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Sam Stelfox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Library for looking up the the vendor associated with a MAC address.