metadata_presenter 0.9.0 → 0.10.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/metadata_presenter/answers_controller.rb +3 -1
- data/app/controllers/metadata_presenter/pages_controller.rb +1 -0
- data/app/models/metadata_presenter/metadata.rb +2 -2
- data/app/models/metadata_presenter/page.rb +0 -4
- data/app/models/metadata_presenter/page_answers.rb +31 -0
- data/app/validators/metadata_presenter/base_validator.rb +7 -11
- data/app/validators/metadata_presenter/validate_answers.rb +7 -7
- data/app/views/metadata_presenter/component/_number.html.erb +0 -1
- data/app/views/metadata_presenter/component/_text.html.erb +1 -2
- data/app/views/metadata_presenter/component/_textarea.html.erb +0 -1
- data/app/views/metadata_presenter/page/singlequestion.html.erb +1 -1
- data/fixtures/version.json +10 -41
- data/lib/metadata_presenter/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1ef68ecaae97370722eab970f6dd1ce2490c35f762af5bb2ff7addbe51fded02
|
4
|
+
data.tar.gz: 5a56f15853ed9becc11b70d0d0e1532ead81a098de1f7fbe3a1f1103a60c9a5d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bccc48c9113831eed3a67fbb8aeb19ebc6f624b1526feb113578f67f4a1d6ab8989ff01f2d9f44176f03e80782fe8313f389979b042d749217b6c2d683dd8557
|
7
|
+
data.tar.gz: 7d8aabc2e90780a6d01ae263abfc6b93e6dd9b888f3b7c5339b16305e3008feb16f0c4aee41d91429dd8e1e24384fea93c44827e44a093db7b6aff8554b97f18
|
@@ -3,7 +3,9 @@ module MetadataPresenter
|
|
3
3
|
before_action :check_page_exists
|
4
4
|
|
5
5
|
def create
|
6
|
-
|
6
|
+
@page_answers = PageAnswers.new(page, answers_params)
|
7
|
+
|
8
|
+
if @page_answers.validate_answers
|
7
9
|
save_user_data # method signature
|
8
10
|
redirect_to_next_page
|
9
11
|
else
|
@@ -24,7 +24,7 @@ class MetadataPresenter::Metadata
|
|
24
24
|
metadata.respond_to?(method_name)
|
25
25
|
end
|
26
26
|
|
27
|
-
def method_missing(
|
28
|
-
metadata.send(
|
27
|
+
def method_missing(method_name, *args, &block)
|
28
|
+
metadata.send(method_name, *args, &block)
|
29
29
|
end
|
30
30
|
end
|
@@ -0,0 +1,31 @@
|
|
1
|
+
module MetadataPresenter
|
2
|
+
class PageAnswers
|
3
|
+
include ActiveModel::Model
|
4
|
+
include ActiveModel::Validations
|
5
|
+
|
6
|
+
def initialize(page, answers)
|
7
|
+
@page = page
|
8
|
+
@answers = answers
|
9
|
+
end
|
10
|
+
|
11
|
+
def validate_answers
|
12
|
+
ValidateAnswers.new(self, components: components).valid?
|
13
|
+
end
|
14
|
+
|
15
|
+
def components
|
16
|
+
page.components
|
17
|
+
end
|
18
|
+
|
19
|
+
def respond_to_missing?(method_name, include_private = false)
|
20
|
+
answers[method_name.to_s].present?
|
21
|
+
end
|
22
|
+
|
23
|
+
def method_missing(method_name, *args, &block)
|
24
|
+
answers[method_name.to_s]
|
25
|
+
end
|
26
|
+
|
27
|
+
private
|
28
|
+
|
29
|
+
attr_reader :page, :answers
|
30
|
+
end
|
31
|
+
end
|
@@ -26,18 +26,14 @@ module MetadataPresenter
|
|
26
26
|
# end
|
27
27
|
#
|
28
28
|
class BaseValidator
|
29
|
-
# @return [MetadataPresenter::
|
30
|
-
attr_reader :
|
31
|
-
|
32
|
-
# @return [Hash] the user answers
|
33
|
-
attr_reader :answers
|
29
|
+
# @return [MetadataPresenter::PageAnswers] page answers object
|
30
|
+
attr_reader :page_answers
|
34
31
|
|
35
32
|
# @return [MetadataPresenter::Component] component object from the metadata
|
36
33
|
attr_reader :component
|
37
34
|
|
38
|
-
def initialize(
|
39
|
-
@
|
40
|
-
@answers = answers
|
35
|
+
def initialize(page_answers:, component:)
|
36
|
+
@page_answers = page_answers
|
41
37
|
@component = component
|
42
38
|
end
|
43
39
|
|
@@ -46,10 +42,10 @@ module MetadataPresenter
|
|
46
42
|
|
47
43
|
if invalid_answer?
|
48
44
|
error_message = custom_error_message || default_error_message
|
49
|
-
|
45
|
+
page_answers.errors.add(component.id, error_message)
|
50
46
|
end
|
51
47
|
|
52
|
-
|
48
|
+
page_answers.errors.blank?
|
53
49
|
end
|
54
50
|
|
55
51
|
# The custom message will be lookup from the schema key on the metadata.
|
@@ -67,7 +63,7 @@ module MetadataPresenter
|
|
67
63
|
# @return [String] user answer for the specific component
|
68
64
|
#
|
69
65
|
def user_answer
|
70
|
-
|
66
|
+
page_answers.send(component.name)
|
71
67
|
end
|
72
68
|
|
73
69
|
# The default error message will be look using the schema key.
|
@@ -1,11 +1,10 @@
|
|
1
1
|
module MetadataPresenter
|
2
2
|
class ValidateAnswers
|
3
|
-
attr_reader :
|
3
|
+
attr_reader :page_answers, :components
|
4
4
|
|
5
|
-
def initialize(
|
6
|
-
@
|
7
|
-
@
|
8
|
-
@components = Array(page.components)
|
5
|
+
def initialize(page_answers, components:)
|
6
|
+
@page_answers = page_answers
|
7
|
+
@components = Array(components)
|
9
8
|
end
|
10
9
|
|
11
10
|
def valid?
|
@@ -16,12 +15,13 @@ module MetadataPresenter
|
|
16
15
|
!valid?
|
17
16
|
end
|
18
17
|
|
18
|
+
private
|
19
|
+
|
19
20
|
def validators
|
20
21
|
components.map do |component|
|
21
22
|
component_validations(component).map do |key|
|
22
23
|
"MetadataPresenter::#{key.classify}Validator".constantize.new(
|
23
|
-
|
24
|
-
answers: answers,
|
24
|
+
page_answers: page_answers,
|
25
25
|
component: component
|
26
26
|
)
|
27
27
|
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<div class="fb-main-grid-wrapper" data-block-id="<%= @page.id %>" data-block-type="page" data-block-pagetype="<%= @page.type %>">
|
2
2
|
<div class="govuk-grid-row">
|
3
3
|
<div class="govuk-grid-column-two-thirds">
|
4
|
-
<%= form_for @
|
4
|
+
<%= form_for @page_answers, as: :answers, url: @page.url, method: :post do |f| %>
|
5
5
|
<%= f.govuk_error_summary %>
|
6
6
|
<% @page.components.each do |component| %>
|
7
7
|
<%= render partial: component, locals: {
|
data/fixtures/version.json
CHANGED
@@ -58,10 +58,10 @@
|
|
58
58
|
"_type": "page.singlequestion",
|
59
59
|
"components": [
|
60
60
|
{
|
61
|
-
"_id": "
|
61
|
+
"_id": "name_text_1",
|
62
62
|
"_type": "text",
|
63
63
|
"label": "Full name",
|
64
|
-
"name": "
|
64
|
+
"name": "name_text_1",
|
65
65
|
"validation": {
|
66
66
|
"required": true,
|
67
67
|
"max_length": 10,
|
@@ -79,7 +79,7 @@
|
|
79
79
|
"heading": "Email address",
|
80
80
|
"components": [
|
81
81
|
{
|
82
|
-
"_id": "
|
82
|
+
"_id": "email-address_email_1",
|
83
83
|
"_type": "text",
|
84
84
|
"errors": {
|
85
85
|
"format": {},
|
@@ -94,7 +94,7 @@
|
|
94
94
|
}
|
95
95
|
},
|
96
96
|
"label": "Your email address",
|
97
|
-
"name": "
|
97
|
+
"name": "email-address_email_1",
|
98
98
|
"validation": {
|
99
99
|
"required": true,
|
100
100
|
"max_length": 30,
|
@@ -110,10 +110,10 @@
|
|
110
110
|
"_type": "page.singlequestion",
|
111
111
|
"components": [
|
112
112
|
{
|
113
|
-
"_id": "
|
113
|
+
"_id": "parent-name_text_1",
|
114
114
|
"_type": "text",
|
115
115
|
"label": "Parent name",
|
116
|
-
"name": "
|
116
|
+
"name": "parent-name_text_1",
|
117
117
|
"validation": {
|
118
118
|
"required": false,
|
119
119
|
"max_length": 10,
|
@@ -132,9 +132,9 @@
|
|
132
132
|
"heading":"Your age",
|
133
133
|
"components": [
|
134
134
|
{
|
135
|
-
"_id": "
|
135
|
+
"_id": "your-age_number_1",
|
136
136
|
"hint": "Component hint",
|
137
|
-
"name": "
|
137
|
+
"name": "your-age_number_1",
|
138
138
|
"_type": "number",
|
139
139
|
"label": "Your age",
|
140
140
|
"errors": {},
|
@@ -152,10 +152,10 @@
|
|
152
152
|
"_type": "page.singlequestion",
|
153
153
|
"components": [
|
154
154
|
{
|
155
|
-
"_id": "
|
155
|
+
"_id": "family-hobbies_text_1",
|
156
156
|
"_type": "textarea",
|
157
157
|
"label": "Your family hobbies",
|
158
|
-
"name": "
|
158
|
+
"name": "family-hobbies_text_1",
|
159
159
|
"rows": 5,
|
160
160
|
"validation": {
|
161
161
|
"required": true
|
@@ -165,37 +165,6 @@
|
|
165
165
|
"heading": "Family Hobbies",
|
166
166
|
"url": "/family-hobbies"
|
167
167
|
},
|
168
|
-
{
|
169
|
-
"_uuid": "4251b25e-08de-4dcb-8f2f-dd9848dcdca6",
|
170
|
-
"_id": "page.radio-buttons",
|
171
|
-
"_type": "page.singlequestion",
|
172
|
-
"components": [
|
173
|
-
{
|
174
|
-
"_id": "radio-buttons_radios_1",
|
175
|
-
"_type": "radios",
|
176
|
-
"errors": {},
|
177
|
-
"hint": "Component hint",
|
178
|
-
"label": "Component label",
|
179
|
-
"items": [
|
180
|
-
{
|
181
|
-
"_id": "radio-buttons_radio_1",
|
182
|
-
"_type": "radio",
|
183
|
-
"label": "Yes",
|
184
|
-
"value": "radio_value_1"
|
185
|
-
},
|
186
|
-
{
|
187
|
-
"_id": "radio-buttons_radio_2",
|
188
|
-
"_type": "radio",
|
189
|
-
"label": "No",
|
190
|
-
"value": "radio_value_2"
|
191
|
-
}
|
192
|
-
],
|
193
|
-
"name": "radio-buttons_radios_1"
|
194
|
-
}
|
195
|
-
],
|
196
|
-
"heading": "Parent name",
|
197
|
-
"url": "/radio-buttons"
|
198
|
-
},
|
199
168
|
{
|
200
169
|
"_uuid": "e819d0c2-7062-4997-89cf-44d26d098404",
|
201
170
|
"_id": "page._check-answers",
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metadata_presenter
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.10.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- MoJ Online
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-02-
|
11
|
+
date: 2021-02-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -236,6 +236,7 @@ files:
|
|
236
236
|
- app/models/metadata_presenter/metadata.rb
|
237
237
|
- app/models/metadata_presenter/next_page.rb
|
238
238
|
- app/models/metadata_presenter/page.rb
|
239
|
+
- app/models/metadata_presenter/page_answers.rb
|
239
240
|
- app/models/metadata_presenter/service.rb
|
240
241
|
- app/validators/metadata_presenter/base_validator.rb
|
241
242
|
- app/validators/metadata_presenter/max_length_validator.rb
|