Sequence diagram: module attribute #4

dial/interpreter.py

@@ -81,7 +81,7 @@ def _call_callback(self, interpreter, token, *args, **kw):
         try:
             self.callback(interpreter, *args, **kw)
         except AttributeError as e:
-            raise BadAttribute(interpreter, token, e.args[0])
+            raise BadAttribute(interpreter, token, '.'.join(e.args))
 
     def __call__(self, interpreter, token):
         args = tuple(

dial/sequence.py

@@ -112,9 +112,10 @@ def _attr(self, attr, value):
 
     def _module_attr(self, module, attr, value):
         self._ensuremodule(module)
-        value = value.strip()
+        if not hasattr(self.modules[module], attr):
+            raise AttributeError(module, attr)
 
-        setattr(self.modules[module], attr, value)
+        setattr(self.modules[module], attr, value.strip())
 
     statemap = {
         'start': {

tests/test_interpreter.py

@@ -5,6 +5,19 @@
 from dial.interpreter import BadSyntax, BadAttribute
 
 
+def test_sequence_moduleattr_error():
+    d = SequenceDiagram(Tokenizer())
+    s = '''# Sequence
+foo.invalid: Foo
+'''
+    with pytest.raises(BadAttribute) as e:
+        d.parse(s)
+    assert str(e.value) == '''\
+File "String", Interpreter SequenceDiagram, line 2, col 16
+Invalid attribute: foo.invalid.\
+'''
+
+
 def test_sequence_moduleattr():
     d = SequenceDiagram(Tokenizer())
     s = '''# Sequence
@@ -20,16 +33,7 @@ def test_sequence_moduleattr():
     assert repr(d) == s[:-1]
 
 
-def test_sequence_title():
-    d = SequenceDiagram(Tokenizer())
-    s = '''# Sequence
-title: Foo Bar
-
-foo -> bar: baz
-'''
-    d.parse(s)
-    assert repr(d) == s[:-1]
-
+def test_sequence_title_error():
     d = SequenceDiagram(Tokenizer())
     s = '''# Sequence
 invalid: Foo Bar
@@ -44,6 +48,17 @@ def test_sequence_title():
 '''
 
 
+def test_sequence_title():
+    d = SequenceDiagram(Tokenizer())
+    s = '''# Sequence
+title: Foo Bar
+
+foo -> bar: baz
+'''
+    d.parse(s)
+    assert repr(d) == s[:-1]
+
+
 def test_sequence_calltext():
     d = SequenceDiagram(Tokenizer())
     s = '''# Sequence