macker 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aa439c52993c14e5555b66285280b137d9b8c95
-  data.tar.gz: 0e2b2b93e03f29b3e7a5cc5eb017e98295a2355b
+  metadata.gz: ea5d1e1ff7f91eef4e7bca6bf77f48dc7d81056f
+  data.tar.gz: e22dcdbf13329e83ac29836c1d182d9f68d84f88
 SHA512:
-  metadata.gz: 7b76f5513fb2617a47939307872afef96e3207643acae2c662930f9cfdb60fa9997d16be4489f6f6d6cc59923f70528031162f9a9cac227412cf4795a4852a09
-  data.tar.gz: 9e2690473284226b08e6519cdb27498c4e21e790966707910bad0acfd23741fb8097ea33a4c35ef6797a053c50a1a19ef26a93cbc67faf68ff520e00edfdd332
+  metadata.gz: 17fabf1c334ac6e68c1b9ad5f854c58c165d7671a0837c7fb437e82563353fb22898384c088f04d7e907c24d1453f3772d47ad2de5ddc76c0ccde740c0eba776
+  data.tar.gz: f34c606101a3bf655996d27bdafe9c96e2f28b617a325135e17a02997f07fecab6513c7e8268da5388d651f1c92d9ee39dcc6d38ee772ed664c3c5743b8e384e

data/README.md

@@ -48,7 +48,8 @@ Macker.configure do |config|
   config.user_agent      = 'Mozilla/5.0 (X11; Linux x86_64; rv:54.0) Gecko/20100101 Firefox/54.0'  # A common user agent
   config.ttl_in_seconds  = 86_400                                                                  # Will expire the vendors in one day
   config.cache           = File.expand_path(File.dirname(__FILE__) + '/../../data/oui_*.txt')      # Can be a string, pathname or proc
-  config.auto_expiration = true                                                                    # Expiration can be checked manually
+  config.auto_expire     = true                                                                    # Expiration can be checked manually
+  config.auto_stale      = true                                                                    # Stale can be checked manually
 end
 ```
 
@@ -156,9 +157,15 @@ Macker.iso_code_table
 Macker.vendor_table
 # => "Apple, Inc."=>[{:prefix=>...} ... ]
 
+Macker.lapsed!
+# => false
+
 Macker.expire!
 # => false
 
+Macker.stale!
+# => false
+
 Macker.expired?
 # => false
 

data/lib/macker.rb

@@ -66,7 +66,7 @@ module Macker
   # @param opts [Hash] options for the method
   # @return [Address] MAC address with vendor data
   def lookup(mac, opts = {})
-    expire! if config.auto_expiration
+    lapsed!
     data = prefix_table[Address.new(mac).prefix]
     if data.nil?
       opts[:raising] ? raise(NotFoundOuiVendor, "OUI not found for MAC: #{mac}") : (return nil)
@@ -100,7 +100,7 @@ module Macker
   # @param opts [Hash] options for the method
   # @return [Address] MAC address with data
   def generate(opts = {})
-    expire! if config.auto_expiration
+    lapsed!
     return generate_by_iso_code(opts.delete(:iso_code).upcase, opts) if opts[:iso_code]
     vendor = opts.delete(:vendor)
     case vendor
@@ -153,13 +153,35 @@ module Macker
     @vendor_table
   end
 
-  # Fetch new vendor list if cached list is expired or stale
+  # Fetch new vendor list if cached list is lapsed (expired or stale)
+  # @return [Boolean] true if vendor list is lapsed and updated
+  def lapsed!
+    if config.auto_expire && expired?
+      update(true)
+      true
+    elsif config.auto_stale && stale?
+      update
+      true
+    else
+      false
+    end
+  end
+
+  # Fetch new vendor list if cached list is expired
   # @return [Boolean] true if vendor list is expired and updated from remote
   def expire!
     if expired?
       update(true)
       true
-    elsif stale?
+    else
+      false
+    end
+  end
+
+  # Fetch new vendor list if cached list is stale
+  # @return [Boolean] true if vendor list is stale and updated from cache
+  def stale!
+    if stale?
       update
       true
     else

data/lib/macker/config.rb

@@ -16,7 +16,9 @@ module Macker
         # Can be a string, pathname or proc
         cache:           File.expand_path(File.dirname(__FILE__) + '/../../data/oui_*.txt'),
         # Expiration can be checked manually
-        auto_expiration: true
+        auto_expire:     true,
+        # Stale can be checked manually
+        auto_stale:      true
       )
     end
 

data/lib/macker/version.rb

@@ -3,5 +3,5 @@
 # Macker namespace
 module Macker
   # Macker version
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macker
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Egon Zemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake