louis 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 815efeb0963298718c4d7d20b24c90869ac88855
-  data.tar.gz: 4bddbc7c4bd64cd127fdce911fcbd1317869d9e1
+  metadata.gz: 7090e2ccc5dc371c32ba14b4f1a614493b751f30
+  data.tar.gz: 4beb1e00fe0a15adddc8a3b81a15f9464c8a0d5d
 SHA512:
-  metadata.gz: ea8f89ca4f8a4b54dee5b9ef94098bfcd34c16a8c88a8726b2ce18bfcb3685941d458af73da813382781ceabab434aa97978e7e0425011193d23efda588dfba9
-  data.tar.gz: 3b3ce0dbee1cb514c754126843e7fa1d199837cda85541f397a35e787ebdca25d56ba2df9d46c1d34c1b06c4497da65dac64efa6150ee8feec4a282392024931
+  metadata.gz: 757c160bb189fecddf2b7a6355afb947abe2380b5d3ae63bdca8b82442ee88264c116d516ef841fc6920379429d2b1d2fa00295860888d1efec4f857f148b92d
+  data.tar.gz: 47503685ccdf6cba569d9dc27a8561dbeb0c92e7a02417bbcfd3a808ec3487758f542dd2b47fda5d9594d69e4c13d059e2f79a1e317f49b3f05a9822e8eb6465

data/.travis.yml

@@ -1,4 +1,2 @@
 language: ruby
 cache: bundler
-rvm:
-  - 2.1.5

data/lib/louis.rb

@@ -14,16 +14,14 @@ module Louis
 
   # Loads the lookup table, parsing out the uncommented non-blank lines into
   # objects we can compare MACs against to find their vendor.
-  def self.lookup_table
-    @lookup_table ||= JSON.parse(File.read(Louis::PARSED_DATA_FILE))
-  end
+  LOOKUP_TABLE = JSON.parse(File.read(Louis::PARSED_DATA_FILE))
 
   # Collect the recorded mask and order it appropriately from most specific to
   # least.
   #
   # @param [Array<Fixnum>]
   def self.mask_keys
-    @mask_keys ||= lookup_table.keys.map(&:to_i).sort.reverse
+    @mask_keys ||= LOOKUP_TABLE.keys.map(&:to_i).sort.reverse
   end
 
   # Returns the name of the vendor that has the most specific prefix
@@ -47,11 +45,11 @@ module Louis
   end
 
   def self.search_table(encoded_mac)
-    lookup_table.each do |mask, table|
+    mask_keys.each{|mask|
+      table = LOOKUP_TABLE[mask.to_s]
       prefix = (encoded_mac & calculate_mask(nil, mask)).to_s
       return table[prefix] if table.include?(prefix)
-    end
-
+    }
     nil
   end
 end

data/lib/louis/version.rb

@@ -1,3 +1,3 @@
 module Louis
-  VERSION = "2.0.6"
+  VERSION = "2.0.7"
 end

data/spec/louis_spec.rb

@@ -33,6 +33,9 @@ RSpec.describe Louis do
     let(:unknown_mac) { 'c5:00:00:00:00:00' }
     let(:local_mac)     { '3e:97:0e' }
     let(:multicast_mac) { '3d:97:0e' }
+    let(:multi_match_mac) { 'E4:95:6E:40:00:00'}
+    let(:most_specific_match) { 'Guang Lian Zhi Tong Technology Limited'}
+    let(:least_specific_match) { 'IEEE Registration Authority'}
 
     it 'should return a hash' do
       expect(Louis.lookup(base_mac)).to be_a(Hash)
@@ -73,6 +76,11 @@ RSpec.describe Louis do
     it 'should return "Unknown" as the long vendor string for unknown MAC prefixes' do
       expect(Louis.lookup(unknown_mac)['long_vendor']).to eq('Unknown')
     end
+
+    it 'should return the most specific vendor match for MAC prefixes that match multiple mask keys' do
+      expect(Louis.lookup(multi_match_mac)['long_vendor']).to_not eq(least_specific_match)
+      expect(Louis.lookup(multi_match_mac)['long_vendor']).to eq(most_specific_match)
+    end
   end
 
   # For future reference, these may change and are depedent on the

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: louis
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Sam Stelfox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler