rails-nginx 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbaec8277f134da5669ffbddbb1ff2711bafefa63cf7127a01ac913615fec65b
-  data.tar.gz: 327cefb2c793ec50601b204c1132a5298268b078a3878b70bd1369a367eb145d
+  metadata.gz: f8d5a194f3c4e13cf96afe0ff92032d147bdf1b1547eb2005b8179f5c416f9ae
+  data.tar.gz: 92f5b4f5c6e4a555c275168a2b2c26a66ac12b7e3ade54469fab424d202b0bd9
 SHA512:
-  metadata.gz: 7b8cb5b4d4b6fefd6f2bee6bfe0563604bb32f5a827defc97bcdecf0d55ed31e65a1d37976bdb46019feb4488870fc3ef70b4f94a42f09cb00ff1716ecdbdef2
-  data.tar.gz: 36c7dfec4ba7f55dd8d76a9c11e159c7498428a71fda31af1b16d68dfa83b838da2aac66a474734b8a971681ba4f7df9e5eeb563f19363d56ee300254295ed68
+  metadata.gz: cef88d4facf475fa212f1dbb16ed0011061b5eb541efa8cb9ece8400d644c9f235097142156471ad8f9fd1443e025c4cebb0436f439046d7cb866d4e031f38b6
+  data.tar.gz: 1f3d3669700f109d9e9ab0f5ef28a34a52b7bd808d06df4c5b435982f82cf6169f3a0f8af70959f4a45b2ddc1b60d00554f2e6deab5f0634d1c7ef087a7fd896

data/README.md

@@ -180,6 +180,13 @@ Run the Standard Ruby linter, and RSpec test suite.
 bundle exec rake
 ```
 
+**OR**
+
+Run the rake task through [Appraisal](https://github.com/thoughtbot/appraisal) to test against many Puma versions.
+```
+bundle exec appraisal rake
+```
+
 #### Generating a new Dummy server
 
 There's a built-in executable if you'd like to generate a new Dummy server to upgrade the regression tests to work with the latest version of Rails.

data/lib/puma/plugin/hooks_wrapper.rb

@@ -0,0 +1,41 @@
+module HooksWrapper
+  def booted(config, &)
+    if new_hooks?
+      config.after_booted(&)
+    else
+      config.on_booted(&)
+    end
+  end
+
+  def restarted(config, &)
+    if new_hooks?
+      config.before_restart(&)
+    else
+      config.on_restart(&)
+    end
+  end
+
+  def stopped(config, &)
+    return unless stopped_hook?
+
+    if new_hooks?
+      config.after_stopped(&)
+    else
+      config.on_stopped(&)
+    end
+  end
+
+  private
+
+  PUMA_VERSION = Gem::Version.new(Puma::Const::PUMA_VERSION)
+
+  def new_hooks?
+    # Puma renamed their hooks in v7.
+    Gem::Version.new("7.0.0") <= PUMA_VERSION
+  end
+
+  def stopped_hook?
+    # Puma v6.5 added on_stopped.
+    Gem::Version.new("6.5.0") <= PUMA_VERSION
+  end
+end

data/lib/puma/plugin/rails_nginx.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "puma/plugin"
+require_relative "hooks_wrapper"
 require_relative "../../rails/nginx"
 
 # The Puma team recommends this approach to extend the Puma DSL.
@@ -27,13 +28,15 @@ def rails_port!
 end
 
 Puma::Plugin.create do
+  include HooksWrapper
+
   def config(puma_config)
     rails_port!
 
     puma_config.clear_binds!
     puma_config.port Rails::Nginx.port
 
-    puma_config.on_booted do
+    booted(puma_config) do
       if puma_config.rails_nginx_configs.empty?
         Rails::Nginx.start!
       else
@@ -43,7 +46,7 @@ Puma::Plugin.create do
       end
     end
 
-    puma_config.on_restart do
+    restarted(puma_config) do
       if puma_config.rails_nginx_configs.empty?
         Rails::Nginx.stop!
         Rails::Nginx.start!
@@ -55,14 +58,12 @@ Puma::Plugin.create do
       end
     end
 
-    if defined?(puma_config.on_stopped)
-      puma_config.on_stopped do
-        if puma_config.rails_nginx_configs.empty?
-          Rails::Nginx.stop!
-        else
-          puma_config.rails_nginx_configs.each_value do |options|
-            Rails::Nginx.stop!(options)
-          end
+    stopped(puma_config) do
+      if puma_config.rails_nginx_configs.empty?
+        Rails::Nginx.stop!
+      else
+        puma_config.rails_nginx_configs.each_value do |options|
+          Rails::Nginx.stop!(options)
         end
       end
     end

data/lib/rails/nginx/version.rb

@@ -2,6 +2,6 @@
 
 module Rails
   module Nginx
-    VERSION = "1.0.5"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-nginx
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Bert McCutchen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-15 00:00:00.000000000 Z
+date: 2025-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -62,6 +62,7 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- lib/puma/plugin/hooks_wrapper.rb
 - lib/puma/plugin/rails_nginx.rb
 - lib/rails/nginx.rb
 - lib/rails/nginx/configuration.rb