rackup 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8147a54f57ff6cc1143ffb8b1d56284e4a587ca63aeeb21e491d83348d9dfcd
-  data.tar.gz: 438c92e88aee281963b9a796c716feab222e6a16d34533f89278c42f8be1c34f
+  metadata.gz: 3c239e669891dd32bd5459cc09851002a3053efcef6b1e0b2273b59a0ecde2ca
+  data.tar.gz: 36a8f1702ab1ad684761a12a16b54139b7b817eccaab1c4ee1598b4f2d5e9b6b
 SHA512:
-  metadata.gz: 918d8410462f54b58b63defeb39b95fae57ae7da05f19dfee0479718d0b4422909b13a00c1a9f3e19f7e5fb4328b4240db0f7bbbc89d77f0df5e2d8a8e8b94f4
-  data.tar.gz: c821f8a16afb6946aea5dee3bb0a9b070f782df68dfd979772c612dab61d5c983b3fceb32567ce24fac5aff4627157dfea35fee643170bf4ac75d92497308b52
+  metadata.gz: 793c6af71f771f2faf322f4d138b2cea8dcbf40a4a99fdb582b71f58768f3a727e20021c2a5c7a09040e9af2b2ae4ae9c3f2a6b5e2578983cbbaba94b337fc3e
+  data.tar.gz: f8af38a1f3839bafb9cd765256a0e1eed88506cd8a785eb387e173253b78402175c666a3227d7e9c06e5b09c4e9f969e25dfe64c169ce7cdd56027f3a0f539c6

data/lib/rack/handler.rb

@@ -0,0 +1,5 @@
+warn "Rack::Handler is deprecated and replaced by Rackup::Handler"
+require_relative '../rackup/handler'
+module Rack
+	Handler = ::Rackup::Handler
+end

data/lib/rack/server.rb

@@ -0,0 +1,5 @@
+warn "Rack::Server is deprecated and replaced by Rackup::Server"
+require_relative '../rackup/server'
+module Rack
+	Server = ::Rackup::Server
+end

data/lib/rackup/handler.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'rack/handler'
-
 module Rackup
   # *Handlers* connect web servers with Rack.
   #
@@ -11,9 +9,26 @@ module Rackup
   # A second optional hash can be passed to include server-specific
   # configuration.
   module Handler
+    @handlers = {}
+
+    # Register a named handler class.
+    def self.register(name, klass)
+      if klass.is_a?(String)
+        warn "Calling Rackup::Handler.register with a string is deprecated, use the class/module itself.", uplevel: 1
+
+        klass = self.const_get(klass, false)
+      end
+
+      name = name.to_sym
+
+      @handlers[name] = klass
+    end
+
     def self.[](name)
+      name = name.to_sym
+
       begin
-        Rack::Handler[name] || self.const_get(name, false)
+        @handlers[name] || self.const_get(name, false)
       rescue NameError
         # Ignore.
       end
@@ -28,17 +43,15 @@ module Rackup
         return server
       end
 
-      require_handler("rack/handler", name)
+      begin
+        require_handler("rackup/handler", name)
+      rescue LoadError
+        require_handler("rack/handler", name)
+      end
 
       return self[name]
     end
 
-    def self.register(name, klass)
-      name = name.to_sym
-
-      Rack::Handler.register(name, klass)
-    end
-
     RACK_HANDLER = 'RACK_HANDLER'
     RACKUP_HANDLER = 'RACKUP_HANDLER'
 

data/lib/rackup/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Rackup
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rackup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Rack Contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +115,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/rackup
+- lib/rack/handler.rb
+- lib/rack/server.rb
 - lib/rackup.rb
 - lib/rackup/handler.rb
 - lib/rackup/handler/cgi.rb