Merge branch 'release/1.5.0'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lru-map",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "An ES6-y Map with LRU and max-age eviction",
   "main": "index.js",
   "scripts": {

src/lru-map.coffee

@@ -191,21 +191,33 @@ module.exports = class LRUMap
 
 		opts.timeout ?= 10000
 		opts.invokeNewValueFunction ?= true
+		opts.onCacheHit ?= -> undefined
+		opts.onCacheMiss ?= -> undefined
 
 		unless typeof opts.timeout is 'number' and opts.timeout >= 1
 			throw new TypeError 'opts.timeout must be a positive number (possibly Infinity)'
 
 		unless typeof opts.invokeNewValueFunction is 'boolean'
 			throw new TypeError 'opts.invokeNewValueFunction must be boolean'
 
+		unless typeof opts.onCacheHit is 'function'
+			throw new TypeError 'opts.onCacheHit must be a function'
+
+		unless typeof opts.onCacheMiss is 'function'
+			throw new TypeError 'opts.onCacheMiss must be a function'
+
 		if _atomicInflights.has key
+			setTimeout -> opts.onCacheHit key
 			return _atomicInflights.get key
 
 		@reapStale()
 
 		if _map.has key
+			setTimeout -> opts.onCacheHit key
 			return Promise.resolve @get key
 
+		setTimeout -> opts.onCacheMiss key
+
 		if opts.invokeNewValueFunction and typeof newValue is 'function'
 			newValue = newValue()
 

test/lru-map.coffee

@@ -619,6 +619,18 @@ describe 'LRUMap', ->
 			lmap = new LRUMap
 			expect(-> lmap.setIfNull 'foo', {bar: true}, {timeout: 0.1}).to.throwError /positive/i
 
+		it 'errors if opts.invokeNewValueFunction is not boolean', ->
+			lmap = new LRUMap
+			expect(-> lmap.setIfNull 'foo', {bar: true}, {invokeNewValueFunction: 0.1}).to.throwError /boolean/i
+
+		it 'errors if opts.onCacheHit is not a function', ->
+			lmap = new LRUMap
+			expect(-> lmap.setIfNull 'foo', {bar: true}, {onCacheHit: 0.1}).to.throwError /function/i
+
+		it 'errors if opts.onCacheMiss is not a function', ->
+			lmap = new LRUMap
+			expect(-> lmap.setIfNull 'foo', {bar: true}, {onCacheMiss: 0.1}).to.throwError /function/i
+
 		it 'returns the inflight promise, if one exists', ->
 			lmap = new LRUMap
 			lmap.testInflights.set 'foo', Promise.resolve({hi: 'mom'})
@@ -673,6 +685,25 @@ describe 'LRUMap', ->
 			lmap.setIfNull('foo', (-> 'hi'), {invokeNewValueFunction: false})
 			.then (value) -> expect(typeof value).to.be 'function'
 
+		it 'calls opts.onCacheHit when a cache hit occurs', (done) ->
+			lmap = new LRUMap
+			lmap.set('foo', 'bar')
+			lmap.setIfNull('foo', 'bar', {
+				onCacheHit: (key) ->
+					expect(key).to.be 'foo'
+					done()
+				onCacheMiss: -> expect().fail('should have hit')
+			})
+
+		it 'calls opts.onCacheMiss when a cache miss occurs', (done) ->
+			lmap = new LRUMap
+			lmap.setIfNull('foo', 'bar', {
+				onCacheMiss: (key) ->
+					expect(key).to.be 'foo'
+					done()
+				onCacheHit: -> expect().fail('should have missed')
+			})
+
 	describe '#delete()', ->
 		it 'removes the specified key and its value', ->
 			lmap = new LRUMap