govuk-components 4.0.0a1 → 4.0.0a2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5498c871090fc7b01a2bf8b6caf80a29a00d713917173e6c7350d47e99b3f56
-  data.tar.gz: 86369759dd515ef9fd7a9826be8c95ce3dacbcd987c59cdcc253cdb1e32648b5
+  metadata.gz: 4a89715e3ac54c26a25f8711ffcc1bcbae3c7cd697e6dc4993d6581c52fe4885
+  data.tar.gz: 8c781f15f6e02d50b5c463732770340502a7c3e300b63f633c6ca09b084effab
 SHA512:
-  metadata.gz: ec79d90aeab7f907b61a3105ac2a05595846d05d5af481489160aa3da47020459044c77dec97e9734a742faf1cbc86eedc46ec486899ed8f60b8fdbf85b491dc
-  data.tar.gz: f8b7225906230461f099835e91799117f6f6528a93e1311b01109b4210a0003e532201877377166d3cadf4ba841306e886ca41164aaeb7497b53340da530ff62
+  metadata.gz: 4c89afcba1f59b8b7d02142b891904667a9b6aaeb84db7f1d4c6c373d516b7ee302aa23e6431d21e3144f1ea6bbdc7d78703bc6d3dfe88e5c00c2f987ce8368c
+  data.tar.gz: 1dc348dde934a1806118c18c75d20b4cee98b03ba2032a1a86a4a0519461662acab039b8a8f65fd41ef3406faf634da95e72db9a2e33456af191375f87477b19

data/README.md

@@ -6,7 +6,7 @@
 [![Gem](https://img.shields.io/gem/dt/govuk-components?logo=rubygems)](https://rubygems.org/gems/govuk-components)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/cbcbc140f300b920d833/test_coverage)](https://codeclimate.com/github/DFE-Digital/govuk-components/test_coverage)
 [![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk-components)](https://github.com/DFE-Digital/govuk-components/blob/main/LICENSE)
-[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-4.4.1-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-4.5.0-brightgreen)](https://design-system.service.gov.uk)
 [![Rails](https://img.shields.io/badge/Rails-6.1.7%20%E2%95%B1%207.0.3-E16D6D)](https://weblog.rubyonrails.org/releases/)
 [![Ruby](https://img.shields.io/badge/Ruby-3.0.5%20%20%E2%95%B1%203.1.3%20%20%E2%95%B1%203.2.0-E16D6D)](https://www.ruby-lang.org/en/downloads/)
 

data/app/components/govuk_component/pagination_component.rb

@@ -96,7 +96,7 @@ private
       text: @previous_text,
     }
 
-    previous_page(**kwargs.compact)
+    with_previous_page(**kwargs.compact)
   end
 
   def build_next
@@ -107,11 +107,11 @@ private
       text: @next_text,
     }
 
-    next_page(**kwargs.compact)
+    with_next_page(**kwargs.compact)
   end
 
   def build_items
-    pagy.series.map { |i| item(number: i, href: pagy_url_for(pagy, i), from_pagy: true) }
+    pagy.series.map { |i| with_item(number: i, href: pagy_url_for(pagy, i), from_pagy: true) }
   end
 
   def default_adjacent_text(side)

data/app/components/govuk_component/summary_list_component/card_component.html.erb

@@ -0,0 +1,16 @@
+<%= tag.div(**html_attributes) do %>
+  <div class="govuk-summary-card__title-wrapper">
+    <%= tag.h2(title, class: "govuk-summary-card__title") %>
+
+    <% if actions.any? %>
+      <ul class="govuk-summary-card__actions">
+        <% actions.each do |action| %>
+          <%= tag.li(action, class: "govuk-summary-card__action") %>
+        <% end %>
+      </ul>
+    <% end %>
+  </div>
+  <div class="govuk-summary-card__content">
+    <%= summary_list || content %>
+  </div>
+<% end %>

data/app/components/govuk_component/summary_list_component/card_component.rb

@@ -0,0 +1,19 @@
+class GovukComponent::SummaryListComponent::CardComponent < GovukComponent::Base
+  attr_reader :title
+
+  renders_many :actions
+  renders_one :summary_list, "GovukComponent::SummaryListComponent"
+
+  def initialize(title:, actions: [], classes: [], html_attributes: {})
+    @title = title
+    actions.each { |a| with_action { a } } if actions.any?
+
+    super(classes: classes, html_attributes: html_attributes)
+  end
+
+private
+
+  def default_attributes
+    { class: %w(govuk-summary-card) }
+  end
+end

data/app/components/govuk_component/summary_list_component.rb

@@ -1,6 +1,6 @@
 module GovukComponent
   class SummaryListComponent < GovukComponent::Base
-    attr_reader :borders, :actions
+    attr_reader :borders, :actions, :card
 
     renders_many :rows, ->(classes: [], html_attributes: {}, &block) do
       GovukComponent::SummaryListComponent::RowComponent.new(
@@ -11,9 +11,10 @@ module GovukComponent
       )
     end
 
-    def initialize(rows: nil, actions: true, borders: config.default_summary_list_borders, classes: [], html_attributes: {})
+    def initialize(rows: nil, actions: true, borders: config.default_summary_list_borders, card: nil, classes: [], html_attributes: {})
       @borders             = borders
       @show_actions_column = actions
+      @card                = card
 
       super(classes: classes, html_attributes: html_attributes)
 
@@ -22,8 +23,21 @@ module GovukComponent
       build(rows)
     end
 
+    def call
+      summary_list = tag.dl(**html_attributes) { safe_join(rows) }
+
+      (card.nil?) ? summary_list : card_with(summary_list)
+    end
+
   private
 
+    # we're not using `renders_one` here because we always want the card to render
+    # outside of the summary list. when manually building use
+    # govuk_summary_list_card { govuk_summary_list }
+    def card_with(summary_list)
+      render(GovukComponent::SummaryListComponent::CardComponent.new(**card)) { summary_list }
+    end
+
     def borders_class
       %(govuk-summary-list--no-border) unless borders
     end
@@ -38,10 +52,10 @@ module GovukComponent
       rows.each do |data|
         k, v, a = data.values_at(:key, :value, :actions)
 
-        row(**data.slice(:classes, :html_attributes)) do |r|
-          r.key(**k)
-          r.value(**v)
-          Array.wrap(a).each { |ad| r.action(**ad) }
+        with_row(**data.slice(:classes, :html_attributes)) do |r|
+          r.with_key(**k)
+          r.with_value(**v)
+          Array.wrap(a).each { |ad| r.with_action(**ad) }
         end
       end
     end

data/app/components/govuk_component/table_component/body_component.rb

@@ -24,7 +24,7 @@ private
   def build_rows_from_row_data(data, first_cell_is_header)
     return if data.blank?
 
-    data.each { |d| row(cell_data: d, first_cell_is_header: first_cell_is_header) }
+    data.each { |d| with_row(cell_data: d, first_cell_is_header: first_cell_is_header) }
   end
 
   def default_attributes

data/app/components/govuk_component/table_component/cell_component.rb

@@ -1,5 +1,5 @@
 class GovukComponent::TableComponent::CellComponent < GovukComponent::Base
-  attr_reader :text, :header, :numeric, :width, :scope, :parent
+  attr_reader :text, :header, :numeric, :width, :scope, :parent, :colspan, :rowspan
 
   alias_method :numeric?, :numeric
   alias_method :header?, :header
@@ -13,12 +13,14 @@ class GovukComponent::TableComponent::CellComponent < GovukComponent::Base
     "one-quarter"    => "govuk-!-width-one-quarter",
   }.freeze
 
-  def initialize(scope: nil, header: nil, numeric: false, text: nil, width: nil, parent: nil, classes: [], html_attributes: {})
+  def initialize(scope: nil, header: nil, numeric: false, text: nil, width: nil, parent: nil, rowspan: nil, colspan: nil, classes: [], html_attributes: {})
     @text    = text
     @numeric = numeric
     @width   = width
     @scope   = scope
     @parent  = parent
+    @colspan = colspan
+    @rowspan = rowspan
     @header  = (header.nil?) ? in_thead? : header
 
     super(classes: classes, html_attributes: html_attributes)
@@ -39,11 +41,15 @@ private
   end
 
   def cell_element
-    header ? 'th' : 'td'
+    if in_thead? || header?
+      'th'
+    else
+      'td'
+    end
   end
 
   def default_attributes
-    { class: default_classes, scope: determine_scope }
+    { class: default_classes, scope: determine_scope, colspan: colspan, rowspan: rowspan }.compact
   end
 
   def determine_scope
@@ -56,28 +62,40 @@ private
       nil
     in { auto_table_scopes: true, parent: 'thead' }
       'col'
-    in { auto_table_scopes: true, parent: 'tbody' }
+    in { auto_table_scopes: true, parent: 'tbody' } | { auto_table_scopes: true, parent: 'tfoot' }
       'row'
     else
-      Rails.logger.warn("No scope pattern matched")
-
       nil
     end
   end
 
   def default_classes
-    if header
-      class_names("govuk-table__header", "govuk-table__header--numeric" => numeric?, width_class => width?)
-    else
-      class_names("govuk-table__cell", "govuk-table__cell--numeric" => numeric?, width_class => width?)
-    end
+    class_names(
+      "govuk-table__#{class_suffix}",
+      "govuk-table__#{class_suffix}--numeric" => numeric?,
+      width => width?,
+    )
   end
 
-  def width_class
-    WIDTHS.fetch(width, nil)
+  def class_suffix
+    if in_thead? || (in_tbody? && header?)
+      "header"
+    elsif in_tfoot?
+      "footer"
+    else
+      "cell"
+    end
   end
 
   def in_thead?
     parent == "thead"
   end
+
+  def in_tfoot?
+    parent == "tfoot"
+  end
+
+  def in_tbody?
+    parent == "tbody"
+  end
 end

data/app/components/govuk_component/table_component/col_group_component.rb

@@ -0,0 +1,45 @@
+class GovukComponent::TableComponent::ColGroupComponent < GovukComponent::Base
+  renders_many :cols, "ColComponent"
+
+  def initialize(classes: [], cols: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    return if cols.blank?
+
+    cols.each { |c| with_col(span: c) }
+  end
+
+  def call
+    tag.colgroup(**html_attributes) { safe_join(cols) }
+  end
+
+  def render?
+    cols.any?
+  end
+
+private
+
+  def default_attributes
+    {}
+  end
+
+  class ColComponent < GovukComponent::Base
+    attr_reader :span
+
+    def initialize(span: 1, classes: [], html_attributes: {})
+      @span = span.to_s
+
+      super(classes: classes, html_attributes: html_attributes)
+    end
+
+    def call
+      tag.col(span: span, **html_attributes)
+    end
+
+  private
+
+    def default_attributes
+      {}
+    end
+  end
+end

data/app/components/govuk_component/table_component/foot_component.rb

@@ -0,0 +1,44 @@
+class GovukComponent::TableComponent::FootComponent < GovukComponent::Base
+  renders_many :rows, ->(cell_data: nil, first_cell_is_header: false, classes: [], html_attributes: {}, &block) do
+    GovukComponent::TableComponent::RowComponent.from_foot(
+      cell_data: cell_data,
+      first_cell_is_header: first_cell_is_header,
+      classes: classes,
+      html_attributes: html_attributes,
+      &block
+    )
+  end
+
+  attr_reader :first_cell_is_header, :row_data
+
+  def initialize(rows: nil, first_cell_is_header: false, classes: [], html_attributes: {})
+    @rows = rows
+    @first_cell_is_header = first_cell_is_header
+
+    super(classes: classes, html_attributes: html_attributes)
+
+    return unless rows.presence
+
+    build_rows_from_row_data(rows)
+  end
+
+  def call
+    tag.tfoot(**html_attributes) { safe_join(rows) }
+  end
+
+  def render?
+    rows.any?
+  end
+
+private
+
+  def build_rows_from_row_data(data)
+    return if data.blank?
+
+    with_row(cell_data: data, first_cell_is_header: first_cell_is_header)
+  end
+
+  def default_attributes
+    { class: %w(govuk-table__foot) }
+  end
+end

data/app/components/govuk_component/table_component/head_component.rb

@@ -25,7 +25,7 @@ private
   def build_rows_from_row_data(data)
     return if data.blank?
 
-    data.each { |d| row(cell_data: d) }
+    data.each { |d| with_row(cell_data: d) }
   end
 
   def default_attributes

data/app/components/govuk_component/table_component/row_component.rb

@@ -1,5 +1,5 @@
 class GovukComponent::TableComponent::RowComponent < GovukComponent::Base
-  renders_many :cells, ->(scope: nil, header: nil, text: nil, numeric: false, width: nil, classes: [], html_attributes: {}, &block) do
+  renders_many :cells, ->(scope: nil, header: nil, text: nil, numeric: false, width: nil, rowspan: nil, colspan: nil, classes: [], html_attributes: {}, &block) do
     GovukComponent::TableComponent::CellComponent.new(
       scope: scope,
       header: header,
@@ -7,6 +7,8 @@ class GovukComponent::TableComponent::RowComponent < GovukComponent::Base
       numeric: numeric,
       width: width,
       parent: parent,
+      rowspan: rowspan,
+      colspan: colspan,
       classes: classes,
       html_attributes: html_attributes,
       &block
@@ -32,6 +34,10 @@ class GovukComponent::TableComponent::RowComponent < GovukComponent::Base
     new(*args, parent: 'tbody', **kwargs, &block)
   end
 
+  def self.from_foot(*args, **kwargs, &block)
+    new(*args, parent: 'tfoot', **kwargs, &block)
+  end
+
   def call
     tag.tr(**html_attributes) { safe_join(cells) }
   end
@@ -41,7 +47,14 @@ private
   def build_cells_from_cell_data(cell_data)
     return if cell_data.blank?
 
-    cell_data.each.with_index { |data, i| cell(text: data, **cell_attributes(i)) }
+    cell_data.each_with_index do |data, i|
+      case data
+      when Hash
+        with_cell(**data, **cell_attributes(i))
+      when String
+        with_cell(text: data, **cell_attributes(i))
+      end
+    end
   end
 
   def cell_attributes(count)

data/app/components/govuk_component/table_component.rb

@@ -1,12 +1,15 @@
 module GovukComponent
   class TableComponent < GovukComponent::Base
     renders_one :caption, "GovukComponent::TableComponent::CaptionComponent"
+    renders_many :cols, "GovukComponent::TableComponent::ColGroupComponent::ColComponent"
+    renders_many :colgroups, "GovukComponent::TableComponent::ColGroupComponent"
     renders_one :head, "GovukComponent::TableComponent::HeadComponent"
     renders_many :bodies, "GovukComponent::TableComponent::BodyComponent"
+    renders_one :foot, "GovukComponent::TableComponent::FootComponent"
 
     attr_accessor :id, :first_cell_is_header, :caption_text
 
-    def initialize(id: nil, rows: nil, head: nil, caption: nil, first_cell_is_header: false, classes: [], html_attributes: {})
+    def initialize(id: nil, rows: nil, head: nil, foot: nil, caption: nil, first_cell_is_header: false, classes: [], html_attributes: {})
       @id                   = id
       @first_cell_is_header = first_cell_is_header
       @caption_text         = caption
@@ -17,19 +20,20 @@ module GovukComponent
       return unless rows.presence
 
       # if no head is passed in,use the first row for headers
-      build(*(head ? [head, rows] : [rows[0], rows[1..]]), caption_text)
+      build(*(head ? [head, rows] : [rows[0], rows[1..]]), foot, caption_text)
     end
 
     def call
-      tag.table(**html_attributes) { safe_join([caption, head, bodies]) }
+      tag.table(**html_attributes) { safe_join([caption, colgroups, head, bodies, foot]) }
     end
 
   private
 
-    def build(head_data, body_data, caption_text)
-      caption(text: caption_text)
-      head(rows: [head_data])
-      body(rows: body_data, first_cell_is_header: first_cell_is_header)
+    def build(head_data, body_data, foot_data, caption_text)
+      with_caption(text: caption_text)
+      with_head(rows: [head_data])
+      with_body(rows: body_data, first_cell_is_header: first_cell_is_header)
+      with_foot(rows: foot_data, first_cell_is_header: first_cell_is_header)
     end
 
     def default_attributes

data/app/helpers/govuk_components_helper.rb

@@ -15,6 +15,7 @@ module GovukComponentsHelper
     govuk_section_break: 'GovukComponent::SectionBreakComponent',
     govuk_start_button: 'GovukComponent::StartButtonComponent',
     govuk_summary_list: 'GovukComponent::SummaryListComponent',
+    govuk_summary_card: 'GovukComponent::SummaryListComponent::CardComponent',
     govuk_table: 'GovukComponent::TableComponent',
     govuk_tabs: 'GovukComponent::TabComponent',
     govuk_tag: 'GovukComponent::TagComponent',

data/app/helpers/govuk_link_helper.rb

@@ -17,11 +17,6 @@ module GovukLinkHelper
     warning:   "govuk-button--warning",
   }.freeze
 
-  NEW_TAB_ATTRIBUTES = {
-    target: "_blank",
-    rel: "noreferrer noopener"
-  }.freeze
-
   def govuk_link_classes(*styles, default_class: 'govuk-link')
     if (invalid_styles = (styles - LINK_STYLES.keys)) && invalid_styles.any?
       fail(ArgumentError, "invalid styles #{invalid_styles.to_sentence}. Valid styles are #{LINK_STYLES.keys.to_sentence}")
@@ -38,14 +33,14 @@ module GovukLinkHelper
     [default_class] + BUTTON_STYLES.values_at(*styles).compact
   end
 
-  def govuk_link_to(name = nil, options = nil, extra_options = {}, new_tab: false, &block)
+  def govuk_link_to(name = nil, options = nil, extra_options = {}, &block)
     extra_options = options if block_given?
-    html_options = build_html_options(extra_options, new_tab: new_tab)
+    html_options = build_html_options(extra_options)
 
     if block_given?
       link_to(name, html_options, &block)
     else
-      link_to(prepare_link_text(name, new_tab), options, html_options)
+      link_to(name, options, html_options)
     end
   end
 
@@ -71,15 +66,15 @@ module GovukLinkHelper
     end
   end
 
-  def govuk_button_link_to(name = nil, options = nil, extra_options = {}, new_tab: false, &block)
+  def govuk_button_link_to(name = nil, options = nil, extra_options = {}, &block)
     extra_options = options if block_given?
     html_options = GovukComponent::StartButtonComponent::LINK_ATTRIBUTES
-      .merge build_html_options(extra_options, style: :button, new_tab: new_tab)
+      .merge build_html_options(extra_options, style: :button)
 
     if block_given?
       link_to(name, html_options, &block)
     else
-      link_to(prepare_link_text(name, new_tab), options, html_options)
+      link_to(name, options, html_options)
     end
   end
 
@@ -96,24 +91,19 @@ module GovukLinkHelper
 
 private
 
-  def build_html_options(provided_options, style: :link, new_tab: false)
+  def build_html_options(provided_options, style: :link)
     element_styles = { link: LINK_STYLES, button: BUTTON_STYLES }.fetch(style, {})
 
     # we need to take a couple of extra steps here because we don't want the style
     # params (inverse, muted, etc) to end up as extra attributes on the link.
 
-    remaining_options = new_tab_options(new_tab)
-      .deep_merge_html_attributes(remove_styles_from_provided_options(element_styles, provided_options))
+    remaining_options = remove_styles_from_provided_options(element_styles, provided_options)
 
     style_classes = build_style_classes(style, extract_styles_from_provided_options(element_styles, provided_options))
 
     combine_attributes(remaining_options, class_name: style_classes)
   end
 
-  def new_tab_options(new_tab)
-    new_tab ? NEW_TAB_ATTRIBUTES : {}
-  end
-
   def build_style_classes(style, provided_options)
     keys = *provided_options&.keys
 
@@ -143,16 +133,6 @@ private
 
     provided_options&.except(*styles.keys)
   end
-
-  def prepare_link_text(text, new_tab)
-    return text unless new_tab
-
-    new_tab_text = new_tab.is_a?(String) ? new_tab : Govuk::Components.config.default_link_new_tab_text
-
-    return text if new_tab_text.blank?
-
-    %(#{text} #{new_tab_text})
-  end
 end
 
 ActiveSupport.on_load(:action_view) { include GovukLinkHelper }

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '4.0.0a1'.freeze
+    VERSION = '4.0.0a2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 4.0.0a1
+  version: 4.0.0a2
 platform: ruby
 authors:
 - DfE developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 3.0.0rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 3.0.0rc1
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -204,14 +204,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -288,28 +288,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.1
 description: A collection of components intended to ease the building of GOV.UK Design
   System web applications
 email:
@@ -349,9 +349,10 @@ files:
 - app/components/govuk_component/phase_banner_component.rb
 - app/components/govuk_component/section_break_component.rb
 - app/components/govuk_component/start_button_component.rb
-- app/components/govuk_component/summary_list_component.html.erb
 - app/components/govuk_component/summary_list_component.rb
 - app/components/govuk_component/summary_list_component/action_component.rb
+- app/components/govuk_component/summary_list_component/card_component.html.erb
+- app/components/govuk_component/summary_list_component/card_component.rb
 - app/components/govuk_component/summary_list_component/key_component.rb
 - app/components/govuk_component/summary_list_component/row_component.rb
 - app/components/govuk_component/summary_list_component/value_component.rb
@@ -361,6 +362,8 @@ files:
 - app/components/govuk_component/table_component/body_component.rb
 - app/components/govuk_component/table_component/caption_component.rb
 - app/components/govuk_component/table_component/cell_component.rb
+- app/components/govuk_component/table_component/col_group_component.rb
+- app/components/govuk_component/table_component/foot_component.rb
 - app/components/govuk_component/table_component/head_component.rb
 - app/components/govuk_component/table_component/row_component.rb
 - app/components/govuk_component/tag_component.rb

data/app/components/govuk_component/summary_list_component.html.erb

@@ -1,5 +0,0 @@
-<%= tag.dl(**html_attributes) do %>
-  <% rows.each do |row| %>
-    <%= row %>
-  <% end %>
-<% end %>