Current section

49 Versions

Jump to

Compare versions

4 files changed
+14 additions
-9 deletions
  @@ -51,4 +51,4 @@
51 51 {<<"optional">>,true},
52 52 {<<"repository">>,<<"hexpm">>},
53 53 {<<"requirement">>,<<"~> 2.1">>}]]}.
54 - {<<"version">>,<<"0.13.0">>}.
54 + {<<"version">>,<<"0.14.0">>}.
  @@ -133,15 +133,14 @@ if Code.ensure_loaded?(Ecto) do
133 133 [
134 134 %{
135 135 entry_type: entry_type,
136 - entry: prefix <> @jsonpath_joiner <> to_string(field),
136 + entry: entry_path(entry_type, prefix, field),
137 137 rules: rules
138 138 }
139 139 ]
140 140 end
141 141
142 142 defp errors_flatener({field, errors}, prefix, entry_type) when is_map(errors) do
143 - errors
144 - |> Enum.flat_map(&errors_flatener(&1, prefix <> @jsonpath_joiner <> to_string(field), entry_type))
143 + Enum.flat_map(errors, &errors_flatener(&1, entry_path(entry_type, prefix, field), entry_type))
145 144 end
146 145
147 146 defp errors_flatener({field, errors}, prefix, entry_type) when is_list(errors) do
  @@ -153,7 +152,7 @@ if Code.ensure_loaded?(Ecto) do
153 152 |> Enum.flat_map(
154 153 &errors_flatener(
155 154 &1,
156 - "#{prefix}#{@jsonpath_joiner}" <> to_string(field) <> "[#{i}]",
155 + entry_path(entry_type, prefix, field) <> "[#{i}]",
157 156 entry_type
158 157 )
159 158 )
  @@ -163,5 +162,13 @@ if Code.ensure_loaded?(Ecto) do
163 162
164 163 acc
165 164 end
165 +
166 + defp entry_path("json_data_property", prefix, field) do
167 + prefix <> @jsonpath_joiner <> to_string(field)
168 + end
169 +
170 + defp entry_path(_entry_type, _prefix, field) do
171 + to_string(field)
172 + end
166 173 end
167 174 end
  @@ -47,8 +47,6 @@ defmodule EView.Views.ValidationError do
47 47 end
48 48
49 49 if Code.ensure_loaded?(NExJsonSchema) do
50 - alias EView.Helpers.Sanitizer
51 -
52 50 @doc """
53 51 Render a JSON Schema validation error.
54 52 """
  @@ -70,7 +68,7 @@ defmodule EView.Views.ValidationError do
70 68 %{
71 69 entry_type: entry_type,
72 70 entry: path,
73 - rules: [Sanitizer.sanitize(rule)]
71 + rules: [EView.Helpers.Sanitizer.sanitize(rule)]
74 72 }
75 73 end
76 74 end
  @@ -1,7 +1,7 @@
1 1 defmodule EView.Mixfile do
2 2 use Mix.Project
3 3
4 - @version "0.13.0"
4 + @version "0.14.0"
5 5
6 6 def project do
7 7 [