From 1a87363f74bb6e788b7841974ef98eb7e63e82a3 Mon Sep 17 00:00:00 2001
From: Jelani Woods <jelani@firstdraft.com>
Date: Mon, 4 Aug 2025 08:33:23 -0500
Subject: [PATCH 1/5] --wip-- [skip ci]

---
 lib/rspec/html_messages.rb                   | 2 +-
 lib/rspec/html_messages/diff_formatter.rb    | 2 +-
 lib/rspec/html_messages/template_renderer.rb | 2 +-
 lib/rspec/html_messages/value_formatter.rb   | 2 +-
 lib/rspec/html_messages/version.rb           | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/rspec/html_messages.rb b/lib/rspec/html_messages.rb
index 7ee3460..46c6ef5 100644
--- a/lib/rspec/html_messages.rb
+++ b/lib/rspec/html_messages.rb
@@ -11,7 +11,7 @@
 
 module Rspec
   # Main renderer class for converting enriched JSON examples to HTML
-  class HtmlMessages
+  module HtmlMessages
     include HtmlMessages::ValueFormatter
     include HtmlMessages::DiffFormatter
     include HtmlMessages::TemplateRenderer
diff --git a/lib/rspec/html_messages/diff_formatter.rb b/lib/rspec/html_messages/diff_formatter.rb
index 9eed6d5..14811c0 100644
--- a/lib/rspec/html_messages/diff_formatter.rb
+++ b/lib/rspec/html_messages/diff_formatter.rb
@@ -3,7 +3,7 @@
 require "diffy"
 
 module Rspec
-  class HtmlMessages
+  module HtmlMessages
     module DiffFormatter
       def effective_diffable?(force_diffable: [], force_not_diffable: [])
         return true if force_diffable&.include?(matcher_name)
diff --git a/lib/rspec/html_messages/template_renderer.rb b/lib/rspec/html_messages/template_renderer.rb
index 433e816..5ea50c6 100644
--- a/lib/rspec/html_messages/template_renderer.rb
+++ b/lib/rspec/html_messages/template_renderer.rb
@@ -3,7 +3,7 @@
 require "action_view"
 
 module Rspec
-  class HtmlMessages
+  module HtmlMessages
     module TemplateRenderer
       include ActionView::Helpers::TagHelper
       include ActionView::Helpers::TextHelper
diff --git a/lib/rspec/html_messages/value_formatter.rb b/lib/rspec/html_messages/value_formatter.rb
index d596307..908113d 100644
--- a/lib/rspec/html_messages/value_formatter.rb
+++ b/lib/rspec/html_messages/value_formatter.rb
@@ -4,7 +4,7 @@
 require "amazing_print"
 
 module Rspec
-  class HtmlMessages
+  module HtmlMessages
     module ValueFormatter
       # Oj options for deserializing - use object mode to restore symbols
       # but keep safety options to prevent code execution
diff --git a/lib/rspec/html_messages/version.rb b/lib/rspec/html_messages/version.rb
index 0b614b6..4ba352d 100644
--- a/lib/rspec/html_messages/version.rb
+++ b/lib/rspec/html_messages/version.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Rspec
-  class HtmlMessages
-    VERSION = "0.2.1"
+  module HtmlMessages
+    VERSION = "0.2.2"
   end
 end

From cb133b074fe893fe6f17c34fa4c60951d8124ad4 Mon Sep 17 00:00:00 2001
From: Jelani Woods <jelani@firstdraft.com>
Date: Mon, 4 Aug 2025 09:45:33 -0500
Subject: [PATCH 2/5] Revert "--wip-- [skip ci]"

This reverts commit 1a87363f74bb6e788b7841974ef98eb7e63e82a3.
---
 lib/rspec/html_messages.rb                   | 2 +-
 lib/rspec/html_messages/diff_formatter.rb    | 2 +-
 lib/rspec/html_messages/template_renderer.rb | 2 +-
 lib/rspec/html_messages/value_formatter.rb   | 2 +-
 lib/rspec/html_messages/version.rb           | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/rspec/html_messages.rb b/lib/rspec/html_messages.rb
index 46c6ef5..7ee3460 100644
--- a/lib/rspec/html_messages.rb
+++ b/lib/rspec/html_messages.rb
@@ -11,7 +11,7 @@
 
 module Rspec
   # Main renderer class for converting enriched JSON examples to HTML
-  module HtmlMessages
+  class HtmlMessages
     include HtmlMessages::ValueFormatter
     include HtmlMessages::DiffFormatter
     include HtmlMessages::TemplateRenderer
diff --git a/lib/rspec/html_messages/diff_formatter.rb b/lib/rspec/html_messages/diff_formatter.rb
index 14811c0..9eed6d5 100644
--- a/lib/rspec/html_messages/diff_formatter.rb
+++ b/lib/rspec/html_messages/diff_formatter.rb
@@ -3,7 +3,7 @@
 require "diffy"
 
 module Rspec
-  module HtmlMessages
+  class HtmlMessages
     module DiffFormatter
       def effective_diffable?(force_diffable: [], force_not_diffable: [])
         return true if force_diffable&.include?(matcher_name)
diff --git a/lib/rspec/html_messages/template_renderer.rb b/lib/rspec/html_messages/template_renderer.rb
index 5ea50c6..433e816 100644
--- a/lib/rspec/html_messages/template_renderer.rb
+++ b/lib/rspec/html_messages/template_renderer.rb
@@ -3,7 +3,7 @@
 require "action_view"
 
 module Rspec
-  module HtmlMessages
+  class HtmlMessages
     module TemplateRenderer
       include ActionView::Helpers::TagHelper
       include ActionView::Helpers::TextHelper
diff --git a/lib/rspec/html_messages/value_formatter.rb b/lib/rspec/html_messages/value_formatter.rb
index 908113d..d596307 100644
--- a/lib/rspec/html_messages/value_formatter.rb
+++ b/lib/rspec/html_messages/value_formatter.rb
@@ -4,7 +4,7 @@
 require "amazing_print"
 
 module Rspec
-  module HtmlMessages
+  class HtmlMessages
     module ValueFormatter
       # Oj options for deserializing - use object mode to restore symbols
       # but keep safety options to prevent code execution
diff --git a/lib/rspec/html_messages/version.rb b/lib/rspec/html_messages/version.rb
index 4ba352d..0b614b6 100644
--- a/lib/rspec/html_messages/version.rb
+++ b/lib/rspec/html_messages/version.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Rspec
-  module HtmlMessages
-    VERSION = "0.2.2"
+  class HtmlMessages
+    VERSION = "0.2.1"
   end
 end

From 9585d9814b13aff6eff1f40897ccf65f15de9088 Mon Sep 17 00:00:00 2001
From: Jelani Woods <jelani@firstdraft.com>
Date: Mon, 4 Aug 2025 09:46:22 -0500
Subject: [PATCH 3/5] Remove zeitwerk

---
 lib/rspec/html_messages.rb  | 7 -------
 rspec-html_messages.gemspec | 1 -
 2 files changed, 8 deletions(-)

diff --git a/lib/rspec/html_messages.rb b/lib/rspec/html_messages.rb
index 7ee3460..5bf6b45 100644
--- a/lib/rspec/html_messages.rb
+++ b/lib/rspec/html_messages.rb
@@ -1,14 +1,7 @@
 # frozen_string_literal: true
 
-require "zeitwerk"
 require "active_support/backtrace_cleaner"
 
-Zeitwerk::Loader.new.then do |loader|
-  loader.tag = "rspec-html_messages"
-  loader.push_dir "#{__dir__}/.."
-  loader.setup
-end
-
 module Rspec
   # Main renderer class for converting enriched JSON examples to HTML
   class HtmlMessages
diff --git a/rspec-html_messages.gemspec b/rspec-html_messages.gemspec
index 562e2f1..8457432 100644
--- a/rspec-html_messages.gemspec
+++ b/rspec-html_messages.gemspec
@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "amazing_print", "~> 1.6"
   spec.add_dependency "diffy", "~> 3.4"
   spec.add_dependency "oj", "~> 3.16"
-  spec.add_dependency "zeitwerk", "~> 2.7"
 
   spec.extra_rdoc_files = Dir["README*", "LICENSE*"]
   spec.files = Dir["*.gemspec", "lib/**/*"]

From 43267d83b5ef0609dac440fe038b248b580701be Mon Sep 17 00:00:00 2001
From: Jelani Woods <jelani@firstdraft.com>
Date: Mon, 4 Aug 2025 09:54:00 -0500
Subject: [PATCH 4/5] --wip-- [skip ci]

---
 lib/rspec/html_messages.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/rspec/html_messages.rb b/lib/rspec/html_messages.rb
index 5bf6b45..e1a6597 100644
--- a/lib/rspec/html_messages.rb
+++ b/lib/rspec/html_messages.rb
@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 require "active_support/backtrace_cleaner"
+require "rspec/html_messages/value_formatter"
+require "rspec/html_messages/diff_formatter"
+require "rspec/html_messages/template_renderer"
 
 module Rspec
   # Main renderer class for converting enriched JSON examples to HTML

From fa11af0e0e4ef85bdd818ed7e71601e5691093bb Mon Sep 17 00:00:00 2001
From: Jelani Woods <jelani@firstdraft.com>
Date: Mon, 4 Aug 2025 10:06:10 -0500
Subject: [PATCH 5/5] Bump version

---
 lib/rspec/html_messages/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rspec/html_messages/version.rb b/lib/rspec/html_messages/version.rb
index 0b614b6..58f47a9 100644
--- a/lib/rspec/html_messages/version.rb
+++ b/lib/rspec/html_messages/version.rb
@@ -2,6 +2,6 @@
 
 module Rspec
   class HtmlMessages
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end