Merge branch 'main' into dependabot/bundler/puma-7.1.0

Author: Spone

.github/workflows/ci.yml

@@ -39,6 +39,8 @@ jobs:
             rails_version: "7.2"
           - ruby_version: "3.4"
             rails_version: "8.0"
+          - ruby_version: "3.4"
+            rails_version: "8.1"
           - ruby_version: "head"
             rails_version: "main"
     env:

.tool-versions

@@ -1 +1 @@
-ruby 3.4.3
+ruby 3.4.7

Appraisals

@@ -33,6 +33,17 @@ appraise "rails-8.0" do
   end
 end
 
+appraise "rails-8.1" do
+  ruby "~> 3.4.0"
+
+  gem "rails", "~> 8.1.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"

Gemfile

@@ -13,6 +13,7 @@ ruby ruby_version
 group :development, :test do
   gem "allocation_stats"
   gem "appraisal", "~> 2"
+  gem "appraisal-run", "~> 1.1"
   gem "benchmark-ips", "~> 2"
   gem "better_html"
   gem "bundler", "~> 2"

Gemfile.lock

@@ -1,79 +1,83 @@
 PATH
   remote: .
   specs:
-    view_component (4.0.2)
-      activesupport (>= 7.1.0, < 8.1)
+    view_component (4.1.0)
+      activesupport (>= 7.1.0, < 8.2)
+      actionview (>= 7.1.0, < 8.2)
       concurrent-ruby (~> 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (8.0.3)
-      actionpack (= 8.0.3)
-      activesupport (= 8.0.3)
+    action_text-trix (2.1.15)
+      railties
+    actioncable (8.1.0)
+      actionpack (= 8.1.0)
+      activesupport (= 8.1.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (8.0.3)
-      actionpack (= 8.0.3)
-      activejob (= 8.0.3)
-      activerecord (= 8.0.3)
-      activestorage (= 8.0.3)
-      activesupport (= 8.0.3)
+    actionmailbox (8.1.0)
+      actionpack (= 8.1.0)
+      activejob (= 8.1.0)
+      activerecord (= 8.1.0)
+      activestorage (= 8.1.0)
+      activesupport (= 8.1.0)
       mail (>= 2.8.0)
-    actionmailer (8.0.3)
-      actionpack (= 8.0.3)
-      actionview (= 8.0.3)
-      activejob (= 8.0.3)
-      activesupport (= 8.0.3)
+    actionmailer (8.1.0)
+      actionpack (= 8.1.0)
+      actionview (= 8.1.0)
+      activejob (= 8.1.0)
+      activesupport (= 8.1.0)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (8.0.3)
-      actionview (= 8.0.3)
-      activesupport (= 8.0.3)
+    actionpack (8.1.0)
+      actionview (= 8.1.0)
+      activesupport (= 8.1.0)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (8.0.3)
-      actionpack (= 8.0.3)
-      activerecord (= 8.0.3)
-      activestorage (= 8.0.3)
-      activesupport (= 8.0.3)
+    actiontext (8.1.0)
+      action_text-trix (~> 2.1.15)
+      actionpack (= 8.1.0)
+      activerecord (= 8.1.0)
+      activestorage (= 8.1.0)
+      activesupport (= 8.1.0)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.0.3)
-      activesupport (= 8.0.3)
+    actionview (8.1.0)
+      activesupport (= 8.1.0)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (8.0.3)
-      activesupport (= 8.0.3)
+    activejob (8.1.0)
+      activesupport (= 8.1.0)
       globalid (>= 0.3.6)
-    activemodel (8.0.3)
-      activesupport (= 8.0.3)
-    activerecord (8.0.3)
-      activemodel (= 8.0.3)
-      activesupport (= 8.0.3)
+    activemodel (8.1.0)
+      activesupport (= 8.1.0)
+    activerecord (8.1.0)
+      activemodel (= 8.1.0)
+      activesupport (= 8.1.0)
       timeout (>= 0.4.0)
-    activestorage (8.0.3)
-      actionpack (= 8.0.3)
-      activejob (= 8.0.3)
-      activerecord (= 8.0.3)
-      activesupport (= 8.0.3)
+    activestorage (8.1.0)
+      actionpack (= 8.1.0)
+      activejob (= 8.1.0)
+      activerecord (= 8.1.0)
+      activesupport (= 8.1.0)
       marcel (~> 1.0)
-    activesupport (8.0.3)
+    activesupport (8.1.0)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
@@ -87,9 +91,9 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
+    appraisal-run (1.1.0)
     ast (2.4.3)
     base64 (0.3.0)
-    benchmark (0.4.1)
     benchmark-ips (2.14.0)
     better_html (2.1.1)
       actionview (>= 6.0)
@@ -135,7 +139,7 @@ GEM
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
       websocket-driver (~> 0.7)
-    globalid (1.2.1)
+    globalid (1.3.0)
       activesupport (>= 6.1)
     haml (6.3.0)
       temple (>= 0.8.2)
@@ -161,17 +165,18 @@ GEM
     m (1.6.2)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
-    mail (2.8.1)
+    mail (2.9.0)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.4)
+    marcel (1.1.0)
     matrix (0.4.3)
     method_source (1.1.0)
     mini_mime (1.1.5)
     minitest (5.26.0)
-    net-imap (0.5.9)
+    net-imap (0.5.12)
       date
       net-protocol
     net-pop (0.1.2)
@@ -205,7 +210,7 @@ GEM
       prettyprint
     prettyprint (0.2.0)
     prism (1.6.0)
-    propshaft (1.2.1)
+    propshaft (1.3.1)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
@@ -224,30 +229,30 @@ GEM
       rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
-    rails (8.0.3)
-      actioncable (= 8.0.3)
-      actionmailbox (= 8.0.3)
-      actionmailer (= 8.0.3)
-      actionpack (= 8.0.3)
-      actiontext (= 8.0.3)
-      actionview (= 8.0.3)
-      activejob (= 8.0.3)
-      activemodel (= 8.0.3)
-      activerecord (= 8.0.3)
-      activestorage (= 8.0.3)
-      activesupport (= 8.0.3)
+    rails (8.1.0)
+      actioncable (= 8.1.0)
+      actionmailbox (= 8.1.0)
+      actionmailer (= 8.1.0)
+      actionpack (= 8.1.0)
+      actiontext (= 8.1.0)
+      actionview (= 8.1.0)
+      activejob (= 8.1.0)
+      activemodel (= 8.1.0)
+      activerecord (= 8.1.0)
+      activestorage (= 8.1.0)
+      activesupport (= 8.1.0)
       bundler (>= 1.15.0)
-      railties (= 8.0.3)
+      railties (= 8.1.0)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (8.0.3)
-      actionpack (= 8.0.3)
-      activesupport (= 8.0.3)
+    railties (8.1.0)
+      actionpack (= 8.1.0)
+      activesupport (= 8.1.0)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -404,6 +409,7 @@ PLATFORMS
 DEPENDENCIES
   allocation_stats
   appraisal (~> 2)
+  appraisal-run (~> 1.1)
   benchmark-ips (~> 2)
   better_html
   bundler (~> 2)

docs/CHANGELOG.md

@@ -10,10 +10,28 @@ nav_order: 6
 
 ## main
 
+* Make `ViewComponent::VERSION` accessible to other gems by default.
+
+    *Hans Lemuet*
+
+* Added Reinvented Hospitality to the list of companies using ViewComponent.
+
+    *Torgil Zechel*
+
+## 4.1.0
+
+* Add Rails 8.1 support.
+
+    *Hans Lemuet*
+
 * Add Carwow to list of companies using ViewComponent.
 
     *Tom Lord*
 
+* Declare `actionview` as a `view_component` gem dependency.
+
+    *Michal Cichra*
+
 ## 4.0.2
 
 * Share the view context in tests to prevent out-of-order rendering issues for certain advanced use-cases, eg. testing instances of Rails' `FormBuilder`.

docs/CONTRIBUTING.md

@@ -45,11 +45,26 @@ The codespace environment includes a minimal Rails app with ViewComponent instal
 2. Expose the port when prompted by the Visual Studio Code Web Editor.
 3. Add the external URL to the config block in `config/application.rb` as prompted by the error.
 
+## Running tests with Appraisal
+
+This project uses [appraisal](https://github.com/thoughtbot/appraisal) to run tests for various versions of Ruby and Rails, and [appraisal-run](https://github.com/camertron/appraisal-run) to run them in Docker containers.
+
+1. Install the dependencies: `bundle`
+2. Make sure the tests pass: `appraisal-run gemfiles/*.gemfile -- bundle exec rake`
+
+When a new version of Rails is released:
+
+1. Add a new `appraise` block in `Appraisals`.
+2. Run `bundle exec appraisal generate`
+3. Update the gemfiles locks `appraisal-run gemfiles/*.gemfile -- bundle lock`
+4. Make sure the tests pass: `appraisal-run gemfiles/*.gemfile -- bundle exec rake`
+5. Commit and push the changes.
+6. Release a new version.
+
 ## Submitting a pull request
 
 1. [Fork](https://github.com/viewcomponent/view_component/fork) and clone the repository.
-1. Configure and install the dependencies: `bundle exec appraisal install`.
-2. Make sure the tests pass: `bundle exec appraisal rake` (see below for specific cases).
+2. Make sure the tests pass: `appraisal-run gemfiles/*.gemfile -- bundle exec rake`.
 3. Create a new branch: `git checkout -b my-branch-name`.
 4. Add tests, make the change, and make sure the tests still pass.
 5. Add an entry to the top of `docs/CHANGELOG.md` for the changes, no matter how small.

docs/_data/library.yml

@@ -1 +1 @@
-version: 4.0.2
+version: 4.1.0

docs/index.md

@@ -158,11 +158,13 @@ Hundreds of people have [contributed](https://github.com/ViewComponent/view_comp
 * [Ophelos](https://ophelos.com)
 * [Orbit](https://orbit.love)
 * [PeopleForce](https://peopleforce.io)
+* [Percent Pledge](https://www.percentpledge.org/)
 * [PLT4M](https://plt4m.com/)
 * [Podia](https://www.podia.com/)
 * [PrintReleaf](https://www.printreleaf.com/)
 * [Project Blacklight](http://projectblacklight.org/)
 * [QuickNode](https://www.quicknode.com/)
+* [Reinvented Hospitality](https://reinvented-hospitality.com/)
 * [Room AI](https://roomai.com/)
 * [SerpApi](https://www.serpapi.com/)
 * [SearchApi](https://www.searchapi.io/)

gemfiles/rails_7.1.gemfile

@@ -9,6 +9,7 @@ gem "rails", "~> 7.1.0"
 group :development, :test do
   gem "allocation_stats"
   gem "appraisal", "~> 2"
+  gem "appraisal-run", "~> 1.0"
   gem "benchmark-ips", "~> 2"
   gem "better_html"
   gem "bundler", "~> 2"
@@ -34,7 +35,7 @@ group :development, :test do
   gem "slim", "~> 5"
   gem "sprockets-rails", "~> 3"
   gem "standard", "~> 1"
-  gem "tailwindcss-rails", "~> 2"
+  gem "tailwindcss-rails", "~> 4"
   gem "turbo-rails", "~> 1"
   gem "warning"
   gem "yard-activesupport-concern", "< 1"