[template] use SparkPost.Content.Inline instead of custom ContentResponse

Author: Ashu Goel

lib/content/inline.ex

@@ -25,4 +25,12 @@ defmodule SparkPost.Content.Inline do
     html: nil,
     attachments: nil,
     inline_images: nil
+
+  @doc """
+  Convert a raw "from" field into a %SparkPost.Address{} object.
+  """
+  def convert_from_field(%SparkPost.Endpoint.Error{} = content), do: content
+  def convert_from_field(%__MODULE__{} = content) do
+    %{content | from: SparkPost.Address.to_address(content.from)}
+  end
 end

lib/template.ex

@@ -17,7 +17,7 @@ defmodule SparkPost.Template do
     -headers
   """
 
-  alias SparkPost.{Endpoint, Template}
+  alias SparkPost.Endpoint
 
   @doc """
   Generate a preview of an existing template.
@@ -41,7 +41,7 @@ defmodule SparkPost.Template do
     body = %{substitution_data: substitution_data}
     :post
     |> Endpoint.request("/templates/#{template.template_id}/preview#{qs}", body)
-    |> Endpoint.marshal_response(Template.ContentResponse)
-    |> Template.ContentResponse.convert_from_field
+    |> Endpoint.marshal_response(SparkPost.Content.Inline)
+    |> SparkPost.Content.Inline.convert_from_field
   end
 end

lib/template/content_response.ex

@@ -1,9 +1,8 @@
 defmodule SparkPost.TemplateTest do
   use ExUnit.Case, async: false
 
-  alias SparkPost.Content.TemplateRef
+  alias SparkPost.Content.{TemplateRef, Inline}
   alias SparkPost.{Endpoint, MockServer, Template}
-  alias SparkPost.Template.ContentResponse
 
   import Mock
 
@@ -24,7 +23,7 @@ defmodule SparkPost.TemplateTest do
     end
   end
 
-  test_with_mock "Template.preview succeeds with Template.ContentResponse",
+  test_with_mock "Template.preview succeeds with Content.Inline",
     HTTPoison, [request: fn (method, url, body, headers, opts) ->
       assert method == :post
       # draft not set
@@ -33,18 +32,18 @@ defmodule SparkPost.TemplateTest do
       fun.(method, url, body, headers, opts)
     end] do
       resp = Template.preview(TestStruct.basic_template(), TestStruct.substitution_data())
-      assert %ContentResponse{} = resp
+      assert %Inline{} = resp
   end
 
-  test_with_mock "Template.preview succeeds with Template.ContentResponse and draft set",
+  test_with_mock "Template.preview succeeds with Content.Inline and draft set",
     HTTPoison, [request: fn (method, url, body, headers, opts) ->
       assert method == :post
       assert String.ends_with?(url, "preview?draft=true")
       fun = MockServer.mk_http_resp(200, MockServer.get_json("previewtemplate"))
       fun.(method, url, body, headers, opts)
     end] do
       resp = Template.preview(TestStruct.template_with_draft(), TestStruct.substitution_data())
-      assert %ContentResponse{} = resp
+      assert %Inline{} = resp
   end
 
   test_with_mock "Template.preview fails with Endpoint.Error", HTTPoison,