rackup 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8147a54f57ff6cc1143ffb8b1d56284e4a587ca63aeeb21e491d83348d9dfcd
-  data.tar.gz: 438c92e88aee281963b9a796c716feab222e6a16d34533f89278c42f8be1c34f
+  metadata.gz: a2f461ce1898be20b5206f2e36164aed062a6ce123f283d84400ee8f70eff6af
+  data.tar.gz: d4f73f7cb37cc02ac841f5e7ceb15abcde390de3cb099872735249878fdcf1e2
 SHA512:
-  metadata.gz: 918d8410462f54b58b63defeb39b95fae57ae7da05f19dfee0479718d0b4422909b13a00c1a9f3e19f7e5fb4328b4240db0f7bbbc89d77f0df5e2d8a8e8b94f4
-  data.tar.gz: c821f8a16afb6946aea5dee3bb0a9b070f782df68dfd979772c612dab61d5c983b3fceb32567ce24fac5aff4627157dfea35fee643170bf4ac75d92497308b52
+  metadata.gz: 75a3501c7a1bcbe1faf527c280259bc582651c6bb205ad5f37328ad22555ae3d8f51f7ef66ca80ba8b6d72c8c62bcea26878a7f284dc6738efe005f40001c039
+  data.tar.gz: 887ad57cc40e6b4cc97b3476baed14276b37d07588018f874f807ea079d1c586decc5669760e18981e6d5d8497d05fc2d3cad28bdebb84dc4f7a4366b2b81d9e

data/LICENSE.md

@@ -0,0 +1,22 @@
+Released under the MIT license.
+
+Copyright, 2007-2021, by [Leah Neukirchen](https://leahneukirchen.org).  
+Copyright, 2022, by [Samuel G. D. Williams](https://www.codeotaku.com).  
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/rack/handler.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+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,7 @@
+# frozen_string_literal: true
+
+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.2"
 end

data/lib/rackup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'rackup/handler'
 require_relative 'rackup/server'
 require_relative 'rackup/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rackup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Rack Contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-08-10 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
@@ -110,11 +110,15 @@ dependencies:
         version: '0'
 description:
 email:
-executables: []
+executables:
+- rackup
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.md
 - bin/rackup
+- lib/rack/handler.rb
+- lib/rack/server.rb
 - lib/rackup.rb
 - lib/rackup/handler.rb
 - lib/rackup/handler/cgi.rb