govuk-components 1.1.9 → 2.0.0b4

data/app/helpers/govuk_components_helper.rb

@@ -1,21 +1,21 @@
 module GovukComponentsHelper
   {
-    govuk_accordion: 'GovukComponent::Accordion',
-    govuk_back_link: 'GovukComponent::BackLink',
-    govuk_breadcrumbs: 'GovukComponent::Breadcrumbs',
-    govuk_cookie_banner: 'GovukComponent::CookieBanner',
-    govuk_details: 'GovukComponent::Details',
-    govuk_footer: 'GovukComponent::Footer',
-    govuk_header: 'GovukComponent::Header',
-    govuk_inset_text: 'GovukComponent::InsetText',
-    govuk_notification_banner: 'GovukComponent::NotificationBanner',
-    govuk_panel: 'GovukComponent::Panel',
-    govuk_phase_banner: 'GovukComponent::PhaseBanner',
-    govuk_start_now_button: 'GovukComponent::StartNowButton',
-    govuk_summary_list: 'GovukComponent::SummaryList',
-    govuk_tabs: 'GovukComponent::Tabs',
-    govuk_tag: 'GovukComponent::Tag',
-    govuk_warning: 'GovukComponent::Warning',
+    govuk_accordion: 'GovukComponent::AccordionComponent',
+    govuk_back_link: 'GovukComponent::BackLinkComponent',
+    govuk_breadcrumbs: 'GovukComponent::BreadcrumbsComponent',
+    govuk_cookie_banner: 'GovukComponent::CookieBannerComponent',
+    govuk_details: 'GovukComponent::DetailsComponent',
+    govuk_footer: 'GovukComponent::FooterComponent',
+    govuk_header: 'GovukComponent::HeaderComponent',
+    govuk_inset_text: 'GovukComponent::InsetTextComponent',
+    govuk_notification_banner: 'GovukComponent::NotificationBannerComponent',
+    govuk_panel: 'GovukComponent::PanelComponent',
+    govuk_phase_banner: 'GovukComponent::PhaseBannerComponent',
+    govuk_start_now_button: 'GovukComponent::StartButtonComponent',
+    govuk_summary_list: 'GovukComponent::SummaryListComponent',
+    govuk_tabs: 'GovukComponent::TabComponent',
+    govuk_tag: 'GovukComponent::TagComponent',
+    govuk_warning_text: 'GovukComponent::WarningTextComponent',
   }.each do |name, klass|
     define_method(name) do |*args, **kwargs, &block|
       capture do

data/app/helpers/govuk_link_helper.rb

@@ -1,10 +1,14 @@
 module GovukLinkHelper
-  def govuk_link_to(*args, button: false, **kwargs, &block)
-    link_to(*args, **inject_class(kwargs, class_name: link_class(button)), &block)
+  def govuk_link_to(*args, button: false, no_visited_state: false, muted: false, text_colour: false, inverse: false, no_underline: false, **kwargs, &block)
+    classes = build_classes(button, no_visited_state, muted, text_colour, inverse, no_underline)
+
+    link_to(*args, **inject_class(kwargs, class_name: classes), &block)
   end
 
-  def govuk_mail_to(*args, button: false, **kwargs, &block)
-    mail_to(*args, **inject_class(kwargs, class_name: link_class(button)), &block)
+  def govuk_mail_to(*args, button: false, no_visited_state: false, muted: false, text_colour: false, inverse: false, no_underline: false, **kwargs, &block)
+    classes = build_classes(button, no_visited_state, muted, text_colour, inverse, no_underline)
+
+    mail_to(*args, **inject_class(kwargs, class_name: classes), &block)
   end
 
   def govuk_button_to(*args, **kwargs)
@@ -13,6 +17,17 @@ module GovukLinkHelper
 
 private
 
+  def build_classes(button, no_visited_state, muted, text_colour, inverse, no_underline)
+    [
+      link_class(button),
+      no_visited_state_class(no_visited_state),
+      muted_class(muted),
+      text_colour_class(text_colour),
+      inverse_class(inverse),
+      no_underline_class(no_underline),
+    ]
+  end
+
   def inject_class(attributes, class_name:)
     attributes.with_indifferent_access.tap do |attrs|
       attrs[:class] = Array.wrap(attrs[:class]).prepend(class_name)
@@ -22,6 +37,26 @@ private
   def link_class(button)
     button ? 'govuk-button' : 'govuk-link'
   end
+
+  def no_visited_state_class(no_visited_state)
+    'govuk-link--no-visited-state' if no_visited_state
+  end
+
+  def muted_class(muted)
+    'govuk-link--muted' if muted
+  end
+
+  def text_colour_class(colour)
+    'govuk-link--text-colour' if colour
+  end
+
+  def inverse_class(inverse)
+    'govuk-link--inverse' if inverse
+  end
+
+  def no_underline_class(no_underline)
+    'govuk-link--no-underline' if no_underline
+  end
 end
 
 ActiveSupport.on_load(:action_view) { include GovukLinkHelper }

data/lib/govuk/components.rb

@@ -1,2 +1,3 @@
 require "view_component/engine"
+require "govuk/components/helpers/css_utilities"
 require "govuk/components/engine"

data/lib/govuk/components/helpers/css_utilities.rb

@@ -0,0 +1,22 @@
+module Govuk
+  module Components
+    module Helpers
+      module CssUtilities
+        def combine_classes(default_classes, custom_classes)
+          converted_custom_classes = case custom_classes
+                                     when Array
+                                       custom_classes
+                                     when String
+                                       custom_classes.split
+                                     when NilClass
+                                       []
+                                     else
+                                       fail(ArgumentError, "custom classes must be a String, Array or NilClass")
+                                     end
+
+          default_classes.concat(converted_custom_classes).uniq
+        end
+      end
+    end
+  end
+end

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '1.1.9'.freeze
+    VERSION = '2.0.0b4'.freeze
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 2.0.0b4
 platform: ruby
 authors:
 - DfE developers
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -44,16 +44,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.20'
+        version: 2.31.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.20'
+        version: 2.31.1
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -161,40 +161,34 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/components/govuk_component/accordion.html.erb
-- app/components/govuk_component/accordion.rb
-- app/components/govuk_component/back_link.html.erb
-- app/components/govuk_component/back_link.rb
+- app/components/govuk_component/accordion_component.html.erb
+- app/components/govuk_component/accordion_component.rb
+- app/components/govuk_component/back_link_component.rb
 - app/components/govuk_component/base.rb
-- app/components/govuk_component/breadcrumbs.html.erb
-- app/components/govuk_component/breadcrumbs.rb
-- app/components/govuk_component/cookie_banner.html.erb
-- app/components/govuk_component/cookie_banner.rb
-- app/components/govuk_component/details.html.erb
-- app/components/govuk_component/details.rb
-- app/components/govuk_component/footer.html.erb
-- app/components/govuk_component/footer.rb
-- app/components/govuk_component/header.html.erb
-- app/components/govuk_component/header.rb
-- app/components/govuk_component/inset_text.rb
-- app/components/govuk_component/notification_banner.html.erb
-- app/components/govuk_component/notification_banner.rb
-- app/components/govuk_component/panel.html.erb
-- app/components/govuk_component/panel.rb
-- app/components/govuk_component/phase_banner.html.erb
-- app/components/govuk_component/phase_banner.rb
-- app/components/govuk_component/slot.rb
-- app/components/govuk_component/start_now_button.html.erb
-- app/components/govuk_component/start_now_button.rb
-- app/components/govuk_component/summary_list.html.erb
-- app/components/govuk_component/summary_list.rb
-- app/components/govuk_component/tabs.html.erb
-- app/components/govuk_component/tabs.rb
-- app/components/govuk_component/tag.rb
+- app/components/govuk_component/breadcrumbs_component.html.erb
+- app/components/govuk_component/breadcrumbs_component.rb
+- app/components/govuk_component/cookie_banner_component.html.erb
+- app/components/govuk_component/cookie_banner_component.rb
+- app/components/govuk_component/details_component.rb
+- app/components/govuk_component/footer_component.html.erb
+- app/components/govuk_component/footer_component.rb
+- app/components/govuk_component/header_component.html.erb
+- app/components/govuk_component/header_component.rb
+- app/components/govuk_component/inset_text_component.rb
+- app/components/govuk_component/notification_banner_component.html.erb
+- app/components/govuk_component/notification_banner_component.rb
+- app/components/govuk_component/panel_component.rb
+- app/components/govuk_component/phase_banner_component.html.erb
+- app/components/govuk_component/phase_banner_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/tab_component.html.erb
+- app/components/govuk_component/tab_component.rb
+- app/components/govuk_component/tag_component.rb
 - app/components/govuk_component/traits/custom_classes.rb
 - app/components/govuk_component/traits/custom_html_attributes.rb
-- app/components/govuk_component/warning.html.erb
-- app/components/govuk_component/warning.rb
+- app/components/govuk_component/warning_text_component.rb
 - app/helpers/govuk_back_to_top_link_helper.rb
 - app/helpers/govuk_components_helper.rb
 - app/helpers/govuk_link_helper.rb
@@ -202,13 +196,14 @@ files:
 - config/routes.rb
 - lib/govuk/components.rb
 - lib/govuk/components/engine.rb
+- lib/govuk/components/helpers/css_utilities.rb
 - lib/govuk/components/version.rb
 - lib/tasks/govuk/components_tasks.rake
 homepage: https://github.com/DFE-Digital/govuk-components
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -219,12 +214,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Lightweight set of reusable GOV.UK Design System components
 test_files: []

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

@@ -1 +0,0 @@
-<%= link_to @text, @href, class: classes, **html_attributes %>

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

@@ -1,10 +0,0 @@
-<%= tag.details(class: classes, data: { module: 'govuk-details' }, **html_attributes) do %>
-  <summary class="govuk-details__summary">
-    <span class="govuk-details__summary-text">
-      <%= @summary %>
-    </span>
-  </summary>
-  <div class="govuk-details__text">
-    <%= content.presence || @description %>
-  </div>
-<% end %>

data/app/components/govuk_component/details.rb

@@ -1,16 +0,0 @@
-class GovukComponent::Details < GovukComponent::Base
-  attr_accessor :summary, :description
-
-  def initialize(summary:, description: nil, classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
-
-    @summary     = summary
-    @description = description
-  end
-
-private
-
-  def default_classes
-    %w(govuk-details)
-  end
-end

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

@@ -1,52 +0,0 @@
-<%= tag.header(class: classes, role: 'banner', data: { module: 'govuk-header' }, **html_attributes) do %>
-  <div class="govuk-header__container govuk-width-container">
-    <div class="govuk-header__logo">
-      <a href=<%= @logo_href %> class="govuk-header__link govuk-header__link--homepage">
-        <span class="govuk-header__logotype">
-          <svg aria-hidden="true" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 132 97" height="30" width="36">
-            <path fill="currentColor" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
-            <image src="/assets/images/govuk-logotype-crown.png" xlink:href="" class="govuk-header__logotype-crown-fallback-image" width="36" height="32"></image>
-          </svg>
-          <span class="govuk-header__logotype-text">
-            <%= @logo %>
-          </span>
-        </span>
-        <% if @product_name.present? %>
-          <span class="govuk-header__product-name">
-            <%= @product_name %>
-          </span>
-        <% end %>
-
-        <% if product_description.present? %>
-          <%= product_description.content %>
-        <% end %>
-      </a>
-    </div>
-    <div class="govuk-header__content">
-      <% if @service_name.present? %>
-        <a href="<%= @service_name_href %>" class="govuk-header__link govuk-header__link--service-name">
-          <%= @service_name %>
-        </a>
-      <% end %>
-
-      <% if items.any? %>
-        <button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" aria-label="Show or hide navigation menu">
-          <%= menu_button_label %>
-        </button>
-        <nav>
-          <%= tag.ul(class: navigation_classes, aria: { label: "Top Level Navigation" }) do %>
-            <% items.each do |item| %>
-              <%= tag.li(class: item.classes.append(item.active_class), **item.html_attributes) do %>
-                <% if item.link? %>
-                  <%= link_to(item.title, item.href, class: "govuk-header__link") %>
-                <% else %>
-                  <%= item.title %>
-                <% end %>
-              <% end %>
-            <% end %>
-          <% end %>
-        </nav>
-      <% end %>
-    </div>
-  </div>
-<% end %>

data/app/components/govuk_component/header.rb

@@ -1,65 +0,0 @@
-class GovukComponent::Header < GovukComponent::Base
-  include ViewComponent::Slotable
-
-  attr_accessor :logo, :logo_href, :service_name, :service_name_href, :product_name, :menu_button_label
-
-  with_slot :item, collection: true, class_name: 'Item'
-  wrap_slot :item
-
-  with_slot :product_description
-  wrap_slot :product_description
-
-  def initialize(logo: 'GOV.UK', logo_href: '/', service_name: nil, service_name_href: '/', product_name: nil, menu_button_label: 'Menu', classes: [], navigation_classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
-
-    @logo               = logo
-    @logo_href          = logo_href
-    @service_name       = service_name
-    @service_name_href  = service_name_href
-    @product_name       = product_name
-    @menu_button_label  = menu_button_label
-    @navigation_classes = navigation_classes
-  end
-
-private
-
-  def default_classes
-    %w(govuk-header)
-  end
-
-  def navigation_classes
-    %w(govuk-header__navigation).tap { |nc|
-      nc.concat(@navigation_classes.is_a?(String) ? @navigation_classes.split : @navigation_classes)
-    }.uniq
-  end
-
-  class Item < GovukComponent::Slot
-    attr_accessor :title, :href, :active
-
-    def initialize(title:, href: nil, active: false, classes: [], html_attributes: {})
-      super(classes: classes, html_attributes: html_attributes)
-
-      self.title  = title
-      self.href   = href
-      self.active = active
-    end
-
-    def active?
-      active
-    end
-
-    def active_class
-      %w(govuk-header__navigation-item--active) if active?
-    end
-
-    def link?
-      href.present?
-    end
-
-  private
-
-    def default_classes
-      %w(govuk-header__navigation-item)
-    end
-  end
-end