Merge branch 'main' into drop-eol-rails-7.1

Author: Spone

Gemfile

@@ -27,7 +27,7 @@ group :development, :test do
   gem "method_source", "~> 1"
   gem "minitest", "~> 5"
   gem "propshaft", "~> 1"
-  gem "puma", "~> 6"
+  gem "puma", ">= 6"
   gem "rake", "~> 13"
   gem "rails-dom-testing", "~> 2.3.0"
   gem "redis"

Gemfile.lock

@@ -95,9 +95,9 @@ GEM
     ast (2.4.3)
     base64 (0.3.0)
     benchmark-ips (2.14.0)
-    better_html (2.1.1)
-      actionview (>= 6.0)
-      activesupport (>= 6.0)
+    better_html (2.2.0)
+      actionview (>= 7.0)
+      activesupport (>= 7.0)
       ast (~> 2.0)
       erubi (~> 1.4)
       parser (>= 2.4)
@@ -155,7 +155,7 @@ GEM
     jbuilder (2.14.1)
       actionview (>= 7.0.0)
       activesupport (>= 7.0.0)
-    json (2.15.1)
+    json (2.15.2)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -203,7 +203,7 @@ GEM
     nokogiri (1.18.10-x86_64-linux-musl)
       racc (~> 1.4)
     parallel (1.27.0)
-    parser (3.3.9.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
     pp (0.6.3)
@@ -218,7 +218,7 @@ GEM
       date
       stringio
     public_suffix (6.0.2)
-    puma (6.6.1)
+    puma (7.1.0)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.2.3)
@@ -423,7 +423,7 @@ DEPENDENCIES
   method_source (~> 1)
   minitest (~> 5)
   propshaft (~> 1)
-  puma (~> 6)
+  puma (>= 6)
   rails (~> 8)
   rails-dom-testing (~> 2.3.0)
   rake (~> 13)

docs/CHANGELOG.md

@@ -14,6 +14,10 @@ nav_order: 6
 
     *Hans Lemuet*
 
+* Resolve deprecation warning for `ActiveSupport::Configurable`.
+
+    *Simon Fish*
+
 * Make `ViewComponent::VERSION` accessible to other gems by default.
 
     *Hans Lemuet*

docs/index.md

@@ -164,6 +164,7 @@ Hundreds of people have [contributed](https://github.com/ViewComponent/view_comp
 * [PrintReleaf](https://www.printreleaf.com/)
 * [Project Blacklight](http://projectblacklight.org/)
 * [QuickNode](https://www.quicknode.com/)
+* [RailsCarma](https://www.railscarma.com)
 * [Reinvented Hospitality](https://reinvented-hospitality.com/)
 * [Room AI](https://roomai.com/)
 * [SerpApi](https://www.serpapi.com/)

lib/view_component/base.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "action_view"
-require "active_support/configurable"
 require "view_component/collection"
 require "view_component/compile_cache"
 require "view_component/compiler"

lib/view_component/configurable.rb

@@ -4,14 +4,30 @@ module ViewComponent
   module Configurable
     extend ActiveSupport::Concern
 
+    class_methods do
+      def config
+        @_config ||= if respond_to?(:superclass) && superclass.respond_to?(:config)
+          superclass.config.inheritable_copy
+        else
+          ActiveSupport::OrderedOptions.new
+        end
+      end
+
+      def configure
+        yield config
+      end
+    end
+
     included do
       next if respond_to?(:config) && config.respond_to?(:view_component) && config.respond_to_missing?(:instrumentation_enabled)
 
-      include ActiveSupport::Configurable
-
       configure do |config|
         config.view_component ||= ActiveSupport::InheritableOptions.new
       end
+
+      def config
+        self.class.config
+      end
     end
   end
 end