net-http-server 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 35d57af683a4c0b327c281d5ae71f848e076b6be987e9fa4c1ee77d2aab41d68
+  data.tar.gz: 6cd05ef1952687d1ec6b0ac83bfe3ca7ba457fae04891a38fb32b53beee7beb7
+SHA512:
+  metadata.gz: 87305fc9592d5cde9ab305b0a98d22f365fc6af32808aca03323f0d0140b89384a95b9e19b5ccc23552ae611b65b600d02ad526b399d4d606793d7d0cfbd308b
+  data.tar.gz: ad2a7320a5aeb3b2106cf4b871fb589dd2f0ad0afb86d50ad9a41b75e88f76f7ef0115c2d78b450fc42020f4da4bc58d1605de83e43df464bddf2c49f50b7cb2

data/.gitignore

@@ -1,3 +1,4 @@
+Gemfile.lock
 doc/
 pkg/
 vendor/

data/ChangeLog.md

@@ -1,3 +1,12 @@
+### 0.2.3 / 2022-06-18
+
+* Add [gserver] ~> 0.0 as a dependency.
+* Switched to using Ruby 2.x keyword arguments.
+* Fix a bug in {Rack::Handler::HTTP} where the URI `query` string was not being
+  properly loaded.
+* Fixed a bug in {Net::HTTP::Server::Parser} where the older `absnt?` method
+  was being used instead of the newer `absent?` method.
+
 ### 0.2.2 / 2012-09-08
 
 * Added an example `rackup` command.
@@ -32,3 +41,5 @@
   * Added {Net::HTTP::Server::Responses}.
   * Added {Net::HTTP::Server::Daemon}.
   * Added {Rack::Handler::HTTP}.
+
+[gserver]: https://rubygems.org/gems/gserver

data/Gemfile

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+gemspec
+
+group :development do
+  gem 'rake'
+  gem 'rubygems-tasks', '~> 0.1'
+
+  gem 'rack'
+  gem 'rspec', '~> 3.0'
+
+  gem 'kramdown'
+  gem 'redcarpet', platform: :mri
+  gem 'yard', '~> 0.9'
+  gem 'yard-spellcheck'
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Hal Brodigan
+Copyright (c) 2011-2022 Hal Brodigan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,9 +1,8 @@
 # net-http-server
 
-* [Homepage](http://github.com/postmodern/net-http-server)
-* [Issues](http://github.com/postmodern/net-http-server/issues)
-* [Documentation](http://rubydoc.info/gems/net-http-server)
-* [Email](mailto:postmodern.mod3 at gmail.com)
+* [Homepage](https://github.com/postmodern/net-http-server#readme)
+* [Issues](https://github.com/postmodern/net-http-server/issues)
+* [Documentation](https://rubydoc.info/gems/net-http-server)
 
 ## Description
 
@@ -14,41 +13,50 @@
 * Pure Ruby.
 * Supports Streamed Request/Response Bodies.
 * Supports Chunked Transfer-Encoding.
-* Provides a [Rack](http://rack.rubyforge.org/) Handler.
+* Provides a [Rack](https://github.com/rack/rack#readme) Handler.
 
 ## Examples
 
 Simple HTTP Server:
 
-    require 'net/http/server'
-    require 'pp'
+```ruby
+require 'net/http/server'
+require 'pp'
 
-    Net::HTTP::Server.run(:port => 8080) do |request,stream|
-      pp request
+Net::HTTP::Server.run(:port => 8080) do |request,stream|
+  pp request
 
-      [200, {'Content-Type' => 'text/html'}, ['Hello World']]
-    end
+  [200, {'Content-Type' => 'text/html'}, ['Hello World']]
+end
+```
 
 Use it with Rack:
 
-    require 'rack/handler/http'
-    
-    Rack::Handler::HTTP.run app
+```ruby
+require 'rack/handler/http'
+
+Rack::Handler::HTTP.run app
+```
 
 Using it with `rackup`:
 
-    $ rackup -s HTTP
+```shell
+$ rackup -s HTTP
+```
 
 ## Requirements
 
-* [parslet](http://rubygems.org/gems/parslet) ~> 1.0
+* [parslet](http://kschiess.github.io/parslet/) ~> 1.0
+* [gserver](https://rubygems.org/gems/gserver) ~> 0.0
 
 ## Install
 
-    $ gem install net-http-server
+```shell
+$ gem install net-http-server
+```
 
 ## Copyright
 
-Copyright (c) 2011 Hal Brodigan
+Copyright (c) 2011-2022 Hal Brodigan
 
 See {file:LICENSE.txt} for details.

data/Rakefile

@@ -1,36 +1,19 @@
-require 'rubygems'
-require 'rake'
-
 begin
-  gem 'rubygems-tasks', '~> 0.1'
-  require 'rubygems/tasks'
-
-  Gem::Tasks.new
+  require 'bundler/setup'
 rescue LoadError => e
   warn e.message
-  warn "Run `gem install rubygems-tasks` to install 'rubygems/tasks'."
+  warn "Run `gem install bundler` to install Bundler"
+  exit -1
 end
 
-begin
-  gem 'rspec', '~> 2.4'
-  require 'rspec/core/rake_task'
+require 'rubygems/tasks'
+Gem::Tasks.new
 
-  RSpec::Core::RakeTask.new
-rescue LoadError => e
-  task :spec do
-    abort "Please run `gem install rspec` to install RSpec."
-  end
-end
-task :test => :spec
-task :default => :spec
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
 
-begin
-  gem 'yard', '~> 0.8'
-  require 'yard'
+task :test    => :spec
+task :default => :spec
 
-  YARD::Rake::YardocTask.new  
-rescue LoadError => e
-  task :yard do
-    abort "Please run `gem install yard` to install YARD."
-  end
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/gemspec.yml

@@ -4,13 +4,19 @@ description: A Rack compatible pure Ruby HTTP Server.
 license: MIT
 authors: Postmodern
 email: postmodern.mod3@gmail.com
-homepage: http://github.com/postmodern/net-http-server
+homepage: https://github.com/postmodern/net-http-server#readme
 has_yard: true
 
+metadata:
+  documentation_uri: https://rubydoc.info/gems/net-http-server
+  source_code_uri:   https://github.com/postmodern/net-http-server
+  bug_tracker_uri:   https://github.com/postmodern/net-http-server/issues
+  changelog_uri:     https://github.com/postmodern/net-http-server/blob/master/ChangeLog.md
+  rubygems_mfa_required: 'true'
+
 dependencies:
   parslet: ~> 1.0
+  gserver: ~> 0.0
 
 development_dependencies:
-  rubygems-tasks: ~> 0.1
-  rspec: ~> 2.4
-  yard: ~> 0.8
+  bundler: ~> 2.0

data/lib/net/http/server/chunked_stream.rb

@@ -14,7 +14,7 @@ module Net
       class ChunkedStream < Stream
 
         #
-        # Initializes the chuked stream.
+        # Initializes the chunked stream.
         #
         # @param [#read, #write, #flush] socket
         #   The socket to read from and write to.
@@ -47,9 +47,8 @@ module Net
           end
 
           until @buffer.length >= length
-            length_line = @socket.readline("\r\n").chomp
-            chunk_length, chunk_extension = length_line.split(';',2)
-            chunk_length = chunk_length.to_i(16)
+            length_line  = @socket.readline("\r\n").chomp
+            chunk_length = length_line.split(';',2).first.to_i(16)
 
             # read the chunk
             @buffer << @socket.read(chunk_length)

data/lib/net/http/server/daemon.rb

@@ -26,22 +26,19 @@ module Net
 
         # Creates a new HTTP Daemon.
         #
-        # @param [Hash] options
-        #   Options for the daemon.
-        #
-        # @option options [String] :host (DEFAULT_HOST)
+        # @param [String] host
         #   The host to run on.
         #
-        # @option options [String] :port (DEFAULT_PORT)
+        # @param [String] port
         #   The port to listen on.
         #
-        # @option options [Integer] :max_connections (MAX_CONNECTIONS)
+        # @param [Integer] max_connections
         #   The maximum number of simultaneous connections.
         #
-        # @option options [IO] :log ($stderr)
+        # @param [IO] log
         #   The log to write errors to.
         #
-        # @option options [#call] :handler
+        # @param [#call] handler
         #   The HTTP Request Handler object.
         #
         # @yield [request, socket]
@@ -53,15 +50,18 @@ module Net
         # @yieldparam [TCPSocket] socket
         #   The TCP socket of the client.
         #
-        def initialize(options={},&block)
-          host = options.fetch(:host,DEFAULT_HOST)
-          port = options.fetch(:port,DEFAULT_PORT).to_i
-          max_connections = options.fetch(:max_connections,MAX_CONNECTIONS)
-          log = options.fetch(:log,$stderr)
-
-          super(port,host,max_connections,log,false,true)
+        # @raise [ArgumentError]
+        #   No `handler:` value was given.
+        #
+        def initialize(host: DEFAULT_HOST,
+                       port: DEFAULT_PORT,
+                       max_connections: MAX_CONNECTIONS,
+                       log: $stderr,
+                       handler: nil,
+                       &block)
+          super(port.to_i,host,max_connections,log,false,true)
 
-          handler(options[:handler],&block)
+          handler(handler,&block)
         end
 
         #
@@ -106,7 +106,7 @@ module Net
 
             begin
               request = parser.parse(raw_request)
-            rescue Parslet::ParseFailed => error
+            rescue Parslet::ParseFailed
               return Responses::BAD_REQUEST
             end
 

data/lib/net/http/server/parser.rb

@@ -9,7 +9,7 @@ module Net
       #
       # * [Thin](https://github.com/macournoyer/thin/blob/master/ext/thin_parser/common.rl)
       # * [Unicorn](https://github.com/defunkt/unicorn/blob/master/ext/unicorn_http/unicorn_http_common.rl)
-      # * [RFC 2616](http://www.w3.org/Protocols/rfc2616/rfc2616.html)
+      # * [RFC 9110](https://www.rfc-editor.org/rfc/rfc9110.html)
       #
       class Parser < Parslet::Parser
 
@@ -30,7 +30,7 @@ module Net
         rule(:crlf) { str("\r\n") }
 
         rule(:ctl) { cntrl | str("\x7f") }
-        rule(:text) { lws | (ctl.absnt? >> ascii) }
+        rule(:text) { lws | (ctl.absent? >> ascii) }
 
         rule(:safe) { charset('$', '-', '_', '.') }
         rule(:extra) { charset('!', '*', "'", '(', ')', ',') }
@@ -39,7 +39,7 @@ module Net
 
         rule(:unsafe) { ctl | charset(' ', '#', '%') | sorta_safe }
         rule(:national) {
-          (alpha | digit | reserved | extra | safe | unsafe).absnt? >> any
+          (alpha | digit | reserved | extra | safe | unsafe).absent? >> any
         }
 
         rule(:unreserved) { alpha | digit | safe | extra | national }
@@ -57,13 +57,13 @@ module Net
         #
         # Elements
         #
-        rule(:token) { (ctl | separators).absnt? >> ascii }
+        rule(:token) { (ctl | separators).absent? >> ascii }
 
-        rule(:comment_text) { (str('(') | str(')')).absnt? >> text }
+        rule(:comment_text) { (str('(') | str(')')).absent? >> text }
         rule(:comment) { str('(') >> comment_text.repeat >> str(')') }
 
         rule(:quoted_pair) { str("\\") >> ascii }
-        rule(:quoted_text) { quoted_pair | str('"').absnt? >> text }
+        rule(:quoted_text) { quoted_pair | str('"').absent? >> text }
         rule(:quoted_string) { str('"') >> quoted_text >> str('"') }
 
         #
@@ -117,7 +117,7 @@ module Net
           http_version
         }
 
-        rule(:header_name) { (str(':').absnt? >> token).repeat(1) }
+        rule(:header_name) { (str(':').absent? >> token).repeat(1) }
         rule(:header_value) {
           (text | token | separators | quoted_string).repeat(1)
         }

data/lib/net/http/server/server.rb

@@ -8,23 +8,23 @@ module Net
       #
       # Starts the HTTP Server.
       #
-      # @param [Hash] options
-      #   Options for the server.
+      # @param [Boolean] background
+      #   Specifies whether to run the server in the background or
+      #   foreground.
       #
-      # @option options [String] :host (DEFAULT_HOST)
+      # @param [Hash{Symbol => Object}] kwargs
+      #   Additional keyword arguments for {Daemon#initialize}.
+      #
+      # @option kwargs [String] :host (DEFAULT_HOST)
       #   The host to run on.
       #
-      # @option options [String] :port (DEFAULT_PORT)
+      # @option kwargs [String] :port (DEFAULT_PORT)
       #   The port to listen on.
       #
-      # @option options [Integer] :max_connections (MAX_CONNECTIONS)
+      # @option kwargs [Integer] :max_connections (MAX_CONNECTIONS)
       #   The maximum number of simultaneous connections.
       #
-      # @option options [Boolean] :background (false)
-      #   Specifies whether to run the server in the background or
-      #   foreground.
-      #
-      # @option options [#call] :handler
+      # @option kwargs [#call] :handler
       #   The HTTP Request Handler object.
       #
       # @yield [request, socket]
@@ -36,11 +36,14 @@ module Net
       # @yieldparam [TCPSocket] socket
       #   The TCP socket of the client.
       #
-      def Server.run(options={},&block)
-        daemon = Daemon.new(options,&block)
+      # @raise [ArgumentError]
+      #   No `handler:` value was given.
+      #
+      def Server.run(background: false, **kwargs,&block)
+        daemon = Daemon.new(**kwargs,&block)
 
         daemon.start
-        daemon.join unless options[:background]
+        daemon.join unless background
         return daemon
       end
 

data/lib/net/http/server/version.rb

@@ -4,7 +4,7 @@ module Net
   class HTTP < Protocol
     module Server
       # net-http-server version.
-      VERSION = '0.2.2'
+      VERSION = '0.2.3'
     end
   end
 end

data/lib/rack/handler/http.rb

@@ -37,7 +37,7 @@ module Rack
       # @param [#call] app
       #   The application the handler will be passing requests to.
       #
-      # @param [Hash] options
+      # @param [Hash{Symbol => Object}] options
       #   Additional options.
       #
       # @option options [String] :Host
@@ -46,7 +46,7 @@ module Rack
       # @option options [Integer] :Port
       #   The port to listen on.
       #
-      def initialize(app,options={})
+      def initialize(app,**options)
         @app     = app
         @options = options
         @server  = nil
@@ -57,8 +57,8 @@ module Rack
       #
       # @see #initialize
       #
-      def self.run(app,options={})
-        new(app,options).run
+      def self.run(app,**options)
+        new(app,**options).run
       end
 
       #
@@ -66,9 +66,9 @@ module Rack
       #
       def run
         @server = Net::HTTP::Server::Daemon.new(
-          :host    => @options[:Host],
-          :port    => @options[:Port],
-          :handler => self
+          host:    @options[:Host],
+          port:    @options[:Port],
+          handler: self
         )
 
         @server.start
@@ -113,12 +113,12 @@ module Rack
 
         env['REQUEST_METHOD'] = request[:method].to_s
         env['PATH_INFO']      = request_uri.fetch(:path,'*').to_s
-        env['QUERY_STRING']   = request_uri[:query_string].to_s
+        env['QUERY_STRING']   = request_uri[:query].to_s
 
         # add the headers
         request[:headers].each do |name,value|
           key = name.dup
-          
+
           key.upcase!
           key.tr!('-','_')
 

data/net-http-server.gemspec

@@ -2,130 +2,61 @@
 
 require 'yaml'
 
-Gem::Specification.new do |gemspec|
-  root = File.dirname(__FILE__)
-  lib_dir = File.join(root,'lib')
-  files = if File.directory?('.git')
-            `git ls-files`.split($/)
-          elsif File.directory?('.hg')
-            `hg manifest`.split($/)
-          elsif File.directory?('.svn')
-            `svn ls -R`.split($/).select { |path| File.file?(path) }
-          else
-            Dir['{**/}{.*,*}'].select { |path| File.file?(path) }
-          end
+Gem::Specification.new do |gem|
+  gemspec = YAML.load_file('gemspec.yml')
 
-  filter_files = lambda { |paths|
-    case paths
-    when Array
-      (files & paths)
-    when String
-      (files & Dir[paths])
-    end
-  }
-
-  version = {
-    :file => 'net/http/server/version.rb',
-    :constant => 'Net::HTTP::Server::VERSION'
-  }
-
-  defaults = {
-    'name' => File.basename(File.dirname(__FILE__)),
-    'files' => files,
-    'executables' => filter_files['bin/*'].map { |path| File.basename(path) },
-    'test_files' => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'],
-    'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'],
-  }
+  gem.name    = gemspec.fetch('name')
+  gem.version = gemspec.fetch('version') do
+                  lib_dir = File.join(File.dirname(__FILE__),'lib')
+                  $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
 
-  metadata = defaults.merge(YAML.load_file('gemspec.yml'))
+                  require 'net/http/server/version'
+                  Net::HTTP::Server::VERSION
+                end
 
-  gemspec.name = metadata.fetch('name',defaults[:name])
-  gemspec.version = if metadata['version']
-                      metadata['version']
-                    else
-                      $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
+  gem.summary     = gemspec['summary']
+  gem.description = gemspec['description']
+  gem.licenses    = Array(gemspec['license'])
+  gem.authors     = Array(gemspec['authors'])
+  gem.email       = gemspec['email']
+  gem.homepage    = gemspec['homepage']
+  gem.metadata    = gemspec['metadata'] if gemspec['metadata']
 
-                      require version[:file]
-                      eval(version[:constant])
-                    end
+  glob = lambda { |patterns| gem.files & Dir[*patterns] }
 
-  gemspec.summary = metadata.fetch('summary',metadata['description'])
-  gemspec.description = metadata.fetch('description',metadata['summary'])
+  gem.files = `git ls-files`.split($/)
+  gem.files = glob[gemspec['files']] if gemspec['files']
 
-  case metadata['license']
-  when Array
-    gemspec.licenses = metadata['license']
-  when String
-    gemspec.license = metadata['license']
+  gem.executables = gemspec.fetch('executables') do
+    glob['bin/*'].map { |path| File.basename(path) }
   end
+  gem.default_executable = gem.executables.first if Gem::VERSION < '1.7.'
 
-  case metadata['authors']
-  when Array
-    gemspec.authors = metadata['authors']
-  when String
-    gemspec.author = metadata['authors']
-  end
-
-  gemspec.email = metadata['email']
-  gemspec.homepage = metadata['homepage']
+  gem.extensions       = glob[gemspec['extensions'] || 'ext/**/extconf.rb']
+  gem.test_files       = glob[gemspec['test_files'] || \
+                              '{test/{**/}*_test.rb,spec/{**/}*_spec.rb}']
+  gem.extra_rdoc_files = glob[gemspec['extra_doc_files'] || '*.{txt,md}']
 
-  case metadata['require_paths']
-  when Array
-    gemspec.require_paths = metadata['require_paths']
-  when String
-    gemspec.require_path = metadata['require_paths']
-  end
+  gem.require_paths = Array(gemspec.fetch('require_paths') {
+    %w[ext lib].select { |dir| File.directory?(dir) }
+  })
 
-  gemspec.files = filter_files[metadata['files']]
+  gem.requirements              = gemspec['requirements']
+  gem.required_ruby_version     = gemspec['required_ruby_version']
+  gem.required_rubygems_version = gemspec['required_rubygems_version']
+  gem.post_install_message      = gemspec['post_install_message']
 
-  gemspec.executables = metadata['executables']
-  gemspec.extensions = metadata['extensions']
-
-  if Gem::VERSION < '1.7.'
-    gemspec.default_executable = gemspec.executables.first
-  end
-
-  gemspec.test_files = filter_files[metadata['test_files']]
-
-  unless gemspec.files.include?('.document')
-    gemspec.extra_rdoc_files = metadata['extra_doc_files']
-  end
-
-  gemspec.post_install_message = metadata['post_install_message']
-  gemspec.requirements = metadata['requirements']
-
-  if gemspec.respond_to?(:required_ruby_version=)
-    gemspec.required_ruby_version = metadata['required_ruby_version']
-  end
-
-  if gemspec.respond_to?(:required_rubygems_version=)
-    gemspec.required_rubygems_version = metadata['required_ruby_version']
-  end
-
-  parse_versions = lambda { |versions|
-    case versions
-    when Array
-      versions.map { |v| v.to_s }
-    when String
-      versions.split(/,\s*/)
-    end
-  }
-
-  if metadata['dependencies']
-    metadata['dependencies'].each do |name,versions|
-      gemspec.add_dependency(name,parse_versions[versions])  
-    end
-  end
+  split = lambda { |string| string.split(/,\s*/) }
 
-  if metadata['runtime_dependencies']
-    metadata['runtime_dependencies'].each do |name,versions|
-      gemspec.add_runtime_dependency(name,parse_versions[versions])  
+  if gemspec['dependencies']
+    gemspec['dependencies'].each do |name,versions|
+      gem.add_dependency(name,split[versions])
     end
   end
 
-  if metadata['development_dependencies']
-    metadata['development_dependencies'].each do |name,versions|
-      gemspec.add_development_dependency(name,parse_versions[versions])  
+  if gemspec['development_dependencies']
+    gemspec['development_dependencies'].each do |name,versions|
+      gem.add_development_dependency(name,split[versions])
     end
   end
 end