metadata_presenter 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bbf3dc29244816bf09f72e822f69608e9f558dcbf658191c6a655eaa86b890d
-  data.tar.gz: 9a15f8dea3df85ce18dff8341fc565325f23e1dd4813abce5000d200635b691d
+  metadata.gz: 1ef68ecaae97370722eab970f6dd1ce2490c35f762af5bb2ff7addbe51fded02
+  data.tar.gz: 5a56f15853ed9becc11b70d0d0e1532ead81a098de1f7fbe3a1f1103a60c9a5d
 SHA512:
-  metadata.gz: 58b6f7444ac4fe98236b773a953b4c8cda5d65f3187eacd819108baeb43a121e7ceb78c6863e2fa3ab162434ce9684c4c314be45ab86e4924704004785a83989
-  data.tar.gz: ae79d645b8c9b080c8cf11cd62b4036e30a0325c4c879591631476071f2192654fa6714ab070e712a4dc8bc1612df49a04ef486dd36f7cc8920046f7137ebc56
+  metadata.gz: bccc48c9113831eed3a67fbb8aeb19ebc6f624b1526feb113578f67f4a1d6ab8989ff01f2d9f44176f03e80782fe8313f389979b042d749217b6c2d683dd8557
+  data.tar.gz: 7d8aabc2e90780a6d01ae263abfc6b93e6dd9b888f3b7c5339b16305e3008feb16f0c4aee41d91429dd8e1e24384fea93c44827e44a093db7b6aff8554b97f18

data/app/controllers/metadata_presenter/answers_controller.rb

@@ -3,7 +3,9 @@ module MetadataPresenter
     before_action :check_page_exists
 
     def create
-      if page.validate_answers(answers_params)
+      @page_answers = PageAnswers.new(page, answers_params)
+
+      if @page_answers.validate_answers
         save_user_data # method signature
         redirect_to_next_page
       else

data/app/controllers/metadata_presenter/pages_controller.rb

@@ -5,6 +5,7 @@ module MetadataPresenter
       @page ||= service.find_page_by_url(request.env['PATH_INFO'])
 
       if @page
+        @page_answers = PageAnswers.new(@page, @user_data)
         render template: @page.template
       else
         not_found

data/app/models/metadata_presenter/metadata.rb

@@ -24,7 +24,7 @@ class MetadataPresenter::Metadata
     metadata.respond_to?(method_name)
   end
 
-  def method_missing(method, *args, &block)
-    metadata.send(method, *args, &block)
+  def method_missing(method_name, *args, &block)
+    metadata.send(method_name, *args, &block)
   end
 end

data/app/models/metadata_presenter/page.rb

@@ -2,10 +2,6 @@ module MetadataPresenter
   class Page < MetadataPresenter::Metadata
     include ActiveModel::Validations
 
-    def validate_answers(answers)
-      ValidateAnswers.new(page: self, answers: answers).valid?
-    end
-
     def uuid
       _uuid
     end

data/app/models/metadata_presenter/page_answers.rb

@@ -0,0 +1,31 @@
+module MetadataPresenter
+  class PageAnswers
+    include ActiveModel::Model
+    include ActiveModel::Validations
+
+    def initialize(page, answers)
+      @page = page
+      @answers = answers
+    end
+
+    def validate_answers
+      ValidateAnswers.new(self, components: components).valid?
+    end
+
+    def components
+      page.components
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      answers[method_name.to_s].present?
+    end
+
+    def method_missing(method_name, *args, &block)
+      answers[method_name.to_s]
+    end
+
+    private
+
+    attr_reader :page, :answers
+  end
+end

data/app/validators/metadata_presenter/base_validator.rb

@@ -26,18 +26,14 @@ module MetadataPresenter
   #   end
   #
   class BaseValidator
-    # @return [MetadataPresenter::Page] page object from the metadata
-    attr_reader :page
-
-    # @return [Hash] the user answers
-    attr_reader :answers
+    # @return [MetadataPresenter::PageAnswers] page answers object
+    attr_reader :page_answers
 
     # @return [MetadataPresenter::Component] component object from the metadata
     attr_reader :component
 
-    def initialize(page:, answers:, component:)
-      @page = page
-      @answers = answers
+    def initialize(page_answers:, component:)
+      @page_answers = page_answers
       @component = component
     end
 
@@ -46,10 +42,10 @@ module MetadataPresenter
 
       if invalid_answer?
         error_message = custom_error_message || default_error_message
-        page.errors.add(component.id, error_message)
+        page_answers.errors.add(component.id, error_message)
       end
 
-      page.errors.blank?
+      page_answers.errors.blank?
     end
 
     # The custom message will be lookup from the schema key on the metadata.
@@ -67,7 +63,7 @@ module MetadataPresenter
     # @return [String] user answer for the specific component
     #
     def user_answer
-      answers[component.name]
+      page_answers.send(component.name)
     end
 
     # The default error message will be look using the schema key.

data/app/validators/metadata_presenter/validate_answers.rb

@@ -1,11 +1,10 @@
 module MetadataPresenter
   class ValidateAnswers
-    attr_reader :page, :components, :answers
+    attr_reader :page_answers, :components
 
-    def initialize(page:, answers:)
-      @page = page
-      @answers = answers
-      @components = Array(page.components)
+    def initialize(page_answers, components:)
+      @page_answers = page_answers
+      @components = Array(components)
     end
 
     def valid?
@@ -16,12 +15,13 @@ module MetadataPresenter
       !valid?
     end
 
+    private
+
     def validators
       components.map do |component|
         component_validations(component).map do |key|
           "MetadataPresenter::#{key.classify}Validator".constantize.new(
-            page: page,
-            answers: answers,
+            page_answers: page_answers,
             component: component
           )
         end

data/app/views/metadata_presenter/component/_number.html.erb

@@ -3,6 +3,5 @@
     label: { text: input_title },
     hint: { text: component.hint },
     name: "answers[#{component.name}]",
-    value: answer(component.name),
     width: component.width_class_input.to_i
 %>

data/app/views/metadata_presenter/component/_text.html.erb

@@ -2,6 +2,5 @@
   f.govuk_text_field component.id.to_sym,
     label: { text: input_title },
     hint: { text: component.hint },
-    name: "answers[#{component.name}]",
-    value: answer(component.name)
+    name: "answers[#{component.name}]"
 %>

data/app/views/metadata_presenter/component/_textarea.html.erb

@@ -3,7 +3,6 @@
     label: { text: input_title },
     hint: { text: component.hint },
     name: "answers[#{component.name}]",
-    value: answer(component.name),
     max_chars: component.maxchars,
     max_words: component.maxwords,
     threshold: component.threshold,

data/app/views/metadata_presenter/page/singlequestion.html.erb

@@ -1,7 +1,7 @@
 <div class="fb-main-grid-wrapper" data-block-id="<%= @page.id %>" data-block-type="page" data-block-pagetype="<%= @page.type %>">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <%= form_for @page, as: :answers, url: @page.url, method: :post do |f| %>
+      <%= form_for @page_answers, as: :answers, url: @page.url, method: :post do |f| %>
         <%= f.govuk_error_summary %>
         <% @page.components.each do |component| %>
           <%= render partial: component, locals: {

data/fixtures/version.json

@@ -58,10 +58,10 @@
       "_type": "page.singlequestion",
       "components": [
         {
-          "_id": "page.name--text.auto_name__1",
+          "_id": "name_text_1",
           "_type": "text",
           "label": "Full name",
-          "name": "full_name",
+          "name": "name_text_1",
           "validation": {
             "required": true,
             "max_length": 10,
@@ -79,7 +79,7 @@
       "heading": "Email address",
       "components": [
         {
-          "_id": "page.email-address--email.auto_name__2",
+          "_id": "email-address_email_1",
           "_type": "text",
           "errors": {
             "format": {},
@@ -94,7 +94,7 @@
             }
           },
           "label": "Your email address",
-          "name": "email_address",
+          "name": "email-address_email_1",
           "validation": {
             "required": true,
             "max_length": 30,
@@ -110,10 +110,10 @@
       "_type": "page.singlequestion",
       "components": [
         {
-          "_id": "page.parent-name--text.auto_name__3",
+          "_id": "parent-name_text_1",
           "_type": "text",
           "label": "Parent name",
-          "name": "parent_name",
+          "name": "parent-name_text_1",
           "validation": {
             "required": false,
             "max_length": 10,
@@ -132,9 +132,9 @@
       "heading":"Your age",
       "components": [
         {
-          "_id": "your_age_number_1",
+          "_id": "your-age_number_1",
           "hint": "Component hint",
-          "name": "your_age_number_1",
+          "name": "your-age_number_1",
           "_type": "number",
           "label": "Your age",
           "errors": {},
@@ -152,10 +152,10 @@
       "_type": "page.singlequestion",
       "components": [
         {
-          "_id": "page.family-hobbies--text.auto_name__3",
+          "_id": "family-hobbies_text_1",
           "_type": "textarea",
           "label": "Your family hobbies",
-          "name": "family_hobbies",
+          "name": "family-hobbies_text_1",
           "rows": 5,
           "validation": {
             "required": true
@@ -165,37 +165,6 @@
       "heading": "Family Hobbies",
       "url": "/family-hobbies"
     },
-    {
-      "_uuid": "4251b25e-08de-4dcb-8f2f-dd9848dcdca6",
-      "_id": "page.radio-buttons",
-      "_type": "page.singlequestion",
-      "components": [
-        {
-          "_id": "radio-buttons_radios_1",
-          "_type": "radios",
-          "errors": {},
-          "hint": "Component hint",
-          "label": "Component label",
-          "items": [
-            {
-              "_id": "radio-buttons_radio_1",
-              "_type": "radio",
-              "label": "Yes",
-              "value": "radio_value_1"
-            },
-            {
-              "_id": "radio-buttons_radio_2",
-              "_type": "radio",
-              "label": "No",
-              "value": "radio_value_2"
-            }
-          ],
-          "name": "radio-buttons_radios_1"
-        }
-      ],
-      "heading": "Parent name",
-      "url": "/radio-buttons"
-    },
     {
       "_uuid": "e819d0c2-7062-4997-89cf-44d26d098404",
       "_id": "page._check-answers",

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -236,6 +236,7 @@ files:
 - app/models/metadata_presenter/metadata.rb
 - app/models/metadata_presenter/next_page.rb
 - app/models/metadata_presenter/page.rb
+- app/models/metadata_presenter/page_answers.rb
 - app/models/metadata_presenter/service.rb
 - app/validators/metadata_presenter/base_validator.rb
 - app/validators/metadata_presenter/max_length_validator.rb