metadata_presenter 2.0.2 → 2.1.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4e13fd4a4a17bf97e91a2e69b59a5c12c3743e0cf38ce40a1c06b9b4b9915898
4
- data.tar.gz: c35ff1dc9a73b802e01f4995a4224ac73077f1a2e00676e67e7a49095d29c6fb
3
+ metadata.gz: 328ddd84238751ae9472c63068708a0ffc416cc001adec0519fd0492601e6540
4
+ data.tar.gz: a069b169471657e65036008522e588fb8fae0871eb4f26614d73e9d0f3ca2474
5
5
  SHA512:
6
- metadata.gz: 9d456b26ddc24e8e39e586eec91f7bc4acfd2c67506bc59d70fc1fdda8e8e0846dfc27fb965b9cd67653d6cca60ef7262a691cc4e8399486db0626b157f9b789
7
- data.tar.gz: 073523ef858cf90830133c5c8f2cdc3a230b6d79c8b9794c2d156892cfbfbc8a8208f744937aa63f55cefa70d5846a533f4fa492dfbee35b8f2fa06122adbf46
6
+ metadata.gz: 2f247335e09e2d0759fe0902d7b19a147670382c107e824036df8986c796eff05fbe2c7213c034d751287ac4356a33666478d989a9b9cd620006be4b24d02a19
7
+ data.tar.gz: bdb20dfd9804e2d780a54b534f564b16b32b4dd0930373adf3e71172ba2551aa23fe8e8abd9e06bad0dd15b27f8fbb912784bbbd9832906a520fd2f37245ab4e
@@ -6,24 +6,11 @@ module MetadataPresenter
6
6
  def page
7
7
  return if no_current_or_referrer_pages? || service.no_back_link?(current_page)
8
8
 
9
- return referrer_page if return_to_referrer?
10
-
11
9
  TraversedPages.new(service, user_data, current_page).last
12
10
  end
13
11
 
14
12
  private
15
13
 
16
- def referrer_page
17
- @referrer_page ||= service.find_page_by_url(URI(referrer).path)
18
- end
19
-
20
- def return_to_referrer?
21
- return false unless current_page.standalone?
22
-
23
- current_page.standalone? ||
24
- (referrer_page && referrer_page.standalone?)
25
- end
26
-
27
14
  def no_current_or_referrer_pages?
28
15
  current_page.blank? || referrer.nil?
29
16
  end
@@ -38,14 +38,6 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
38
38
  pages[pages.index(current_page) + 1] if current_page.present?
39
39
  end
40
40
 
41
- def previous_page(current_page:, referrer:)
42
- return if current_page.nil? || referrer.nil?
43
-
44
- unless no_back_link?(current_page)
45
- flow_page(current_page) || referrer_page(referrer)
46
- end
47
- end
48
-
49
41
  def confirmation_page
50
42
  @confirmation_page ||= pages.find do |page|
51
43
  page.type == 'page.confirmation'
@@ -57,7 +49,9 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
57
49
  end
58
50
 
59
51
  def no_back_link?(current_page)
60
- current_page == start_page || current_page == confirmation_page
52
+ current_page == start_page ||
53
+ current_page == confirmation_page ||
54
+ current_page.standalone?
61
55
  end
62
56
 
63
57
  private
@@ -1,3 +1,3 @@
1
1
  module MetadataPresenter
2
- VERSION = '2.0.2'.freeze
2
+ VERSION = '2.1.0'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metadata_presenter
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.2
4
+ version: 2.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - MoJ Online