Add a current state value that includes signed + now

lib/turbo_boost/commands/middlewares/exit_middleware.rb

@@ -26,7 +26,7 @@ def modify?(env)
   def modify!(env, response)
     responder = env["turbo_boost_command_responder"]
     status, headers, body = response
-    new_body = body_to_s(body)
+    new_body = body_to_a(body).join
 
     case response_type(new_body)
     when :body
@@ -45,10 +45,13 @@ def modify!(env, response)
     [status, headers, body]
   end
 
-  def body_to_s(body)
-    return body.join if body.respond_to?(:join)
-    return body.to_ary.join if body.respond_to?(:to_ary)
-    body.to_s
+  def body_to_a(body)
+    return [] if body.nil?
+    return body if body.is_a?(Array)
+    return [body] if body.is_a?(String)
+    return body.to_ary if body.respond_to?(:to_ary)
+    return body.each.to_a if body.respond_to?(:each)
+    [body.to_s]
   end
 
   def response_type(body)

lib/turbo_boost/commands/responder.rb

@@ -9,15 +9,15 @@ def initialize
   end
 
   def body
-    @body.join
+    @body.join.html_safe
   end
 
   def add_header(key, value)
     headers[key.to_s.downcase] = value.to_s
   end
 
   def add_content(content)
-    @body << "#{sanitizer.sanitize(content.to_s).html_safe}\n"
+    @body << sanitizer.sanitize(content) + "\n"
   end
 
   private

lib/turbo_boost/commands/sanitizer.rb

@@ -7,7 +7,7 @@ class TurboBoost::Commands::Sanitizer
   attr_reader :scrubber
 
   def sanitize(value)
-    super(value, scrubber: scrubber)
+    super(value.to_s, scrubber: scrubber)
   end
 
   private

lib/turbo_boost/commands/state.rb

@@ -13,7 +13,11 @@ def initialize(payload = {})
     store[:_signed] ||= {}
   end
 
-  delegate_missing_to :store
+  def current
+    signed.merge now
+  end
+
+  delegate_missing_to :current
 
   def now
     store[:_now]
@@ -28,7 +32,7 @@ def signed
   end
 
   def cache_key
-    "TurboBoost::Commands::State/#{Digest::SHA2.base64digest(to_s)}"
+    "TurboBoost::Commands::State/#{Digest::SHA2.base64digest(current.to_s)}"
   end
 
   def to_json