Skip to content

Commit

Permalink
[API] fix a typo in the "middlewares" optional argument of the Messag…
Browse files Browse the repository at this point in the history
…e Buses
  • Loading branch information
olivierphi committed Sep 30, 2018
1 parent 6172e0e commit d4a582e
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
3 changes: 2 additions & 1 deletion README.md
Expand Up @@ -165,7 +165,8 @@ def handler(message: MessageWithList) -> str:
message.payload.append("handler does something")
return "handler result"

sut.add_handler(MessageWithList, handler)
message_bus = MessageBus(middlewares=[middleware_one, middleware_two])
message_bus.add_handler(MessageWithList, handler)

message = MessageWithList(payload=["initial message payload"])
result = sut.handle(message)
Expand Down
4 changes: 2 additions & 2 deletions src/pymessagebus/_commandbus.py
Expand Up @@ -8,11 +8,11 @@ class CommandBus(api.CommandBus):
def __init__(
self,
*,
middleswares: t.List[api.Middleware] = None,
middlewares: t.List[api.Middleware] = None,
allow_result: bool = True,
locking: bool = True,
) -> None:
self._messagebus = MessageBus(middleswares=middleswares)
self._messagebus = MessageBus(middlewares=middlewares)
self._allow_result = bool(allow_result)
self._locking = bool(locking)
self._is_processing_a_message = False
Expand Down
4 changes: 2 additions & 2 deletions src/pymessagebus/_messagebus.py
Expand Up @@ -5,10 +5,10 @@


class MessageBus(api.MessageBus):
def __init__(self, *, middleswares: t.List[api.Middleware] = None) -> None:
def __init__(self, *, middlewares: t.List[api.Middleware] = None) -> None:
self._handlers: t.Dict[type, t.List[t.Callable]] = defaultdict(list)
self._middlewares_chain = self._get_middlewares_callables_chain(
middleswares, self._trigger_handlers_for_message_as_a_middleware
middlewares, self._trigger_handlers_for_message_as_a_middleware
)

def add_handler(self, message_class: type, message_handler: t.Callable) -> None:
Expand Down
2 changes: 1 addition & 1 deletion tests/_commandbus_test.py
Expand Up @@ -105,7 +105,7 @@ def handler(message: MessageWithList) -> str:
return "handler result"

# We already tests simpler cases on the MessageBus test suite, so we will only test the most complex case here:
sut = CommandBus(middleswares=[middleware_one, middleware_two])
sut = CommandBus(middlewares=[middleware_one, middleware_two])
sut.add_handler(MessageWithList, handler)

message = MessageWithList(payload=["initial message payload"])
Expand Down
6 changes: 3 additions & 3 deletions tests/_messagebus_test.py
Expand Up @@ -136,7 +136,7 @@ def handler_two(message: MessageWithList):
return "handler two result"

# 1. Simplest test: one handler, one middleware
sut1 = MessageBus(middleswares=[middleware_one])
sut1 = MessageBus(middlewares=[middleware_one])
sut1.add_handler(MessageWithList, handler_one)

message1 = MessageWithList(payload=[])
Expand All @@ -149,7 +149,7 @@ def handler_two(message: MessageWithList):
]

# 2. Next step: one handler, multiple middlewares
sut2 = MessageBus(middleswares=[middleware_one, middleware_two])
sut2 = MessageBus(middlewares=[middleware_one, middleware_two])
sut2.add_handler(MessageWithList, handler_one)

message2 = MessageWithList(payload=[])
Expand All @@ -164,7 +164,7 @@ def handler_two(message: MessageWithList):
]

# 3. Ultimate step: multiple handlers, multiple middlewares
sut3 = MessageBus(middleswares=[middleware_one, middleware_two])
sut3 = MessageBus(middlewares=[middleware_one, middleware_two])
sut3.add_handler(MessageWithList, handler_one)
sut3.add_handler(MessageWithList, handler_two)

Expand Down
8 changes: 4 additions & 4 deletions tests/middleware/logger_test.py
Expand Up @@ -17,7 +17,7 @@ def test_middleware_basic(caplog):
logger = logging.getLogger(logger_name)

sut = get_logger_middleware(logger)
message_bus = MessageBus(middleswares=[sut])
message_bus = MessageBus(middlewares=[sut])
message_bus.add_handler(MessageClassOne, get_one)

message = MessageClassOne()
Expand All @@ -44,7 +44,7 @@ def test_middleware_with_error(caplog):
logger = logging.getLogger(logger_name)

sut = get_logger_middleware(logger)
message_bus = MessageBus(middleswares=[sut])
message_bus = MessageBus(middlewares=[sut])
message_bus.add_handler(MessageClassOne, errorful_handler)
message = MessageClassOne()
with caplog.at_level(logging.DEBUG, logger=logger_name):
Expand Down Expand Up @@ -73,7 +73,7 @@ def test_middleware_with_custom_log_levels(caplog):
mgs_received_level=logging.CRITICAL, mgs_succeeded_level=logging.WARNING
)
sut = get_logger_middleware(logger, sut_config)
message_bus = MessageBus(middleswares=[sut])
message_bus = MessageBus(middlewares=[sut])
message_bus.add_handler(MessageClassOne, get_one)

message = MessageClassOne()
Expand Down Expand Up @@ -101,7 +101,7 @@ def test_middleware_with_custom_log_levels_with_error(caplog):
mgs_received_level=logging.WARNING, mgs_failed_level=logging.INFO
)
sut = get_logger_middleware(logger, sut_config)
message_bus = MessageBus(middleswares=[sut])
message_bus = MessageBus(middlewares=[sut])
message_bus.add_handler(MessageClassOne, errorful_handler)

message = MessageClassOne()
Expand Down

0 comments on commit d4a582e

Please sign in to comment.