rack-test_server 0.1.5 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6406dd22b7cccbc0b58ecc54464b265ebbdbd4ca006ccc09d736cd5435b66afd
-  data.tar.gz: 916b218f513afcaea4266c3557ca514b1f39df726ff6bc01e7c9b6511c411b18
+  metadata.gz: 335efdff6c7d5e4a5be51002462ca17c92ac11e667011eee6d2b1d21195d555d
+  data.tar.gz: e1dbadcb0ecf680e4077ad67e6b796efbe00329de6c75e7aeff0210b1fc03940
 SHA512:
-  metadata.gz: 0ef53d8ef4627b0a4883e58743d62addadd1a83fce858eee9ce02ccde12058226410b7ff674e76cbdd21423fc5b8b903aec3f40dec12558d0fda5028cedc8795
-  data.tar.gz: 47ffe65375c3dbc5c91a08a1286e79f6f35d58d7b78e62180faefa952c85569f3bef71a4a310fba9a8b3b65db8dba6184be6f2e9da4cb0c66243d293bec12c38
+  metadata.gz: bb914169d7cbd83015dbf3beb3f14163a514b69f7aa3b27100f567436c27c91d523b4a6292ac3b455e4ddeab85ae3ef5d626cd70216f44058826e0659cebd032
+  data.tar.gz: 4443827d97045b7bec5a905ed9991b0c78601bcc66dfea8b1bd94ba6d11b17fb9860bfd93008bb0a3d8d762c8a33c3f050a4cf3dac0c224e9cce53a0414732c6

data/README.md

@@ -38,6 +38,8 @@ gem 'rack-test_server'
 
 and then `bundle install`.
 
+NOTE: Ruby 2.3 users can use 0.1.5. (without `rackup` gem), however it is no longer supported.
+
 ## Usage
 
 If you are working with Rails application, add configuration like below in spec/support/system_testing_helper.rb:
@@ -47,7 +49,7 @@ require 'rack/test_server'
 
 # Configure Rack server
 #
-# options for Rack::Server
+# options for Rackup::Server
 # @see https://github.com/rack/rack/blob/2.2.3/lib/rack/server.rb#L173
 # options for Rack::Handler::Puma
 # @see https://github.com/puma/puma/blob/v5.4.0/lib/rack/handler/puma.rb#L84

data/lib/rack/test_server/signal_trap_interceptor.rb

@@ -20,12 +20,19 @@ module Rack
   end
 end
 
-require 'rack/server'
-
-# Disable SIGINT handler in Rack::Server.
-# https://github.com/rack/rack/blob/2.2.3/lib/rack/server.rb#L319
-Rack::Server.prepend(Rack::TestServer::SignalTrapInterceptor)
+begin
+  # Disable SIGINT handler in Rackup::Server.
+  require 'rackup/server'
+  # https://github.com/rack/rackup/blob/main/lib/rackup/server.rb#L333
+  Rackup::Server.prepend(Rack::TestServer::SignalTrapInterceptor)
+rescue LoadError
+  # Disable SIGINT handler in Rack::Server.
+  # https://github.com/rack/rack/blob/2.2.3/lib/rack/server.rb#L319
+  require 'rack/server'
+  Rack::Server.prepend(Rack::TestServer::SignalTrapInterceptor)
+end
 
 # Mainly inteded to disable SIGINT handler in Puma.
 # https://github.com/puma/puma/blob/v5.5.0/lib/puma/launcher.rb#L485
+# https://github.com/puma/puma/blob/v6.4.2/lib/puma/launcher.rb#L441
 Signal.singleton_class.prepend(Rack::TestServer::SignalTrapInterceptor)

data/lib/rack/test_server/version.rb

@@ -2,6 +2,6 @@
 
 module Rack
   class TestServer
-    VERSION = '0.1.5'
+    VERSION = '0.2.1'
   end
 end

data/lib/rack/test_server.rb

@@ -8,7 +8,7 @@ require 'rack/test_server/puma_signal_trap_interceptor'
 require 'rack/test_server/signal_trap_interceptor'
 
 module Rack
-  # An utility class for launching HTTP server with Rack::Server#start
+  # An utility class for launching HTTP server with Rackup::Server#start
   # and waiting for the server available with checking a healthcheck endpoint with net/http.
   #
   # The most typical usage is:
@@ -28,7 +28,11 @@ module Rack
         end
       end
 
-      @server = Rack::Server.new(app: testapp, **options)
+      begin
+        @server = Rackup::Server.new(app: testapp, **options)
+      rescue NameError
+        @server = Rack::Server.new(app: testapp, **options)
+      end
       @host = @server.options[:Host] || @server.default_options[:Host]
       @port = @server.options[:Port] || @server.default_options[:Port]
     end
@@ -46,7 +50,7 @@ module Rack
     #
     # @note This method will block the thread, and in most cases {#start_async} is suitable.
     def start
-      # Disable SIGINT handler in Rack::Server.
+      # Disable SIGINT handler in Rackup::Server.
       # https://github.com/rack/rack/blob/2.2.3/lib/rack/server.rb#L319
       SignalTrapInterceptor.enable
       @server.start do |server|

data/rack-test_server.gemspec

@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3'
-  spec.add_dependency 'rack', '>= 2', '< 3'
+  spec.required_ruby_version = '>= 2.4'
+  spec.add_dependency 'rack'
+  spec.add_dependency 'rackup'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'puma'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'sinatra'
-  spec.add_development_dependency 'thin'
   spec.add_development_dependency 'webrick'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-test_server
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.1
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-17 00:00:00.000000000 Z
+date: 2024-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,28 +16,22 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rackup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -45,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -146,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="