Merge pull request #13 from resuelve/upgrade

upgrade libs and setup CI

Author: alanraul

.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+---
+    name: CI
+    
+    on:
+        pull_request:
+            branches: master
+
+    env:
+        GOOGLE_CREDENTIALS: ./secrets/google_credentials.json
+
+    jobs:
+        build-and-test:
+            name: Build and test
+            runs-on: ubuntu-latest
+            container: elixir:1.10-alpine
+            steps:
+                - uses: actions/checkout@v2
+                - name: Install build dependencies
+                  run: |
+                    touch ./secrets/google_credentials.json
+                    apk add --update bash openssl git
+                    mix local.hex --force && mix local.rebar --force
+                - name: Install elixir dependencies
+                  run: mix deps.get
+                - name: Run CI Tests
+                  env:
+                    MIX_ENV: test
+                  run: mix ci

.github/workflows/publish-hexpm.yml

@@ -0,0 +1,29 @@
+---
+    name: Publish to hex.pm
+    
+    on:
+      push:
+        tags:
+          - "*"
+    
+    env:
+        GOOGLE_CREDENTIALS: ./secrets/google_credentials.json
+    
+    jobs:
+      publish-hexpm:
+        name: publish to hex.pm
+        runs-on: ubuntu-latest
+        container: elixir:1.10-alpine
+        steps:
+          - uses: actions/checkout@v2
+          - name: Install dependencies
+            run: |
+              touch ./secrets/google_credentials.json
+              apk add --update bash openssl git
+              mix local.hex --force && mix local.rebar --force
+          - name: Install elixir dependencies
+            run: mix deps.get
+          - name: publish to hex.pm
+            run: mix hex.publish --yes
+            env:
+              HEX_API_KEY: ${{ secrets.HEX_KEY_PUBLISH }}

config/config.exs

@@ -1,6 +1,6 @@
 # This file is responsible for configuring your application
 # and its dependencies with the aid of the Mix.Config module.
-use Mix.Config
+import Config
 
 # This configuration is loaded before any dependency and is restricted
 # to this project. If another project depends on this project, this
@@ -29,4 +29,4 @@ use Mix.Config
 #
 #     import_config "#{Mix.env}.exs"
 
-import_config "#{Mix.env}.exs"
+import_config "#{Mix.env()}.exs"

config/dev.exs

@@ -1,8 +1,8 @@
-use Mix.Config
+import Config
 
 config :chatex, host: System.get_env("GOOGLE_CHAT_URL")
 config :chatex, token: System.get_env("BOT_TOKEN")
 config :chatex, client_email: System.get_env("BOT_CLIENT_EMAIL")
 
 config :goth,
-  json: System.get_env("GOOGLE_CREDENTIALS") |> File.read!
+  json: System.get_env("GOOGLE_CREDENTIALS") |> File.read!()

config/prod.exs

@@ -1,8 +1,8 @@
-use Mix.Config
+import Config
 
 config :chatex, host: "${GOOGLE_CHAT_URL}"
 config :chatex, token: "${BOT_TOKEN}"
 config :chatex, client_email: "${BOT_CLIENT_EMAIL}"
 
 config :goth,
-  json: "${GOOGLE_CREDENTIALS}" |> File.read!
+  json: "${GOOGLE_CREDENTIALS}" |> File.read!()

config/test.exs

@@ -1,13 +1,15 @@
-use Mix.Config
+import Config
 
 config :chatex, host: "api.dialogflow.com"
 config :chatex, bot: "LBot"
 config :chatex, client_email: "[email protected]"
 
 config :goth,
-  json: "[{\"type\": \"test_service_account\",\"project_id\": \"resuelve-1819\",\"private_key_id\": \"19011998\"," <>
-    "\"private_key\": \"-----BEGIN PRIVATE KEY-----fakekey-----END PRIVATE KEY-----\"," <>
-    "\"client_email\": \"[email protected]\"," <>
-    "\"client_id\": \"19011998\",\"auth_uri\": \"https://accounts.google.com/o/oauth2/auth\"," <>
-    "\"token_uri\": \"https://accounts.google.com/o/oauth2/token\"," <>
-    "\"auth_provider_x509_cert_url\": \"https://www.googleapis.com/oauth2/v1/certs\",\"client_x509_cert_url\":" <> "\"https://www.googleapis.com/robot/v1/metadata/x509/c_blanco%40resuelve-1819.iam.gserviceaccount.com\"}]"
+  json:
+    "[{\"type\": \"test_service_account\",\"project_id\": \"resuelve-1819\",\"private_key_id\": \"19011998\"," <>
+      "\"private_key\": \"-----BEGIN PRIVATE KEY-----fakekey-----END PRIVATE KEY-----\"," <>
+      "\"client_email\": \"[email protected]\"," <>
+      "\"client_id\": \"19011998\",\"auth_uri\": \"https://accounts.google.com/o/oauth2/auth\"," <>
+      "\"token_uri\": \"https://accounts.google.com/o/oauth2/token\"," <>
+      "\"auth_provider_x509_cert_url\": \"https://www.googleapis.com/oauth2/v1/certs\",\"client_x509_cert_url\":" <>
+      "\"https://www.googleapis.com/robot/v1/metadata/x509/c_blanco%40resuelve-1819.iam.gserviceaccount.com\"}]"

lib/chatex.ex

@@ -8,17 +8,20 @@ defmodule Chatex do
   @doc """
   Envía una respuesta generada a google chat.
   """
-  @spec request(atom, String.t, String.t) :: tuple
+  @spec request(atom, String.t(), String.t()) :: tuple
   def request(method, path, body) do
-    HTTPoison.start
+    HTTPoison.start()
 
     case HTTPoison.request(method, "#{host()}#{path}", body, headers()) do
       {:ok, %HTTPoison.Response{status_code: status, body: body}} when status in 200..299 ->
         {:ok, Poison.decode!(body)}
+
       {:ok, %HTTPoison.Response{status_code: status, body: body}} when status in 400..499 ->
         {:error, Poison.decode!(body)}
+
       {:ok, %HTTPoison.Response{status_code: status, body: body}} when status >= 500 ->
         {:error, Poison.decode!(body)}
+
       {:error, %HTTPoison.Error{reason: reason}} ->
         {:error, Poison.decode!(reason)}
     end
@@ -27,7 +30,7 @@ defmodule Chatex do
   # ---------------------------------------------------------------------------
   # URL de Google chat API.
   # ---------------------------------------------------------------------------
-  @spec host :: String.t
+  @spec host :: String.t()
   defp host, do: Application.get_env(:chatex, :host)
 
   # ---------------------------------------------------------------------------

lib/chatex/helpers/card_helper.ex

@@ -8,43 +8,53 @@ defmodule Chatex.Helpers.CardHelper do
 
   https://developers.google.com/hangouts/chat/reference/message-formats/cards#buttons
   """
-  @spec button(String.t, String.t, String.t) :: map
-  @spec button(String.t, String.t, String.t, list) :: map
+  @spec button(String.t(), String.t(), String.t()) :: map
+  @spec button(String.t(), String.t(), String.t(), list) :: map
   def button("text", text, redirect) do
     %{textButton: %{text: text, onClick: %{openLink: %{url: redirect}}}}
   end
+
   def button("icon", name, redirect) do
     %{imageButton: %{icon: name, onClick: %{openLink: %{url: redirect}}}}
   end
+
   def button("image", icon, redirect) do
     %{imageButton: %{iconUrl: icon, onClick: %{openLink: %{url: redirect}}}}
   end
+
   def button("text", text, action, parameters) do
-    %{textButton: %{text: text, onClick: %{
-      action: %{actionMethodName: action, parameters: parameters}}
-    }}
+    %{
+      textButton: %{
+        text: text,
+        onClick: %{
+          action: %{actionMethodName: action, parameters: parameters}
+        }
+      }
+    }
   end
 
   @doc """
   Ayuda a establecer como se representará en el chat una lista de botones.
   """
-  @spec buttons_display(String.t, list) :: map | list
+  @spec buttons_display(String.t(), list) :: map | list
   def buttons_display("inline", buttons) do
     %{buttons: Enum.map(buttons, fn button -> button end)}
   end
+
   def buttons_display("block", buttons) do
     Enum.map(buttons, fn button -> %{buttons: [button]} end)
   end
+
   def buttons_display("widget", buttons) do
     Enum.map(buttons, fn button -> %{widgets: [%{buttons: [button]}]} end)
   end
 
   @doc """
   Establece el header de un card.
-  
+
   https://developers.google.com/hangouts/chat/reference/message-formats/cards#headers
   """
-  @spec header(String.t, String.t, String.t, String.t) :: map
+  @spec header(String.t(), String.t(), String.t(), String.t()) :: map
   def header(title, subtitle \\ nil, image \\ nil, style \\ "IMAGE") do
     %{title: title, subtitle: subtitle, imageUrl: image, imageStyle: style}
   end

lib/chatex/helpers/token_helper.ex

@@ -8,7 +8,7 @@ defmodule Chatex.Helpers.TokenHelper do
   @doc """
   Valida que el token sea el mismo que el proporcionado por Google Chat.
   """
-  @spec validate(nil | String.t) :: tuple
+  @spec validate(nil | String.t()) :: tuple
   def validate(nil), do: {:error, "Token no encontrado"}
   def validate(send), do: _compare(send, _token())
 
@@ -18,16 +18,17 @@ defmodule Chatex.Helpers.TokenHelper do
   defp _compare(send, expected) when send == expected do
     {:ok, "Token valido"}
   end
+
   defp _compare(send, expected) do
-    Logger.info "Token esperado: #{expected}"
-    Logger.info "Token enviado: #{send}"
+    Logger.info("Token esperado: #{expected}")
+    Logger.info("Token enviado: #{send}")
 
     {:error, "Token inválido"}
   end
 
   # ---------------------------------------------------------------------------
   # URL de Google chat API.
   # ---------------------------------------------------------------------------
-  @spec _token :: String.t
+  @spec _token :: String.t()
   defp _token, do: Application.get_env(:chatex, :token)
 end

lib/chatex/service/spaces.ex

@@ -8,13 +8,15 @@ defmodule Chatex.Service.Spaces do
   @doc """
   Lista los espacios en los cuales se ha agregado al bot.
   """
-  @spec list(integer, list, String.t | nil) :: tuple
+  @spec list(integer, list, String.t() | nil) :: tuple
   def list(pageSize \\ 100, acc \\ [], pageToken \\ "") do
     case request(:get, "spaces?pageSize=#{pageSize}&pageToken=#{pageToken}", "") do
       {:ok, %{"spaces" => spaces, "nextPageToken" => ""}} ->
         {:ok, acc ++ spaces}
+
       {:ok, %{"spaces" => spaces, "nextPageToken" => next_page_token}} ->
         list(pageSize, acc ++ spaces, next_page_token)
+
       {:error, error} ->
         {:error, error}
     end
@@ -23,12 +25,16 @@ defmodule Chatex.Service.Spaces do
   @doc """
   Lista un atributo de los espacios.
   """
-  @spec list_attribute(String.t, integer) :: tuple
+  @spec list_attribute(String.t(), integer) :: tuple
   def list_attribute(attribute \\ "displayName", pageSize \\ 100) do
     case list(pageSize) do
       {:ok, spaces} ->
-        {:ok, Enum.reduce(spaces, "", fn(space, acc) -> acc <>
-                                            "- #{space["#{attribute}"]}\n" end)}
+        {:ok,
+         Enum.reduce(spaces, "", fn space, acc ->
+           acc <>
+             "- #{space["#{attribute}"]}\n"
+         end)}
+
       {:error, error} ->
         {:error, error}
     end

lib/chatex/service/spaces/members.ex

@@ -8,13 +8,15 @@ defmodule Chatex.Service.Spaces.Members do
   @doc """
   Lista todos los miembros de un canal.
   """
-  @spec list(String.t, integer, list, String.t | nil) :: tuple
+  @spec list(String.t(), integer, list, String.t() | nil) :: tuple
   def list(room, pageSize \\ 100, acc \\ [], pageToken \\ nil) do
     case request(:get, "spaces/#{room}/members?pageSize=#{pageSize}&pageToken=#{pageToken}", "") do
       {:ok, %{"memberships" => members, "nextPageToken" => ""}} ->
         {:ok, acc ++ members}
+
       {:ok, %{"memberships" => members, "nextPageToken" => next_page_token}} ->
         list(room, pageSize, acc ++ members, next_page_token)
+
       {:error, error} ->
         {:error, error}
     end
@@ -23,12 +25,16 @@ defmodule Chatex.Service.Spaces.Members do
   @doc """
   Lista los miembros de un canal excluyendo usuarios anonimos.
   """
-  @spec list_active(String.t, integer) :: tuple
+  @spec list_active(String.t(), integer) :: tuple
   def list_active(room, pageSize \\ 100) do
     case list(room, pageSize) do
       {:ok, members} ->
-        {:ok, Enum.filter(members, fn(m) -> m["member"]["displayName"] !=
-                                                          "Anonymous User" end)}
+        {:ok,
+         Enum.filter(members, fn m ->
+           m["member"]["displayName"] !=
+             "Anonymous User"
+         end)}
+
       {:error, error} ->
         {:error, error}
     end
@@ -37,12 +43,16 @@ defmodule Chatex.Service.Spaces.Members do
   @doc """
   Lista un atributo de los miembros activos del canal.
   """
-  @spec list_attribute(String.t, String.t, integer) :: tuple
+  @spec list_attribute(String.t(), String.t(), integer) :: tuple
   def list_attribute(room, attribute \\ "displayName", pageSize \\ 100) do
     case list_active(room, pageSize) do
       {:ok, members} ->
-        {:ok, Enum.reduce(members, "", fn(m, acc) -> acc <>
-                                      "- #{m["member"]["#{attribute}"]}\n" end)}
+        {:ok,
+         Enum.reduce(members, "", fn m, acc ->
+           acc <>
+             "- #{m["member"]["#{attribute}"]}\n"
+         end)}
+
       {:error, error} ->
         {:error, error}
     end
@@ -51,11 +61,12 @@ defmodule Chatex.Service.Spaces.Members do
   @doc """
   Obtiene el atributo de un miembro aleatorio.
   """
-  @spec random(String.t, String.t, integer) :: tuple
+  @spec random(String.t(), String.t(), integer) :: tuple
   def random(room, attribute \\ "name", pageSize \\ 100) do
     case list_active(room, pageSize) do
       {:ok, members} ->
         {:ok, Enum.random(members)["member"]["#{attribute}"]}
+
       {:error, error} ->
         {:error, error}
     end

lib/chatex/service/spaces/messages.ex

@@ -8,25 +8,26 @@ defmodule Chatex.Service.Spaces.Messages do
   @doc """
   Crea un mensaje.
   """
-  @spec create(String.t, String.t) :: tuple
+  @spec create(String.t(), String.t()) :: tuple
   def create(room, message) do
     request(:post, "spaces/#{room}/messages", Poison.encode!(message))
   end
 
   @doc """
   Actualiza un mensaje.
   """
-  @spec update(String.t, String.t, map) :: tuple
+  @spec update(String.t(), String.t(), map) :: tuple
   def update(room, update_mask, message) do
     request(:put, "spaces/#{room}?updateMask=#{update_mask}", Poison.encode!(message))
   end
 
   @doc """
   Elimina un mensaje.
   """
-  @spec delete(String.t) :: tuple
-  @spec delete(String.t, String.t) :: tuple
+  @spec delete(String.t()) :: tuple
+  @spec delete(String.t(), String.t()) :: tuple
   def delete(message_id), do: request(:delete, message_id, "")
+
   def delete(room_id, message_id) do
     request(:delete, "spaces/#{room_id}/messages/#{message_id}", "")
   end