<%= if @user_is_self do %>
<%= if @asciicast_count > 0 do %>
-
<% end %>
<% else %>
<%= if @asciicast_count > 0 do %>
-
- If you have already recorded an asciicast but you don't see it
+ If you have already uploaded a recording but you don't see it
here then associate it with your account by running
asciinema auth in your terminal.
@@ -66,11 +66,11 @@
<% {0, false} -> %>
<% _ -> %>
- <%= for asciicasts <- Enum.chunk_every(@page, 3, 3) do %>
+ <%= for asciicasts <- Enum.chunk_every(@page, 2, 2) do %>
<%= for asciicast <- asciicasts do %>
-
- <%= render AsciinemaWeb.AsciicastView, "_card.html", conn: @conn, asciicast: asciicast %>
+
+ <%= render AsciinemaWeb.RecordingView, "_card.html", conn: @conn, asciicast: asciicast %>
<% end %>
diff --git a/lib/asciinema_web/views/api/asciicast_view.ex b/lib/asciinema_web/views/api/recording_view.ex
similarity index 93%
rename from lib/asciinema_web/views/api/asciicast_view.ex
rename to lib/asciinema_web/views/api/recording_view.ex
index 74c3e9b69..b4a45d5c1 100644
--- a/lib/asciinema_web/views/api/asciicast_view.ex
+++ b/lib/asciinema_web/views/api/recording_view.ex
@@ -1,4 +1,4 @@
-defmodule AsciinemaWeb.Api.AsciicastView do
+defmodule AsciinemaWeb.Api.RecordingView do
use AsciinemaWeb, :view
def render("created.text", assigns) do
@@ -24,7 +24,7 @@ defmodule AsciinemaWeb.Api.AsciicastView do
"""
is_tmp_user = Asciinema.Accounts.temporary_user?(conn.assigns.current_user)
- gc_days = Asciinema.Asciicasts.gc_days()
+ gc_days = Asciinema.Recordings.gc_days()
if is_tmp_user && gc_days do
hostname = AsciinemaWeb.instance_hostname()
diff --git a/lib/asciinema_web/views/oembed_view.ex b/lib/asciinema_web/views/oembed_view.ex
index 33416c4fb..dbd576552 100644
--- a/lib/asciinema_web/views/oembed_view.ex
+++ b/lib/asciinema_web/views/oembed_view.ex
@@ -38,8 +38,8 @@ defmodule AsciinemaWeb.OembedView do
max_height || image_height
)
- asciicast_url = Routes.asciicast_url(Endpoint, :show, asciicast)
- thumbnail_url = asciicast_url <> ".png"
+ recording_url = Routes.recording_url(Endpoint, :show, asciicast)
+ thumbnail_url = recording_url <> ".png"
%{
type: "rich",
@@ -52,15 +52,15 @@ defmodule AsciinemaWeb.OembedView do
thumbnail_url: thumbnail_url,
thumbnail_width: width,
thumbnail_height: height,
- html: html(asciicast_url, thumbnail_url, asciicast.title, width),
+ html: html(recording_url, thumbnail_url, asciicast.title, width),
width: width,
height: height
}
end
- defp html(asciicast_url, thumbnail_url, title, width) do
+ defp html(recording_url, thumbnail_url, title, width) do
safe =
- content_tag(:a, href: asciicast_url, target: "_blank") do
+ content_tag(:a, href: recording_url, target: "_blank") do
img_tag(thumbnail_url, alt: title, width: width)
end
diff --git a/lib/asciinema_web/views/asciicast_view.ex b/lib/asciinema_web/views/recording_view.ex
similarity index 96%
rename from lib/asciinema_web/views/asciicast_view.ex
rename to lib/asciinema_web/views/recording_view.ex
index 053e5b9b4..25ba2a35f 100644
--- a/lib/asciinema_web/views/asciicast_view.ex
+++ b/lib/asciinema_web/views/recording_view.ex
@@ -1,7 +1,8 @@
-defmodule AsciinemaWeb.AsciicastView do
+defmodule AsciinemaWeb.RecordingView do
use AsciinemaWeb, :view
import Scrivener.HTML
- alias Asciinema.Asciicasts
+ alias Asciinema.Recordings
+ alias Asciinema.Recordings.Asciicast
alias AsciinemaWeb.Endpoint
alias AsciinemaWeb.Router.Helpers.Extra, as: RoutesX
alias AsciinemaWeb.UserView
@@ -42,6 +43,7 @@ defmodule AsciinemaWeb.AsciicastView do
terminalLineHeight: asciicast.terminal_line_height,
customTerminalFontFamily: asciicast.terminal_font_family,
poster: poster(asciicast.snapshot),
+ markers: markers(asciicast.markers),
idleTimeLimit: asciicast.idle_time_limit,
title: title(asciicast),
author: author_username(asciicast),
@@ -67,7 +69,7 @@ defmodule AsciinemaWeb.AsciicastView do
end
def embed_script(asciicast) do
- src = Routes.asciicast_url(Endpoint, :show, asciicast) <> ".js"
+ src = Routes.recording_url(Endpoint, :show, asciicast) <> ".js"
id = "asciicast-#{Phoenix.Param.to_param(asciicast)}"
content_tag(:script, [src: src, id: id, async: true], do: [])
end
@@ -80,7 +82,7 @@ defmodule AsciinemaWeb.AsciicastView do
Routes.oembed_url(
Endpoint,
:show,
- url: Routes.asciicast_url(Endpoint, :show, asciicast),
+ url: Routes.recording_url(Endpoint, :show, asciicast),
format: format
)
end
@@ -135,6 +137,15 @@ defmodule AsciinemaWeb.AsciicastView do
"data:text/plain," <> text <> @csi_init <> "?25l"
end
+ defp markers(nil), do: nil
+
+ defp markers(markers) do
+ case Asciicast.parse_markers(markers) do
+ {:ok, markers} -> Enum.map(markers, &Tuple.to_list/1)
+ {:error, _} -> nil
+ end
+ end
+
defp line_to_text(segments) do
segments
|> Enum.map(&segment_to_text/1)
@@ -263,11 +274,8 @@ defmodule AsciinemaWeb.AsciicastView do
present?(asciicast.command) && asciicast.command != asciicast.shell ->
asciicast.command
- asciicast.private ->
- "untitled"
-
true ->
- "asciicast:#{asciicast.id}"
+ "untitled"
end
end
@@ -569,11 +577,11 @@ defmodule AsciinemaWeb.AsciicastView do
end
def asciicast_gc_days do
- Asciicasts.gc_days()
+ Recordings.gc_days()
end
def terminal_font_family_options do
- for family <- Asciicasts.custom_terminal_font_families() do
+ for family <- Recordings.custom_terminal_font_families() do
case family do
"FiraCode Nerd Font" -> {"Nerd Font - Fira Code", family}
"JetBrainsMono Nerd Font" -> {"Nerd Font - JetBrains Mono", family}
diff --git a/priv/repo/migrations/20211212114046_insert_upgrade_jobs.exs b/priv/repo/migrations/20211212114046_insert_upgrade_jobs.exs
index 5bbcabb96..a61e929f5 100644
--- a/priv/repo/migrations/20211212114046_insert_upgrade_jobs.exs
+++ b/priv/repo/migrations/20211212114046_insert_upgrade_jobs.exs
@@ -8,7 +8,7 @@ defmodule Asciinema.Repo.Migrations.InsertUpgradeJobs do
{:ok, _} =
Multi.new()
|> Multi.insert(:seed, job(U.InitialSeed))
- |> Multi.insert(:asciicasts, job(U.UpgradeAsciicasts))
+ |> Multi.insert(:asciicasts, job(U.UpgradeRecordings))
|> Repo.transaction()
end
diff --git a/priv/repo/migrations/20230515080531_add_markers_to_asciicasts.exs b/priv/repo/migrations/20230515080531_add_markers_to_asciicasts.exs
new file mode 100644
index 000000000..196115c96
--- /dev/null
+++ b/priv/repo/migrations/20230515080531_add_markers_to_asciicasts.exs
@@ -0,0 +1,9 @@
+defmodule Asciinema.Repo.Migrations.AddMarkersToAsciicasts do
+ use Ecto.Migration
+
+ def change do
+ alter table(:asciicasts) do
+ add :markers, :text
+ end
+ end
+end
diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs
index a26f2aa4c..1ad314897 100644
--- a/priv/repo/seeds.exs
+++ b/priv/repo/seeds.exs
@@ -11,4 +11,4 @@
# and so on) as they will fail if something goes wrong.
user = Asciinema.Accounts.ensure_asciinema_user()
-Asciinema.Asciicasts.ensure_welcome_asciicast(user)
+Asciinema.Recordings.ensure_welcome_asciicast(user)
diff --git a/test/asciinema/asciicasts_test.exs b/test/asciinema/recordings_test.exs
similarity index 82%
rename from test/asciinema/asciicasts_test.exs
rename to test/asciinema/recordings_test.exs
index b068bd3a4..85df88f24 100644
--- a/test/asciinema/asciicasts_test.exs
+++ b/test/asciinema/recordings_test.exs
@@ -1,8 +1,8 @@
-defmodule Asciinema.AsciicastsTest do
+defmodule Asciinema.RecordingsTest do
use Asciinema.DataCase
import Asciinema.Factory
- alias Asciinema.Asciicasts
- alias Asciinema.Asciicasts.Asciicast
+ alias Asciinema.Recordings
+ alias Asciinema.Recordings.Asciicast
describe "create_asciicast/3" do
test "pre-v1 payload with uname" do
@@ -24,7 +24,7 @@ defmodule Asciinema.AsciicastsTest do
fixture(:upload, %{path: "0.9.7/stdout.time", content_type: "application/octet-stream"})
}
- {:ok, asciicast} = Asciicasts.create_asciicast(user, params, %{user_agent: "a/user/agent"})
+ {:ok, asciicast} = Recordings.create_asciicast(user, params, %{user_agent: "a/user/agent"})
assert %Asciicast{
version: 2,
@@ -60,7 +60,7 @@ defmodule Asciinema.AsciicastsTest do
fixture(:upload, %{path: "0.9.8/stdout.time", content_type: "application/octet-stream"})
}
- {:ok, asciicast} = Asciicasts.create_asciicast(user, params, %{user_agent: "a/user/agent"})
+ {:ok, asciicast} = Recordings.create_asciicast(user, params, %{user_agent: "a/user/agent"})
assert %Asciicast{
version: 2,
@@ -99,8 +99,8 @@ defmodule Asciinema.AsciicastsTest do
})
}
- {:ok, asciicast} = Asciicasts.create_asciicast(user, params, %{user_agent: "a/user/agent"})
- stream = Asciicasts.stdout_stream(asciicast)
+ {:ok, asciicast} = Recordings.create_asciicast(user, params, %{user_agent: "a/user/agent"})
+ stream = Recordings.stdout_stream(asciicast)
assert :ok == Stream.run(stream)
assert [{1.234567, "xxżó"}, {1.358023, "łć"}, {3.358023, "xx"}] == Enum.take(stream, 3)
@@ -110,7 +110,7 @@ defmodule Asciinema.AsciicastsTest do
user = fixture(:user)
upload = fixture(:upload, %{path: "1/asciicast.json"})
- {:ok, asciicast} = Asciicasts.create_asciicast(user, upload, %{user_agent: "a/user/agent"})
+ {:ok, asciicast} = Recordings.create_asciicast(user, upload, %{user_agent: "a/user/agent"})
assert %Asciicast{
version: 1,
@@ -132,21 +132,21 @@ defmodule Asciinema.AsciicastsTest do
user = fixture(:user)
upload = fixture(:upload, %{path: "1/invalid.json"})
- assert {:error, %Ecto.Changeset{}} = Asciicasts.create_asciicast(user, upload)
+ assert {:error, %Ecto.Changeset{}} = Recordings.create_asciicast(user, upload)
end
test "json file, unsupported version number" do
user = fixture(:user)
upload = fixture(:upload, %{path: "5/asciicast.json"})
- assert {:error, {:unsupported_format, 5}} = Asciicasts.create_asciicast(user, upload)
+ assert {:error, {:unsupported_format, 5}} = Recordings.create_asciicast(user, upload)
end
test "cast file, v2 format, minimal" do
user = fixture(:user)
upload = fixture(:upload, %{path: "2/minimal.cast"})
- {:ok, asciicast} = Asciicasts.create_asciicast(user, upload, %{user_agent: "a/user/agent"})
+ {:ok, asciicast} = Recordings.create_asciicast(user, upload, %{user_agent: "a/user/agent"})
assert %Asciicast{
version: 2,
@@ -173,7 +173,7 @@ defmodule Asciinema.AsciicastsTest do
user = fixture(:user)
upload = fixture(:upload, %{path: "2/full.cast"})
- {:ok, asciicast} = Asciicasts.create_asciicast(user, upload, %{user_agent: "a/user/agent"})
+ {:ok, asciicast} = Recordings.create_asciicast(user, upload, %{user_agent: "a/user/agent"})
assert %Asciicast{
version: 2,
@@ -201,35 +201,35 @@ defmodule Asciinema.AsciicastsTest do
user = fixture(:user)
upload = fixture(:upload, %{path: "new-logo-bars.png"})
- assert {:error, :unknown_format} = Asciicasts.create_asciicast(user, upload)
+ assert {:error, :unknown_format} = Recordings.create_asciicast(user, upload)
end
end
describe "delete_asciicast/1" do
test "v1/v2" do
asciicast = insert(:asciicast_v1) |> with_file()
- assert {:ok, _asciicast} = Asciicasts.delete_asciicast(asciicast)
+ assert {:ok, _asciicast} = Recordings.delete_asciicast(asciicast)
asciicast = insert(:asciicast_v2) |> with_file()
- assert {:ok, _asciicast} = Asciicasts.delete_asciicast(asciicast)
+ assert {:ok, _asciicast} = Recordings.delete_asciicast(asciicast)
end
end
describe "stdout_stream/1" do
test "with asciicast v1 file" do
- stream = Asciicasts.stdout_stream("test/fixtures/1/asciicast.json")
+ stream = Recordings.stdout_stream("test/fixtures/1/asciicast.json")
assert :ok == Stream.run(stream)
assert [{1.234567, "foo bar"}, {6.913554, "baz qux"}] == Enum.take(stream, 2)
end
test "with asciicast v2 file" do
- stream = Asciicasts.stdout_stream("test/fixtures/2/minimal.cast")
+ stream = Recordings.stdout_stream("test/fixtures/2/minimal.cast")
assert :ok == Stream.run(stream)
assert [{1.234567, "foo bar"}, {5.678987, "baz qux"}] == Enum.take(stream, 2)
end
test "with asciicast v2 file, with idle_time_limit" do
- stream = Asciicasts.stdout_stream("test/fixtures/2/full.cast")
+ stream = Recordings.stdout_stream("test/fixtures/2/full.cast")
assert :ok == Stream.run(stream)
assert [{1.234567, "foo bar"}, {3.734567, "baz qux"}, {6.234567, "żółć jaźń"}] ==
@@ -237,7 +237,7 @@ defmodule Asciinema.AsciicastsTest do
end
test "with asciicast v2 file, with blank lines" do
- stream = Asciicasts.stdout_stream("test/fixtures/2/with-blank-lines.cast")
+ stream = Recordings.stdout_stream("test/fixtures/2/with-blank-lines.cast")
assert :ok == Stream.run(stream)
assert [{1.234567, "foo bar"}, {5.678987, "baz qux"}, {8.456789, "żółć jaźń"}] ==
@@ -248,7 +248,7 @@ defmodule Asciinema.AsciicastsTest do
describe "stdout_stream/2" do
test "with gzipped files" do
stream =
- Asciicasts.stdout_stream(
+ Recordings.stdout_stream(
{"test/fixtures/0.9.9/stdout.time", "test/fixtures/0.9.9/stdout"}
)
@@ -258,7 +258,7 @@ defmodule Asciinema.AsciicastsTest do
test "with bzipped files" do
stream =
- Asciicasts.stdout_stream(
+ Recordings.stdout_stream(
{"test/fixtures/0.9.8/stdout.time", "test/fixtures/0.9.8/stdout"}
)
@@ -268,7 +268,7 @@ defmodule Asciinema.AsciicastsTest do
test "with bzipped files (utf-8 sequence split between frames)" do
stream =
- Asciicasts.stdout_stream(
+ Recordings.stdout_stream(
{"test/fixtures/0.9.8/stdout-split.time", "test/fixtures/0.9.8/stdout-split"}
)
@@ -281,7 +281,7 @@ defmodule Asciinema.AsciicastsTest do
@tag :vt
test "returns list of screen lines" do
stdout_stream = [{1.0, "a"}, {2.4, "b"}, {2.6, "c"}]
- snapshot = Asciicasts.generate_snapshot(stdout_stream, 4, 2, 2.5)
+ snapshot = Recordings.generate_snapshot(stdout_stream, 4, 2, 2.5)
assert snapshot == [[["ab", %{}], [" ", %{"inverse" => true}], [" ", %{}]], [[" ", %{}]]]
end
end
@@ -291,8 +291,8 @@ defmodule Asciinema.AsciicastsTest do
asciicast_v1 = insert(:asciicast_v1)
asciicast_v2 = insert(:asciicast_v2)
- assert ^asciicast_v1 = Asciicasts.upgrade(asciicast_v1)
- assert ^asciicast_v2 = Asciicasts.upgrade(asciicast_v2)
+ assert ^asciicast_v1 = Recordings.upgrade(asciicast_v1)
+ assert ^asciicast_v2 = Recordings.upgrade(asciicast_v2)
end
test "converts v0 file to v2" do
@@ -300,19 +300,33 @@ defmodule Asciinema.AsciicastsTest do
stream_v0 =
asciicast
- |> Asciicasts.stdout_stream()
+ |> Recordings.stdout_stream()
|> Enum.to_list()
- asciicast = Asciicasts.upgrade(asciicast)
+ asciicast = Recordings.upgrade(asciicast)
assert asciicast.version == 2
assert asciicast.path =~ ~r|\d\d/\d\d/#{asciicast.id}\.cast$|
stream_v2 =
asciicast
- |> Asciicasts.stdout_stream()
+ |> Recordings.stdout_stream()
|> Enum.to_list()
assert stream_v0 == stream_v2
end
end
+
+ describe "parse_markers/1" do
+ test "returns markers for valid syntax" do
+ result = Asciicast.parse_markers("1.0 - Intro\n2.5\n5.0 - Tips & Tricks\n")
+
+ assert result == {:ok, [{1.0, "Intro"}, {2.5, ""}, {5.0, "Tips & Tricks"}]}
+ end
+
+ test "returns error for invalid syntax" do
+ result = Asciicast.parse_markers("1.0 - Intro\nFoobar\n")
+
+ assert result == {:error, 1}
+ end
+ end
end
diff --git a/test/controllers/api/asciicast_controller_test.exs b/test/controllers/api/recording_controller_test.exs
similarity index 75%
rename from test/controllers/api/asciicast_controller_test.exs
rename to test/controllers/api/recording_controller_test.exs
index b85c344d8..8e8e54fe4 100644
--- a/test/controllers/api/asciicast_controller_test.exs
+++ b/test/controllers/api/recording_controller_test.exs
@@ -1,4 +1,4 @@
-defmodule Asciinema.Api.AsciicastControllerTest do
+defmodule Asciinema.Api.RecordingControllerTest do
use AsciinemaWeb.ConnCase
alias Asciinema.Accounts
@@ -15,7 +15,7 @@ defmodule Asciinema.Api.AsciicastControllerTest do
{:ok, conn: conn, token: token}
end
- @asciicast_url ~r|^http://localhost:4001/a/[a-zA-Z0-9]{25}|
+ @recording_url ~r|^http://localhost:4001/a/[a-zA-Z0-9]{25}|
@successful_response ~r|View.+at.+http://localhost:4001/a/[a-zA-Z0-9]{25}\n|s
describe ".create" do
@@ -29,9 +29,9 @@ defmodule Asciinema.Api.AsciicastControllerTest do
fixture(:upload, %{path: "0.9.7/stdout.time", content_type: "application/octet-stream"})
}
- conn = post conn, Routes.api_asciicast_path(conn, :create), %{"asciicast" => asciicast}
+ conn = post conn, Routes.api_recording_path(conn, :create), %{"asciicast" => asciicast}
assert text_response(conn, 201) =~ @successful_response
- assert List.first(get_resp_header(conn, "location")) =~ @asciicast_url
+ assert List.first(get_resp_header(conn, "location")) =~ @recording_url
end
@tag token: nil
@@ -44,9 +44,9 @@ defmodule Asciinema.Api.AsciicastControllerTest do
fixture(:upload, %{path: "0.9.8/stdout.time", content_type: "application/octet-stream"})
}
- conn = post conn, Routes.api_asciicast_path(conn, :create), %{"asciicast" => asciicast}
+ conn = post conn, Routes.api_recording_path(conn, :create), %{"asciicast" => asciicast}
assert text_response(conn, 201) =~ @successful_response
- assert List.first(get_resp_header(conn, "location")) =~ @asciicast_url
+ assert List.first(get_resp_header(conn, "location")) =~ @recording_url
end
test "separate files (pre-v1 params), v0.9.9 client", %{conn: conn} do
@@ -58,55 +58,55 @@ defmodule Asciinema.Api.AsciicastControllerTest do
fixture(:upload, %{path: "0.9.9/stdout.time", content_type: "application/octet-stream"})
}
- conn = post conn, Routes.api_asciicast_path(conn, :create), %{"asciicast" => asciicast}
+ conn = post conn, Routes.api_recording_path(conn, :create), %{"asciicast" => asciicast}
assert text_response(conn, 201) =~ @successful_response
- assert List.first(get_resp_header(conn, "location")) =~ @asciicast_url
+ assert List.first(get_resp_header(conn, "location")) =~ @recording_url
end
test "json file, v1 format", %{conn: conn} do
upload = fixture(:upload, %{path: "1/asciicast.json"})
- conn = post conn, Routes.api_asciicast_path(conn, :create), %{"asciicast" => upload}
+ conn = post conn, Routes.api_recording_path(conn, :create), %{"asciicast" => upload}
assert text_response(conn, 201) =~ @successful_response
- assert List.first(get_resp_header(conn, "location")) =~ @asciicast_url
+ assert List.first(get_resp_header(conn, "location")) =~ @recording_url
end
test "json file, v2 format", %{conn: conn} do
upload = fixture(:upload, %{path: "2/minimal.cast"})
- conn = post conn, Routes.api_asciicast_path(conn, :create), %{"asciicast" => upload}
+ conn = post conn, Routes.api_recording_path(conn, :create), %{"asciicast" => upload}
assert text_response(conn, 201) =~ @successful_response
- assert List.first(get_resp_header(conn, "location")) =~ @asciicast_url
+ assert List.first(get_resp_header(conn, "location")) =~ @recording_url
end
test "json file, v1 format (missing required data)", %{conn: conn} do
upload = fixture(:upload, %{path: "1/invalid.json"})
- conn = post conn, Routes.api_asciicast_path(conn, :create), %{"asciicast" => upload}
+ conn = post conn, Routes.api_recording_path(conn, :create), %{"asciicast" => upload}
assert %{"errors" => _} = json_response(conn, 422)
end
test "json file, unsupported version number", %{conn: conn} do
upload = fixture(:upload, %{path: "5/asciicast.json"})
- conn = post conn, Routes.api_asciicast_path(conn, :create), %{"asciicast" => upload}
+ conn = post conn, Routes.api_recording_path(conn, :create), %{"asciicast" => upload}
assert text_response(conn, 422) =~ ~r|not supported|
end
test "non-json file", %{conn: conn} do
upload = fixture(:upload, %{path: "new-logo-bars.png"})
- conn = post conn, Routes.api_asciicast_path(conn, :create), %{"asciicast" => upload}
+ conn = post conn, Routes.api_recording_path(conn, :create), %{"asciicast" => upload}
assert text_response(conn, 400) =~ ~r|valid asciicast|
end
test "existing user (API token)", %{conn: conn, token: token} do
{:ok, _} = Accounts.create_user_with_api_token(token, "test")
upload = fixture(:upload, %{path: "1/asciicast.json"})
- conn = post conn, Routes.api_asciicast_path(conn, :create), %{"asciicast" => upload}
+ conn = post conn, Routes.api_recording_path(conn, :create), %{"asciicast" => upload}
assert text_response(conn, 201) =~ @successful_response
- assert List.first(get_resp_header(conn, "location")) =~ @asciicast_url
+ assert List.first(get_resp_header(conn, "location")) =~ @recording_url
end
@tag token: nil
test "no authentication", %{conn: conn} do
upload = fixture(:upload, %{path: "1/asciicast.json"})
- conn = post conn, Routes.api_asciicast_path(conn, :create), %{"asciicast" => upload}
+ conn = post conn, Routes.api_recording_path(conn, :create), %{"asciicast" => upload}
assert response(conn, 401)
end
@@ -115,23 +115,23 @@ defmodule Asciinema.Api.AsciicastControllerTest do
Accounts.get_user_with_api_token(token, "test")
token |> Accounts.get_api_token!() |> Accounts.revoke_api_token!()
upload = fixture(:upload, %{path: "1/asciicast.json"})
- conn = post conn, Routes.api_asciicast_path(conn, :create), %{"asciicast" => upload}
+ conn = post conn, Routes.api_recording_path(conn, :create), %{"asciicast" => upload}
assert response(conn, 401)
end
@tag token: "invalid-lol"
test "authentication with invalid token", %{conn: conn} do
upload = fixture(:upload, %{path: "1/asciicast.json"})
- conn = post conn, Routes.api_asciicast_path(conn, :create), %{"asciicast" => upload}
+ conn = post conn, Routes.api_recording_path(conn, :create), %{"asciicast" => upload}
assert response(conn, 401)
end
test "requesting json response", %{conn: conn} do
upload = fixture(:upload, %{path: "2/minimal.cast"})
conn = put_req_header(conn, "accept", "application/json")
- conn = post conn, Routes.api_asciicast_path(conn, :create), %{"asciicast" => upload}
+ conn = post conn, Routes.api_recording_path(conn, :create), %{"asciicast" => upload}
assert %{"url" => "http" <> _} = json_response(conn, 201)
- assert List.first(get_resp_header(conn, "location")) =~ @asciicast_url
+ assert List.first(get_resp_header(conn, "location")) =~ @recording_url
end
end
end
diff --git a/test/controllers/oembed_controller_test.exs b/test/controllers/oembed_controller_test.exs
index 79ff45f94..c5b79d753 100644
--- a/test/controllers/oembed_controller_test.exs
+++ b/test/controllers/oembed_controller_test.exs
@@ -6,7 +6,7 @@ defmodule Asciinema.OembedControllerTest do
describe "show" do
test "for JSON format", %{conn: conn} do
asciicast = insert(:asciicast)
- url = Routes.asciicast_url(Endpoint, :show, asciicast)
+ url = Routes.recording_url(Endpoint, :show, asciicast)
conn =
get(
@@ -25,7 +25,7 @@ defmodule Asciinema.OembedControllerTest do
test "for XML format", %{conn: conn} do
asciicast = insert(:asciicast)
- url = Routes.asciicast_url(Endpoint, :show, asciicast)
+ url = Routes.recording_url(Endpoint, :show, asciicast)
conn = get(conn, Routes.oembed_path(conn, :show, url: url, format: "xml"))
@@ -35,7 +35,7 @@ defmodule Asciinema.OembedControllerTest do
test "for maxwidth without maxheight", %{conn: conn} do
asciicast = insert(:asciicast)
- url = Routes.asciicast_url(Endpoint, :show, asciicast)
+ url = Routes.recording_url(Endpoint, :show, asciicast)
conn = get(conn, Routes.oembed_path(conn, :show, url: url, format: "json", maxwidth: "500"))
diff --git a/test/controllers/asciicast_controller_test.exs b/test/controllers/recording_controller_test.exs
similarity index 87%
rename from test/controllers/asciicast_controller_test.exs
rename to test/controllers/recording_controller_test.exs
index b3e6ce127..fcff84ef2 100644
--- a/test/controllers/asciicast_controller_test.exs
+++ b/test/controllers/recording_controller_test.exs
@@ -1,4 +1,4 @@
-defmodule Asciinema.AsciicastControllerTest do
+defmodule Asciinema.RecordingControllerTest do
use AsciinemaWeb.ConnCase
import Asciinema.Factory
@@ -38,7 +38,7 @@ defmodule Asciinema.AsciicastControllerTest do
describe "show" do
test "HTML", %{conn: conn} do
asciicast = insert(:asciicast, title: "Good stuff")
- url = Routes.asciicast_path(conn, :show, asciicast)
+ url = Routes.recording_path(conn, :show, asciicast)
conn_2 = get(conn, url)
assert html_response(conn_2, 200) =~ "Good stuff"
@@ -71,7 +71,7 @@ defmodule Asciinema.AsciicastControllerTest do
@tag :rsvg
test "PNG", %{conn: conn} do
asciicast = insert(:asciicast)
- url = Routes.asciicast_path(conn, :show, asciicast)
+ url = Routes.recording_path(conn, :show, asciicast)
conn_2 = get(conn, url <> ".png")
assert response(conn_2, 200)
@@ -84,7 +84,7 @@ defmodule Asciinema.AsciicastControllerTest do
test "SVG", %{conn: conn} do
asciicast = insert(:asciicast)
- url = Routes.asciicast_path(conn, :show, asciicast)
+ url = Routes.recording_path(conn, :show, asciicast)
conn_2 = get(conn, url <> ".svg")
assert response(conn_2, 200)
@@ -101,14 +101,14 @@ defmodule Asciinema.AsciicastControllerTest do
test "HTML with GIF generation instructions", %{conn: conn} do
asciicast = insert(:asciicast)
- conn = get(conn, Routes.asciicast_path(conn, :show, asciicast) <> ".gif")
+ conn = get(conn, Routes.recording_path(conn, :show, asciicast) <> ".gif")
assert html_response(conn, 200) =~ "GIF"
assert response_content_type(conn, :html)
end
test "embed JS", %{conn: conn} do
asciicast = insert(:asciicast)
- url = Routes.asciicast_path(conn, :show, asciicast)
+ url = Routes.recording_path(conn, :show, asciicast)
conn_2 = get(conn, url <> ".js")
assert response(conn_2, 200)
@@ -121,7 +121,7 @@ defmodule Asciinema.AsciicastControllerTest do
test "embed iframe", %{conn: conn} do
asciicast = fixture(:asciicast)
- conn = get(conn, Routes.asciicast_path(conn, :iframe, asciicast))
+ conn = get(conn, Routes.recording_path(conn, :iframe, asciicast))
assert html_response(conn, 200) =~ ~r/iframe\.css/
assert html_response(conn, 200) =~ ~r/iframe\.js/
assert html_response(conn, 200) =~ ~r/window\.players\.set/
@@ -139,7 +139,7 @@ defmodule Asciinema.AsciicastControllerTest do
end
test "requires logged in user", %{conn: conn, asciicast: asciicast} do
- conn = get(conn, Routes.asciicast_path(conn, :edit, asciicast))
+ conn = get(conn, Routes.recording_path(conn, :edit, asciicast))
assert redirected_to(conn, 302) == "/login/new"
end
@@ -147,14 +147,14 @@ defmodule Asciinema.AsciicastControllerTest do
conn = log_in(conn, insert(:user))
assert_raise(Asciinema.Authorization.ForbiddenError, fn ->
- get(conn, Routes.asciicast_path(conn, :edit, asciicast))
+ get(conn, Routes.recording_path(conn, :edit, asciicast))
end)
end
test "displays form", %{conn: conn, asciicast: asciicast, user: user} do
conn = log_in(conn, user)
- conn = get(conn, Routes.asciicast_path(conn, :edit, asciicast))
+ conn = get(conn, Routes.recording_path(conn, :edit, asciicast))
assert html_response(conn, 200) =~ "Save"
end
@@ -163,7 +163,7 @@ defmodule Asciinema.AsciicastControllerTest do
conn = log_in(conn, user)
attrs = %{asciicast: %{title: "Haha!"}}
- conn = put conn, Routes.asciicast_path(conn, :update, asciicast), attrs
+ conn = put conn, Routes.recording_path(conn, :update, asciicast), attrs
location = List.first(get_resp_header(conn, "location"))
assert get_flash(conn, :info) =~ ~r/updated/i
@@ -189,19 +189,19 @@ defmodule Asciinema.AsciicastControllerTest do
conn = log_in(conn, insert(:user))
assert_raise(Asciinema.Authorization.ForbiddenError, fn ->
- delete(conn, Routes.asciicast_path(conn, :delete, asciicast))
+ delete(conn, Routes.recording_path(conn, :delete, asciicast))
end)
end
test "removes and redirects", %{conn: conn, asciicast: asciicast, user: user} do
conn = log_in(conn, user)
- conn = delete(conn, Routes.asciicast_path(conn, :delete, asciicast))
+ conn = delete(conn, Routes.recording_path(conn, :delete, asciicast))
assert get_flash(conn, :info) =~ ~r/deleted/i
assert response(conn, 302)
- conn = get(build_conn(), Routes.asciicast_path(conn, :show, asciicast))
+ conn = get(build_conn(), Routes.recording_path(conn, :show, asciicast))
assert html_response(conn, 404) =~ ~r/not found/i
end
end
diff --git a/test/controllers/user_controller_test.exs b/test/controllers/user_controller_test.exs
index dfc0589b4..62ae31368 100644
--- a/test/controllers/user_controller_test.exs
+++ b/test/controllers/user_controller_test.exs
@@ -78,7 +78,7 @@ defmodule Asciinema.UserControllerTest do
conn = get(conn, "/~dracula3000")
html = html_response(conn, 200)
- assert html =~ "2 asciicasts"
+ assert html =~ "2 recordings"
assert html =~ "Public stuff"
assert html =~ "Private stuff"
end
diff --git a/test/support/factory.ex b/test/support/factory.ex
index 166ad2e16..7f0ec275b 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -1,7 +1,7 @@
defmodule Asciinema.Factory do
use ExMachina.Ecto, repo: Asciinema.Repo
alias Asciinema.Accounts.User
- alias Asciinema.Asciicasts.Asciicast
+ alias Asciinema.Recordings.Asciicast
alias Asciinema.FileStore
def user_factory do
diff --git a/test/support/fixtures.ex b/test/support/fixtures.ex
index e481651de..685692c0d 100644
--- a/test/support/fixtures.ex
+++ b/test/support/fixtures.ex
@@ -1,5 +1,5 @@
defmodule Asciinema.Fixtures do
- alias Asciinema.{Repo, Asciicasts}
+ alias Asciinema.{Repo, Recordings}
alias Asciinema.Accounts.User
def fixture(what, attrs \\ %{})
@@ -49,14 +49,14 @@ defmodule Asciinema.Fixtures do
def fixture(:asciicast_v1, _attrs) do
user = fixture(:user)
upload = fixture(:upload_v1)
- {:ok, asciicast} = Asciicasts.create_asciicast(user, upload)
+ {:ok, asciicast} = Recordings.create_asciicast(user, upload)
asciicast
end
def fixture(:asciicast_v2, _attrs) do
user = fixture(:user)
upload = fixture(:upload_v2)
- {:ok, asciicast} = Asciicasts.create_asciicast(user, upload)
+ {:ok, asciicast} = Recordings.create_asciicast(user, upload)
asciicast
end
end
diff --git a/test/views/asciicast_view_test.exs b/test/views/recording_view_test.exs
similarity index 92%
rename from test/views/asciicast_view_test.exs
rename to test/views/recording_view_test.exs
index d032faed2..8ddf01478 100644
--- a/test/views/asciicast_view_test.exs
+++ b/test/views/recording_view_test.exs
@@ -1,11 +1,11 @@
-defmodule Asciinema.AsciicastViewTest do
+defmodule Asciinema.RecordingViewTest do
use AsciinemaWeb.ConnCase, async: true
- alias AsciinemaWeb.AsciicastView
- alias Asciinema.Asciicasts.Asciicast
+ alias AsciinemaWeb.RecordingView
+ alias Asciinema.Recordings.Asciicast
def thumbnail_from(snapshot, w, h) do
asciicast = %Asciicast{snapshot: snapshot}
- AsciicastView.thumbnail(asciicast, w, h)
+ RecordingView.thumbnail(asciicast, w, h)
end
describe "thumbnail/3" do