support for the integer part of numbers

Author: craig-day

README.md

@@ -39,7 +39,7 @@ The following data from the CLDR is supported.
   - Dates ⚡
   - Times ❌
   - Numbers
-      - Basic ❌
+      - Basic ⚡
       - Currency ❌
       - Percent ❌
       - Decimal ❌

lib/cldrex/formatters/number_formatter.ex

@@ -0,0 +1,34 @@
+defmodule CLDRex.Formatters.NumberFormatter do
+  @moduledoc false
+  import CLDRex.Utils
+
+  alias CLDRex.Main
+  alias CLDRex.Parsers.NumberParser
+
+  @type locale :: atom | String.t
+
+  def format(number, format, locale) do
+    format
+    |> NumberParser.parse(locale)
+    |> process_tokens(number, locale)
+  end
+
+  defp process_tokens(%{grouping: _g, first_grouping: fg, fractional_part: _fp}, number, locale) do
+    {integer, remainder} = number
+    |> to_string
+    |> Integer.parse
+
+    grouping_size = String.length(fg)
+
+    integer
+    |> Integer.digits
+    |> Enum.chunk(grouping_size)
+    |> Enum.reduce([], fn (g, acc) -> Enum.concat(acc, [Enum.join(g)]) end)
+    |> Enum.join(group(locale))
+  end
+
+  defp group(locale) do
+    Main.cldr_main_data
+    |> get_in([locale, :numbers, :symbols, :group])
+  end
+end

lib/cldrex/numbers.ex

@@ -4,14 +4,28 @@ defmodule CLDRex.Numbers do
   # Provide number localization including conversion to currency, percentage, and
   # decimal values.
   # """
+  import CLDRex.Utils
+
+  alias CLDRex.Main
+  alias CLDRex.Formatters.NumberFormatter
+
   @type locale :: atom | String.t
 
   @doc """
   Localize the given number into the given locale.
   """
   @spec localize(number, locale) :: String.t
   def localize(number, locale) do
+    locale   = normalize_locale(locale)
+    fallback = fallback(locale)
+
+    pattern = get_in(Main.cldr_main_data,
+      [locale, :numbers, :decimal_pattern])
+
+    if !pattern, do: pattern = get_in(Main.cldr_main_data,
+      [locale, :numbers, :decimal_pattern])
 
+    NumberFormatter.format(number, pattern, locale)
   end
 
   @doc """

lib/cldrex/parsers/number_parser.ex

@@ -0,0 +1,18 @@
+defmodule CLDRex.Parsers.NumberParser do
+  @moduledoc false
+  alias CLDRex.Main
+
+  def parse(format_string, locale) do
+    format_string = to_string(format_string)
+    [whole_part, fractional_part] = extract_base_parts(format_string, locale)
+    [grouping, first_grouping] = extract_groupings(whole_part, locale)
+
+    %{grouping: grouping, first_grouping: first_grouping, fractional_part: fractional_part}
+  end
+
+  defp extract_base_parts(format_string, locale),
+    do: String.split(format_string, ".", parts: 2)
+
+  defp extract_groupings(format_string, locale),
+    do: String.split(format_string, ",", parts: 2)
+end

lib/cldrex/parsers/xml_parser.ex

@@ -22,6 +22,7 @@ defmodule CLDRex.Parsers.XMLParser do
   end
 
   defp process_file(file) do
+    IO.puts "Processing #{inspect(file)}"
     # the replace is an ugly hack because the doc uses a relative path which
     # breaks at compile time, so we need to change that path
     doc = @main_path
@@ -35,20 +36,21 @@ defmodule CLDRex.Parsers.XMLParser do
       display_pattern: extract_display_pattern(doc),
       languages: extract_languages(doc),
       territories: extract_territories(doc),
-      calendar: extract_calendar(doc)
+      calendar: extract_calendar(doc),
+      numbers: Map.get(extract_numbers(doc), :numbers, %{})
     })
   end
 
   defp extract_display_pattern(doc) do
     doc
-    |> xpath(~x"//localeDisplayPattern/localePattern/text()")
+    |> xpath(~x"//localeDisplayPattern/localePattern/text()"s)
     |> to_string
   end
 
   defp extract_languages(doc) do
     doc
     |> xpath(~x"//languages/language"l,
-      locale: ~x"./@type", language: ~x"./text()")
+      locale: ~x"./@type", language: ~x"./text()"s)
     |> Enum.reduce(%{}, fn(l, acc) ->
       loc = l.locale |> to_string |> String.to_atom
       lng = l.language |> to_string
@@ -59,14 +61,53 @@ defmodule CLDRex.Parsers.XMLParser do
   defp extract_territories(doc) do
     doc
     |> xpath(~x"//territories/territory"l,
-      un_code: ~x"./@type", name: ~x"./text()")
+      un_code: ~x"./@type", name: ~x"./text()"s)
     |> Enum.reduce(%{}, fn(l, acc) ->
       code = l.un_code |> to_string |> String.to_atom
       name = l.name |> to_string
       Map.put(acc, code, name)
     end)
   end
 
+  defp extract_numbers(doc) do
+    numbers = xpath(doc, ~x"//numbers"e)
+
+    case numbers do
+      nil -> %{}
+      _   ->
+        numbers_map = xmap(doc, numbers: [
+          ~x"//numbers",
+          decimal_pattern: ~x"./decimalFormats/decimalFormatLength/decimalFormat/pattern[1]/text()"s,
+          decimal_formats: [
+            ~x"./decimalFormats/decimalFormatLength"l,
+            type: ~x"./@type",
+            patterns: [
+              ~x"./decimalFormat/pattern"l,
+              type: ~x"./@type",
+              count: ~x"./@count",
+              pattern: ~x"./text()"s
+            ]
+          ]
+        ])
+
+        symbols = if xpath(numbers, ~x"//numbers/symbols"e) do
+          xmap(numbers, symbols: [
+            ~x"//numbers/symbols",
+            decimal: ~x"./decimal/text()"s,
+            group: ~x"./group/text()"s,
+            percent: ~x"./percentSign/text()"s,
+            plus: ~x"./plusSign/text()"s,
+            minus: ~x"./minusSign/text()"s
+          ])
+        end
+
+        case symbols do
+          nil -> numbers_map
+          _   -> put_in(numbers_map, [:numbers, :symbols], symbols.symbols)
+        end
+    end
+  end
+
   defp extract_calendar(doc) do
     doc
     |> extract_calendar_map
@@ -86,7 +127,7 @@ defmodule CLDRex.Parsers.XMLParser do
           months: [
             ~x"./month"l,
             month: ~x"./@type",
-            label: ~x"./text()"
+            label: ~x"./text()"s
           ]
         ]
       ],
@@ -99,24 +140,24 @@ defmodule CLDRex.Parsers.XMLParser do
           days: [
             ~x"./day"l,
             day: ~x"./@type",
-            label: ~x"./text()"
+            label: ~x"./text()"s
           ]
         ]
       ],
       date_formats: [
         ~x"./dateFormats/dateFormatLength"l,
         length: ~x"./@type",
-        format: ~x"./dateFormat/pattern/text()"
+        format: ~x"./dateFormat/pattern/text()"s
       ],
       time_formats: [
         ~x"./timeFormats/timeFormatLength"l,
         length: ~x"./@type",
-        format: ~x"./timeFormat/pattern/text()"
+        format: ~x"./timeFormat/pattern/text()"s
       ],
       date_time_formats: [
         ~x"./dateTimeFormats/dateTimeFormatLength"l,
         length: ~x"./@type",
-        format: ~x"./dateTimeFormat/pattern/text()"
+        format: ~x"./dateTimeFormat/pattern/text()"s
       ]
     ])
   end