Merge pull request #1 from ruby2elixir/feature/structs

Support for structs + tuples

Author: mindreframer

lib/atomic_map.ex

@@ -1,19 +1,28 @@
 defmodule AtomicMap do
   def convert(v, opts \\ [])
+
+  def convert(struct=%{__struct__: type}, opts) do
+    struct
+    |> Map.from_struct
+    |> convert(opts)
+    |> Map.put(:__struct__, type)
+  end
+
   def convert(map, opts) when is_map(map) do
     safe = Keyword.get(opts, :safe, true)
     map |> Enum.reduce(%{}, fn({k,v}, acc)->
-      if is_binary(k),   do: k = as_atom(k, safe)
-      if is_complex?(v), do: v = convert(v, opts)
+      k = as_atom(k, safe)
+      v = convert(v, opts)
       acc |> Map.put(k, v)
     end)
   end
   def convert(list, opts) when is_list(list) do
     list |> Enum.map(fn(x)-> convert(x, opts) end)
   end
+  def convert(tuple, opts) when is_tuple(tuple) do
+    tuple |> Tuple.to_list |> convert(opts) |> List.to_tuple
+  end
   def convert(v, _opts),  do: v
-
-  defp is_complex?(v), do: is_map(v) || is_list(v)
   defp as_atom(s, true) when is_binary(s), do: s |> String.to_existing_atom
   defp as_atom(s, true),                   do: s
 

mix.exs

@@ -1,7 +1,7 @@
 defmodule AtomicMap.Mixfile do
   use Mix.Project
 
-  @version  "0.6.0"
+  @version  "0.7.0"
   def project do
     [app: :atomic_map,
      version: @version,

test/atomic_map_test.exs

@@ -2,6 +2,10 @@ defmodule AtomicMapTest do
   use ExUnit.Case
   doctest AtomicMap
 
+  defmodule MyStruct do
+    defstruct first: nil, second: nil
+  end
+
   test "works with maps" do
     input    = %{"a" => 2, "b" => %{"c" => 4}}
     expected = %{a: 2, b: %{c: 4}}
@@ -38,6 +42,24 @@ defmodule AtomicMapTest do
     assert AtomicMap.convert(input) == expected
   end
 
+  test "works with structs" do
+    input    = %AtomicMapTest.MyStruct{first: [%{"a" => 1}]}
+    expected = %AtomicMapTest.MyStruct{first: [%{a: 1}]}
+    assert AtomicMap.convert(input) == expected
+  end
+
+  test "works with nested structs" do
+    input    = %AtomicMapTest.MyStruct{first: [%AtomicMapTest.MyStruct{first: %{"b" => 1}}]}
+    expected = %AtomicMapTest.MyStruct{first: [%AtomicMapTest.MyStruct{first: %{b: 1}}]}
+    assert AtomicMap.convert(input) == expected
+  end
+
+  test "works with tuples" do
+    input    = %{ "first"  => {1,2}}
+    expected = %{first: {1, 2}}
+    assert AtomicMap.convert(input) == expected
+  end
+
   test "raises for not existing atoms" do
     assert_raise ArgumentError, fn ->
       input = %{"a" => 2, "b" => %{"c" => 4}, "__not___existing__" => 5}