Merge pull request #2412 from ViewComponent/re_add_format

Re-introduce Base#format and Collection#format to fix Rails 7.1 tests

Author: joelhawksley

.gitignore

@@ -45,5 +45,4 @@ build-iPhoneSimulator/
 /replicate-bug
 
 # Appraisal
-/gemfiles/*.gemfile.lock
 /gemfiles/.bundle/

Appraisals

@@ -1,26 +1,44 @@
 # frozen_string_literal: true
 
 appraise "rails-7.1" do
-  gem "rails", "~> 7.1"
-  gem "tailwindcss-rails", "~> 2"
-  gem "turbo-rails", "~> 1"
+  ruby "~> 3.2.0"
+
+  gem "rails", "~> 7.1.0"
+
+  group :development, :test do
+    gem "turbo-rails", "~> 1"
+    gem "rspec-rails", "~> 7"
+  end
 end
 
 appraise "rails-7.2" do
-  gem "rails", "~> 7.2"
-  gem "tailwindcss-rails", "~> 2"
-  gem "turbo-rails", "~> 2"
+  ruby "~> 3.3.0"
+
+  gem "rails", "~> 7.2.0"
+
+  group :development, :test do
+    gem "turbo-rails", "~> 2"
+    gem "rspec-rails", "~> 7"
+  end
 end
 
 appraise "rails-8.0" do
-  gem "rails", "~> 8.0"
-  gem "tailwindcss-rails", "~> 2"
-  gem "turbo-rails", "~> 2"
+  ruby "~> 3.4.0"
+
+  gem "rails", "~> 8.0.0"
+
+  group :development, :test do
+    gem "turbo-rails", "~> 2"
+    gem "rspec-rails", "~> 8"
+  end
 end
 
 appraise "rails-main" do
   gem "rack", git: "https://github.com/rack/rack", ref: "8a4475a9f416a72e5b02bd7817e4a8ed684f29b0"
   gem "rails", github: "rails/rails", branch: "main"
-  gem "tailwindcss-rails", "~> 2"
-  gem "turbo-rails", "~> 2"
+
+  group :development, :test do
+    gem "turbo-rails", "~> 2"
+    gem "rspec-rails", "~> 8"
+  end
 end

Gemfile

@@ -30,14 +30,15 @@ group :development, :test do
   gem "rake", "~> 13"
   gem "rails-dom-testing", "~> 2.3.0"
   gem "redis"
-  gem "rspec-rails", "~> 8"
+  gem "rspec-rails"
   gem "rubocop-md", "~> 2"
   gem "selenium-webdriver", "~> 4"
   gem "simplecov-console", "< 1"
   gem "simplecov", "< 1"
   gem "slim", "~> 5"
   gem "sprockets-rails", "~> 3"
   gem "standard", "~> 1"
+  gem "tailwindcss-rails", "~> 2"
   gem "turbo-rails"
   gem "warning"
   gem "yard-activesupport-concern", "< 1"

Gemfile.lock

@@ -348,6 +348,10 @@ GEM
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.25.0)
     stringio (3.1.7)
+    tailwindcss-rails (2.1.0)
+      railties (>= 6.0.0)
+    tailwindcss-rails (2.1.0-arm64-darwin)
+      railties (>= 6.0.0)
     temple (0.10.3)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
@@ -409,14 +413,15 @@ DEPENDENCIES
   rails-dom-testing (~> 2.3.0)
   rake (~> 13)
   redis
-  rspec-rails (~> 8)
+  rspec-rails
   rubocop-md (~> 2)
   selenium-webdriver (~> 4)
   simplecov (< 1)
   simplecov-console (< 1)
   slim (~> 5)
   sprockets-rails (~> 3)
   standard (~> 1)
+  tailwindcss-rails (~> 2)
   turbo-rails
   view_component!
   warning

docs/CHANGELOG.md

@@ -14,6 +14,12 @@ nav_order: 6
 
     *Hans Lemuet*
 
+* Conditionally add the `ViewComponent::Base#format` method back for Rails 7.1 only.
+* Compute and check lockfiles into source control.
+* Constrain Rails versions in gemfiles to only allow the patch version to vary, eg. `~> 7.1.0` instead of `~> 7.1`.
+
+    *Cameron Dutro*
+
 ## 4.0.0
 
 Two years after releasing [3.0.0](https://github.com/ViewComponent/view_component/releases/tag/v3.0.0) and almost six years since [1.0.0](https://github.com/ViewComponent/view_component/releases/tag/v1.0.0), we're proud to ship ViewComponent 4. This release marks a shift towards a Long Term Support model for the project, having reached significant feature maturity. While contributions are always welcome, we're unlikely to accept further breaking changes or major feature additions.

gemfiles/rails_7.1.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.1"
-gem "tailwindcss-rails", "~> 2"
-gem "turbo-rails", "~> 1"
+ruby "~> 3.2.0"
+
+gem "rails", "~> 7.1.0"
 
 group :development, :test do
   gem "allocation_stats"
@@ -34,6 +34,8 @@ group :development, :test do
   gem "slim", "~> 5"
   gem "sprockets-rails", "~> 3"
   gem "standard", "~> 1"
+  gem "tailwindcss-rails", "~> 2"
+  gem "turbo-rails", "~> 1"
   gem "warning"
   gem "yard-activesupport-concern", "< 1"
   gem "yard", "< 1"