Fix deprecations

.travis.yml

@@ -1,8 +1,8 @@
 language: elixir
 elixir:
-  - 1.2.6
+  - 1.6.1
 otp_release:
-  - 18.0
+  - 20.0
 env:
   - MIX_ENV=test
 

lib/api/account_settings_api.ex

@@ -18,7 +18,7 @@ defmodule Zendesk.AccountSettingsApi do
   # Private
 
   defp parse_account_settings(response) do
-    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Dict.get(:settings)
+    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Map.get(:settings)
   end
 
 end

lib/api/attachments_api.ex

@@ -62,11 +62,11 @@ defmodule Zendesk.AttachmentApi do
   end
 
   defp parse_upload(response) do
-    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Dict.get(:upload)
+    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Map.get(:upload)
   end
 
   defp parse_attachment(response) do
-    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Dict.get(:attachment)
+    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Map.get(:attachment)
   end
 
 end

lib/api/automations_api.ex

@@ -20,9 +20,9 @@ defmodule Zendesk.AutomationsApi do
 
   """
   def list_automations(account) do
-    perform_request(&Zendesk.Ticket.incremental_from_json_array/1, 
-                    account: account, 
-                    verb: :get, 
+    perform_request(&Zendesk.Ticket.incremental_from_json_array/1,
+                    account: account,
+                    verb: :get,
                     endpoint: @list_automations)
   end
 
@@ -35,9 +35,9 @@ defmodule Zendesk.AutomationsApi do
 
   """
   def get_automations(account, automation_id) do
-    perform_request(&Zendesk.Ticket.incremental_from_json_array/1, 
-                    account: account, 
-                    verb: :get, 
+    perform_request(&Zendesk.Ticket.incremental_from_json_array/1,
+                    account: account,
+                    verb: :get,
                     endpoint: ExPrintf.sprintf(@get_automations, [automation_id]))
   end
 
@@ -48,9 +48,9 @@ defmodule Zendesk.AutomationsApi do
 
   """
   def list_active_automations(account) do
-    perform_request(&Zendesk.Ticket.incremental_from_json_array/1, 
-                    account: account, 
-                    verb: :get, 
+    perform_request(&Zendesk.Ticket.incremental_from_json_array/1,
+                    account: account,
+                    verb: :get,
                     endpoint: @list_active_automations)
   end
 
@@ -64,12 +64,12 @@ defmodule Zendesk.AutomationsApi do
   """
   def create_automation(account, automation) do
     json = Zendesk.Ticket.to_json(%{automation: automation})
-    perform_request(&Zendesk.Ticket.incremental_from_json_array/1, 
-                    account: account, 
-                    verb: :post, 
-                    endpoint: @create_automation, 
-                    body: json, 
-                    headers: headers)
+    perform_request(&Zendesk.Ticket.incremental_from_json_array/1,
+                    account: account,
+                    verb: :post,
+                    endpoint: @create_automation,
+                    body: json,
+                    headers: headers())
   end
 
   @doc """
@@ -86,12 +86,12 @@ defmodule Zendesk.AutomationsApi do
   def update_automation(account, automation, automation_id) do
     json = Zendesk.Ticket.to_json(%{automation: automation})
     IO.inspect json
-    perform_request(&Zendesk.Ticket.incremental_from_json_array/1, 
-                    account: account, 
-                    verb: :put, 
-                    endpoint: ExPrintf.sprintf(@update_automation, [automation_id]), 
-                    body: json, 
-                    headers: headers)
+    perform_request(&Zendesk.Ticket.incremental_from_json_array/1,
+                    account: account,
+                    verb: :put,
+                    endpoint: ExPrintf.sprintf(@update_automation, [automation_id]),
+                    body: json,
+                    headers: headers())
   end
 
   @doc """
@@ -104,11 +104,11 @@ defmodule Zendesk.AutomationsApi do
   """
 
   def delete_automation(account, automation_id) do
-    perform_request(&parse_delete/1, 
-                    account: account, 
-                    verb: :delete, 
-                    endpoint: ExPrintf.sprintf(@delete_automation, [automation_id]), 
-                    headers: headers)
+    perform_request(&parse_delete/1,
+                    account: account,
+                    verb: :delete,
+                    endpoint: ExPrintf.sprintf(@delete_automation, [automation_id]),
+                    headers: headers())
   end
 
   defp headers do
@@ -120,4 +120,4 @@ defmodule Zendesk.AutomationsApi do
   end
 
 
-end
+end

lib/api/brand_api.ex

@@ -30,11 +30,11 @@ defmodule Zendesk.BrandApi do
   # Private
 
   defp prase_brands(response) do
-    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Dict.get(:brands)
+    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Map.get(:brands)
   end
 
   defp prase_brand(response) do
-    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Dict.get(:brand)
+    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Map.get(:brand)
   end
 
 end

lib/api/comment_api.ex

@@ -55,7 +55,7 @@ defmodule Zendesk.CommentApi do
     verb: :put,
     endpoint: ExPrintf.sprintf(@redact_comment, [ticket_id, comment_id]),
     body: redact_json(text),
-    headers: headers)
+    headers: headers())
   end
 
   @doc """

lib/api/common.ex

@@ -6,11 +6,11 @@ defmodule Zendesk.CommonApi do
       defp perform_request(parse_method, args) do
         import Zendesk.CommonApi
         internal_perform_request(parse_method,
-        account: Dict.get(args, :account),
-        verb:  Dict.get(args, :verb),
-        endpoint: Dict.get(args, :endpoint),
-        body: Dict.get(args, :body),
-        headers: Dict.get(args, :headers))
+        account: Keyword.get(args, :account),
+        verb:  Keyword.get(args, :verb),
+        endpoint: Keyword.get(args, :endpoint),
+        body: Keyword.get(args, :body),
+        headers: Keyword.get(args, :headers))
       end
 
       defp perform_upload_file(parse_method, account: account, endpoint: endpoint, file: file) do
@@ -42,7 +42,7 @@ defmodule Zendesk.CommonApi do
     |> parse_response(parse_method, full_endpoint)
   end
 
-  def parse_response(%HTTPoison.Response{status_code: status_code, body: body}, _parse_method, endpoint)
+  def parse_response(%HTTPoison.Response{status_code: status_code, body: body}, _parse_method, _endpoint)
   when status_code == 401 or status_code == 404 do
     Zendesk.Error.from_json(body)
   end
@@ -62,7 +62,7 @@ defmodule Zendesk.CommonApi do
   end
 
   def prepare_params(account, body, headers) do
-    empty_params
+    empty_params()
     |> add_auth(account)
     |> add_body(body)
     |> add_headers(headers)

lib/api/group_membership_api.ex

@@ -65,11 +65,11 @@ defmodule Zendesk.GroupMembershipApi do
   # Private
 
   defp parse_all_membership(response) do
-    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Dict.get(:group_memberships)
+    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Map.get(:group_memberships)
   end
 
   defp parse_single_membership(response) do
-    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Dict.get(:group_membership)
+    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Map.get(:group_membership)
   end
 
 end

lib/api/organization_api.ex

@@ -52,7 +52,7 @@ defmodule Zendesk.OrganizationApi do
   # Private
 
   defp parse_organization(response) do
-    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Dict.get(:organization)
+    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Map.get(:organization)
   end
 
   defp parse_get_organizations(response) do

lib/api/request_api.ex

@@ -79,7 +79,7 @@ defmodule Zendesk.RequestApi do
   def create_request(account, request: request) do
     json = Zendesk.Request.to_json(%{request: request})
     perform_request(&parse_request/1, account: account, verb: :post, endpoint: @endpoint,
-    body: json, headers: headers)
+    body: json, headers: headers())
   end
 
   @doc """
@@ -93,7 +93,7 @@ defmodule Zendesk.RequestApi do
     json = Zendesk.Request.to_json(%{request: request})
     perform_request(&parse_request/1, account: account, verb: :put,
     endpoint: ExPrintf.sprintf(@single_request, [request_id]),
-    body: json, headers: headers)
+    body: json, headers: headers())
   end
 
   # Private

lib/api/search_api.ex

@@ -16,7 +16,7 @@ defmodule Zendesk.SearchApi do
   `query` query to perform
   """
   def search(account, type: type, query: query) do
-    type_string = to_char_list(type)
+    type_string = to_charlist(type)
     search(account, raw_query: "type:#{type_string} #{query}")
   end
 

lib/api/tags_api.ex

@@ -97,7 +97,7 @@ defmodule Zendesk.TagsApi do
     perform_tag_request(account, verb: :delete,
     endpoint: @tags_for_ticket, id: ticket_id, tags: tags)
   end
-  
+
   @doc """
   Delete user tags
 
@@ -116,7 +116,7 @@ defmodule Zendesk.TagsApi do
     account: account,
     verb: verb,
     endpoint: ExPrintf.sprintf(endpoint, [id]),
-    headers: headers,
+    headers: headers(),
     body: tags |> list_to_json(:tags))
   end
 
@@ -130,7 +130,7 @@ defmodule Zendesk.TagsApi do
   end
 
   defp parse_tags(response) do
-    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Dict.get(:tags)
+    Poison.Parser.parse(response, keys: :atoms) |> elem(1) |> Map.get(:tags)
   end
 
 end

lib/api/targets_api.ex

@@ -8,7 +8,8 @@ defmodule Zendesk.TargetsApi do
   @show_targets "/targets/%s.json"
   @create_target "/targets.json"
   @update_target "/targets/%s.json"
-  @reorder_targets "/targets/reorder.json"
+  @delete_target "/targets/%s.json"
+  # @reorder_targets "/targets/reorder.json"
   use Zendesk.CommonApi
 
 
@@ -19,9 +20,9 @@ defmodule Zendesk.TargetsApi do
 
   """
   def list_targets(account) do
-    perform_request(&Zendesk.Ticket.incremental_from_json_array/1, 
-                    account: account, 
-                    verb: :get, 
+    perform_request(&Zendesk.Ticket.incremental_from_json_array/1,
+                    account: account,
+                    verb: :get,
                     endpoint: @list_targets)
   end
 
@@ -34,9 +35,9 @@ defmodule Zendesk.TargetsApi do
 
   """
   def show_target(account, id) do
-    perform_request(&Zendesk.Ticket.incremental_from_json_array/1, 
-                    account: account, 
-                    verb: :get, 
+    perform_request(&Zendesk.Ticket.incremental_from_json_array/1,
+                    account: account,
+                    verb: :get,
                     endpoint: ExPrintf.sprintf(@show_targets, [id]))
   end
 
@@ -50,12 +51,12 @@ defmodule Zendesk.TargetsApi do
   """
   def create_target(account, target) do
     json = Zendesk.Ticket.to_json(%{target: target})
-    perform_request(&Zendesk.Ticket.incremental_from_json_array/1, 
-                    account: account, 
-                    verb: :post, 
-                    endpoint: @create_target, 
-                    body: json, 
-                    headers: headers)
+    perform_request(&Zendesk.Ticket.incremental_from_json_array/1,
+                    account: account,
+                    verb: :post,
+                    endpoint: @create_target,
+                    body: json,
+                    headers: headers())
   end
 
   @doc """
@@ -71,12 +72,12 @@ defmodule Zendesk.TargetsApi do
 
   def update_target(account, target, target_id) do
     json = Zendesk.Ticket.to_json(%{target: target})
-    perform_request(&Zendesk.Ticket.incremental_from_json_array/1, 
-                    account: account, 
-                    verb: :put, 
-                    endpoint: ExPrintf.sprintf(@update_target, [target_id]), 
-                    body: json, 
-                    headers: headers)
+    perform_request(&Zendesk.Ticket.incremental_from_json_array/1,
+                    account: account,
+                    verb: :put,
+                    endpoint: ExPrintf.sprintf(@update_target, [target_id]),
+                    body: json,
+                    headers: headers())
   end
 
   @doc """
@@ -89,11 +90,11 @@ defmodule Zendesk.TargetsApi do
   """
 
   def delete_target(account, target_id) do
-    perform_request(&parse_delete/1, 
-                    account: account, 
-                    verb: :delete, 
-                    endpoint: ExPrintf.sprintf(@delete_target, [target_id]), 
-                    headers: headers)
+    perform_request(&parse_delete/1,
+                    account: account,
+                    verb: :delete,
+                    endpoint: ExPrintf.sprintf(@delete_target, [target_id]),
+                    headers: headers())
   end
 
   defp headers do
@@ -103,4 +104,4 @@ defmodule Zendesk.TargetsApi do
     response
   end
 
-end
+end