Fix bug in map_binary!/1 and map_charlist!/1

elixir-cldr · May 10, 2018 · 7403880 · 7403880
1 parent 6edc7f5
commit 7403880
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Cldr Territories v1.3.1 May 10, 2018
+
+### Bug fix
+
+* Fixed a bug intrudeced in 1.3.0 where function with `!` and `as_option` resulted in `{:ok, result}` instead of `result`
+
 ## Cldr Territories v1.3.0 May 8, 2018
 
 ### Enhancements
@@ -9,7 +15,7 @@
   * `children/2` and `children!/2`
   * `to_currency_code/2` and `to_currency_code!/2`
   * `to_currency_codes/2` and `to_currency_codes!/2`
-  * `country_codes/2`
+  * `country_codes/1`
 * Improved specs
 * Relaxed posion and jason dependency
 

diff --git a/lib/cldr/territory.ex b/lib/cldr/territory.ex
@@ -827,8 +827,14 @@ defmodule Cldr.Territory do
       iex> Cldr.Territory.to_currency_code!(:US)
       :USD
 
+      iex> Cldr.Territory.to_currency_code!(:US, as: :charlist)
+      'USD'
+
       iex> Cldr.Territory.to_currency_code!("PS")
       :ILS
+
+      iex> Cldr.Territory.to_currency_code!("PS", as: :binary)
+      "ILS"
   """
   @spec to_currency_code!(atom_binary_tag(), as_options()) :: atom_binary_charlist() | no_return()
   def to_currency_code!(territory_code, opts \\ [as: :atom])
@@ -903,8 +909,14 @@ defmodule Cldr.Territory do
       iex> Cldr.Territory.to_currency_codes!(:US)
       [:USD]
 
+      iex> Cldr.Territory.to_currency_codes!(:US, as: :charlist)
+      ['USD']
+
       iex> Cldr.Territory.to_currency_codes!("PS")
       [:ILS, :JOD]
+
+      iex> Cldr.Territory.to_currency_codes!("PS", as: :binary)
+      ["ILS", "JOD"]
   """
   @spec to_currency_codes!(atom_binary_tag(), as_options()) :: [atom_binary_charlist()] | no_return()
   def to_currency_codes!(territory_code, opts \\ [as: :atom])
@@ -972,7 +984,7 @@ defmodule Cldr.Territory do
   defp map_binary(result) when is_atom(result), do: to_string(result)
 
   defp map_binary!({:error, {exception, reason}}), do: raise exception, reason
-  defp map_binary!(result), do: map_binary(result)
+  defp map_binary!({:ok, result}), do: map_binary(result)
 
   defp map_charlist({:error, reason}), do: {:error, reason}
   defp map_charlist({:ok, result}), do: {:ok, map_charlist(result)}
@@ -982,5 +994,5 @@ defmodule Cldr.Territory do
   defp map_charlist(result) when is_atom(result), do: to_charlist(result)
 
   defp map_charlist!({:error, {exception, reason}}), do: raise exception, reason
-  defp map_charlist!(result), do: map_charlist(result)
+  defp map_charlist!({:ok, result}), do: map_charlist(result)
 end
diff --git a/mix.exs b/mix.exs
@@ -1,7 +1,7 @@
 defmodule CldrTerritories.Mixfile do
   use Mix.Project
 
-  @version "1.3.0"
+  @version "1.3.1"
 
   def project do
     [