Fix Cldr.Plug.SetLocale to allow locale names. Closes #131

CHANGELOG.md

@@ -1,3 +1,11 @@
+# Changelog for Cldr v2.11.1
+
+This is the changelog for Cldr v2.11.1 released on October 20th, 2019.  For older changelogs please consult the release tag on [GitHub](https://github.com/elixir-cldr/cldr/tags)
+
+### Bug Fixes
+
+* Validate session-based locale in `Cldr.Plug.SetLocale`. Closes #131. Thanks for @Ray-Wang.
+
 # Changelog for Cldr v2.11.0
 
 This is the changelog for Cldr v2.11.0 released on October 10th, 2019.  For older changelogs please consult the release tag on [GitHub](https://github.com/elixir-cldr/cldr/tags)

lib/cldr/plug/plug_set_locale.ex

@@ -191,6 +191,7 @@ if Code.ensure_loaded?(Plug) do
     defp fetch_param(conn, :session, _param, options) do
       conn
       |> get_session(options[:session_key])
+      |> Cldr.validate_locale(options[:cldr])
     end
 
     defp fetch_param(conn, :cookie, param, options) do

mix.exs

@@ -1,7 +1,7 @@
 defmodule Cldr.Mixfile do
   use Mix.Project
 
-  @version "2.11.0"
+  @version "2.11.1"
 
   def project do
     [

test/plug/plug_set_locale_test.exs

@@ -164,10 +164,42 @@ defmodule Cldr.Plug.SetLocale.Test do
 
     conn =
       :get
-      |> conn("/?locale=fr")
+      |> conn("/")
+      |> Plug.Session.call(session_opts)
+      |> fetch_session("cldr_locale")
+      |> put_session("cldr_locale", Cldr.Locale.new!("ru", opts[:cldr]))
+      |> Cldr.Plug.SetLocale.call(opts)
+
+    assert conn.private[:cldr_locale] ==
+             %Cldr.LanguageTag{
+               extensions: %{},
+               gettext_locale_name: nil,
+               locale: %{},
+               private_use: [],
+               transform: %{},
+               language_variant: nil,
+               canonical_locale_name: "ru-Cyrl-RU",
+               cldr_locale_name: "ru",
+               language: "ru",
+               rbnf_locale_name: "ru",
+               requested_locale_name: "ru",
+               script: "Cyrl",
+               territory: "RU"
+             }
+
+    assert Cldr.get_locale() == conn.private[:cldr_locale]
+  end
+
+  test "set the locale from the session using a locale name" do
+    opts = Cldr.Plug.SetLocale.init(from: :session, cldr: TestBackend.Cldr)
+    session_opts = Plug.Session.init(store: :cookie, key: "_key", signing_salt: "X")
+
+    conn =
+      :get
+      |> conn("/")
       |> Plug.Session.call(session_opts)
       |> fetch_session("cldr_locale")
-      |> put_session("cldr_locale", Cldr.Locale.new("ru", opts[:cldr]))
+      |> put_session("cldr_locale", "ru")
       |> Cldr.Plug.SetLocale.call(opts)
 
     assert conn.private[:cldr_locale] ==