rackup 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 500a1eebb3f2dc73a7f4e0b50753603f19f4b2c841a55c01c047188ed6d2214f
-  data.tar.gz: 7e51b56d52e396e9c208b06c7a25be3389d0df9c55c3c3333f0379e5aec73719
+  metadata.gz: 18162c3f490c041f7b861caf10d48fcd77e81a5e209dbabb1b3f7ec09ccd5145
+  data.tar.gz: 92e5b171f36c54799a05ef413acef33128805fac66c082272a1548aca2234f02
 SHA512:
-  metadata.gz: 9aa96ee4990bf4d93f23c4d3d2b16b28c793e9f4fabc2a24a007f241067262168608bcf0e2091368131563dfe9bb4b7fc2845330a75e96c7886b956a12e5f933
-  data.tar.gz: 62821749a10a8f337c3f0b4dde6f83fab067c68a1d3864f74a8cd1b28fb62d8be8430a571112ea5f5b60b753ad278140d130ec3f73c3a67f739345b288f73a49
+  metadata.gz: 8bbd6a449a64bf48fba176d81c61f13e8eab2888853576effaa8ebf85e9579798ad2069655d9ac123322aafed5a2656bd0bd83f39e53558119e3827310fce3f6
+  data.tar.gz: d56e025ca3edfa363e94a566e356629b306c46c3490d91e7cf70a6d77d37fc4c20da30337a6c66103eccf32e71a6182c989850d965dce163b3a3566ff1faa83c

data/lib/rackup/handler/webrick.rb

@@ -16,6 +16,19 @@ require_relative '../stream'
 module Rackup
   module Handler
     class WEBrick < ::WEBrick::HTTPServlet::AbstractServlet
+      # A WEBrick HTTPServer subclass that invokes the Rack app directly,
+      # bypassing the mount table and default OPTIONS * handling.
+      class Server < ::WEBrick::HTTPServer
+        def initialize(app, config)
+          super(config)
+          @handler = Handler::WEBrick.new(self, app)
+        end
+
+        def service(req, res)
+          @handler.service(req, res)
+        end
+      end
+
       def self.run(app, **options)
         environment  = ENV['RACK_ENV'] || 'development'
         default_host = environment == 'development' ? 'localhost' : nil
@@ -28,8 +41,7 @@ module Rackup
           require 'webrick/https'
         end
 
-        @server = ::WEBrick::HTTPServer.new(options)
-        @server.mount "/", Rackup::Handler::WEBrick, app
+        @server = Server.new(app, options)
         yield @server if block_given?
         @server.start
       end
@@ -102,11 +114,25 @@ module Rackup
         )
 
         env[::Rack::QUERY_STRING] ||= ""
-        unless env[::Rack::PATH_INFO] == ""
-          path, n = req.request_uri.path, env[::Rack::SCRIPT_NAME].length
-          env[::Rack::PATH_INFO] = path[n, path.length - n]
+
+        # Handle OPTIONS * requests which have no path
+        if req.unparsed_uri == "*"
+          env[::Rack::PATH_INFO] = "*"
+          env[::Rack::REQUEST_PATH] = "*"
+          
+          # Ensure SERVER_NAME and SERVER_PORT are set from server config
+          # (WEBrick allows these to be nil for OPTIONS * requests)
+          # See https://github.com/ruby/webrick/pull/182 for a proper fix.
+          env[::Rack::SERVER_NAME] ||= @server[:ServerName] || @server[:BindAddress] || "localhost"
+          env[::Rack::SERVER_PORT] ||= (@server[:Port] || 80).to_s
+        else
+          unless env[::Rack::PATH_INFO] == ""
+            # Strip the script name prefix from the path to get path info
+            script_name_length = env[::Rack::SCRIPT_NAME].length
+            env[::Rack::PATH_INFO] = req.request_uri.path[script_name_length..-1] || ""
+          end
+          env[::Rack::REQUEST_PATH] ||= env[::Rack::SCRIPT_NAME] + env[::Rack::PATH_INFO]
         end
-        env[::Rack::REQUEST_PATH] ||= [env[::Rack::SCRIPT_NAME], env[::Rack::PATH_INFO]].join
 
         status, headers, body = @app.call(env)
         begin

data/lib/rackup/server.rb

@@ -170,14 +170,14 @@ module Rackup
     # This method can be used to very easily launch a CGI application, for
     # example:
     #
-    #  Rack::Server.start(
+    #  Rackup::Server.start(
     #    :app => lambda do |e|
     #      [200, {'content-type' => 'text/html'}, ['hello world']]
     #    end,
     #    :server => 'cgi'
     #  )
     #
-    # Further options available here are documented on Rack::Server#initialize
+    # Further options available here are documented on Rackup::Server#initialize
     def self.start(options = nil)
       new(options).start
     end

data/lib/rackup/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2022-2023, by Samuel Williams.
 
 module Rackup
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/lib/rackup.rb

@@ -6,3 +6,16 @@
 require_relative 'rackup/handler'
 require_relative 'rackup/server'
 require_relative 'rackup/version'
+
+begin
+  # Although webrick is gone from Ruby since 3.0, it still warns all the way
+  # through to 3.3. Only on 3.4 will requiring it not produce a warning anymore.
+  verbose, $VERBOSE = $VERBOSE, nil
+  require 'webrick'
+  # If the user happens to have webrick in their bundle, make the handler available.
+  require_relative 'rackup/handler/webrick'
+rescue LoadError
+  # ¯\_(ツ)_/¯
+ensure
+  $VERBOSE = verbose
+end

data/readme.md

@@ -24,6 +24,24 @@ $ rackup
 
 Your application should now be available locally, typically `http://localhost:9292`.
 
+### Server Handler
+
+You can also use `Rackup::Handler` to start a server programmatically:
+
+``` ruby
+require 'rackup'
+
+# Use the default server:
+handler = Rackup::Handler.default
+handler.run(app, **options)
+
+# Use a specific server:
+handler = Rackup::Handler.get('puma')
+handler.run(app, **options)
+```
+
+Do not require specific handlers or assume they will exist/work. Instead, use the `default` method to get the best available handler.
+
 ## (Soft) Deprecation
 
 For a long time, `rackup` (the executable and implementation) was part of `rack`, and `webrick` was the default server, included with Ruby. It made it easy to run a Rack application without having to worry about the details of the server - great for documentation and demos.

data/releases.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. For info on how to format all future additions to this file please reference [Keep A Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## v2.2.1
+
+  - Try to require `webrick` and `rackup/handler/webrick` by default, for compatibility with code that expects them to be available.
+
 ## v2.2.0
 
   - Remove old rack shims.
+  - Remove `webrick` dependency.
+
+## v2.1.0
+
+  - Correctly support streaming responses with `webrick`.
+
+## v2.0.0
+
+  - Initial release and migration of code from `rack`.
+
+## v1.0.1
+
+  - Fix `rackup.rb` invalid requires.
+
+## v1.0.0
+
+  - Initial release of empty shim for Rack v2.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rackup
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -64,10 +64,9 @@ authors:
 - Wyatt Pan
 - Yehuda Katz
 - Zachary Scott
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -83,8 +82,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
-description:
-email:
 executables:
 - rackup
 extensions: []
@@ -107,9 +104,9 @@ homepage: https://github.com/rack/rackup
 licenses:
 - MIT
 metadata:
+  changelog_uri: https://github.com/rack/rackup/blob/main/releases.md
   rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/rack/rackup.git
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,8 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A general server command for Rack applications.
 test_files: []