Merge branch 'master' into closure-option

Author: danielberkompas

guides/how_to/rotate_keys.md

@@ -15,15 +15,21 @@ For example, if your config currently looks like this:
         default: {Cloak.Ciphers.AES.GCM, tag: "AES.GCM.V1", key: <<...>>},
       ]
 
-Then change the `:default` label to the new key, and demote the existing
-key to the `:retired` label.
+Then you should change the `:default` label to the new key, and demote the
+existing key to the `:retired` label.
 
     config :my_app, MyApp.Vault,
       ciphers: [
         default: {Cloak.Ciphers.AES.GCM, tag: "AES.GCM.V2", key: <<...>>},
         retired: {Cloak.Ciphers.AES.GCM, tag: "AES.GCM.V1", key: <<...>>}
       ]
 
+> #### Labels don't matter, order does {: .tip}
+>
+> The `:ciphers` configuration is _order-dependent_. The first key in the list
+> will be used as the default, regardless of its label. This guide uses the 
+> `:default` and `:retired` labels for clarity, but the order is what matters.
+
 ## Migrate Data To New Key
 
 For each schema that uses your vault, run `mix cloak.migrate`:

lib/cloak_ecto/type.ex

@@ -68,6 +68,7 @@ defmodule Cloak.Ecto.Type do
       def load(value) do
         with {:ok, value} <- decrypt(value) do
           value = after_decrypt(value)
+
           if unquote(closure) do
             {:ok, fn -> value end}
           else

mix.exs

@@ -74,6 +74,7 @@ defmodule Cloak.Ecto.MixProject do
         "guides/how_to/rotate_keys.md": [title: "Rotate Keys"],
         "guides/how_to/troubleshooting.md": [title: "Troubleshooting"],
         "guides/how_to/closure_wrapping.md": [title: "Closure Wrapping"],
+        "guides/how_to/troubleshooting.md": [title: "Troubleshooting"],
         "guides/upgrading/0.9.x_to_1.0.x.md": [title: "0.9.x to 1.0.x"]
       ],
       extra_section: "GUIDES",

test/cloak_ecto/types/date_test.exs

@@ -27,7 +27,10 @@ defmodule Cloak.Ecto.DateTest do
   test ".cast unwraps closures" do
     assert {:ok, ~D[2017-01-05]} = Field.cast(fn -> "2017-01-05" end)
     assert {:ok, ~D[2017-01-05]} = Field.cast(fn -> %{year: "2017", month: "1", day: "5"} end)
-    assert {:ok, ~D[2017-01-05]} = Field.cast(fn -> %{"year" => "2017", "month" => "1", "day" => "5"} end)
+
+    assert {:ok, ~D[2017-01-05]} =
+             Field.cast(fn -> %{"year" => "2017", "month" => "1", "day" => "5"} end)
+
     assert {:ok, ~D[2017-01-05]} = Field.cast(fn -> ~D[2017-01-05] end)
   end
 
@@ -48,5 +51,4 @@ defmodule Cloak.Ecto.DateTest do
     assert is_function(closure, 0)
     assert ~D[2017-01-05] = closure.()
   end
-
 end