1.5.1 Fix small changeSettings bug

README.md

@@ -47,7 +47,7 @@ And now you can be assured that someAsyncCall will abide by your rate guidelines
 
 Bottleneck builds a queue of requests and executes them as soon as possible. All the requests will be executed *in order*.
 
-This is sufficient for the vast majority of applications. Read the [Gotchas](https://github.com/SGrondin/bottleneck#gotchas) section and you're good to go. Or keep reading to learn about the fine tuning available for the more complex cases.
+This is sufficient for the vast majority of applications. Read the [Gotchas](https://github.com/SGrondin/bottleneck#gotchas) section and you're good to go. Or keep reading to learn about all the fine tuning available for the more complex cases.
 
 
 #Docs
@@ -116,6 +116,12 @@ limiter.changeSettings(maxConcurrent, minTime, highWater, strategy);
 ```
 Same parameters as the constructor, pass ```null``` to skip a parameter and keep it to its current value.
 
+**Note:** Changing `maxConcurrent` and `minTime` will not affect requests that have already been scheduled for execution.
+
+For example, imagine that 3 minute-long requests are `submit`'ted at time T+0 with `maxConcurrent = 0` and `minTime = 2000`. The requests will be launched at T+0 seconds, T+2 seconds and T+4 seconds respectively. If right after adding the requests to Bottleneck, you were to call `limiter.changeSettings(1);`, it won't change the fact that there will be 3 requests running at the same time for roughly 60 seconds as in this example they each take a minute to complete. Once again, `changeSettings` only affects requests that have not yet been `submit`'ted.
+
+This is by design, as Bottleneck made a promise to execute those requests according to the settings valid at the time. Changing settings afterwards should not retroactively affect space & time nor break previous assumptions as that would make code very error-prone and Bottleneck a tool that cannot be relied upon.
+
 
 ###changePenalty()
 ```javascript

bottleneck.js

@@ -1,4 +1,4 @@
-(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 // Generated by CoffeeScript 1.7.1
 (function() {
   var Bottleneck,
@@ -92,6 +92,7 @@
       this.minTime = minTime != null ? minTime : this.minTime;
       this.highWater = highWater != null ? highWater : this.highWater;
       this.strategy = strategy != null ? strategy : this.strategy;
+      while (this._tryToRun()) {}
       return this;
     };
 
@@ -151,5 +152,5 @@
 
 }).call(this);
 
-}).call(this,typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"./Bottleneck":1}]},{},[2])
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+},{"./Bottleneck":1}]},{},[2]);

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "bottleneck",
   "main": "bottleneck.js",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "homepage": "https://github.com/SGrondin/bottleneck",
   "authors": [
     "SGrondin <github@simongrondin.name>"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bottleneck",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Async rate limiter",
   "main": "lib/index.js",
   "scripts": {

src/Bottleneck.coffee

@@ -41,7 +41,9 @@ class Bottleneck
 		@_queue.push {task, args, cb}
 		@_tryToRun()
 		reachedHighWaterMark
-	changeSettings: (@maxNb=@maxNb, @minTime=@minTime, @highWater=@highWater, @strategy=@strategy) -> @
+	changeSettings: (@maxNb=@maxNb, @minTime=@minTime, @highWater=@highWater, @strategy=@strategy) ->
+		while @_tryToRun() then
+		@
 	changePenalty: (@penalty=@penalty) -> @
 	changeReservoir: (@reservoir) ->
 		while @_tryToRun() then