Merge 36c653f into d1161cd

lib/Store.lua

@@ -48,12 +48,18 @@ function Store.new(reducer, initialState, middlewares)
 	table.insert(self._connections, connection)
 
 	if middlewares then
-		local dispatch = Store.dispatch
+		local unboundDispatch = self.dispatch
+		local dispatch = function(...)
+			return unboundDispatch(self, ...)
+		end
+
 		for _, middleware in ipairs(middlewares) do
-			dispatch = middleware(dispatch)
+			dispatch = middleware(dispatch, self)
 		end
 
-		self.dispatch = dispatch
+		self.dispatch = function(self, ...)
+			return dispatch(...)
+		end
 	end
 
 	return self

lib/loggerMiddleware.lua

@@ -39,9 +39,9 @@ local loggerMiddleware = {
 	outputFunction = print,
 }
 
-function loggerMiddleware.middleware(next)
-	return function(store, action)
-		local result = next(store, action)
+function loggerMiddleware.middleware(nextDispatch, store)
+	return function(action)
+		local result = nextDispatch(action)
 
 		loggerMiddleware.outputFunction(("Action dispatched: %s\nState changed to: %s"):format(
 			prettyPrint(action),

lib/thunkMiddleware.lua

@@ -4,12 +4,12 @@
 	This middleware consumes the function; middleware further down the chain
 	will not receive it.
 ]]
-local function thunkMiddleware(next)
-	return function(store, action)
+local function thunkMiddleware(nextDispatch, store)
+	return function(action)
 		if typeof(action) == "function" then
 			return action(store)
 		else
-			return next(store, action)
+			return nextDispatch(action)
 		end
 	end
 end