"}
+ viewer_class = @root_class["viewer"]
+ {:ok, ~s(
#{content}
)}
end
end
@@ -46,77 +44,56 @@ defmodule Helper.Converter.EditorToHTML do
acc <> clean_html
end)
- {:ok, "#{content}
"}
+ viewer_class = @root_class["viewer"]
+ {:ok, ~s(![](\"#{url}\")
"
- # |> IO.inspect(label: "iamge ret")
- end
+ defp parse_block(%{"type" => "header", "data" => data}), do: Frags.Header.get(data)
- defp parse_block(%{"type" => "list", "data" => %{"style" => "unordered", "items" => items}}) do
- content =
- Enum.reduce(items, "", fn item, acc ->
- acc <> "#{item} "
- end)
+ defp parse_block(%{"type" => "list", "data" => data}) do
+ %{"items" => items, "mode" => mode} = data
- "#{item} "
+ acc <> Frags.List.get_item(mode |> String.to_atom(), item)
end)
- ""
+ # end
- false ->
- acc <> "#{text} "
- end
- end
- end
-end
-
-# {
-# type: "list",
-# data: {
-# type: "checklist",
-# items: [
-# {
-# checked: true,
-# hideLabel: false,
-# indent: 0,
-# label: '标签',
-# labelType: 'default',
-# text: "content 1.",
-# },
-# {
-# checked: false,
-# hideLabel: false,
-# indent: 1,
-# label: '完成',
-# labelType: 'green',
-# text: "content 1.1",
-# },
-# {
-# checked: false,
-# hideLabel: false,
-# indent: 1,
-# label: '未完成',
-# labelType: 'red',
-# text: "content 1.2",
-# },
-# {
-# checked: false,
-# hideLabel: false,
-# indent: 0,
-# label: '完成',
-# labelType: 'green',
-# text: "content 2.",
-# },
-# {
-# checked: false,
-# hideLabel: false,
-# indent: 1,
-# label: '标签',
-# labelType: 'default',
-# text: "content 2.1",
-# },
-# {
-# checked: false,
-# hideLabel: false,
-# indent: 2,
-# label: '标签',
-# labelType: 'default',
-# text: "content 2.1.1",
-# },
-# {
-# checked: false,
-# hideLabel: false,
-# indent: 2,
-# label: '未完成',
-# labelType: 'red',
-# text: "content 2.1.2",
-# },
-# {
-# checked: false,
-# hideLabel: false,
-# indent: 3,
-# label: '未完成',
-# labelType: 'red',
-# text: "content 2.1.2.1",
-# },
-# {
-# checked: false,
-# hideLabel: false,
-# indent: 2,
-# label: '完成',
-# labelType: 'green',
-# text: "content 2.1.3",
-# },
-# {
-# checked: false,
-# hideLabel: false,
-# indent: 3,
-# label: '标签',
-# labelType: 'default',
-# text: "content 2.1.3.1",
-# },
-# {
-# checked: false,
-# hideLabel: false,
-# indent: 3,
-# label: '完成',
-# labelType: 'green',
-# text: "content 2.1.3.2",
-# },
-# {
-# checked: false,
-# hideLabel: false,
-# indent: 0,
-# label: '未完成',
-# labelType: 'red',
-# text: "content 3.",
-# },
-# ]
-# },
-# }
diff --git a/lib/helper/converter/editor_to_html/paragraph.ex b/lib/helper/converter/editor_to_html/paragraph.ex
deleted file mode 100644
index f363d0c57..000000000
--- a/lib/helper/converter/editor_to_html/paragraph.ex
+++ /dev/null
@@ -1,17 +0,0 @@
-defmodule Helper.Converter.EditorToHTML.Paragraph do
- @moduledoc """
- parse editor.js's paragraph block
-
- see https://editorjs.io/
- """
- defmacro __using__(_opts) do
- quote do
- # alias Helper.Metric
- # @clazz Metric.Article.class_names(:html)
-
- defp parse_block(%{"type" => "paragraph", "data" => %{"text" => text}}) do
- "
#{content}
)}
end
- defp parse_block(%{"type" => "image", "data" => data}) do
- url = get_in(data, ["file", "url"])
+ defp parse_block(%{"type" => "paragraph", "data" => %{"text" => text}}), do: "#{text}
" - "- #{content}
- #{content}
#{items_content}
)
end
- # TODO: add item class
- defp parse_block(%{"type" => "checklist", "data" => %{"items" => items}}) do
- content =
- Enum.reduce(items, "", fn item, acc ->
- text = Map.get(item, "text")
- checked = Map.get(item, "checked")
+ # defp parse_block(%{"type" => "image", "data" => data}) do
+ # url = get_in(data, ["file", "url"])
- case checked do
- true ->
- acc <> "#{text}
"
+ # "#{text}
"
- end
- end)
-
- "#{content}
"
- # |> IO.inspect(label: "jjj")
- end
-
- defp parse_block(%{"type" => "delimiter", "data" => %{"type" => type}}) do
- svg_icon = DelimiterIcons.svg(type)
+ # defp parse_block(%{"type" => "delimiter", "data" => %{"type" => type}}) do
+ # svg_icon = DelimiterIcons.svg(type)
- # TODO: left-wing, righ-wing staff
- {:skip_sanitize, "#{svg_icon}
"}
- end
+ # # TODO: left-wing, righ-wing staff
+ # {:skip_sanitize, "#{svg_icon}
"}
+ # end
# IO.inspect(data, label: "parse linkTool")
# TODO: parse the link-card info
- defp parse_block(%{"type" => "linkTool", "data" => data}) do
- link = get_in(data, ["link"])
+ # defp parse_block(%{"type" => "linkTool", "data" => data}) do
+ # link = get_in(data, ["link"])
- ""
- # |> IO.inspect(label: "linkTool ret")
- end
+ # ""
+ # # |> IO.inspect(label: "linkTool ret")
+ # end
# IO.inspect(data, label: "parse quote")
- defp parse_block(%{"type" => "quote", "data" => data}) do
- text = get_in(data, ["text"])
+ # defp parse_block(%{"type" => "quote", "data" => data}) do
+ # text = get_in(data, ["text"])
- "#{text}
"
- # |> IO.inspect(label: "quote ret")
- end
+ # "#{text}
"
+ # # |> IO.inspect(label: "quote ret")
+ # end
defp parse_block(%{"type" => "code", "data" => data}) do
text = get_in(data, ["text"])
@@ -128,7 +105,8 @@ defmodule Helper.Converter.EditorToHTML do
end
defp parse_block(_block) do
- "[unknow block]
"
+ undown_block_class = @root_class["unknow_block"]
+ ~s("[unknow block]
")
end
def string_to_json(string), do: Jason.decode(string)
diff --git a/lib/helper/converter/editor_to_html/list.ex b/lib/helper/converter/editor_to_html/list.ex
deleted file mode 100644
index f83c82d22..000000000
--- a/lib/helper/converter/editor_to_html/list.ex
+++ /dev/null
@@ -1,196 +0,0 @@
-defmodule Helper.Converter.EditorToHTML.List do
- @moduledoc """
- parse editor.js's list-like block (include checklist order/unorder list)
-
- see https://editorjs.io/
- """
-
- # @behaviour Helper.Converter.EditorToHTML.Parser
-
- defmacro __using__(_opts) do
- quote do
- alias Helper.Metric
-
- @clazz Metric.Article.class_names(:html)
-
- defp parse_block(%{
- "type" => "list",
- "data" =>
- %{
- "mode" => "checklist",
- "items" => [
- %{
- "checked" => checked,
- "hideLabel" => hide_label,
- "indent" => indent,
- "label" => label,
- "labelType" => label_type,
- "text" => text
- }
- ]
- } = data
- }) do
- """
-
- hello list
-
- """
-
- #
- # #{text}
- #
- #
- end
-
- defp parse_block(%{
- "type" => "list",
- "data" =>
- %{
- "text" => text,
- "level" => level,
- "eyebrowTitle" => eyebrow_title
- } = data
- }) do
- """
- #{eyebrow_title}
- #
- #{text}
-
- """
- end
-
- defp parse_block(%{
- "type" => "list",
- "data" =>
- %{
- "text" => text,
- "level" => level,
- "footerTitle" => footer_title
- } = data
- }) do
- """
- #{eyebrow_title}
-
- #{text}
-
-
- """
- end
-
- defp parse_block(%{
- "type" => "list",
- "data" => %{
- "text" => text,
- "level" => level
- }
- }) do
- "#{text}
" - end - end - end -end diff --git a/lib/helper/converter/editor_to_html/validator/editor_schema.ex b/lib/helper/converter/editor_to_html/validator/editor_schema.ex index 6c72745df..d1b8fa656 100644 --- a/lib/helper/converter/editor_to_html/validator/editor_schema.ex +++ b/lib/helper/converter/editor_to_html/validator/editor_schema.ex @@ -6,8 +6,8 @@ defmodule Helper.Converter.EditorToHTML.Validator.EditorSchema do # list @valid_list_mode ["checklist", "order_list", "unorder_list"] - @valid_list_label_type ["success", "done", "todo"] - @valid_list_indent [0, 1, 2, 3, 4] + @valid_list_label_type ["green", "red", "warn", "default"] + @valid_list_indent [0, 1, 2, 3] def get("editor") do %{ @@ -36,6 +36,7 @@ defmodule Helper.Converter.EditorToHTML.Validator.EditorSchema do "hideLabel" => [:boolean], "label" => [:string], "labelType" => [enum: @valid_list_label_type], + "prefixIndex" => [:string, required: false], "indent" => [enum: @valid_list_indent], "text" => [:string] } diff --git a/lib/helper/converter/html_sanitizer.ex b/lib/helper/converter/html_sanitizer.ex index c2937d2ae..6aef2f6ae 100644 --- a/lib/helper/converter/html_sanitizer.ex +++ b/lib/helper/converter/html_sanitizer.ex @@ -20,6 +20,7 @@ defmodule Helper.Converter.HtmlSanitizer do # Meta.allow_tag_with_these_attributes("em", []) Meta.allow_tag_with_these_attributes("b", []) Meta.allow_tag_with_these_attributes("i", []) + Meta.allow_tag_with_these_attributes("mark", ["class"]) Meta.allow_tag_with_these_attributes("code", ["class"]) Meta.allow_tag_with_these_attributes("pre", ["class"]) @@ -32,11 +33,31 @@ defmodule Helper.Converter.HtmlSanitizer do # Meta.allow_tag_with_these_attributes("h6", ["class"]) Meta.allow_tag_with_these_attributes("p", ["class"]) Meta.allow_tag_with_these_attributes("img", ["class", "src"]) - Meta.allow_tag_with_these_attributes("div", ["class"]) + Meta.allow_tag_with_these_attributes("div", ["class", "data-index"]) Meta.allow_tag_with_these_attributes("ul", ["class"]) Meta.allow_tag_with_these_attributes("ol", ["class"]) Meta.allow_tag_with_these_attributes("li", ["class"]) + Meta.allow_tag_with_these_attributes("svg", [ + "t", + "p-id", + "class", + "version", + "xmlns", + # should be viewBox, see: https://github.com/rrrene/html_sanitize_ex/issues/48 + "viewbox", + "width", + "height", + "x", + "y" + # "baseProfile", + # "contentScriptType", + # "contentStyleType", + # "preserveAspectRatio", + ]) + + Meta.allow_tag_with_these_attributes("path", ["d", "p-id"]) + Meta.allow_tag_with_these_attributes("iframe", [ "sandbox", "allow-same-origin", @@ -56,6 +77,9 @@ defmodule Helper.Converter.HtmlSanitizer do def sanitize({:skip_sanitize, html}), do: html def sanitize(html) when is_binary(html) do - html |> HtmlSanitizeEx.Scrubber.scrub(Scrubber) + html + |> HtmlSanitizeEx.Scrubber.scrub(Scrubber) + # workarround for https://github.com/rrrene/html_sanitize_ex/issues/48 + |> String.replace(" viewbox=\"", " viewBox=\"") end end diff --git a/lib/helper/metric/article.ex b/lib/helper/metric/article.ex deleted file mode 100644 index c1f265d5b..000000000 --- a/lib/helper/metric/article.ex +++ /dev/null @@ -1,30 +0,0 @@ -defmodule Helper.Metric.Article do - @moduledoc """ - html article class names parsed from editor.js's json data - - currently use https://editorjs.io/ as rich-text editor - # NOTE: DONOT CHANGE ONCE SET, OTHERWISE IT WILL CAUSE INCOMPATIBILITY ISSUE - """ - - @doc """ - get all the class names of the parsed editor.js's html parts - """ - def class_names(:html) do - %{ - # root wrapper - viewer: "article-viewer-wrapper", - unknow_block: "unknow-block", - invalid_block: "invalid-block", - # header - header: %{ - wrapper: "header-wrapper", - eyebrow_title: "eyebrow-title", - footer_title: "footer-title" - }, - # list - list: %{ - wrapper: "list-wrapper" - } - } - end -end diff --git a/lib/helper/spec_type.ex b/lib/helper/spec_type.ex deleted file mode 100644 index 40dd76b42..000000000 --- a/lib/helper/spec_type.ex +++ /dev/null @@ -1,30 +0,0 @@ -defmodule Helper.SpecType do - @moduledoc """ - custom @types - """ - - @typedoc """ - Type GraphQL flavor the error format - """ - @type gq_error :: {:error, [message: String.t(), code: non_neg_integer()]} - - @typedoc """ - general response conventions - """ - @type done :: {:ok, map} | {:error, map} - - @type id :: non_neg_integer() | String.t() - - @typedoc """ - general contribute type for wiki and cheatshet - """ - @type github_contributor2 :: %{ - github_id: String.t(), - avatar: String.t(), - html_url: String.t(), - nickname: String.t(), - bio: nil | String.t(), - location: nil | String.t(), - company: nil | String.t() - } -end diff --git a/lib/helper/types.ex b/lib/helper/types.ex new file mode 100644 index 000000000..4063c3a4f --- /dev/null +++ b/lib/helper/types.ex @@ -0,0 +1,66 @@ +defmodule Helper.Types do + @moduledoc """ + custom @types + """ + + @typedoc """ + Type GraphQL flavor the error format + """ + @type gq_error :: {:error, [message: String.t(), code: non_neg_integer()]} + + @typedoc """ + general response conventions + """ + @type done :: {:ok, map} | {:error, map} + + @type id :: non_neg_integer() | String.t() + + @typedoc """ + general contribute type for wiki and cheatshet + """ + @type github_contributor2 :: %{ + github_id: String.t(), + avatar: String.t(), + html_url: String.t(), + nickname: String.t(), + bio: nil | String.t(), + location: nil | String.t(), + company: nil | String.t() + } + + @typedoc """ + editor.js's header tool data format + """ + @type editor_header :: %{ + required(:text) => String.t(), + required(:level) => String.t(), + eyebrowTitle: String.t(), + footerTitle: String.t() + } + + @typedoc """ + valid editor.js's list item indent + """ + @type editor_list_indent :: 0 | 1 | 2 | 3 + + @typedoc """ + valid editor.js's list item label type + """ + @type editor_list_label_type :: :default | :red | :green | :warn + + @typedoc """ + editor.js's list item for order_list | unorder_list | checklist + """ + @type editor_list_item :: %{ + required(:hideLabel) => String.t(), + required(:indent) => editor_list_indent, + required(:label) => String.t(), + required(:labelType) => editor_list_label_type, + required(:text) => String.t(), + prefixIndex: String.t() + } + @typedoc """ + html fragment + """ + @type html :: String.t() +end diff --git a/lib/helper/utils.ex b/lib/helper/utils.ex index 13b64b4ff..a522a6788 100644 --- a/lib/helper/utils.ex +++ b/lib/helper/utils.ex @@ -237,4 +237,13 @@ defmodule Helper.Utils do defp update_word_count(word, acc) do Map.update(acc, to_string(word), 1, &(&1 + 1)) end + + # see https://stackoverflow.com/a/49558074/4050784 + @spec str_occurence(String.t(), String.t()) :: Integer.t() + def str_occurence(string, substr) when is_binary(string) and is_binary(substr) do + len = string |> String.split(substr) |> length() + len - 1 + end + + def str_occurence(_, _), do: "must be strings" end diff --git a/test/helper/converter/editor_to_html_test/header_test.exs b/test/helper/converter/editor_to_html_test/header_test.exs index c77e15cad..30303a3c8 100644 --- a/test/helper/converter/editor_to_html_test/header_test.exs +++ b/test/helper/converter/editor_to_html_test/header_test.exs @@ -3,10 +3,10 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.Header do use GroupherServerWeb.ConnCase, async: true - alias Helper.Metric alias Helper.Converter.EditorToHTML, as: Parser + alias Helper.Converter.EditorToHTML.{Class, Frags} - @clazz Metric.Article.class_names(:html) + @root_class Class.article() describe "[header block unit]" do @editor_json %{ @@ -36,13 +36,19 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.Header do ], "version" => "2.15.0" } - @tag :wip + @tag :wip2 test "header parse should work" do {:ok, editor_string} = Jason.encode(@editor_json) {:ok, converted} = Parser.to_html(editor_string) + h1_frag = Frags.Header.get(%{"text" => "header content", "level" => 1}) + h2_frag = Frags.Header.get(%{"text" => "header content", "level" => 2}) + h3_frag = Frags.Header.get(%{"text" => "header content", "level" => 3}) + + viewer_class = @root_class["viewer"] + assert converted == - "header content
header content
header content
"
+ ~s(
#{h1_frag}#{h2_frag}#{h3_frag}
)
end
@editor_json %{
@@ -60,24 +66,30 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.Header do
],
"version" => "2.15.0"
}
- @tag :wip
+ @tag :wip2
test "full header parse should work" do
{:ok, editor_string} = Jason.encode(@editor_json)
{:ok, converted} = Parser.to_html(editor_string)
+ frag =
+ Frags.Header.get(%{
+ "text" => "header content",
+ "level" => 1,
+ "eyebrowTitle" => "eyebrow title content",
+ "footerTitle" => "footer title content"
+ })
+
+ viewer_class = @root_class["viewer"]
+
assert converted ==
- "\n
\neyebrow title content
\n header content
\nfooter title content
\n"
+ ~s(
#{frag}
)
end
@editor_json %{
"time" => 1_567_250_876_713,
"version" => "2.15.0"
}
- @tag :wip
+ @tag :wip2
test "optional field should valid properly" do
json =
Map.merge(@editor_json, %{
@@ -96,10 +108,17 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.Header do
{:ok, editor_string} = Jason.encode(json)
{:ok, converted} = Parser.to_html(editor_string)
+ frag =
+ Frags.Header.get(%{
+ "text" => "header content",
+ "level" => 1,
+ "eyebrowTitle" => "eyebrow title content"
+ })
+
+ viewer_class = @root_class["viewer"]
+
assert converted ==
- "\n
\neyebrow title content
\n header content
\n"
+ ~s(
#{frag}
)
json =
Map.merge(@editor_json, %{
@@ -118,10 +137,17 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.Header do
{:ok, editor_string} = Jason.encode(json)
{:ok, converted} = Parser.to_html(editor_string)
+ frag =
+ Frags.Header.get(%{
+ "text" => "header content",
+ "level" => 1,
+ "footerTitle" => "footer title content"
+ })
+
+ viewer_class = @root_class["viewer"]
+
assert converted ==
- "\n
\nheader content
\nfooter title content
\n"
+ ~s(hello Editor.js workspace. is an element <script>alert("hello")</script>"
# "text" : ""
- @clazz Metric.Article.class_names(:html)
+ @root_class Class.article()
@real_editor_data ~S({
"time" : 1567250876713,
@@ -135,8 +132,10 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML do
{:ok, editor_string} = Jason.encode(editor_json)
{:ok, converted} = Parser.to_html(editor_string)
+ viewer_class = @root_class["viewer"]
+
assert converted ==
- "
#{frag}
)
end
@tag :wip
diff --git a/test/helper/converter/editor_to_html_test/index_test.exs b/test/helper/converter/editor_to_html_test/index_test.exs
index 83b8016ef..0c8336f0d 100644
--- a/test/helper/converter/editor_to_html_test/index_test.exs
+++ b/test/helper/converter/editor_to_html_test/index_test.exs
@@ -3,16 +3,13 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML do
use GroupherServerWeb.ConnCase, async: true
- alias Helper.Metric
+ alias Helper.Converter.EditorToHTML.Class
alias Helper.Converter.EditorToHTML, as: Parser
- # alias Helper.Metric
- # @clazz Metric.Article.class_names(:html)
-
# "evel script
"
+ ~s()
editor_json = %{
"time" => 1_567_250_876_713,
@@ -154,8 +153,10 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML do
{:ok, editor_string} = Jason.encode(editor_json)
{:ok, converted} = Parser.to_html(editor_string)
+ viewer_class = @root_class["viewer"]
+
assert converted ==
- "
evel script
Editor.js is an element <script>evel script</script>
"
+ ~s()
end
end
end
diff --git a/test/helper/converter/editor_to_html_test/list_test.exs b/test/helper/converter/editor_to_html_test/list_test.exs
index 8c7fbda27..db5b0c621 100644
--- a/test/helper/converter/editor_to_html_test/list_test.exs
+++ b/test/helper/converter/editor_to_html_test/list_test.exs
@@ -3,58 +3,187 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.List do
use GroupherServerWeb.ConnCase, async: true
- alias Helper.Metric
alias Helper.Converter.EditorToHTML, as: Parser
+ alias Helper.Converter.EditorToHTML.Class
+ alias Helper.Utils
- # @clazz Metric.Article.class_names(:html)
+ @root_class Class.article()
+ @class get_in(@root_class, ["list"])
describe "[list block unit]" do
- @editor_json %{
- "time" => 1_567_250_876_713,
- "blocks" => [
- %{
- "type" => "list",
- "data" => %{
- "mode" => "checklist",
- "items" => [
- %{
- "checked" => true,
- "hideLabel" => false,
- "indent" => 0,
- "label" => "label",
- "labelType" => "success",
- "text" => "list item"
- }
- ]
+ defp set_items(mode, items) do
+ editor_json = %{
+ "time" => 1_567_250_876_713,
+ "blocks" => [
+ %{
+ "type" => "list",
+ "data" => %{
+ "mode" => mode,
+ "items" => items
+ }
}
- }
- ],
- "version" => "2.15.0"
- }
+ ],
+ "version" => "2.15.0"
+ }
+ end
+
+ test "basic list parse should work" do
+ editor_json =
+ set_items("unorder_list", [
+ %{
+ "checked" => true,
+ "hideLabel" => false,
+ "indent" => 0,
+ "label" => "label",
+ "labelType" => "default",
+ "text" =>
+ "一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。"
+ },
+ %{
+ "checked" => false,
+ "hideLabel" => false,
+ "indent" => 0,
+ "label" => "label",
+ "labelType" => "default",
+ "text" => "list item"
+ },
+ %{
+ "checked" => false,
+ "hideLabel" => false,
+ "indent" => 1,
+ "label" => "green",
+ "labelType" => "green",
+ "text" => "list item"
+ }
+ ])
+
+ {:ok, editor_string} = Jason.encode(editor_json)
+ {:ok, converted} = Parser.to_html(editor_string)
+
+ unorder_list_prefix_class = @class["unorder_list_prefix"]
+ assert Utils.str_occurence(converted, unorder_list_prefix_class) == 3
+ end
+
+ @tag :wip2
+ test "basic order list parse should work" do
+ editor_json =
+ set_items("order_list", [
+ %{
+ "checked" => true,
+ "hideLabel" => false,
+ "indent" => 0,
+ "label" => "label",
+ "labelType" => "default",
+ "prefixIndex" => "1.",
+ "text" =>
+ "一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。"
+ },
+ %{
+ "checked" => false,
+ "hideLabel" => false,
+ "indent" => 0,
+ "label" => "label",
+ "labelType" => "default",
+ "prefixIndex" => "2.",
+ "text" => "list item"
+ },
+ %{
+ "checked" => false,
+ "hideLabel" => false,
+ "indent" => 1,
+ "label" => "green",
+ "labelType" => "green",
+ "prefixIndex" => "2.1",
+ "text" => "list item"
+ }
+ ])
+
+ {:ok, editor_string} = Jason.encode(editor_json)
+ {:ok, converted} = Parser.to_html(editor_string)
+
+ order_list_prefix_class = @class["order_list_prefix"]
+ assert Utils.str_occurence(converted, order_list_prefix_class) == 3
+ end
+
@tag :wip
- test "valid list parse should work" do
- {:ok, editor_string} = Jason.encode(@editor_json)
- # assert {:ok, converted} = Parser.to_html(editor_string)
+ test "basic checklist parse should work" do
+ editor_json =
+ set_items("checklist", [
+ %{
+ "checked" => true,
+ "hideLabel" => false,
+ "indent" => 0,
+ "label" => "label",
+ "labelType" => "default",
+ "text" =>
+ "一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。一个带着中文的很长的句子。"
+ },
+ %{
+ "checked" => false,
+ "hideLabel" => false,
+ "indent" => 0,
+ "label" => "label",
+ "labelType" => "default",
+ "text" => "list item"
+ },
+ %{
+ "checked" => false,
+ "hideLabel" => false,
+ "indent" => 1,
+ "label" => "green",
+ "labelType" => "green",
+ "text" => "list item"
+ },
+ %{
+ "checked" => false,
+ "hideLabel" => false,
+ "indent" => 1,
+ "label" => "red",
+ "labelType" => "red",
+ "text" => "list item"
+ }
+ ])
+
+ {:ok, editor_string} = Jason.encode(editor_json)
{:ok, converted} = Parser.to_html(editor_string)
- IO.inspect(converted, label: "list converted")
+
+ checked_class = @class["checklist_checkbox_checked"]
+ assert Utils.str_occurence(converted, checked_class) == 1
end
- @editor_json %{
- "time" => 1_567_250_876_713,
- "blocks" => [
- %{
- "type" => "list",
- "data" => %{
- "invalid-mode" => "",
- "items" => []
+ @tag :wip
+ test "checklist without label parse should work" do
+ editor_json =
+ set_items("checklist", [
+ %{
+ "checked" => true,
+ "hideLabel" => true,
+ "indent" => 0,
+ "label" => "label",
+ "labelType" => "default",
+ "text" => "list item"
+ },
+ %{
+ "checked" => false,
+ "hideLabel" => true,
+ "indent" => 0,
+ "label" => "label",
+ "labelType" => "default",
+ "text" => "list item"
}
- }
- ],
- "version" => "2.15.0"
- }
+ ])
+
+ {:ok, editor_string} = Jason.encode(editor_json)
+ {:ok, converted} = Parser.to_html(editor_string)
+
+ label_class = @class["label"]
+ assert Utils.str_occurence(converted, label_class) == 0
+ end
+
@tag :wip
test "invalid list mode parse should raise error message" do
- {:ok, editor_string} = Jason.encode(@editor_json)
+ editor_json = set_items("invalid-mode", [])
+ {:ok, editor_string} = Jason.encode(editor_json)
{:error, err_msg} = Parser.to_html(editor_string)
assert err_msg == [
@@ -66,31 +195,21 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.List do
]
end
- @editor_json %{
- "time" => 1_567_250_876_713,
- "blocks" => [
- %{
- "type" => "list",
- "data" => %{
- "mode" => "checklist",
- "items" => [
- %{
- "checked" => true,
- "hideLabel" => "invalid",
- "indent" => 5,
- "label" => "label",
- "labelType" => "success",
- "text" => "list item"
- }
- ]
- }
- }
- ],
- "version" => "2.15.0"
- }
@tag :wip
test "invalid list data parse should raise error message" do
- {:ok, editor_string} = Jason.encode(@editor_json)
+ editor_json =
+ set_items("checklist", [
+ %{
+ "checked" => true,
+ "hideLabel" => "invalid",
+ "indent" => 5,
+ "label" => "label",
+ "labelType" => "default",
+ "text" => "list item"
+ }
+ ])
+
+ {:ok, editor_string} = Jason.encode(editor_json)
{:error, err_msg} = Parser.to_html(editor_string)
assert err_msg == [
@@ -103,43 +222,33 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.List do
%{
block: "list(checklist)",
field: "indent",
- message: "should be: 0 | 1 | 2 | 3 | 4"
+ message: "should be: 0 | 1 | 2 | 3"
}
]
end
- @editor_json %{
- "time" => 1_567_250_876_713,
- "blocks" => [
- %{
- "type" => "list",
- "data" => %{
- "mode" => "checklist",
- "items" => [
- %{
- "checked" => true,
- "hideLabel" => true,
- "indent" => 10,
- "label" => "label",
- "labelType" => "success",
- "text" => "list item"
- }
- ]
- }
- }
- ],
- "version" => "2.15.0"
- }
@tag :wip
test "invalid indent field should get error" do
- {:ok, editor_string} = Jason.encode(@editor_json)
+ editor_json =
+ set_items("checklist", [
+ %{
+ "checked" => true,
+ "hideLabel" => true,
+ "indent" => 10,
+ "label" => "label",
+ "labelType" => "default",
+ "text" => "list item"
+ }
+ ])
+
+ {:ok, editor_string} = Jason.encode(editor_json)
{:error, error} = Parser.to_html(editor_string)
assert error === [
%{
block: "list(checklist)",
field: "indent",
- message: "should be: 0 | 1 | 2 | 3 | 4"
+ message: "should be: 0 | 1 | 2 | 3"
}
]
end
diff --git a/test/helper/converter/editor_to_html_test/paragraph_test.exs b/test/helper/converter/editor_to_html_test/paragraph_test.exs
index 9b570719f..618306cd6 100644
--- a/test/helper/converter/editor_to_html_test/paragraph_test.exs
+++ b/test/helper/converter/editor_to_html_test/paragraph_test.exs
@@ -3,10 +3,10 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.Paragraph do
use GroupherServerWeb.ConnCase, async: true
- alias Helper.Metric
+ alias Helper.Converter.EditorToHTML.Class
alias Helper.Converter.EditorToHTML, as: Parser
- @clazz Metric.Article.class_names(:html)
+ @root_class Class.article()
describe "[paragraph block]" do
@editor_json %{
@@ -26,7 +26,8 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.Paragraph do
{:ok, editor_string} = Jason.encode(@editor_json)
{:ok, converted} = Parser.to_html(editor_string)
- assert converted == "
Editor.js is an element <script>evel script</script>
paragraph content
"
+ viewer_class = @root_class["viewer"]
+ assert converted == ~s()
end
@editor_json %{
diff --git a/test/helper/converter/md_to_editor_test.exs b/test/helper/converter/md_to_editor_test.exs
index cfd3c2b9f..ecc23c98d 100644
--- a/test/helper/converter/md_to_editor_test.exs
+++ b/test/helper/converter/md_to_editor_test.exs
@@ -4,11 +4,11 @@ defmodule GroupherServer.Test.Helper.Converter.MdToEditor do
"""
use GroupherServerWeb.ConnCase, async: true
- alias Helper.Metric
alias Helper.Converter.MdToEditor, as: Converter
alias Helper.Converter.EditorToHTML
+ alias Helper.Converter.EditorToHTML.Class
- @clazz Metric.Article.class_names(:html)
+ @root_class Class.article()
# alias Helper.Converter.HtmlSanitizer, as: Sanitizer
describe "[basic md test]" do
@@ -249,8 +249,10 @@ defmodule GroupherServer.Test.Helper.Converter.MdToEditor do
{:ok, html} = EditorToHTML.to_html(editor_blocks)
+ viewer_class = @root_class["viewer"]
+
assert html ==
- "
paragraph content
hello
this is a basic markdown text
delete me
italic me
My in-line-code-content is best
"
+ ~s()
end
end
end
diff --git a/test/helper/utils_test.exs b/test/helper/utils_test.exs
index 642b8c1a4..ec5e43b94 100644
--- a/test/helper/utils_test.exs
+++ b/test/helper/utils_test.exs
@@ -91,34 +91,41 @@ defmodule GroupherServer.Test.Helper.UtilsTest do
end
describe "[deep merge]" do
- test 'one level of maps without conflict' do
+ test "one level of maps without conflict" do
result = Utils.deep_merge(%{a: 1}, %{b: 2})
assert result == %{a: 1, b: 2}
end
- test 'two levels of maps without conflict' do
+ test "two levels of maps without conflict" do
result = Utils.deep_merge(%{a: %{b: 1}}, %{a: %{c: 3}})
assert result == %{a: %{b: 1, c: 3}}
end
- test 'three levels of maps without conflict' do
+ test "three levels of maps without conflict" do
result = Utils.deep_merge(%{a: %{b: %{c: 1}}}, %{a: %{b: %{d: 2}}})
assert result == %{a: %{b: %{c: 1, d: 2}}}
end
- test 'non-map value in left' do
+ test "non-map value in left" do
result = Utils.deep_merge(%{a: 1}, %{a: %{b: 2}})
assert result == %{a: %{b: 2}}
end
- test 'non-map value in right' do
+ test "non-map value in right" do
result = Utils.deep_merge(%{a: %{b: 1}}, %{a: 2})
assert result == %{a: 2}
end
- test 'non-map value in both' do
+ test "non-map value in both" do
result = Utils.deep_merge(%{a: 1}, %{a: 2})
assert result == %{a: 2}
end
end
+
+ describe "[sub str occurence]" do
+ test "normal occurence case" do
+ assert 2 == Utils.str_occurence("foo bar foobar", "foo")
+ assert 0 == Utils.str_occurence("hello world", "foo")
+ end
+ end
end
hello
this is a basic markdown text
delete me
italic me
My in-line-code-content is best