content_block_tools 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99811790c4d8143e24ce25e8363e24daa1f1357abe68e4774e80762540a7a99e
-  data.tar.gz: 25d492eae3b951462342163d5d05388556d190e469215ff8e2dd4fb8a8083f21
+  metadata.gz: d95412a3ec737416ecb0d2d974c2f5113d160e43d97ba8f4f506008e02da0112
+  data.tar.gz: ce284d219102d4294b4e250eedbce6be8890272bf4cfc850841e389a8e7d72ef
 SHA512:
-  metadata.gz: 62056453f1c35fb2c14016cb6f514e473f8d6f49208cf7355917086cd0b80b3fd58e5f3e66fc5addd8fc26fcb515e91fc1b9c24e4ce2d975d584c817feaac872
-  data.tar.gz: 961d83d5c8bf96dd0699dc58c8f4f60e69b17e9707bd6e9c205dec1b3c981641c6db1431ae068ed389cc4bcac8daf4d362f594ae28c8ef2273ef6e2f3a20c2ff
+  metadata.gz: bc16b47625ee69ed16aec061a8c47c1ec0e6ef4bd5f8bedac6568011c1b0ba8c92094601d0f9283e8ed004ec014662200ea6890c4611cc61eab466050b3143c8
+  data.tar.gz: ae98f4e61da8a2c05ab3b3e2c6423daa2049235ec3f436dbf5f4e4ab3008c367556f7d5260a6d68ab8d9bee105efc2441cfd5163f881b4fe70eed6accaa1efda

data/README.md

@@ -50,20 +50,6 @@ 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/presenters/field_presenters/pension/amount_presenter.rb

@@ -4,7 +4,7 @@ module ContentBlockTools
       module Pension
         class AmountPresenter < BasePresenter
           def render
-            "£#{field}"
+            field.start_with?("£") ? 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 = "2.0.0"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - GOV.UK Dev