Rename context Users -> Accounts

lib/asciinema/accounts/accounts.ex

@@ -1,7 +1,7 @@
-defmodule Asciinema.Users do
+defmodule Asciinema.Accounts do
   import Ecto.Query, warn: false
   import Ecto, only: [assoc: 2]
-  alias Asciinema.Users.{User, ApiToken}
+  alias Asciinema.Accounts.{User, ApiToken}
   alias Asciinema.{Repo, Asciicasts, Email, Mailer}
 
   def create_asciinema_user!() do

lib/asciinema/accounts/api_token.ex

@@ -1,7 +1,7 @@
-defmodule Asciinema.Users.ApiToken do
+defmodule Asciinema.Accounts.ApiToken do
   use Ecto.Schema
   import Ecto.Changeset
-  alias Asciinema.Users.{ApiToken, User}
+  alias Asciinema.Accounts.{ApiToken, User}
 
   schema "api_tokens" do
     field :token, :string

lib/asciinema/accounts/user.ex

@@ -1,7 +1,7 @@
-defmodule Asciinema.Users.User do
+defmodule Asciinema.Accounts.User do
   use Ecto.Schema
   import Ecto.Changeset
-  alias Asciinema.Users.User
+  alias Asciinema.Accounts.User
 
   @valid_email_re ~r/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i
 
@@ -18,7 +18,7 @@ defmodule Asciinema.Users.User do
     timestamps(inserted_at: :created_at)
 
     has_many :asciicasts, Asciinema.Asciicasts.Asciicast
-    has_many :api_tokens, Asciinema.Users.ApiToken
+    has_many :api_tokens, Asciinema.Accounts.ApiToken
   end
 
   def changeset(struct, params \\ %{}) do

lib/asciinema/asciicasts/asciicast.ex

@@ -1,7 +1,7 @@
 defmodule Asciinema.Asciicasts.Asciicast do
   use Ecto.Schema
   import Ecto.Changeset
-  alias Asciinema.Users.User
+  alias Asciinema.Accounts.User
   alias Asciinema.Asciicasts.Asciicast
   alias Asciinema.PngGenerator.PngParams
 

lib/asciinema_web/auth.ex

@@ -1,6 +1,6 @@
 defmodule AsciinemaWeb.Auth do
   import Plug.Conn
-  alias Asciinema.Users.User
+  alias Asciinema.Accounts.User
   alias Asciinema.Repo
 
   @user_key "warden.user.user.key"

lib/asciinema_web/controllers/api/asciicast_controller.ex

@@ -1,8 +1,8 @@
 defmodule AsciinemaWeb.Api.AsciicastController do
   use AsciinemaWeb, :controller
   import AsciinemaWeb.Auth, only: [get_basic_auth: 1, put_basic_auth: 3]
-  alias Asciinema.{Asciicasts, Users}
-  alias Asciinema.Users.User
+  alias Asciinema.{Asciicasts, Accounts}
+  alias Asciinema.Accounts.User
 
   plug :parse_v0_params
   plug :authenticate
@@ -62,7 +62,7 @@ defmodule AsciinemaWeb.Api.AsciicastController do
 
   defp authenticate(conn, _opts) do
     with {username, api_token} <- get_basic_auth(conn),
-         {:ok, %User{} = user} <- Users.get_user_with_api_token(api_token, username) do
+         {:ok, %User{} = user} <- Accounts.get_user_with_api_token(api_token, username) do
       assign(conn, :current_user, user)
     else
       _otherwise ->

lib/asciinema_web/controllers/login_controller.ex

@@ -1,6 +1,6 @@
 defmodule AsciinemaWeb.LoginController do
   use AsciinemaWeb, :controller
-  alias Asciinema.Users
+  alias Asciinema.Accounts
 
   def new(conn, _params) do
     render(conn, "new.html")
@@ -9,7 +9,7 @@ defmodule AsciinemaWeb.LoginController do
   def create(conn, %{"login" => %{"email" => email_or_username}}) do
     email_or_username = String.trim(email_or_username)
 
-    case Users.send_login_email(email_or_username) do
+    case Accounts.send_login_email(email_or_username) do
       {:ok, _url} ->
         redirect(conn, to: login_path(conn, :sent))
       {:error, :user_not_found} ->

lib/asciinema_web/controllers/session_controller.ex

@@ -1,9 +1,9 @@
 defmodule AsciinemaWeb.SessionController do
   use AsciinemaWeb, :controller
   import AsciinemaWeb.UserView, only: [profile_path: 1]
-  alias Asciinema.Users
+  alias Asciinema.Accounts
   alias AsciinemaWeb.Auth
-  alias Asciinema.Users.User
+  alias Asciinema.Accounts.User
 
   def new(conn, %{"t" => login_token}) do
     conn
@@ -15,7 +15,7 @@ defmodule AsciinemaWeb.SessionController do
   end
 
   def create(conn, %{"api_token" => api_token}) do
-    case Users.get_user_with_api_token(api_token) do
+    case Accounts.get_user_with_api_token(api_token) do
       {:ok, user} ->
         login_via_api_token(conn, user)
       {:error, :token_invalid} ->
@@ -33,7 +33,7 @@ defmodule AsciinemaWeb.SessionController do
     login_token = get_session(conn, :login_token)
     conn = delete_session(conn, :login_token)
 
-    case Users.verify_login_token(login_token) do
+    case Accounts.verify_login_token(login_token) do
       {:ok, user} ->
         conn
         |> Auth.log_in(user)
@@ -73,18 +73,18 @@ defmodule AsciinemaWeb.SessionController do
         |> put_rails_flash(:notice, "Setting username and email will help you with logging in later.")
         |> redirect_to_edit_profile
       {%User{email: nil}, %User{email: nil}} ->
-        Users.merge!(current_user, logging_user)
+        Accounts.merge!(current_user, logging_user)
         conn
         |> put_rails_flash(:notice, "Setting username and email will help you with logging in later.")
         |> redirect_to_edit_profile
       {%User{email: nil}, %User{}} ->
-        Users.merge!(logging_user, current_user)
+        Accounts.merge!(logging_user, current_user)
         conn
         |> Auth.log_in(logging_user)
         |> put_rails_flash(:notice, "Recorder token has been added to your account.")
         |> redirect_to_profile
       {%User{}, %User{email: nil}} ->
-        Users.merge!(current_user, logging_user)
+        Accounts.merge!(current_user, logging_user)
         conn
         |> put_rails_flash(:notice, "Recorder token has been added to your account.")
         |> redirect_to_profile

lib/asciinema_web/controllers/user_controller.ex

@@ -1,6 +1,6 @@
 defmodule AsciinemaWeb.UserController do
   use AsciinemaWeb, :controller
-  alias Asciinema.Users
+  alias Asciinema.Accounts
   alias AsciinemaWeb.Auth
 
   def new(conn, %{"t" => signup_token}) do
@@ -16,7 +16,7 @@ defmodule AsciinemaWeb.UserController do
     signup_token = get_session(conn, :signup_token)
     conn = delete_session(conn, :signup_token)
 
-    case Users.verify_signup_token(signup_token) do
+    case Accounts.verify_signup_token(signup_token) do
       {:ok, user} ->
         conn
         |> Auth.log_in(user)

lib/asciinema_web/views/user_view.ex

@@ -1,6 +1,6 @@
 defmodule AsciinemaWeb.UserView do
   use AsciinemaWeb, :view
-  alias Asciinema.Users.User
+  alias Asciinema.Accounts.User
   alias Asciinema.Gravatar
 
   def avatar_url(user) do

test/asciinema/users_test.exs

@@ -1,11 +1,11 @@
-defmodule Asciinema.UsersTest do
+defmodule Asciinema.AccountsTest do
   import Asciinema.Fixtures
   use Asciinema.DataCase
   use Bamboo.Test
   alias Asciinema.Email
 
   describe "send_login_email/1" do
-    import Asciinema.Users, only: [send_login_email: 1]
+    import Asciinema.Accounts, only: [send_login_email: 1]
 
     test "existing user, by email" do
       user = fixture(:user)

test/controllers/api/asciicast_controller_test.exs

@@ -1,6 +1,6 @@
 defmodule Asciinema.Api.AsciicastControllerTest do
   use AsciinemaWeb.ConnCase
-  alias Asciinema.Users
+  alias Asciinema.Accounts
 
   setup %{conn: conn} = context do
     token = Map.get(context, :token, "9da34ff4-9bf7-45d4-aa88-98c933b15a3f")
@@ -84,7 +84,7 @@ defmodule Asciinema.Api.AsciicastControllerTest do
     end
 
     test "existing user (API token)", %{conn: conn, token: token} do
-      {:ok, _} = Users.create_user_with_api_token(token, "test")
+      {:ok, _} = Accounts.create_user_with_api_token(token, "test")
       upload = fixture(:upload, %{path: "1/asciicast.json"})
       conn = post conn, api_asciicast_path(conn, :create), %{"asciicast" => upload}
       assert text_response(conn, 201) =~ @asciicast_url
@@ -99,8 +99,8 @@ defmodule Asciinema.Api.AsciicastControllerTest do
     end
 
     test "authentication with revoked token", %{conn: conn, token: token} do
-      Users.get_user_with_api_token(token, "test") # force registration of the token
-      token |> Users.get_api_token! |> Users.revoke_api_token!
+      Accounts.get_user_with_api_token(token, "test") # force registration of the token
+      token |> Accounts.get_api_token! |> Accounts.revoke_api_token!
       upload = fixture(:upload, %{path: "1/asciicast.json"})
       conn = post conn, api_asciicast_path(conn, :create), %{"asciicast" => upload}
       assert response(conn, 401)

test/controllers/session_controller_test.exs

@@ -1,7 +1,7 @@
 defmodule Asciinema.SessionControllerTest do
   use AsciinemaWeb.ConnCase
-  alias Asciinema.Users
-  alias Asciinema.Users.{User, ApiToken}
+  alias Asciinema.Accounts
+  alias Asciinema.Accounts.{User, ApiToken}
 
   @revoked_token "eb927b31-9ca3-4a6a-8a0c-dfba318e2e84"
   @regular_user_token "c4ecd96a-9a16-464d-be6a-bc1f3c50c4ae"
@@ -10,8 +10,8 @@ defmodule Asciinema.SessionControllerTest do
   @other_tmp_user_token "2eafaa20-80c8-47fc-b014-74072027edae"
 
   setup %{conn: conn} do
-    {:ok, %User{}} = Users.get_user_with_api_token(@revoked_token, "revoked")
-    @revoked_token |> Users.get_api_token! |> Users.revoke_api_token!
+    {:ok, %User{}} = Accounts.get_user_with_api_token(@revoked_token, "revoked")
+    @revoked_token |> Accounts.get_api_token! |> Accounts.revoke_api_token!
 
     regular_user = fixture(:user)
     ApiToken.create_changeset(regular_user, @regular_user_token) |> Repo.insert!
@@ -19,9 +19,9 @@ defmodule Asciinema.SessionControllerTest do
     other_regular_user = fixture(:user, %{username: "other", email: "other@example.com"})
     ApiToken.create_changeset(other_regular_user, @other_regular_user_token) |> Repo.insert!
 
-    {:ok, %User{} = tmp_user} = Users.get_user_with_api_token(@tmp_user_token, "tmp")
+    {:ok, %User{} = tmp_user} = Accounts.get_user_with_api_token(@tmp_user_token, "tmp")
 
-    {:ok, %User{}} = Users.get_user_with_api_token(@other_tmp_user_token, "other_tmp")
+    {:ok, %User{}} = Accounts.get_user_with_api_token(@other_tmp_user_token, "other_tmp")
 
     {:ok, conn: conn, regular_user: regular_user, tmp_user: tmp_user}
   end

test/support/fixtures.ex

@@ -1,6 +1,6 @@
 defmodule Asciinema.Fixtures do
   alias Asciinema.{Repo, Asciicasts}
-  alias Asciinema.Users.User
+  alias Asciinema.Accounts.User
 
   def fixture(what, attrs \\ %{})