MessageContext: combined messages and terms dicts

Thanks @zbraniecki

Author: spookylukey

fluent/context.py

@@ -30,8 +30,7 @@ def __init__(self, locales, functions=None, use_isolating=True):
             _functions.update(functions)
         self._functions = _functions
         self._use_isolating = use_isolating
-        self._messages = {}
-        self._terms = {}
+        self._messages_and_terms = {}
         self._babel_locale = self._get_babel_locale()
         self._plural_form = babel.plural.to_python(self._babel_locale.plural_form)
 
@@ -40,12 +39,9 @@ def add_messages(self, source):
         resource = parser.parse(source)
         # TODO - warn/error about duplicates
         for item in resource.body:
-            if isinstance(item, Message):
-                if item.id.name not in self._messages:
-                    self._messages[item.id.name] = item
-            elif isinstance(item, Term):
-                if item.id.name not in self._terms:
-                    self._terms[item.id.name] = item
+            if isinstance(item, (Message, Term)):
+                if item.id.name not in self._messages_and_terms:
+                    self._messages_and_terms[item.id.name] = item
 
     def has_message(self, message_id):
         try:
@@ -63,15 +59,17 @@ def format(self, message_id, args=None):
         return resolved, errors
 
     def _get_message(self, message_id):
+        if message_id.startswith('-'):
+            raise LookupError(message_id)
         if '.' in message_id:
             name, attr_name = message_id.split('.', 1)
-            msg = self._messages[name]
+            msg = self._messages_and_terms[name]
             for attribute in msg.attributes:
                 if attribute.id.name == attr_name:
                     return attribute.value
             raise LookupError(message_id)
         else:
-            return self._messages[message_id]
+            return self._messages_and_terms[message_id]
 
     def _get_babel_locale(self):
         for l in self.locales:

fluent/resolver.py

@@ -166,17 +166,14 @@ def handle_term_reference(term_reference, env):
 
 def lookup_reference(name, env):
     message = None
-    if name.startswith("-"):
-        try:
-            message = env.context._terms[name]
-        except LookupError:
+    try:
+        message = env.context._messages_and_terms[name]
+    except LookupError:
+        if name.startswith("-"):
             env.errors.append(
                 FluentReferenceError("Unknown term: {0}"
                                      .format(name)))
-    else:
-        try:
-            message = env.context._messages[name]
-        except LookupError:
+        else:
             env.errors.append(
                 FluentReferenceError("Unknown message: {0}"
                                      .format(name)))

tests/test_context.py

@@ -18,10 +18,9 @@ def test_add_messages(self):
             bar = Bar
             -baz = Baz
         """))
-        self.assertIn('foo', self.ctx._messages)
-        self.assertIn('bar', self.ctx._messages)
-        self.assertNotIn('-baz', self.ctx._messages)
-        self.assertIn('-baz', self.ctx._terms)
+        self.assertIn('foo', self.ctx._messages_and_terms)
+        self.assertIn('bar', self.ctx._messages_and_terms)
+        self.assertIn('-baz', self.ctx._messages_and_terms)
 
     def test_has_message(self):
         self.ctx.add_messages(dedent_ftl("""
@@ -31,6 +30,13 @@ def test_has_message(self):
         self.assertTrue(self.ctx.has_message('foo'))
         self.assertFalse(self.ctx.has_message('bar'))
 
+    def test_has_message_for_term(self):
+        self.ctx.add_messages(dedent_ftl("""
+            -foo = Foo
+        """))
+
+        self.assertFalse(self.ctx.has_message('-foo'))
+
     def test_has_message_with_attribute(self):
         self.ctx.add_messages(dedent_ftl("""
             foo = Foo
@@ -84,3 +90,11 @@ def test_format_missing(self):
         self.assertRaises(LookupError,
                           self.ctx.format,
                           'a-missing-message')
+
+    def test_format_term(self):
+        self.ctx.add_messages(dedent_ftl("""
+            -foo = Foo
+        """))
+        self.assertRaises(LookupError,
+                          self.ctx.format,
+                          '-foo')