content_block_tools 1.14.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 838582c2538bbe70c10178123a0d45012cc374f311ab2c201248315bdc4a75ca
-  data.tar.gz: 6df681c851529b676a3c99e9102eb650d14cb4264e6a19c9af090457f6f84faa
+  metadata.gz: 225bb65ced69b2b51cb081edfe13a9c6456747d64d3a1f7b561d58dc2c9aa47c
+  data.tar.gz: 58a80f5c4111e17f38a2eb1baffa6921fea0f7d405a69180423f5599b8473cc6
 SHA512:
-  metadata.gz: 2811f4de394ea44cdad0a0b780b8933c6748d65a21b183f33134d1a94e3b8ab3ab1e423ac116ebda8cd84541abdf5487a73101e03612c5ba9b7e834570da592a
-  data.tar.gz: 4e43661c293351a6e00038116ee6da74e51b43fe9ad6db0c1e5cf1f8b2e758439e537c5c8b73466490f219cdaf76083bcfb7f70aefa9561f78f9909a024dca47
+  metadata.gz: 4b9f52c49ce3fe7ee95fcde5c5973e8c8d76c70dbb740fd4f96e0c6a57806c526f82257c0a88f2b9b58c5d404c3835d3dc756c587d49ef0748d1dc9f9f18e96d
+  data.tar.gz: 197c2203d07a5bb9b16efe787a60d741b28e81eabd7156e5708d1939b363e6a012fff0cc94e2b34f85c9ae414d37c3df84c107a65e5ddab0b1f21f45d01c8037

data/README.md

@@ -50,6 +50,20 @@ content_block.render
 
 For more information, see the [Documentation](https://www.rubydoc.info/github/alphagov/content_block_tools)
 
+## Development
+
+### Running the test suites
+
+To run the unit tests:
+```
+bundle exec rspec
+```
+
+To run the feature tests:
+```
+bundle exec cucumber
+```
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/components/content_block_tools/tax_component.rb

@@ -8,11 +8,10 @@ module ContentBlockTools
     def initialize(content_block:, _block_type: nil, _block_name: nil)
       @content_block = content_block
       validate_format!
-      validate_presence_of_income_tax_rates! if tax_table_format?
     end
 
     def render
-      return "" unless tax_table_format?
+      raise format_inapplicable_error unless tax_table_format? && able_to_format_as_table?
 
       Tax::TaxTableComponent.new(rates: income_tax_rates).render
     end
@@ -23,17 +22,18 @@ module ContentBlockTools
 
     delegate :format, :details, to: :content_block
 
+    def format_inapplicable_error
+      InvalidFormatError.new("Cannot render 'tax_table' format: missing income tax rates")
+    end
+
     def validate_format!
       return if SUPPORTED_FORMATS.include?(format)
 
       raise InvalidFormatError, "Unknown format '#{format}' for tax"
     end
 
-    def validate_presence_of_income_tax_rates!
-      return if income_tax_rates&.any?
-
-      raise InvalidFormatError,
-            "Cannot render 'tax_table' format: missing income tax rates"
+    def able_to_format_as_table?
+      income_tax_rates&.present?
     end
 
     def tax_table_format?

data/lib/content_block_tools/content_block.rb

@@ -49,38 +49,6 @@ module ContentBlockTools
 
     attr_reader :content_id, :title, :embed_code
 
-    # Creates a ContentBlock instance from an embed code string by fetching
-    # the content item data from the Content Store API.
-    #
-    # @param embed_code [String] The embed code string to parse and fetch content for
-    #   @example
-    #     ContentBlock.from_embed_code("{{embed:content_block_pension:2b92cade-549c-4449-9796-e7a3957f3a86}}")
-    #
-    # @return [ContentBlock] A new ContentBlock instance populated with data from the Content Store
-    #
-    # @raise [ContentBlockTools::InvalidEmbedCodeError] if the embed code format is invalid
-    # @raise [GdsApi::HTTPErrorResponse] if the API request fails
-    #
-    # @example Create a ContentBlock from an embed code
-    #   embed_code = "{{embed:content_block_email:123e4567-e89b-12d3-a456-426614174000}}"
-    #   content_block = ContentBlock.from_embed_code(embed_code)
-    #   content_block.title #=> "Contact Email"
-    #   content_block.document_type #=> "email"
-    #
-    # @see ContentBlockReference.from_string
-    # @see GdsApi.content_store
-    def self.from_embed_code(embed_code)
-      reference = ContentBlockReference.from_string(embed_code)
-      api_response = GdsApi.content_store.content_item(reference.content_store_identifier)
-      new(
-        content_id: api_response["content_id"],
-        title: api_response["title"],
-        document_type: api_response["document_type"],
-        details: api_response["details"],
-        embed_code:,
-      )
-    end
-
     def initialize(content_id:, title:, document_type:, details:, embed_code:)
       @content_id = content_id
       @title = title

data/lib/content_block_tools/content_block_reference.rb

@@ -52,21 +52,6 @@ module ContentBlockTools
       !identifier.match?(UUID_REGEX)
     end
 
-    # Returns the content store path for this content block reference
-    #
-    # Constructs a path used to identify and retrieve the content block from the content store.
-    # The path follows the format `/content-blocks/{document_type}/{identifier}`.
-    #
-    # @example
-    #   reference = ContentBlockReference.new(document_type: "content_block_contact", identifier: "some-slug", embed_code: "...")
-    #   reference.content_store_identifier
-    #   #=> "/content-blocks/content_block_contact/some-slug"
-    #
-    # @return [String] the content store path for this content block
-    def content_store_identifier
-      "/content-blocks/#{document_type}/#{identifier}"
-    end
-
     class << self
       # Finds all content block references within a document, using `ContentBlockReference::EMBED_REGEX`
       # to scan through the document

data/lib/content_block_tools/embed_code.rb

@@ -5,8 +5,8 @@ module ContentBlockTools
   # fields to render. The format is:
   #   {{embed:block_type:identifier}}
   #   {{embed:block_type:identifier/field1/nested_field2}}
-  #   {{embed:block_type:identifier|format}}
-  #   {{embed:block_type:identifier/field1|format}}
+  #   {{embed:block_type:identifier#format}}
+  #   {{embed:block_type:identifier/field1#format}}
   #
   # @example Basic embed code
   #   embed_code = EmbedCode.new("{{embed:content_block_contact:main-office}}")

data/lib/content_block_tools/presenters/field_presenters/pension/amount_presenter.rb

@@ -4,7 +4,7 @@ module ContentBlockTools
       module Pension
         class AmountPresenter < BasePresenter
           def render
-            field.start_with?("£") ? field : "£#{field}"
+            "£#{field}"
           end
         end
       end

data/lib/content_block_tools/renderer.rb

@@ -39,14 +39,18 @@ module ContentBlockTools
 
     attr_reader :content_block
 
+    def failure_message
+      "Unable to render block '#{content_block.title}' #{content_block.embed_code}"
+    end
+
     def base_tag
       rendering_block? ? :div : :span
     end
 
     def content
       internal_content_path.present? ? field_or_block_content : component.new(content_block:).render
-    rescue UnknownComponentError
-      content_block.title
+    rescue UnknownComponentError, InvalidFormatError
+      failure_message
     end
 
     def field_or_block_content
@@ -59,7 +63,7 @@ module ContentBlockTools
         render_hash_content(field_content)
       else
         log_content_not_found
-        content_block.embed_code
+        failure_message
       end
     end
 

data/lib/content_block_tools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 2.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -1117,14 +1117,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.12
+rubygems_version: 4.0.18
 specification_version: 4
 summary: A suite of tools for working with GOV.UK Content Blocks
 test_files: []