From ec3b9e83f8659ee4fa274b642289e0ac304abb34 2017-05-17 21:38:45
From: Brett Smith <brettcsmith@brettcsmith.org>
Date: 2017-05-17 21:38:45
Subject: [PATCH] historical: Format amounts according to currency convention.

---

diff --git a/oxrlib/commands/historical.py b/oxrlib/commands/historical.py
index 075fa8386d13c994058ab6ec7ab0c32a62ba244b..e85569f20f5d8bf39b8fc3cd5edb82f22186ad31 100644
--- a/oxrlib/commands/historical.py
+++ b/oxrlib/commands/historical.py
@@ -1,12 +1,22 @@
+from babel.numbers import format_currency
+
 from .. import rate as oxrrate
 
-def format_one_rate(rate, from_amt, from_curr, to_curr):
-    return "{:g} {} = {:g} {}".format(
-        from_amt, from_curr, rate.convert(from_amt, from_curr, to_curr), to_curr)
+CURRENCY_FMT = '#,##0.### ¤¤'
+RATE_FMT = '{from_amt:g} {from_curr} = {to_amt:g} {to_curr}'
+
+def format_conversion(rate, from_amt, from_curr, to_curr):
+    to_amt = rate.convert(from_amt, from_curr, to_curr)
+    return "{} = {}".format(
+        format_currency(from_amt, from_curr, CURRENCY_FMT),
+        format_currency(to_amt, to_curr, CURRENCY_FMT),
+    )
 
 def format_rate_pair(rate, from_curr, to_curr):
-    yield format_one_rate(rate, 1, from_curr, to_curr)
-    yield format_one_rate(rate, 1, to_curr, from_curr)
+    amt = rate.convert(1, from_curr, to_curr)
+    yield RATE_FMT.format(from_amt=1, from_curr=from_curr, to_amt=amt, to_curr=to_curr)
+    amt = rate.convert(1, to_curr, from_curr)
+    yield RATE_FMT.format(from_amt=1, from_curr=to_curr, to_amt=amt, to_curr=from_curr)
 
 def run(config, stdout, stderr):
     loaders = config.get_loaders()
@@ -22,6 +32,6 @@ def run(config, stdout, stderr):
         print(*format_rate_pair(rate, config.args.from_currency, config.args.to_currency),
               sep='\n', file=stdout)
     else:
-        print(format_one_rate(rate, config.args.amount,
-                              config.args.from_currency, config.args.to_currency),
+        print(format_conversion(rate, config.args.amount,
+                                config.args.from_currency, config.args.to_currency),
               file=stdout)
diff --git a/setup.py b/setup.py
index 32946afcc9df42d8ebc424d7c54863bd632044da..8414c7c932e6ecfd28844d5abc3831239947d040 100755
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,12 @@ from setuptools import setup
 setup(
     name='oxrlib',
     description="Library to query the Open Exchange Rates (OXR) API",
-    version='1.0',
+    version='1.1',
     author='Brett Smith',
     author_email='brettcsmith@brettcsmith.org',
     license='GNU AGPLv3+',
 
+    install_requires=['babel'],
     setup_requires=['pytest-runner'],
     tests_require=['pytest'],
 
diff --git a/tests/test_historical.py b/tests/test_historical.py
index f8dfcfcf4ba0091ed2cae4d8ae435f3219cce38f..3becdba240954dcc11a39b0256e4a7d1394e34f8 100644
--- a/tests/test_historical.py
+++ b/tests/test_historical.py
@@ -82,14 +82,12 @@ def test_one_rate(historical1_responder, output):
 def test_conversion(historical1_responder, output):
     config = build_config(historical1_responder, amount=10, from_currency='AED')
     lines = lines_from_run(config, output)
-    # FIXME: Assertion probably changes after we deal with precision right.
-    assert next(lines).startswith('10 AED = 2.72297')
+    assert next(lines) == '10.00 AED = 2.72 USD\n'
     assert next(lines, None) is None
 
 def test_back_conversion(historical1_responder, output):
     config = build_config(historical1_responder,
                           amount=2, from_currency='USD', to_currency='ALL')
     lines = lines_from_run(config, output)
-    # FIXME: Assertion probably changes after we deal with precision right.
-    assert next(lines) == '2 USD = 289.059586 ALL\n'
+    assert next(lines) == '2.00 USD = 289 ALL\n'
     assert next(lines, None) is None