update tests and functions

Author: gjaldon

lib/voodoo.ex

@@ -5,7 +5,8 @@ defmodule Voodoo do
 
   ## Configuration
   """
-  use HTTPoison.Base
+
+  alias Voodoo.Util
 
   defmodule MissingSecretKeyError do
     defexception message: """
@@ -62,18 +63,17 @@ defmodule Voodoo do
   Process request body and convert to escaped json string
   Accepts a map
   """
-  def process_request_body(body) do
+  def process_request_body(body) when is_map(body) do
     Poison.encode! body
   end
+  def process_request_body(body), do: body
 
   @doc """
   Set request headers and format
   """
-  def process_request_headers(_) do
-    Map.new
-    |> Map.put("key", Voodoo.secret_key)
-    |> Map.put("content-type",  "application/json")
-    |> Map.to_list
+  def request_headers do
+    [{"content-type", "application/json"},
+     {"key", Voodoo.secret_key}]
   end
 
   @doc """
@@ -86,7 +86,11 @@ defmodule Voodoo do
     * body - request body
     * options - request options
   """
-  def make_request(method, url, body \\ %{}, options \\ []) do
-    {:ok, _response} = request(method, url, body, [], options)
+  def make_request(method, path, body \\ "", options \\ []) do
+    url = process_url(path)
+    body = process_request_body(body)
+
+    HTTPoison.request(method, url, body, request_headers, options)
+    |> Util.handle_voodoo_response
   end
 end

lib/voodoo/material.ex

@@ -16,6 +16,5 @@ defmodule Voodoo.Material do
   """
   def list do
     Voodoo.make_request(:get, @endpoint)
-    |> Voodoo.Util.handle_voodoo_response
   end
 end

lib/voodoo/model.ex

@@ -24,7 +24,6 @@ defmodule Voodoo.Model do
     body = params
 
     Voodoo.make_request(:post, @endpoint, body, opts)
-    |> Util.handle_voodoo_response
   end
 
   @doc """
@@ -39,18 +38,17 @@ defmodule Voodoo.Model do
 
   ## Examples
 
-  {:ok, result} = Voodoo.Model.quote(
-                  %{model_id: 1234,
+  {:ok, result} = Voodoo.Model.get_quote(
+                  %{model_id: 4415,
                     units: "cm",
                     material_id: 7,
-                    qty: 1})
+                    quantity: 1})
   """
   def get_quote(params) do
     url = @endpoint <> "/quote"
     opts = Util.prepare_params(params)
 
     Voodoo.make_request(:get, url, "", opts)
-    |> Util.handle_voodoo_response
   end
 
   @doc """
@@ -85,6 +83,5 @@ defmodule Voodoo.Model do
     opts = Util.prepare_params(params)
 
     Voodoo.make_request(:get, url , "", opts)
-    |> Util.handle_voodoo_response
   end
 end

lib/voodoo/order.ex

@@ -26,7 +26,6 @@ defmodule Voodoo.Order do
     opts = Util.prepare_params(params)
 
     Voodoo.make_request(:get, url, %{}, opts)
-    |> Util.handle_voodoo_response
   end
 
   @doc """
@@ -40,7 +39,8 @@ defmodule Voodoo.Order do
                 qty: 1,
                 units: "mm"}
               ],
-              shipping_info: %{
+              shipping_address: %{
+                email: "[email protected]",
                 city: "foo",
                 name: "bar",
                 zip: "12345",
@@ -58,7 +58,6 @@ defmodule Voodoo.Order do
     body = params
 
     Voodoo.make_request(:post, url, body)
-    |> Util.handle_voodoo_response
   end
 
   @doc """
@@ -82,7 +81,6 @@ defmodule Voodoo.Order do
     body = params
 
     Voodoo.make_request(:post, url, body)
-    |> Util.handle_voodoo_response
   end
 
   @doc """
@@ -99,7 +97,5 @@ defmodule Voodoo.Order do
     body = params
 
     Voodoo.make_request(:post, url, body)
-    |> Util.handle_voodoo_response
   end
-
 end

lib/voodoo/util.ex

@@ -17,6 +17,7 @@ defmodule Voodoo.Util do
         else
           {:ok, body}
         end
+      resp -> resp
     end
   end
 

test/voodoo/model_test.exs

@@ -10,15 +10,22 @@ defmodule Voodoo.ModelTest do
     use_cassette "get model id" do
       params = %{file_url: "https://s3-us-west-2.amazonaws.com/sightline-maps-static-assets/demo.stl"}
       {:ok, resp} = id(params)
-      assert resp == %{
+      assert %{
         "file_bucket" => "repaired-models",
-        "file_key" => "6f15faa7/aeb6/4fa9/ae99/5e92949e58ec/demo.stl",
-        "file_uri" => "repaired-models", "id" => 1907, "notes" => nil,
-        "surface_area" => 200797.360817945, "volume" => 930583.831250032,
-        "x" => 299, "y" => 289, "z" => 38.2941093444824}
+        "file_key" => _,
+        "file_uri" => "repaired-models",
+        "id" => _id,
+        "notes" => nil,
+        "rendering_url" => nil,
+        "surface_area" => 200797.360817945,
+        "volume" => 930583.831250032,
+        "x" => 299,
+        "y" => 289,
+        "z" => 38.2941093444824} = resp
     end
   end
 
+  @tag skip: "API server needs to accept POST requests or query parameters for GET"
   test "get the quote for a model" do
     use_cassette "get the quote for a model" do
       params = %{model_id: 1905,
@@ -43,7 +50,14 @@ defmodule Voodoo.ModelTest do
                  units: "cm",
                  quantity: 1}
       {:ok, resp} = quote_with_attributes(params)
-      assert resp == %{}
+      assert resp == %{
+        "material_id" => 7,
+        "quantity" => 1,
+        "quote" => 34,
+        "total" => 34,
+        "unit_cost" => 34,
+        "units" => "cm"
+      }
     end
   end
 end

test/voodoo/order_test.exs

@@ -21,10 +21,11 @@ defmodule Voodoo.OrderTest do
     use_cassette "create shipment for uploaded items" do
       params = %{models: [%{
                   material_id: 7,
-                  model_id: 1696,
-                  qty: 1,
-                  units: "mm"}],
-                shipping_info: %{
+                  model_id: 4414,
+                  quantity: 1,
+                  units: "cm"}],
+                shipping_address: %{
+                  email: "[email protected]",
                   city: "foo",
                   name: "bar",
                   zip: "12345",
@@ -43,7 +44,7 @@ defmodule Voodoo.OrderTest do
       params = %{models: [
                 %{material_id: 1,
                   model_id: 1905,
-                  qty: 1,
+                  quantity: 1,
                   units: "mm"}],
                 shipment_id: "rate_0b011e90eb824e8ab72cbae2e4b7dda9"}
       {:ok, resp} = create(params)

test/voodoo_test.exs

@@ -8,53 +8,51 @@ defmodule VoodooTest do
   @secret_key "secret_key"
   @api_host "http://foo.com"
 
-  setup do
-    Application.put_env(:voodoo_mfg, :secret_key, @secret_key)
-    Application.put_env(:voodoo_mfg, :api_host, @api_host)
-    :ok
-  end
-
   describe "secret_key/0" do
 
     test "fails when config for key is not set" do
+      old_secret_key = Application.get_env(:voodoo_mfg, :secret_key)
       Application.delete_env(:voodoo_mfg, :secret_key)
       assert_raise MissingSecretKeyError, fn ->
         secret_key
       end
+      Application.put_env(:voodoo_mfg, :secret_key, old_secret_key)
     end
 
     test "returns key when it is set in config" do
+      old_secret_key = Application.get_env(:voodoo_mfg, :secret_key)
+      Application.put_env(:voodoo_mfg, :secret_key, @secret_key)
       assert secret_key == @secret_key
+      Application.put_env(:voodoo_mfg, :secret_key, old_secret_key)
     end
   end
 
   describe "api_host/0" do
 
     test "fails when config for key is not set" do
+      old_host = Application.get_env(:voodoo_mfg, :api_host)
       Application.delete_env(:voodoo_mfg, :api_host)
       assert_raise MissingSecretKeyError, fn ->
         api_host
       end
+      Application.put_env(:voodoo_mfg, :api_host, old_host)
     end
 
     test "returns key when it is set in config" do
+      old_host = Application.get_env(:voodoo_mfg, :api_host)
+      Application.put_env(:voodoo_mfg, :api_host, @api_host)
       assert api_host == @api_host
+      Application.put_env(:voodoo_mfg, :api_host, old_host)
     end
   end
 
   test "process_url/1 attaches base url to endpoint" do
-    assert process_url("/api") == "http://foo.com/api"
-    assert process_url("api") == "http://foo.com/api"
+    assert process_url("/test") == "https://staging-api.voodoomfg.com/api/1/test"
+    assert process_url("test") == "https://staging-api.voodoomfg.com/api/1/test"
   end
 
   test "process_request_body/1 returns json" do
     body = %{foo: "bar"}
     assert Poison.encode!(body) == process_request_body(body)
   end
-
-  test "process_request_headers/1 sets key and content-type headers" do
-    headers = process_request_headers("")
-    assert {"key", @secret_key} in headers
-    assert {"content-type", "application/json"} in headers
-  end
 end