Merge pull request #287 from btharper/es_coverage

Add ordinal 12,345 to ES test suite to increase coverage

num2words/lang_ES.py

@@ -15,7 +15,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301 USA
 
-from __future__ import print_function, unicode_literals
+from __future__ import division, print_function, unicode_literals
+
+import math
 
 from .lang_EU import Num2Word_EU
 
@@ -120,7 +122,6 @@ class Num2Word_ES(Num2Word_EU):
 
     def to_ordinal(self, value):
         self.verify_ordinal(value)
-        try:
         if value == 0:
             text = ""
         elif value <= 10:
@@ -143,25 +144,26 @@ class Num2Word_ES(Num2Word_EU):
                              self.to_ordinal(value - cen))
                     )
         elif value < 1e18:
+            # Round down to the nearest 1e(3n)
             # dec contains the following:
             # [ 1e3,  1e6): 1e3
             # [ 1e6,  1e9): 1e6
             # [ 1e9, 1e12): 1e9
             # [1e12, 1e15): 1e12
             # [1e15, 1e18): 1e15
-                dec = 10 ** ((((len(str(int(value))) - 1) / 3 - 1) + 1) * 3)
-                part = int(float(value / dec) * dec)
-                cardinal = (
-                    self.to_cardinal(part / dec) if part / dec != 1 else ""
-                    )
+            dec = 1000 ** int(math.log(int(value), 1000))
+
+            # Split the parts before and after the word for 'dec'
+            # eg (12, 345) = divmod(12_345, 1_000)
+            high_part, low_part = divmod(value, dec)
+
+            cardinal = self.to_cardinal(high_part) if high_part != 1 else ""
             text = (
                 "%s%s%s %s" % (cardinal, self.ords[dec], self.gender_stem,
-                                   self.to_ordinal(value - part))
+                               self.to_ordinal(low_part))
                     )
         else:
             text = self.to_cardinal(value)
-        except KeyError:
-            text = self.to_cardinal(value)
         return text.strip()
 
     def to_ordinal_num(self, value):

tests/test_es.py

@@ -95,6 +95,7 @@ TEST_CASES_ORDINAL = (
     (28, 'vigésimo octavo'),
     (100, 'centésimo'),
     (1000, 'milésimo'),
+    (12345, 'docemilésimo tricentésimo quadragésimo quinto'),
     (1000000, 'millonésimo'),
     (1000000000000000, 'cuadrillonésimo'),
     (1000000000000000000, 'un trillón')  # over 1e18 is not supported