metadata_presenter 0.24.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0229789953adde481420a7894d10b46a960c916743ccad833e3478d7750f5f52'
-  data.tar.gz: 186e22679a9def093e40479662f4c9417251d18f63c10edb17a20a0555dc6b74
+  metadata.gz: b0b2d2f31a8c12d75f9cf2f3cc9700707bcc9f6f724017ea3a815247c8296b8f
+  data.tar.gz: 9e31cb576a176c3eb47a366527043530fe715a6ced062d8aaa718c5f6c3ffd15
 SHA512:
-  metadata.gz: da02ebfa513bb1f68f74a682d292fb67502f74a29f9cd2f9d3524f92a2a21a87ad157c2d717e01c8e462fac0ea26a05cb00d4aa6c7c3a2aedc228b7e5735ee19
-  data.tar.gz: 0ea7f87eb28078007c0500e047856793ac5cdcd8a239d1934c798b279c90903a9f1197d4e5ee89e6d489b8b218ad9c64fe78d9d28b2d1189a5dcef89763b23b5
+  metadata.gz: 67d005a63fb9b095c2312174ab66a0a9e8dfac71086cf7547e4fff44672146ca5c42969bfa31e7170cc93b5f22281a4ea7e080da1ebf8a18f397d579b5bdf541
+  data.tar.gz: 4ebae292b4427aa8c43ad95a1ccd310eaaac6c0de2b64b951a91bc462b9fe89a6eb4509e16f88f8f4dd0fe5f34fb528c4e9885c6774b285488f6076e6a03583b

data/app/helpers/metadata_presenter/application_helper.rb

@@ -6,15 +6,14 @@ module MetadataPresenter
       end
     end
 
-    # Renders markdown given a text.
+    # Renders html given markdown.
     #
     # @example
-    #   <%=m '# Some markdown' %>
+    #   <%=to_html '# Some markdown' %>
     #
-    def m(text)
+    def to_html(text)
       Kramdown::Document.new(text).to_html.html_safe
     end
-    alias_method :to_markdown, :m
 
     def default_text(property)
       MetadataPresenter::DefaultText[property]

data/app/views/metadata_presenter/attribute/_body.html.erb

@@ -3,6 +3,6 @@
         data-fb-content-id="page[body]"
         data-fb-content-type="content"
         data-fb-default-text="<%= default_text('body') %>">
-    <%= to_markdown(@page.body) %>
+    <%= to_html(@page.body) %>
   </div>
 <%- end %>

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

@@ -18,23 +18,3 @@
     %>
   </div>
 <% end %>
-
-<% if editable? %>
-  <ul class="component-activated-menu govuk-navigation editor-button govuk-button fb-govuk-button">
-    <% if input_components.present? %>
-      <ul>
-        <% input_components.each do |component| %>
-          <li><a href="#add-input-component" data-component-type="<%= component %>"></a>+ Add <%= component %> component</li>
-        <% end %>
-      </ul>
-    <% end %>
-
-    <% if content_components.present? %>
-      <ul>
-        <% content_components.each do |component| %>
-          <li><a href="#add-content-component" data-component-type="<%= component %>">+ Add <%= component %> component</a></li>
-        <% end %>
-      </ul>
-    <% end %>
-  </ul>
-<% end %>

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

@@ -1 +1 @@
-<%= to_markdown(component.html) %>
+<%= to_html(component.content) %>

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

@@ -3,7 +3,7 @@
     <div class="govuk-grid-column-two-thirds">
       <% if @page.body %>
         <p class="govuk-body-l" data-block-id="<%= @page.id %>" data-block-property="body">
-        <%= to_markdown(@page.body) %>
+        <%= to_html(@page.body) %>
         </p>
       <%- end %>
        <%= form_tag(reserved_answers_path, method: :post) do  %>

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

@@ -20,7 +20,7 @@
         <div class="fb-editable"
              data-fb-content-id="page[before_you_start]"
              data-fb-content-type="content">
-          <%= to_markdown(@page.before_you_start) %>
+          <%= to_html(@page.before_you_start) %>
         </div>
       <%- end %>
     </div>

data/default_metadata/component/content.json

@@ -1,5 +1,5 @@
 {
   "_id": "component.content",
   "_type": "content",
-  "html": "[Optional content]"
+  "content": "[Optional content]"
 }

data/default_text/content.json

@@ -2,6 +2,8 @@
   "section_heading": "[Optional section heading]",
   "lede": "[Optional lede paragraph]",
   "body": "[Optional content]",
-  "html": "[Optional content]",
-  "hint": "[Optional hint text]"
+  "content": "[Optional content]",
+  "hint": "[Optional hint text]",
+  "option": "[Required option text]",
+  "option_hint": "[Optional hint text]"
 }

data/fixtures/version.json

@@ -178,14 +178,14 @@
           "legend": "Do you like Star Wars?",
           "items": [
             {
-              "_id": "do-you-like-star-wars_radio_1",
+              "_id": "do-you-like-star-wars_radios_1_item_1",
               "_type": "radio",
               "label": "Only on weekends",
               "hint": "Optional item hint",
               "value": "only-on-weekends"
             },
             {
-              "_id": "do-you-like-star-wars_radio_2",
+              "_id": "do-you-like-star-wars_radios_1_item_2",
               "_type": "radio",
               "label": "Hell no!",
               "hint": "Optional item hint",
@@ -236,21 +236,21 @@
           "legend": "What would you like on your burger?",
           "items": [
             {
-              "_id": "burgers_checkbox_1",
+              "_id": "burgers_checkboxes_1_item_1",
               "_type": "checkbox",
               "label": "Beef, cheese, tomato",
               "hint": "Optional item hint",
               "value": "beef-cheese-tomato"
             },
             {
-              "_id": "burgers_checkbox_2",
+              "_id": "burgers_checkboxes_1_item_2",
               "_type": "checkbox",
               "label": "Chicken, cheese, tomato",
               "hint": "Optional item hint",
               "value": "chicken-cheese-tomato"
             },
             {
-              "_id": "burgers_checkbox_3",
+              "_id": "burgers_checkboxes_1_item_3",
               "_type": "checkbox",
               "label": "Mozzarella, cheddar, feta",
               "hint": "Optional item hint",
@@ -330,7 +330,7 @@
         {
           "_id": "how-many-lights_content_1",
           "_type": "content",
-          "html": "What lights?"
+          "content": "What lights?"
         }
       ],
       "url": "how-many-lights"
@@ -348,9 +348,10 @@
         {
           "_id": "check-answers_content_1",
           "_type": "content",
-          "html": "Check yourself before you wreck yourself."
+          "content": "Check yourself before you wreck yourself."
         }
-      ]
+      ],
+      "extra_components": []
     },
     {
       "_uuid": "b238a22f-c180-48d0-a7d9-8aad2036f1f2",
@@ -364,7 +365,7 @@
         {
           "_id": "confirmation_content_1",
           "_type": "content",
-          "html": "Some day I will be the most powerful Jedi ever!"
+          "content": "Some day I will be the most powerful Jedi ever!"
         }
       ]
     }

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '0.24.0'.freeze
+  VERSION = '0.27.1'.freeze
 end

data/schemas/component/content.json

@@ -11,7 +11,7 @@
     "_type": {
       "const": "content"
     },
-    "html": {
+    "content": {
       "title": "Content",
       "description": "Content to display - use [markdown](https://www.gov.uk/guidance/how-to-publish-on-gov-uk/markdown) to format text or add hyperlinks",
       "type": "string",
@@ -25,6 +25,6 @@
     }
   ],
   "required": [
-    "html"
+    "content"
   ]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.27.1
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder