slimmer 18.5.1 → 18.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53bda50056426a6cc9b849df995c6aa2c82b0fad7bd2121d5347936786ff0cd3
-  data.tar.gz: 9d8c0b2929a185f61d97f268e4e4b156e7ca5591030598c89769305f8427c1c9
+  metadata.gz: 929c5fc128e697424a5a97dde4a4fa38028936ae3d2243cce7bd6f9c06472437
+  data.tar.gz: 5a0edbbc1bbb1bf5a53409d1fa215a7f2d6fbc224e6c496e7d0e110c092f4b99
 SHA512:
-  metadata.gz: 852952d3d2188a3930940640f5167904ebe8509a9ff6b2450980d5da4eeb2479f5f0fe039701d4d7217065d4ff2cdc84c2e547e19ba05881177141400eca5584
-  data.tar.gz: 840403cd40c38716efa8b2da15cad73e3440ef021301e571dc0337510ab3b224fd516a2ca73191588f5ae54b766833bf59ec96e2123db585976ffea59415e7eb
+  metadata.gz: 5ff2f81108c967b67edd10428c266e21843cb16a1e4ce68b2068e7328537e9ba023e3934f0a7cade8d18fb5abb7f6884557f8d2e70ecb603fdb18b808d06268c
+  data.tar.gz: a6869381c29230dea482014b2a7e7efcf155ed9d9f069ad9a193e6a0b1050585b1a4f313adceb261b3feccb7a6b473323192781b473b0f3edadb9a50281fab1c

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 18.6.0
+
+* Remove the part of the body from the error message for SourceWrapperNotFoundError and do some cleanup
+  Use more explanatory error message. Apply this globally to all apps.
+
+# 18.5.2
+
+* Fix a mistake in 18.5.1
+
 # 18.5.1
 
 * Include a part of the body in the error message text

data/lib/slimmer/processors/body_inserter.rb

@@ -10,7 +10,14 @@ module Slimmer::Processors
       source_markup = src.at_css(@source_selector)
       destination_markup = dest.at_css(@destination_selector)
 
-      raise(Slimmer::SourceWrapperNotFoundError, "Source wrapper div not found", caller) if source_markup.nil? && wrapper_check?
+      if source_markup.nil?
+        raise(Slimmer::SourceWrapperNotFoundError, <<~ERROR_MESSAGE, caller)
+          Slimmer did not find a div with ID "wrapper" in the source HTML.
+          This could be because a request was made to your Rails application
+          for a format that it does not support. For example a JavaScript request,
+          when the application only has HTML templates.
+        ERROR_MESSAGE
+      end
 
       css_classes = []
       css_classes << source_markup.attributes["class"].to_s.split(/ +/) if source_markup.has_attribute?("class")
@@ -26,9 +33,5 @@ module Slimmer::Processors
     def is_gem_layout?
       @headers[Slimmer::Headers::TEMPLATE_HEADER]&.start_with?("gem_layout")
     end
-
-    def wrapper_check?
-      ENV["SLIMMER_WRAPPER_CHECK"] == "true"
-    end
   end
 end

data/lib/slimmer/skin.rb

@@ -100,7 +100,6 @@ module Slimmer
     end
 
     def success(source_request, response, body)
-      original_body = body.dup
       wrapper_id = options[:wrapper_id] || "wrapper"
       template_wrapper_id = "wrapper" # All templates in Static use `#wrapper`
 
@@ -123,12 +122,6 @@ module Slimmer
 
       template_name = response.headers[Headers::TEMPLATE_HEADER] || "gem_layout"
       process(processors, body, template(template_name), source_request.env)
-    rescue SourceWrapperNotFoundError => e
-      message = "#{e.message} "\
-                "at: #{source_request.base_url}#{source_request.path} "\
-                "length: #{original_body.to_s.length} "\
-                "body: original_body.to_s[0..2000]"
-      raise SourceWrapperNotFoundError, message, caller
     end
   end
 end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = "18.5.1".freeze
+  VERSION = "18.6.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 18.5.1
+  version: 18.6.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.18.0
+        version: 5.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.18.0
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.14
 signing_key: 
 specification_version: 4
 summary: Thinner than the skinner