Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit0ea6c34

Browse files
committed
refactor(editor): use string-fmt map instead of atom-fmt
1 parentdc5f0cf commit0ea6c34

File tree

3 files changed

+28
-56
lines changed

3 files changed

+28
-56
lines changed

‎lib/helper/converter/editor_to_html/validator.ex‎

Lines changed: 24 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,9 @@ defmodule Helper.Converter.EditorToHTML.Validator do
99
@valid_list_label_type["success","done","todo"]
1010
@valid_list_indent[0,1,2,3,4]
1111

12-
# atoms dynamically and atoms are not
13-
# garbage-collected. Therefore, string should not be an untrusted value, such as
14-
# input received from a socket or during a web request. Consider using
15-
# to_existing_atom/1 instead
16-
# keys_to_atoms is using to_existing_atom under the hook, so we have to pre-define the
17-
# trusted atoms
18-
tursted_atoms=[
19-
# common
20-
:text,
21-
:items,
22-
# header
23-
:level,
24-
:eyebrowTitle,
25-
:footerTitle,
26-
# list
27-
:hideLabel,
28-
:labelType,
29-
:indent,
30-
:checked,
31-
:label,
32-
# code
33-
:lang
34-
]
35-
36-
Enum.each(tursted_atoms,fnatom->_=atomend)
37-
3812
defis_valid(map)whenis_map(map)do
39-
withatom_map<-Utils.keys_to_atoms(map),
40-
true<-is_valid_editorjs_fmt(atom_map)do
41-
blocks=atom_map.blocks
42-
# validate_blocks(blocks)
13+
withtrue<-is_valid_editorjs_fmt(map)do
14+
blocks=map["blocks"]
4315

4416
trydo
4517
validate_blocks(blocks)
@@ -73,8 +45,8 @@ defmodule Helper.Converter.EditorToHTML.Validator do
7345
{:ok,:pass}
7446
end
7547

76-
defpvalidate_block(%{type:"paragraph",data:%{text:text}=data})do
77-
schema=%{text:[:string]}
48+
defpvalidate_block(%{"type"=>"paragraph","data"=>%{"text"=>text}=data})do
49+
schema=%{"text"=>[:string]}
7850

7951
caseValidateBySchema.cast(schema,data)do
8052
{:error,errors}->
@@ -85,12 +57,12 @@ defmodule Helper.Converter.EditorToHTML.Validator do
8557
end
8658
end
8759

88-
defpvalidate_block(%{type:"header",data:%{text:text,level:level}=data})do
60+
defpvalidate_block(%{"type"=>"header","data"=>%{"text"=>text,"level"=>level}=data})do
8961
schema=%{
90-
text:[:string],
91-
level:[enum:@valid_header_level],
92-
eyebrowTitle:[:string,required:false],
93-
footerTitle:[:string,required:false]
62+
"text"=>[:string],
63+
"level"=>[enum:@valid_header_level],
64+
"eyebrowTitle"=>[:string,required:false],
65+
"footerTitle"=>[:string,required:false]
9466
}
9567

9668
caseValidateBySchema.cast(schema,data)do
@@ -102,18 +74,18 @@ defmodule Helper.Converter.EditorToHTML.Validator do
10274
end
10375
end
10476

105-
defpvalidate_block(%{type:"list",data:%{mode:mode,items:items}=data})
77+
defpvalidate_block(%{"type"=>"list","data"=>%{"mode"=>mode,"items"=>items}=data})
10678
whenmodein@valid_list_modeandis_list(items)do
10779
# mode_schema = %{mode: [enum: @valid_list_mode]}
10880
# {:ok, _} = ValidateBySchema.cast(mode_schema, data)
10981

11082
item_schema=%{
111-
checked:[:boolean],
112-
hideLabel:[:boolean],
113-
label:[:string],
114-
labelType:[enum:@valid_list_label_type],
115-
indent:[enum:@valid_list_indent],
116-
text:[:string]
83+
"checked"=>[:boolean],
84+
"hideLabel"=>[:boolean],
85+
"label"=>[:string],
86+
"labelType"=>[enum:@valid_list_label_type],
87+
"indent"=>[enum:@valid_list_indent],
88+
"text"=>[:string]
11789
}
11890

11991
Enum.each(items,fnitem->
@@ -130,7 +102,7 @@ defmodule Helper.Converter.EditorToHTML.Validator do
130102
{:ok,:pass}
131103
end
132104

133-
defpvalidate_block(%{type:"code"})do
105+
defpvalidate_block(%{"type"=>"code"})do
134106
# schema = %{text: [:string]}
135107
# case ValidateBySchema.cast(schema, data) do
136108
# {:error, errors} ->
@@ -142,17 +114,17 @@ defmodule Helper.Converter.EditorToHTML.Validator do
142114
{:ok,:pass}
143115
end
144116

145-
defpvalidate_block(%{type:type}),do:raise("undown#{type} block")
117+
defpvalidate_block(%{"type"=>type}),do:raise("undown#{type} block")
146118
defpvalidate_block(_),do:raise("undown block")
147119

148120
# check if the given map has the right key-value fmt of the editorjs structure
149121
defpis_valid_editorjs_fmt(map)whenis_map(map)do
150-
Map.has_key?(map,:time)and
151-
Map.has_key?(map,:version)and
152-
Map.has_key?(map,:blocks)and
153-
is_list(map.blocks)and
154-
is_binary(map.version)and
155-
is_integer(map.time)
122+
Map.has_key?(map,"time")and
123+
Map.has_key?(map,"version")and
124+
Map.has_key?(map,"blocks")and
125+
is_list(map["blocks"])and
126+
is_binary(map["version"])and
127+
is_integer(map["time"])
156128
end
157129

158130
defpformat_parse_error(type,error_list)whenis_list(error_list)do

‎lib/helper/validate_by_schema.ex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ defmodule Helper.ValidateBySchema do
9191
false->
9292
{:error,
9393
%{
94-
field:"#{field|>to_string}",
95-
message:"should be:#{enum|>Enum.join(" | ")|>to_string}"
94+
field:field,
95+
message:"should be:#{enum|>Enum.join(" | ")}"
9696
}}
9797
end
9898
end

‎test/helper/converter/editor_to_html_test/list_test.exs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.List do
7373
],
7474
"version"=>"2.15.0"
7575
}
76-
@tag:wip
76+
@tag:wip2
7777
test"valid list parse should work"do
7878
{:ok,editor_string}=Jason.encode(@editor_json)
7979
assert{:ok,_}=Parser.to_html(editor_string)
@@ -101,7 +101,7 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.List do
101101
],
102102
"version"=>"2.15.0"
103103
}
104-
@tag:wip
104+
@tag:wip2
105105
test"invalid indent field should get error"do
106106
{:ok,editor_string}=Jason.encode(@editor_json)
107107
{:error,error}=Parser.to_html(editor_string)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp