Skip to content

Commit a294a31

Browse files
maennchenmaennchen
authored
Run Formatter (#122)
1 parent d5f5e8a commit a294a31

File tree

8 files changed

+79
-23
lines changed

8 files changed

+79
-23
lines changed

‎lib/paper_trail.ex

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,18 @@ defmodule PaperTrail do
2222
@doc """
2323
Inserts a record to the database with a related version insertion in one transaction
2424
"""
25-
def insert(changeset, options \\ [origin: nil, meta: nil, originator: nil, prefix: nil, model_key: :model, version_key: :version, ecto_options: []]) do
25+
def insert(
26+
changeset,
27+
options \\ [
28+
origin: nil,
29+
meta: nil,
30+
originator: nil,
31+
prefix: nil,
32+
model_key: :model,
33+
version_key: :version,
34+
ecto_options: []
35+
]
36+
) do
2637
PaperTrail.Multi.new()
2738
|> PaperTrail.Multi.insert(changeset, options)
2839
|> PaperTrail.Multi.commit()
@@ -31,7 +42,18 @@ defmodule PaperTrail do
3142
@doc """
3243
Same as insert/2 but returns only the model struct or raises if the changeset is invalid.
3344
"""
34-
def insert!(changeset, options \\ [origin: nil, meta: nil, originator: nil, prefix: nil, model_key: :model, version_key: :version, ecto_options: []]) do
45+
def insert!(
46+
changeset,
47+
options \\ [
48+
origin: nil,
49+
meta: nil,
50+
originator: nil,
51+
prefix: nil,
52+
model_key: :model,
53+
version_key: :version,
54+
ecto_options: []
55+
]
56+
) do
3557
repo = RepoClient.repo()
3658
ecto_options = options[:ecto_options] || []
3759

‎lib/paper_trail/multi.ex

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,19 @@ defmodule PaperTrail.Multi do
2222
defdelegate get_item_type(data), to: Serializer
2323
defdelegate get_model_id(model), to: Serializer
2424

25-
def insert(%Ecto.Multi{} = multi, changeset, options \\ [
26-
origin: nil, meta: nil, originator: nil, prefix: nil, model_key: :model, version_key: :version, ecto_options: []
27-
]) do
25+
def insert(
26+
%Ecto.Multi{} = multi,
27+
changeset,
28+
options \\ [
29+
origin: nil,
30+
meta: nil,
31+
originator: nil,
32+
prefix: nil,
33+
model_key: :model,
34+
version_key: :version,
35+
ecto_options: []
36+
]
37+
) do
2838
model_key = options[:model_key] || :model
2939
version_key = options[:version_key] || :version
3040
ecto_options = options[:ecto_options] || []
@@ -56,7 +66,8 @@ defmodule PaperTrail.Multi do
5666

5767
repo.insert(updated_changeset, ecto_options)
5868
end)
59-
|> Ecto.Multi.run(version_key, fn repo, %{initial_version: initial_version, model: model} ->
69+
|> Ecto.Multi.run(version_key, fn repo,
70+
%{initial_version: initial_version, model: model} ->
6071
target_version = make_version_struct(%{event: "insert"}, model, options) |> serialize()
6172

6273
Version.changeset(initial_version, target_version) |> repo.update

‎mix.exs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ defmodule PaperTrail.Mixfile do
2929
[
3030
{:ecto, ">= 3.4.6"},
3131
{:ecto_sql, ">= 3.4.5"},
32-
3332
{:ex_doc, ">= 0.0.0", only: :dev, runtime: false},
3433
{:jason, ">= 1.2.0", only: [:dev, :test]},
3534
{:postgrex, ">= 0.0.0", only: [:dev, :test]}

‎test/paper_trail/bang_functions_simple_mode_test.exs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,17 @@ defmodule PaperTrailTest.SimpleModeBangFunctions do
8787

8888
test "PaperTrail.insert!/2 passes ecto options through (e.g. upsert options)" do
8989
user = create_user()
90-
_result = create_company_with_version(@create_company_params, [originator: user])
90+
_result = create_company_with_version(@create_company_params, originator: user)
9191

9292
new_create_company_params = @create_company_params |> Map.replace!(:city, "Barcelona")
9393

94-
ecto_options = [on_conflict: {:replace_all_except, ~w{name}a}, conflict_target: :name]
95-
result = create_company_with_version(new_create_company_params, [originator: user, ecto_options: ecto_options])
94+
ecto_options = [on_conflict: {:replace_all_except, ~w{name}a}, conflict_target: :name]
95+
96+
result =
97+
create_company_with_version(new_create_company_params,
98+
originator: user,
99+
ecto_options: ecto_options
100+
)
96101

97102
assert Company.count() == 1
98103
assert Version.count() == 2

‎test/paper_trail/bang_functions_strict_mode_test.exs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,17 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
124124

125125
test "PaperTrail.insert!/2 passes ecto options through (e.g. upsert options)" do
126126
user = create_user()
127-
_result = create_company_with_version(@create_company_params, [originator: user])
127+
_result = create_company_with_version(@create_company_params, originator: user)
128128

129129
new_create_company_params = @create_company_params |> Map.replace!(:city, "Barcelona")
130130

131-
ecto_options = [on_conflict: {:replace_all_except, ~w{name}a}, conflict_target: :name]
132-
result = create_company_with_version(new_create_company_params, [originator: user, ecto_options: ecto_options])
131+
ecto_options = [on_conflict: {:replace_all_except, ~w{name}a}, conflict_target: :name]
132+
133+
result =
134+
create_company_with_version(new_create_company_params,
135+
originator: user,
136+
ecto_options: ecto_options
137+
)
133138

134139
assert Company.count() == 1
135140
assert Version.count() == 2
@@ -1046,5 +1051,4 @@ defmodule PaperTrailTest.StrictModeBangFunctions do
10461051
defp convert_to_string_map(map) do
10471052
map |> Jason.encode!() |> Jason.decode!()
10481053
end
1049-
10501054
end

‎test/paper_trail/base_test.exs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,25 @@ defmodule PaperTrailTest do
9999

100100
test "PaperTrail.insert/2 passes ecto options through (e.g. upsert options)" do
101101
user = create_user()
102-
{:ok, _result} = create_company_with_version(@create_company_params, [originator: user])
102+
{:ok, _result} = create_company_with_version(@create_company_params, originator: user)
103103

104104
new_create_company_params = @create_company_params |> Map.replace!(:city, "Barcelona")
105105

106-
ecto_options = [on_conflict: {:replace_all_except, ~w{name}a}, conflict_target: :name]
107-
{:ok, result} = create_company_with_version(new_create_company_params, [originator: user, ecto_options: ecto_options])
106+
ecto_options = [on_conflict: {:replace_all_except, ~w{name}a}, conflict_target: :name]
107+
108+
{:ok, result} =
109+
create_company_with_version(new_create_company_params,
110+
originator: user,
111+
ecto_options: ecto_options
112+
)
108113

109114
assert Company.count() == 1
110115
assert Version.count() == 2
111116

112-
assert Map.take(serialize(result[:model]), [:name, :city]) == %{name: "Acme LLC", city: "Barcelona"}
117+
assert Map.take(serialize(result[:model]), [:name, :city]) == %{
118+
name: "Acme LLC",
119+
city: "Barcelona"
120+
}
113121
end
114122

115123
test "updating a company with originator creates a correct company version" do

‎test/paper_trail/strict_mode_test.exs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,17 +131,25 @@ defmodule PaperTrailStrictModeTest do
131131

132132
test "PaperTrail.insert/2 passes ecto options through (e.g. upsert options)" do
133133
user = create_user()
134-
{:ok, _result} = create_company_with_version(@create_company_params, [originator: user])
134+
{:ok, _result} = create_company_with_version(@create_company_params, originator: user)
135135

136136
new_create_company_params = @create_company_params |> Map.replace!(:city, "Barcelona")
137137

138-
ecto_options = [on_conflict: {:replace_all_except, ~w{name}a}, conflict_target: :name]
139-
{:ok, result} = create_company_with_version(new_create_company_params, [originator: user, ecto_options: ecto_options])
138+
ecto_options = [on_conflict: {:replace_all_except, ~w{name}a}, conflict_target: :name]
139+
140+
{:ok, result} =
141+
create_company_with_version(new_create_company_params,
142+
originator: user,
143+
ecto_options: ecto_options
144+
)
140145

141146
assert Company.count() == 1
142147
assert Version.count() == 2
143148

144-
assert Map.take(serialize(result[:model]), [:name, :city]) == %{name: "Acme LLC", city: "Barcelona"}
149+
assert Map.take(serialize(result[:model]), [:name, :city]) == %{
150+
name: "Acme LLC",
151+
city: "Barcelona"
152+
}
145153
end
146154

147155
test "updating a company creates a company version with correct item_changes" do

‎test/support/simple_models.exs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
defmodule LocationType do
32
use Ecto.Type
43

0 commit comments

Comments
 (0)