Merge pull request #229 from schrockwell/2.0

Correctly parsing responses from non-object responses

lib/stripe/connect/oauth.ex

@@ -73,7 +73,7 @@ defmodule Stripe.Connect.OAuth do
     }
 
     case Stripe.oauth_request(:post, endpoint, body) do
-       {:ok, result} -> {:ok, Converter.stripe_map_to_struct(result)}
+       {:ok, result} -> {:ok, Converter.convert_result(result)}
        {:error, error} -> {:error, error}
      end
   end
@@ -98,7 +98,7 @@ defmodule Stripe.Connect.OAuth do
     }
 
     case Stripe.oauth_request(:post, endpoint, body) do
-      {:ok, result} -> {:ok, Converter.stripe_map_to_struct(result)}
+      {:ok, result} -> {:ok, Converter.convert_result(result)}
       {:error, error} -> {:error, error}
     end
   end

lib/stripe/converter.ex

@@ -1,13 +1,17 @@
 defmodule Stripe.Converter do
 
   @doc """
-  Takes the module (e.g. `Stripe.Card`) and the response from Stripe and
-  returns a struct (e.g. `%Stripe.Card{}`) containing the Stripe response.
+  Takes a result map or list of maps from a Stripe response and returns a
+  struct (e.g. `%Stripe.Card{}`) or list of structs.
+
+  If the result is not a supported Stripe object, it just returns a plain map
+  with atomized keys.
   """
-  @spec stripe_map_to_struct(%{String.t => any}) :: struct
-  def stripe_map_to_struct(response), do: convert_stripe_object(response)
+  @spec convert_result(%{String.t => any}) :: struct
+  def convert_result(result), do: convert_value(result)
 
-  @supported_objects ~w(account bank_account card customer event external_account file_upload invoice list plan subscription token)
+  @supported_objects ~w(account bank_account card customer event external_account 
+    file_upload invoice list plan subscription token)
 
   @spec convert_value(any) :: any
   defp convert_value(%{"object" => object_name} = value) when is_binary(object_name) do

lib/stripe/request.ex

@@ -48,6 +48,6 @@ defmodule Stripe.Request do
     |> handle_result
   end
 
-  defp handle_result({:ok, result = %{}}), do: {:ok, Converter.stripe_map_to_struct(result)}
+  defp handle_result({:ok, result = %{}}), do: {:ok, Converter.convert_result(result)}
   defp handle_result({:error, error}), do: {:error, error}
 end

test/fixtures/card_deleted.json

@@ -0,0 +1,4 @@
+{
+  "deleted": true,
+  "id":"card_1A49JREym4h6pgdFkbcuN03L"
+}

test/stripe/converter_test.exs

@@ -52,7 +52,7 @@ defmodule Stripe.ConverterTest do
     }
 
     fixture = Helper.load_fixture("event_with_customer.json")
-    result = Converter.stripe_map_to_struct(fixture)
+    result = Converter.convert_result(fixture)
 
     assert result == expected_result
   end
@@ -116,7 +116,7 @@ defmodule Stripe.ConverterTest do
     }
 
     fixture = Helper.load_fixture("card_list.json")
-    result = Converter.stripe_map_to_struct(fixture)
+    result = Converter.convert_result(fixture)
 
     assert result == expected_result
   end
@@ -153,7 +153,19 @@ defmodule Stripe.ConverterTest do
     }
 
     fixture = Helper.load_fixture("customer.json")
-    result = Converter.stripe_map_to_struct(fixture)
+    result = Converter.convert_result(fixture)
+
+    assert result == expected_result
+  end
+
+  test "converts a deleted response properly" do
+    expected_result = %{
+      deleted: true,
+      id: "card_1A49JREym4h6pgdFkbcuN03L"
+    }
+
+    fixture = Helper.load_fixture("card_deleted.json")
+    result = Converter.convert_result(fixture)
 
     assert result == expected_result
   end