fix external variables to be fluent types

Author: Pike

fluent.runtime/fluent/runtime/__init__.py

@@ -10,7 +10,7 @@
 from .builtins import BUILTINS
 from .prepare import Compiler
 from .resolver import ResolverEnvironment, CurrentEnvironment
-from .utils import ATTRIBUTE_SEPARATOR, TERM_SIGIL, add_message_and_attrs_to_store, ast_to_id
+from .utils import ATTRIBUTE_SEPARATOR, TERM_SIGIL, add_message_and_attrs_to_store, ast_to_id, native_to_fluent
 
 
 class FluentBundle(object):
@@ -65,12 +65,15 @@ def lookup(self, full_id):
     def format(self, message_id, args=None):
         if message_id.startswith(TERM_SIGIL):
             raise LookupError(message_id)
-        if args is None:
-            args = {}
+        fluent_args = {}
+        if args is not None:
+            for argname, argvalue in args.items():
+                fluent_args[argname] = native_to_fluent(argvalue)
+
         errors = []
         resolve = self.lookup(message_id)
         env = ResolverEnvironment(context=self,
-                                  current=CurrentEnvironment(args=args),
+                                  current=CurrentEnvironment(args=fluent_args),
                                   errors=errors)
         return [resolve(env), errors]
 

fluent.runtime/fluent/runtime/resolver.py

@@ -146,7 +146,7 @@ def __call__(self, env):
         return retval
 
 def resolve(fluentish, env):
-    if isinstance(fluentish, (FluentType, FluentNumber)):
+    if isinstance(fluentish, FluentType):
         return fluentish.format(env.context._babel_locale)
     return fluentish
 

fluent.runtime/fluent/runtime/types.py

@@ -81,7 +81,7 @@ class NumberFormatOptions(object):
     maximumSignificantDigits = attr.ib(default=None)
 
 
-class FluentNumber(object):
+class FluentNumber(FluentType):
 
     default_number_format_options = NumberFormatOptions()
 
@@ -276,7 +276,7 @@ class DateFormatOptions(object):
 _SUPPORTED_DATETIME_OPTIONS = ['dateStyle', 'timeStyle', 'timeZone']
 
 
-class FluentDateType(object):
+class FluentDateType(FluentType):
     # We need to match signature of `__init__` and `__new__` due to the way
     # some Python implementation (e.g. PyPy) implement some methods.
     # So we leave those alone, and implement another `_init_options`

fluent.runtime/fluent/runtime/utils.py

@@ -1,5 +1,11 @@
+from __future__ import absolute_import, unicode_literals
+
+from datetime import date, datetime
+from decimal import Decimal
+
 from fluent.syntax.ast import AttributeExpression, Term, TermReference
 
+from .types import FluentInt, FluentFloat, FluentDecimal, FluentDate, FluentDateTime
 from .errors import FluentReferenceError
 
 TERM_SIGIL = '-'
@@ -37,6 +43,23 @@ def numeric_to_native(val):
     return int(val)
 
 
+def native_to_fluent(val):
+    """
+    Convert a python type to a Fluent Type.
+    """
+    if isinstance(val, int):
+        return FluentInt(val)
+    if isinstance(val, float):
+        return FluentFloat(val)
+    if isinstance(val, Decimal):
+        return FluentDecimal(val)
+
+    if isinstance(val, date):
+        return FluentDate.from_date(val)
+    if isinstance(val, datetime):
+        return FluentDateTime.from_date(val)
+    return val
+
 def reference_to_id(ref):
     """
     Returns a string reference for a MessageReference, TermReference or AttributeExpression