Merge pull request #3 from ravigadila/converter

Converter

Author: Ravi kumar

.travis.yml

@@ -0,0 +1,17 @@
+language: python
+
+python:
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+
+install:
+  - python setup.py install
+  - pip install nose
+  - pip install coveralls
+script:
+  - nosetests  --with-coverage --cover-package=forex_python
+
+after_success:
+  coveralls

forex_python/converter.py

@@ -1,5 +1,4 @@
 import requests
-import datetime
 
 
 class RatesNotAvailableError(Exception):
@@ -20,11 +19,8 @@ def _source_url(self):
     def _get_date_string(self, date_obj):
         if date_obj is None:
             return 'latest'
-        try:
-            date_str = date_obj.strftime('%Y-%m-%d')
-            return date_str
-        except ValueError:
-            raise ValueError("Incorrect date String, date should be YYYY-MM-DD")
+        date_str = date_obj.strftime('%Y-%m-%d')
+        return date_str
 
 
 class CurrencyRates(Common):

tests/test.py

@@ -1,18 +1,18 @@
+import datetime
 from unittest import TestCase
 from forex_python.converter import CurrencyRates
+from forex_python.converter import RatesNotAvailableError
 
 
-class TestBase(TestCase):
-    def setUp(self):
-        c = CurrencyRates()
-
-
-class TestGetRates(TestBase):
+class TestGetRates(TestCase):
     """
     Test get_rates with valid(ex: USD) and invalid(ex: XYZ) currency code
     """
+    def setUp(self):
+        self.c = CurrencyRates()
+
     def test_get_rates_valid_code(self):
-        all_rates = c.get_rates('USD')
+        all_rates = self.c.get_rates('USD')
 
         # Check if return value of get_rates dictionary
         self.assertTrue(isinstance(all_rates, dict))
@@ -23,46 +23,68 @@ def test_get_rates_valid_code(self):
         # Test one rate in returned dict is float value
         self.assertTrue(isinstance(all_rates.get('INR'), float))
 
-    def test_get_rates_invalid_code(self):
-        all_rates = c.get_rates('XYZ')
+    def test_get_rates_with_date(self):
+        date_obj = datetime.datetime.strptime('2010-05-10', "%Y-%m-%d").date()
+        all_rates = self.c.get_rates('USD', date_obj)
 
         # Check if return value of get_rates dictionary
         self.assertTrue(isinstance(all_rates, dict))
 
-        # Test no values in dict(empty dict)
-        self.assertFalse(len(all_rates.keys()))
+        # Test at least one rate value returned
+        self.assertTrue(len(all_rates.keys()))
 
-        # Test one rate in returned dict is not float value
-        self.assertFalse(isinstance(all_rates.get('INR'), float))
+        # Test one rate in returned dict is float value
+        self.assertTrue(isinstance(all_rates.get('INR'), float))
+        
+    def test_get_rates_invalid_code(self):
+        self.assertRaises(RatesNotAvailableError, self.c.get_rates, 'XYZ')
 
 
-class TestGetRate(TestBase):
+class TestGetRate(TestCase):
     """
     Test get_rate function using valid and invalid currency codes
     """
+    def setUp(self):
+        self.c = CurrencyRates()
 
     def test_get_rate_with_valid_codes(self):
-        rate = c.get_rate(self, 'USD', 'INR')
+        rate = self.c.get_rate('USD', 'INR')
+
+        # check if return value is float
+        self.assertTrue(isinstance(rate, float))
+
+    def test_get_rate_with_date(self):
+        date_obj = datetime.datetime.strptime('2010-05-10', "%Y-%m-%d").date()
+        rate = self.c.get_rate('USD', 'INR', date_obj)
 
         # check if return value is float
         self.assertTrue(isinstance(rate, float))
 
     def test_get_rate_with_invalid_codes(self):
         # raise exception for invalid currency codes
-        self.assertRaises(RatesNotAvailableError, c.get_rate(self, 'ABCD', 'XYZ'))
+        self.assertRaises(RatesNotAvailableError, self.c.get_rate, 'ABCD', 'XYZ')
 
 
-class TestAmountConvert(TestBase):
+class TestAmountConvert(TestCase):
     """
     test amount conversion from one currency to other
     """
+    def setUp(self):
+        self.c = CurrencyRates()
 
     def test_amount_convert_valid_currency(self):
-        amount = c.convert('USD', 'INR', 10)
+        amount = self.c.convert('USD', 'INR', 10)
 
         # test if amount returned in float
         self.assertTrue(isinstance(amount, float))
 
-    def test_amount_convert_valid_currency(self):
+    def test_amount_convert_date(self):
+        date_obj = datetime.datetime.strptime('2010-05-10', "%Y-%m-%d").date()
+        amount = self.c.convert('USD', 'INR', 10, date_obj)
+
+        # test if amount returned in float
+        self.assertTrue(isinstance(amount, float))
+
+    def test_amount_convert_invalid_currency(self):
         # test if amount returned in float
-        self.assertRaises(RateNotFoundError, c.convert('ABC, 'XYZ', 10))
+        self.assertRaises(RatesNotAvailableError, self.c.convert, 'ABC', 'XYZ', 10)