content_block_tools 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b432a7791692f66578f8ac72f9e02548436de162c781c1359758779c72d5beb
-  data.tar.gz: 94df9abb5ba25e1338396802d0040659e836d1a4aca0825a86921f7045281f1b
+  metadata.gz: 3b4f73d4250542e48814f4b1a7f9963315909983df3cd8f306316c00945c0f27
+  data.tar.gz: b376678520df72388f10802a1652fa3819a0a3ad13d295ed681a5c7bdaf20b1d
 SHA512:
-  metadata.gz: 1ef1c7687153fb85bb6c92f732846f6227ed2f68f19f7c7660ac0a8c0c9d11f1943da3749d35072ac1a5f34f9402a953480597dbac7b6b11397cb3d1bbce9632
-  data.tar.gz: 776b3c2b907514517da5e47b206f96def040815b76edfdab10cd74b20092767a814d28f093de51358b36100ae5be7998025014e51ec773df31c90dc6288098df
+  metadata.gz: 3ab65c991be77d1feb1f8720e9d36d193bfacae7a5e57cebad50ea894ea28a1ceac34c03df4660f0fc8d7f2ecc2195e005fd2a33133540502655e19334fc7a27
+  data.tar.gz: aab61f2f75566b7e869ac36fc8535ad5f5a48bb8dce7304952cdf3a5f056f10e9b396c4e0cf5d7d5491d54535f6f4c131f73fc097017edb1b597adb2a6abf994

data/CHANGELOG.md

@@ -7,6 +7,14 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## 0.6.3
+
+- Fix rendering telephone numbers and rendering individual nested fields ([53](https://github.com/alphagov/govuk_content_block_tools/pull/53))
+
+## 0.6.2
+
+- Handle UK call charges for a Contact block, remove links from telephone numbers ([51](https://github.com/alphagov/govuk_content_block_tools/pull/51))
+
 ## 0.6.1
 
 - Handle multiple telephone numbers for a Contact block ([48](https://github.com/alphagov/govuk_content_block_tools/pull/48)

data/content_block_tools.gemspec

@@ -25,10 +25,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
-  spec.add_development_dependency "rake", "13.2.1"
-  spec.add_development_dependency "rspec", "3.13.0"
+  spec.add_development_dependency "rake", "13.3.0"
+  spec.add_development_dependency "rspec", "3.13.1"
   spec.add_development_dependency "rspec-html-matchers", "0.10.0"
-  spec.add_development_dependency "rubocop-govuk", "5.1.6"
+  spec.add_development_dependency "rubocop-govuk", "5.1.15"
 
   spec.add_dependency "actionview", ">= 6"
 end

data/lib/content_block_tools/presenters/base_presenter.rb

@@ -70,20 +70,12 @@ module ContentBlockTools
       end
 
       def content_for_field_names
-        content = content_block.details.deep_symbolize_keys.dig(*field_names)
-
-        if content.blank?
+        if field_or_block_content.blank?
           ContentBlockTools.logger.warn("Content not found for content block #{content_block.content_id} and fields #{field_names}")
           return content_block.embed_code
         end
 
-        presenter = if content.is_a?(Hash)
-                      block_presenter || ContentBlockTools::Presenters::BlockPresenters::BasePresenter
-                    else
-                      field_presenter || ContentBlockTools::Presenters::FieldPresenters::BasePresenter
-                    end
-
-        presenter.new(content).render
+        field_or_block_presenter.new(field_or_block_content).render
       end
 
       def field_names
@@ -91,11 +83,33 @@ module ContentBlockTools
           embed_code_match = ContentBlockReference::EMBED_REGEX.match(content_block.embed_code)
           if embed_code_match.present?
             all_fields = embed_code_match[4]&.reverse&.chomp("/")&.reverse
-            all_fields&.split("/")&.map(&:to_sym)
+            all_fields&.split("/")&.map do |item|
+              is_number?(item) ? item.to_i : item.to_sym
+            end
           end
         end
       end
 
+      def is_number?(item)
+        Float(item, exception: false)
+      end
+
+      def field_or_block_content
+        @field_or_block_content ||= field_names.any? ? content_block.details.deep_symbolize_keys.dig(*field_names) : nil
+      end
+
+      def rendering_block?
+        field_or_block_content.is_a?(Hash)
+      end
+
+      def field_or_block_presenter
+        @field_or_block_presenter ||= if rendering_block?
+                                        block_presenter || ContentBlockTools::Presenters::BlockPresenters::BasePresenter
+                                      else
+                                        field_presenter || ContentBlockTools::Presenters::FieldPresenters::BasePresenter
+                                      end
+      end
+
       def field_presenter
         @field_presenter ||= field_names ? self.class::FIELD_PRESENTERS[field_names.last] : nil
       end
@@ -105,7 +119,7 @@ module ContentBlockTools
       end
 
       def base_tag
-        field_names ? :span : self.class::BASE_TAG_TYPE
+        field_names ? field_or_block_presenter::BASE_TAG_TYPE : self.class::BASE_TAG_TYPE
       end
 
       def embedded_objects_of_type(type)

data/lib/content_block_tools/presenters/block_presenters/base_presenter.rb

@@ -4,6 +4,7 @@ module ContentBlockTools
       class BasePresenter
         include ActionView::Context
         include ActionView::Helpers::TextHelper
+        BASE_TAG_TYPE = :span
 
         attr_reader :item
 

data/lib/content_block_tools/presenters/block_presenters/contact/telephone_presenter.rb

@@ -3,14 +3,17 @@ module ContentBlockTools
     module BlockPresenters
       module Contact
         class TelephonePresenter < ContentBlockTools::Presenters::BlockPresenters::BasePresenter
+          BASE_TAG_TYPE = :div
+
           def render
-            content_tag(:div, class: "govuk-body govuk-!-margin-bottom-4") do
+            content_tag(:div, class: "govuk-body") do
               concat number_list
+              concat call_charges_link
             end
           end
 
           def number_list
-            content_tag(:ul, class: "govuk-!-padding-0", style: "list-style: none;") do
+            content_tag(:ul, class: "govuk-!-padding-0 govuk-!-margin-0 govuk-list") do
               item[:telephone_numbers].each do |number|
                 concat number_list_item(number)
               end
@@ -18,12 +21,15 @@ module ContentBlockTools
           end
 
           def number_list_item(number)
-            content_tag(:li) do
-              concat content_tag(:span, "#{number[:label]}: ")
+            content_tag(:li, "#{number[:label]}: #{number[:telephone_number]}", class: "govuk-!-margin-bottom-0")
+          end
+
+          def call_charges_link
+            item[:show_uk_call_charges] == "true" && content_tag(:p, class: "govuk-!-margin-0") do
               concat content_tag(:a,
-                                 number[:telephone_number],
+                                 "Find out about call charges",
                                  class: "govuk-link",
-                                 href: "tel:#{CGI.escape number[:telephone_number]}")
+                                 href: "https://www.gov.uk/call-charges")
             end
           end
         end

data/lib/content_block_tools/presenters/field_presenters/base_presenter.rb

@@ -4,6 +4,7 @@ module ContentBlockTools
       class BasePresenter
         include ActionView::Context
         include ActionView::Helpers::TagHelper
+        BASE_TAG_TYPE = :span
 
         attr_reader :field
 

data/lib/content_block_tools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.2.1
+        version: 13.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.2.1
+        version: 13.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.13.0
+        version: 3.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.13.0
+        version: 3.13.1
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.6
+        version: 5.1.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.6
+        version: 5.1.15
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement