content_block_tools 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6e2e8e76c7ac69f15bcb193069f82be59acdd78b7291812cbff6f896e6c8c87
-  data.tar.gz: f46aa1f1fac9b526a45811b367db042c4d9f48b29c9f629fb708cdf0693ad299
+  metadata.gz: dd6b4006445fa5c5a11bf7f14e6ccfcd1819a9bc043af6f3ad19a56334d54172
+  data.tar.gz: 8c513039b815152a5a3bdb0171dc89e4ec6934068ebc46c25c93d64801943d1f
 SHA512:
-  metadata.gz: 62173df5e11a6023a91f7f2c39378098c89293ae6f5db96aa2289aca1f9cdbc030d5ed932b2d8fba1dc914d8514e3e87cb240c2377f034968b5ccfe47c515675
-  data.tar.gz: fb9389766399957affb5c8c45640bd4324f26c383057ec3e458fbf2719b6dfe7eca81c7006294b041b1ca5fc65e51280ace5b632a1de513149061f2dc753563a
+  metadata.gz: 2c96843959e74701746dc5aa20e8b605ad811c810b703f55d6d2cd3ad84a5c17c43bfefe741a5099fedc31f3a67480ee3c4e1d9d8a0ef24d9d4fe4f9ea3eec54
+  data.tar.gz: d7a5a5463e75a58b615fa680e4f0ef264d95e1b5c14c2474b40fdc2e61c9bcb01064052cbcf70461968c059206b3fb288ea658328b9554bd3a15e002e17283a9

data/app/components/content_block_tools/base_component.rb

@@ -0,0 +1,14 @@
+module ContentBlockTools
+  class BaseComponent < ViewComponent::Base
+    include ContentBlockTools::Govspeak
+    def render
+      render_in(view_context)
+    end
+
+  private
+
+    def view_context
+      ActionView::Base.new(ActionView::LookupContext.new([]), {}, nil)
+    end
+  end
+end

data/{lib/content_block_tools/components → app/components/content_block_tools}/contact_component.html.erb

@@ -1,13 +1,13 @@
 <div class="vcard">
   <p class="fn org content-block__title"><%= content_block.title %></p>
 
-  <% if block_type.present? && content_block.details[:description] %>
+  <% if !block_type.present? && content_block.details[:description] %>
     <%= render_govspeak(content_block.details[:description])  %>
   <% end %>
 
   <% if block_type.nil? %>
     <% BLOCK_TYPES.each do |block_type| %>
-     <% content_by_block_type[block_type].each do |item| %>
+     <% content_for_block_type(block_type).each do |item| %>
         <p class="content-block__subtitle"><%= item[:title] %></p>
         <%= component_for_block_type(block_type).new(item:).render.html_safe %>
       <% end %>

data/app/components/content_block_tools/contact_component.rb

@@ -0,0 +1,27 @@
+module ContentBlockTools
+  class ContactComponent < ContentBlockTools::BaseComponent
+    BLOCK_TYPES = %i[addresses email_addresses telephones contact_links].freeze
+
+    def initialize(content_block:, block_type: nil, block_name: nil)
+      @content_block = content_block
+      @block_type = block_type
+      @block_name = block_name
+    end
+
+  private
+
+    attr_reader :content_block, :block_type, :block_name
+
+    def component_for_block_type(block_type)
+      "ContentBlockTools::Contacts::#{block_type.to_s.singularize.camelize}Component".constantize
+    end
+
+    def content_for_block_type(block_type)
+      content_block.details.fetch(block_type, {}).values
+    end
+
+    def item_to_render
+      content_block.details.dig(block_type, block_name)
+    end
+  end
+end

data/app/components/content_block_tools/contacts/address_component.rb

@@ -0,0 +1,40 @@
+module ContentBlockTools
+  module Contacts
+    class AddressComponent < ContentBlockTools::BaseComponent
+      def initialize(item:)
+        @item = item
+      end
+
+    private
+
+      attr_reader :item
+
+      def lines
+        address_parts.map { |attribute|
+          next if item[attribute].blank?
+
+          [attribute, item[attribute]]
+        }.compact.to_h
+      end
+
+      def address_parts
+        %i[recipient street_address town_or_city state_or_county postal_code country]
+      end
+
+      def address_line(field, value)
+        content_tag(:span, value, { class: class_for_field_name(field) })
+      end
+
+      def class_for_field_name(field_name)
+        {
+          recipient: "organization-name",
+          street_address: "street-address",
+          town_or_city: "locality",
+          state_or_county: "region",
+          postal_code: "postal-code",
+          country: "country-name",
+        }[field_name]
+      end
+    end
+  end
+end

data/app/components/content_block_tools/contacts/contact_link_component.rb

@@ -0,0 +1,17 @@
+module ContentBlockTools
+  module Contacts
+    class ContactLinkComponent < ContentBlockTools::BaseComponent
+      def initialize(item:)
+        @item = item
+      end
+
+    private
+
+      attr_reader :item
+
+      def link_text
+        item[:label] || item[:url]
+      end
+    end
+  end
+end

data/app/components/content_block_tools/contacts/email_address_component.rb

@@ -0,0 +1,26 @@
+module ContentBlockTools
+  module Contacts
+    class EmailAddressComponent < ContentBlockTools::BaseComponent
+      def initialize(item:)
+        @item = item
+      end
+
+    private
+
+      attr_reader :item
+
+      def query_params
+        params = {
+          subject: item[:subject],
+          body: item[:body],
+        }.compact.map { |k, v| "#{k}=#{v}" }.join("&")
+
+        "?#{params}" if params.present?
+      end
+
+      def link_text
+        item[:label] || item[:email_address]
+      end
+    end
+  end
+end

data/app/components/content_block_tools/contacts/telephone_component.rb

@@ -0,0 +1,49 @@
+module ContentBlockTools
+  module Contacts
+    class TelephoneComponent < ContentBlockTools::BaseComponent
+      def initialize(item:)
+        @item = item
+      end
+
+    private
+
+      attr_reader :item
+
+      def video_relay_service
+        @video_relay_service ||= item[:video_relay_service] || {}
+      end
+
+      def show_video_relay_service?
+        video_relay_service[:show].present?
+      end
+
+      def video_relay_service_content
+        "#{video_relay_service[:prefix]} #{video_relay_service[:telephone_number]}"
+      end
+
+      def bsl_guidance
+        @bsl_guidance ||= item[:bsl_guidance] || {}
+      end
+
+      def show_bsl_guidance?
+        bsl_guidance[:show].present?
+      end
+
+      def opening_hours
+        @opening_hours ||= item[:opening_hours] || {}
+      end
+
+      def show_opening_hours?
+        opening_hours[:show_opening_hours].present?
+      end
+
+      def call_charges
+        @call_charges ||= item[:call_charges] || {}
+      end
+
+      def show_call_charges?
+        call_charges[:show_call_charges_info_url].present?
+      end
+    end
+  end
+end

data/lib/content_block_tools/content_block.rb

@@ -40,6 +40,7 @@ module ContentBlockTools
   #  @return [String]
   class ContentBlock
     include ActionView::Helpers::TagHelper
+    class UnknownComponentError < StandardError; end
 
     CONTENT_BLOCK_PREFIX = "content_block_".freeze
 
@@ -87,7 +88,7 @@ module ContentBlockTools
 
     def content
       field_names.present? ? field_or_block_content : component.new(content_block: self).render
-    rescue NameError
+    rescue UnknownComponentError
       title
     end
 
@@ -109,7 +110,9 @@ module ContentBlockTools
     end
 
     def component
-      "ContentBlockTools::Components::#{document_type.camelize}Component".constantize
+      "ContentBlockTools::#{document_type.camelize}Component".constantize
+    rescue NameError
+      raise UnknownComponentError
     end
 
     def field_presenter(field)

data/lib/content_block_tools/engine.rb

@@ -1,7 +1,15 @@
+require "rails/engine"
+require "view_component"
+require "view_component/version"
+
 module ContentBlockTools
   class Engine < ::Rails::Engine
     isolate_namespace ContentBlockTools
 
+    config.autoload_paths = %W[
+      "#{root}/app/components"
+    ]
+
     initializer "content_block_tools.assets" do
       if defined? Rails.application.config.assets
         Rails.application.config.assets.paths += %w[

data/lib/content_block_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ContentBlockTools
-  VERSION = "1.1.0"
+  VERSION = "1.1.2"
 end

data/lib/content_block_tools.rb

@@ -1,20 +1,11 @@
 # frozen_string_literal: true
 
 require "action_view"
-require "rails"
 require "uri"
 require "govspeak"
-require "view_component/base"
 
 require "content_block_tools/helpers/govspeak"
 
-require "content_block_tools/components/base_component"
-require "content_block_tools/components/contact_component"
-require "content_block_tools/components/contacts/address_component"
-require "content_block_tools/components/contacts/contact_link_component"
-require "content_block_tools/components/contacts/email_address_component"
-require "content_block_tools/components/contacts/telephone_component"
-
 require "content_block_tools/presenters/field_presenters/base_presenter"
 require "content_block_tools/presenters/field_presenters/contact/email_presenter"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -24,33 +24,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 13.3.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: rspec-html-matchers
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +65,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 5.1.18
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -130,18 +144,18 @@ files:
 - README.md
 - app/assets/stylesheets/blocks/_contact.scss
 - app/assets/stylesheets/content_block_tools.scss
+- app/components/content_block_tools/base_component.rb
+- app/components/content_block_tools/contact_component.html.erb
+- app/components/content_block_tools/contact_component.rb
+- app/components/content_block_tools/contacts/address_component.html.erb
+- app/components/content_block_tools/contacts/address_component.rb
+- app/components/content_block_tools/contacts/contact_link_component.html.erb
+- app/components/content_block_tools/contacts/contact_link_component.rb
+- app/components/content_block_tools/contacts/email_address_component.html.erb
+- app/components/content_block_tools/contacts/email_address_component.rb
+- app/components/content_block_tools/contacts/telephone_component.html.erb
+- app/components/content_block_tools/contacts/telephone_component.rb
 - lib/content_block_tools.rb
-- lib/content_block_tools/components/base_component.rb
-- lib/content_block_tools/components/contact_component.html.erb
-- lib/content_block_tools/components/contact_component.rb
-- lib/content_block_tools/components/contacts/address_component.html.erb
-- lib/content_block_tools/components/contacts/address_component.rb
-- lib/content_block_tools/components/contacts/contact_link_component.html.erb
-- lib/content_block_tools/components/contacts/contact_link_component.rb
-- lib/content_block_tools/components/contacts/email_address_component.html.erb
-- lib/content_block_tools/components/contacts/email_address_component.rb
-- lib/content_block_tools/components/contacts/telephone_component.html.erb
-- lib/content_block_tools/components/contacts/telephone_component.rb
 - lib/content_block_tools/content_block.rb
 - lib/content_block_tools/content_block_reference.rb
 - lib/content_block_tools/engine.rb

data/lib/content_block_tools/components/base_component.rb

@@ -1,15 +0,0 @@
-module ContentBlockTools
-  module Components
-    class BaseComponent < ViewComponent::Base
-      def render
-        render_in(view_context)
-      end
-
-    private
-
-      def view_context
-        ActionView::Base.new(ActionView::LookupContext.new([]), {}, nil)
-      end
-    end
-  end
-end

data/lib/content_block_tools/components/contact_component.rb

@@ -1,31 +0,0 @@
-module ContentBlockTools
-  module Components
-    class ContactComponent < ContentBlockTools::Components::BaseComponent
-      BLOCK_TYPES = %i[addresses email_addresses telephones contact_links].freeze
-
-      def initialize(content_block:, block_type: nil, block_name: nil)
-        @content_block = content_block
-        @block_type = block_type
-        @block_name = block_name
-      end
-
-    private
-
-      attr_reader :content_block, :block_type, :block_name
-
-      def component_for_block_type(block_type)
-        "ContentBlockTools::Components::Contacts::#{block_type.to_s.singularize.camelize}Component".constantize
-      end
-
-      def content_by_block_type
-        @content_by_block_type ||= content_block.details.keys.map { |key|
-          [key, content_block.details[key]&.values]
-        }.to_h
-      end
-
-      def item_to_render
-        content_block.details.dig(block_type, block_name)
-      end
-    end
-  end
-end

data/lib/content_block_tools/components/contacts/address_component.rb

@@ -1,44 +0,0 @@
-module ContentBlockTools
-  module Components
-    module Contacts
-      class AddressComponent < ContentBlockTools::Components::BaseComponent
-        include ContentBlockTools::Govspeak
-
-        def initialize(item:)
-          @item = item
-        end
-
-      private
-
-        attr_reader :item
-
-        def lines
-          address_parts.map { |attribute|
-            next if item[attribute].blank?
-
-            [attribute, item[attribute]]
-          }.compact.to_h
-        end
-
-        def address_parts
-          %i[recipient street_address town_or_city state_or_county postal_code country]
-        end
-
-        def address_line(field, value)
-          content_tag(:span, value, { class: class_for_field_name(field) })
-        end
-
-        def class_for_field_name(field_name)
-          {
-            recipient: "organization-name",
-            street_address: "street-address",
-            town_or_city: "locality",
-            state_or_county: "region",
-            postal_code: "postal-code",
-            country: "country-name",
-          }[field_name]
-        end
-      end
-    end
-  end
-end

data/lib/content_block_tools/components/contacts/contact_link_component.rb

@@ -1,21 +0,0 @@
-module ContentBlockTools
-  module Components
-    module Contacts
-      class ContactLinkComponent < ContentBlockTools::Components::BaseComponent
-        include ContentBlockTools::Govspeak
-
-        def initialize(item:)
-          @item = item
-        end
-
-      private
-
-        attr_reader :item
-
-        def link_text
-          item[:label] || item[:url]
-        end
-      end
-    end
-  end
-end

data/lib/content_block_tools/components/contacts/email_address_component.rb

@@ -1,30 +0,0 @@
-module ContentBlockTools
-  module Components
-    module Contacts
-      class EmailAddressComponent < ContentBlockTools::Components::BaseComponent
-        include ContentBlockTools::Govspeak
-
-        def initialize(item:)
-          @item = item
-        end
-
-      private
-
-        attr_reader :item
-
-        def query_params
-          params = {
-            subject: item[:subject],
-            body: item[:body],
-          }.compact.map { |k, v| "#{k}=#{v}" }.join("&")
-
-          "?#{params}" if params.present?
-        end
-
-        def link_text
-          item[:label] || item[:email_address]
-        end
-      end
-    end
-  end
-end

data/lib/content_block_tools/components/contacts/telephone_component.rb

@@ -1,53 +0,0 @@
-module ContentBlockTools
-  module Components
-    module Contacts
-      class TelephoneComponent < ContentBlockTools::Components::BaseComponent
-        include ContentBlockTools::Govspeak
-
-        def initialize(item:)
-          @item = item
-        end
-
-      private
-
-        attr_reader :item
-
-        def video_relay_service
-          @video_relay_service ||= item[:video_relay_service] || {}
-        end
-
-        def show_video_relay_service?
-          video_relay_service[:show].present?
-        end
-
-        def video_relay_service_content
-          "#{video_relay_service[:prefix]} #{video_relay_service[:telephone_number]}"
-        end
-
-        def bsl_guidance
-          @bsl_guidance ||= item[:bsl_guidance] || {}
-        end
-
-        def show_bsl_guidance?
-          bsl_guidance[:show].present?
-        end
-
-        def opening_hours
-          @opening_hours ||= item[:opening_hours] || {}
-        end
-
-        def show_opening_hours?
-          opening_hours[:show_opening_hours].present?
-        end
-
-        def call_charges
-          @call_charges ||= item[:call_charges] || {}
-        end
-
-        def show_call_charges?
-          call_charges[:show_call_charges_info_url].present?
-        end
-      end
-    end
-  end
-end