metadata_presenter 0.2.0 → 0.3.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 +15 -4
- data/app/controllers/metadata_presenter/pages_controller.rb +1 -1
- data/app/models/metadata_presenter/page.rb +4 -0
- data/app/models/metadata_presenter/service.rb +7 -3
- data/app/views/metadata_presenter/page/singlequestion.html.erb +1 -1
- data/app/views/metadata_presenter/page/start.html.erb +1 -1
- data/config/routes.rb +3 -1
- data/default_metadata/page/start.json +10 -0
- data/default_metadata/service/base.json +1 -12
- data/fixtures/service.json +1 -0
- data/fixtures/version.json +6 -0
- data/lib/metadata_presenter/version.rb +1 -1
- data/schemas/definition/page.json +5 -0
- 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: cff1faeeda0dc9ad30f761911443f2f61adade496ec5c1083dbbe5f30a4d98b3
|
4
|
+
data.tar.gz: a52199fbdfea2f4ee641dd62d792f7bfc2ab76955c40eb8edd0109171120a22f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cd44c337711cb58997b98ff2ef941f573093d135ba79342181226ac294a5efc134072767ed505199c188d906a5a26a500d93bf937ee359309023595674af290f
|
7
|
+
data.tar.gz: 19e793b3f02f3fcba3fb45822da09b6dd4c48037512af6616a8711d3d841cf90f7b549605cb822d891bc5124e39a59d5ace2549757227dd8bb9038de1bc56764
|
@@ -1,5 +1,7 @@
|
|
1
1
|
module MetadataPresenter
|
2
2
|
class AnswersController < EngineController
|
3
|
+
before_action :check_page_exists
|
4
|
+
|
3
5
|
def create
|
4
6
|
if page.validate_answers(answers_params)
|
5
7
|
save_user_data # method signature
|
@@ -12,15 +14,16 @@ module MetadataPresenter
|
|
12
14
|
private
|
13
15
|
|
14
16
|
def page
|
15
|
-
@page ||=
|
16
|
-
service.
|
17
|
-
|
17
|
+
@page ||= begin
|
18
|
+
current_page = service.find_page_by_url(page_url)
|
19
|
+
MetadataPresenter::Page.new(current_page.metadata) if current_page
|
20
|
+
end
|
18
21
|
end
|
19
22
|
|
20
23
|
def redirect_to_next_page
|
21
24
|
next_page = NextPage.new(service).find(
|
22
25
|
session: session,
|
23
|
-
current_page_url:
|
26
|
+
current_page_url: page_url
|
24
27
|
)
|
25
28
|
|
26
29
|
if next_page.present?
|
@@ -38,5 +41,13 @@ module MetadataPresenter
|
|
38
41
|
def answers_params
|
39
42
|
params[:answers] ? params[:answers].permit! : {}
|
40
43
|
end
|
44
|
+
|
45
|
+
def page_url
|
46
|
+
request.env['PATH_INFO']
|
47
|
+
end
|
48
|
+
|
49
|
+
def check_page_exists
|
50
|
+
not_found if page.blank?
|
51
|
+
end
|
41
52
|
end
|
42
53
|
end
|
@@ -2,7 +2,7 @@ module MetadataPresenter
|
|
2
2
|
class PagesController < EngineController
|
3
3
|
def show
|
4
4
|
@user_data = load_user_data # method signature
|
5
|
-
@page ||= service.
|
5
|
+
@page ||= service.find_page_by_url(request.env['PATH_INFO'])
|
6
6
|
|
7
7
|
if @page
|
8
8
|
render template: @page.template
|
@@ -7,12 +7,16 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
|
|
7
7
|
pages.first
|
8
8
|
end
|
9
9
|
|
10
|
-
def
|
11
|
-
pages.find { |page| page.url ==
|
10
|
+
def find_page_by_url(url)
|
11
|
+
pages.find { |page| page.url == url }
|
12
|
+
end
|
13
|
+
|
14
|
+
def find_page_by_uuid(uuid)
|
15
|
+
pages.find { |page| page.uuid == uuid }
|
12
16
|
end
|
13
17
|
|
14
18
|
def next_page(from:)
|
15
|
-
current_page =
|
19
|
+
current_page = find_page_by_url(from)
|
16
20
|
pages[pages.index(current_page) + 1] if current_page.present?
|
17
21
|
end
|
18
22
|
|
@@ -5,7 +5,7 @@
|
|
5
5
|
<%= @page.heading.html_safe %>
|
6
6
|
</h1>
|
7
7
|
|
8
|
-
<%= form_for @page, url:
|
8
|
+
<%= form_for @page, url: @page.url, method: :post do |f| %>
|
9
9
|
<%= f.govuk_error_summary %>
|
10
10
|
<% @page.components.each do |component| %>
|
11
11
|
<%= render partial: component, locals: { component: component, f: f } %>
|
@@ -25,7 +25,7 @@
|
|
25
25
|
</p>
|
26
26
|
<%- end %>
|
27
27
|
|
28
|
-
<%= form_tag(
|
28
|
+
<%= form_tag(@page.url, method: :post) do %>
|
29
29
|
<button <%= 'disabled' if editable? %> class='govuk-button govuk-button--start govuk-!-margin-top-2'>
|
30
30
|
Start
|
31
31
|
<svg class="govuk-button__start-icon" xmlns="http://www.w3.org/2000/svg" width="17.5" height="19" viewBox="0 0 33 40" aria-hidden="true" focusable="false">
|
data/config/routes.rb
CHANGED
@@ -1,8 +1,10 @@
|
|
1
1
|
MetadataPresenter::Engine.routes.draw do
|
2
2
|
root to: 'service#start'
|
3
3
|
|
4
|
-
post '/reserved/:page_url/answers', to: 'answers#create', as: :reserved_answers
|
5
4
|
post '/reserved/submissions', to: 'submissions#create', as: :reserved_submissions
|
6
5
|
get '/reserved/change-answer', to: 'change_answer#create', as: :change_answer
|
6
|
+
|
7
|
+
post '/', to: 'answers#create'
|
8
|
+
match '*path', to: 'answers#create', via: :post
|
7
9
|
match '*path', to: 'pages#show', via: :all
|
8
10
|
end
|
@@ -0,0 +1,10 @@
|
|
1
|
+
{
|
2
|
+
"_id": "page.start",
|
3
|
+
"_type": "page.start",
|
4
|
+
"heading": "Service name goes here",
|
5
|
+
"lede": "This is your start page first paragraph. You can only have one paragraph here.",
|
6
|
+
"body": "Use this service to:\r\n\r\n* do something\r\n* update your name, address or other details\r\n* do something else\r\n\r\nRegistering takes around 5 minutes.",
|
7
|
+
"before_you_start": "###Before you start\r\nYou can also register by post.\r\n\r\nThe online service is also available in Welsh (Cymraeg).\r\n\r\nYou cannot register for this service if you’re in the UK illegally.",
|
8
|
+
"steps": [],
|
9
|
+
"url": "/"
|
10
|
+
}
|
@@ -3,17 +3,6 @@
|
|
3
3
|
"_type": "service.base",
|
4
4
|
"service_name": "Service name",
|
5
5
|
"configuration": {},
|
6
|
-
"pages": [
|
7
|
-
{
|
8
|
-
"_id": "page.start",
|
9
|
-
"_type": "page.start",
|
10
|
-
"heading": "Service name goes here",
|
11
|
-
"lede": "This is your start page first paragraph. You can only have one paragraph here.",
|
12
|
-
"body": "Use this service to:\r\n\r\n* do something\r\n* update your name, address or other details\r\n* do something else\r\n\r\nRegistering takes around 5 minutes.",
|
13
|
-
"before_you_start": "###Before you start\r\nYou can also register by post.\r\n\r\nThe online service is also available in Welsh (Cymraeg).\r\n\r\nYou cannot register for this service if you’re in the UK illegally.",
|
14
|
-
"steps": [],
|
15
|
-
"url": "/"
|
16
|
-
}
|
17
|
-
],
|
6
|
+
"pages": [],
|
18
7
|
"locale": "en"
|
19
8
|
}
|
data/fixtures/service.json
CHANGED
data/fixtures/version.json
CHANGED
@@ -36,6 +36,7 @@
|
|
36
36
|
},
|
37
37
|
"pages": [
|
38
38
|
{
|
39
|
+
"_uuid": "fa391697-ae82-4416-adc3-3433e54ce535",
|
39
40
|
"_id": "page.start",
|
40
41
|
"_type": "page.start",
|
41
42
|
"heading": "Service name goes here",
|
@@ -52,6 +53,7 @@
|
|
52
53
|
"url": "/"
|
53
54
|
},
|
54
55
|
{
|
56
|
+
"_uuid": "847c4a0c-1c5f-4391-8847-42c8d82f1d0b",
|
55
57
|
"_id": "page.name",
|
56
58
|
"_type": "page.singlequestion",
|
57
59
|
"components": [
|
@@ -71,6 +73,7 @@
|
|
71
73
|
"url": "/name"
|
72
74
|
},
|
73
75
|
{
|
76
|
+
"_uuid": "ccf49acb-ad33-4fd3-8a7e-f0594b86cc96",
|
74
77
|
"_id": "page.email-address",
|
75
78
|
"_type": "page.singlequestion",
|
76
79
|
"heading": "Email address",
|
@@ -102,6 +105,7 @@
|
|
102
105
|
"url": "/email-address"
|
103
106
|
},
|
104
107
|
{
|
108
|
+
"_uuid": "7b748584-100e-4d81-a54a-5049190136cc",
|
105
109
|
"_id": "page.parent_name",
|
106
110
|
"_type": "page.singlequestion",
|
107
111
|
"components": [
|
@@ -121,6 +125,7 @@
|
|
121
125
|
"url": "/parent-name"
|
122
126
|
},
|
123
127
|
{
|
128
|
+
"_uuid": "e819d0c2-7062-4997-89cf-44d26d098404",
|
124
129
|
"_id": "page._check-answers",
|
125
130
|
"_type": "page.checkanswers",
|
126
131
|
"body": "Optional content",
|
@@ -132,6 +137,7 @@
|
|
132
137
|
"url": "/check-answers"
|
133
138
|
},
|
134
139
|
{
|
140
|
+
"_uuid": "b238a22f-c180-48d0-a7d9-8aad2036f1f2",
|
135
141
|
"_id": "page._confirmation",
|
136
142
|
"_type": "page.confirmation",
|
137
143
|
"body": "You'll receive a confirmation email",
|
@@ -4,6 +4,10 @@
|
|
4
4
|
"id_seed": "url",
|
5
5
|
"title": "Page definition",
|
6
6
|
"properties": {
|
7
|
+
"_uuid": {
|
8
|
+
"title": "Unique identifier of the page",
|
9
|
+
"description": "Used internally in the editor and the runner."
|
10
|
+
},
|
7
11
|
"url": {
|
8
12
|
"title": "URL",
|
9
13
|
"description": "The page’s relative url - it must not contain any spaces",
|
@@ -95,6 +99,7 @@
|
|
95
99
|
}
|
96
100
|
],
|
97
101
|
"required": [
|
102
|
+
"_uuid",
|
98
103
|
"url"
|
99
104
|
],
|
100
105
|
"category": [
|
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.3.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-01-
|
11
|
+
date: 2021-01-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -261,6 +261,7 @@ files:
|
|
261
261
|
- default_metadata/page/checkanswers.json
|
262
262
|
- default_metadata/page/confirmation.json
|
263
263
|
- default_metadata/page/singlequestion.json
|
264
|
+
- default_metadata/page/start.json
|
264
265
|
- default_metadata/service/base.json
|
265
266
|
- default_metadata/string/error.max_length.json
|
266
267
|
- default_metadata/string/error.min_length.json
|