rhino 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27a587d3f9f4876e2ccefd3b02d69e59c893f3ea
-  data.tar.gz: 26291889cabbf4f9ada2530871dfbb1bc018ab79
+  metadata.gz: dfce0b40449bba07732e53828beb70d8672b978c
+  data.tar.gz: 44cf432edeb5f7eb726e5bff942c8a8b83169494
 SHA512:
-  metadata.gz: c2868df4a87d7d6d4836d02ce71fa28963521d0e9d9d47dae5a8e420258ad01ef8334921071110fa340bc2e57e0506cd8df9372703092762f324e4e99db79715
-  data.tar.gz: c7201266c8a0a0d8b1b69ce79417fcaa5f9325143c7b39b3674bc1c083560abad46d0ae75307d6438f672fe4ed0db3fb2b8bc876683e6b7a16c290f882c89956
+  metadata.gz: f9faf5b2a776213ccdcf5041ec78b893a1cc70802c8391c01da2c119f0acb88f801757fcf3130ab440032408cacfca0fd6366432d41dfa321c3483f2a52749b9
+  data.tar.gz: e91fe4af4a14c1178367450dd4306562fbb1ec4b8ab3baef398029c6cecd532db6a0b27e314fe8712d6df413c1b43a2c515481d463e2a3db6129ff792de849ac

data/bin/rhino

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'rhino'
+require "rhino"
 
 cli = Rhino::CLI.new
 cli.parse

data/lib/rhino.rb

@@ -1,4 +1,8 @@
 require "rack"
+require "slop"
+require "socket"
+require "time"
+require "uri"
 
 require "rhino/cli"
 require "rhino/config"
@@ -10,10 +14,10 @@ require "rhino/version"
 
 module Rhino
   def self.config
-    @@config ||= Rhino::Config.new
+    @config ||= Rhino::Config.new
   end
 
   def self.logger
-    @@logger ||= Rhino::Logger.new
+    @logger ||= Rhino::Logger.new
   end
 end

data/lib/rhino/cli.rb

@@ -1,14 +1,11 @@
-require "slop"
-
 module Rhino
 
-  # A wrapper for command line interaction that encompasses option parsing, version, help, and execution. This class is
-  # instantiated from the binary. The class also handles bootstrapping the launcher.
+  # A wrapper for command line interaction that encompasses option parsing, version, help, and execution.
   #
   # Usage:
   #
   #   cli = Rhino::CLI.new
-  #   cli.parse()
+  #   cli.parse
   #
   class CLI
     BANNER = "usage: rhino [options] [./config.ru]".freeze
@@ -17,18 +14,18 @@ module Rhino
       config = Slop.parse(items) do |options|
         options.banner = BANNER
 
-        options.on "-h", "--help", 'help' do
+        options.on "-h", "--help", "help" do
           return help(options)
         end
 
-        options.on "-v", "--version", 'version' do
+        options.on "-v", "--version", "version" do
           return version
         end
 
-        options.string "-b", "--bind", 'bind (default: 0.0.0.0)', default: "0.0.0.0"
-        options.integer "-p", "--port", 'port (default: 5000)', default: 5000
-        options.integer "--backlog", 'backlog (default: 64)', default: 64
-        options.boolean "--reuseaddr", 'reuseaddr (default: true)', default: true
+        options.string "-b", "--bind", "bind (default: 0.0.0.0)", default: "0.0.0.0"
+        options.integer "-p", "--port", "port (default: 5000)", default: 5000
+        options.integer "--backlog", "backlog (default: 64)", default: 64
+        options.boolean "--reuseaddr", "reuseaddr (default: true)", default: true
       end
 
       run(config)
@@ -45,8 +42,8 @@ module Rhino
     end
 
     def run(options)
-      config, _ = options.arguments
-      Launcher.new(options[:port], options[:bind], options[:reuseaddr], options[:backlog], config || './config.ru').run
+      config, = options.arguments
+      Launcher.new(options[:port], options[:bind], options[:reuseaddr], options[:backlog], config || "./config.ru").run
     end
 
   end

data/lib/rhino/config.rb

@@ -1,7 +1,15 @@
 module Rhino
+
+  # Configuration options used internally such as multithread and multiprocess. Can be accessed via the global.
+  #
+  # Usage:
+  #
+  #   Rhino.config
+  #
   class Config
     attr_accessor :multithread
     attr_accessor :multiprocess
     attr_accessor :run_once
   end
+
 end

data/lib/rhino/http.rb

@@ -1,8 +1,12 @@
-require "uri"
-require "rack"
-require "time"
-
 module Rhino
+
+  # An interface for HTTP. Responsible for reading and writting to the socket via the HTTP protocol.
+  #
+  # Usage:
+  #
+  #   http = Rhino::HTTP.new(socket, application)
+  #   http.handle
+  #
   class HTTP
     RESERVED = /\A(Date|Connection)\Z/i.freeze
     VERSION = "HTTP/1.1".freeze
@@ -12,9 +16,11 @@ module Rhino
     end
 
     attr_accessor :socket
+    attr_accessor :application
 
-    def initialize(socket)
+    def initialize(socket, application)
       self.socket = socket
+      self.application = application
     end
 
     def parse
@@ -45,13 +51,31 @@ module Rhino
         "SCRIPT_NAME" => "",
       }
 
-      while matches = /\A(?<key>[^:]+):\s+(?<value>.*)#{CRLF}\Z/.match(line = socket.gets) do
-
-        case matches[:key]
-        when Rack::CONTENT_TYPE then env["CONTENT_TYPE"] = matches[:value]
-        when Rack::CONTENT_LENGTH then env["CONTENT_LENGTH"] = Integer(matches[:value])
-        else env["HTTP_" + matches[:key].tr("-", "_").upcase] ||= matches[:value]
+      key = nil
+      value = nil
+      loop do
+        hl = socket.gets
+
+        if key && value
+          matches = /\A\s+(?<fold>.+)#{CRLF}\Z/.match(hl)
+          if matches
+            value = "#{value} #{matches[:fold].strip}"
+            next
+          end
+
+          case key
+          when Rack::CONTENT_TYPE then env["CONTENT_TYPE"] = value
+          when Rack::CONTENT_LENGTH then env["CONTENT_LENGTH"] = Integer(value)
+          else env["HTTP_" + key.tr("-", "_").upcase] ||= value
+          end
         end
+
+        break if hl.eql?(CRLF)
+
+        matches = /\A(?<key>[^:]+):\s*(?<value>.+)#{CRLF}\Z/.match(hl)
+        raise Exception.new("invalid header line: #{hl.inspect}") unless matches
+        key = matches[:key].strip
+        value = matches[:value].strip
       end
 
       input = socket.read(env["CONTENT_LENGTH"] || 0)
@@ -61,9 +85,16 @@ module Rhino
       return env
     end
 
-    def handle(application)
+    def handle
       env = parse
-      status, headers, body = application.call(env)
+
+      begin
+        status, headers, body = application.call(env)
+      rescue ::Exception => exception
+        Rhino.logger.log(exception.inspect)
+        status, headers, body = 500, {}, []
+      end
+
       time = Time.now.httpdate
 
       socket.write "#{VERSION} #{status} #{Rack::Utils::HTTP_STATUS_CODES.fetch(status) { 'UNKNOWN' }}#{CRLF}"

data/lib/rhino/launcher.rb

@@ -1,4 +1,12 @@
 module Rhino
+
+  # Handles the bootstrapping of the application (setting up sockets, building via rack, etc).
+  #
+  # Usage:
+  #
+  #   launcher = Rhino.Launcher.new(5000, '0.0.0.0', reuseaddr, 64, './config.ru')
+  #   launcher.run
+  #
   class Launcher
     attr_accessor :port
     attr_accessor :bind
@@ -44,4 +52,5 @@ module Rhino
     end
 
   end
+
 end

data/lib/rhino/logger.rb

@@ -1,4 +1,11 @@
 module Rhino
+
+  # A generic logger extracting output for testing. Can be accessed via the global.
+  #
+  # Usage:
+  #
+  #   Rhino.logger.log("...")
+  #
   class Logger
     attr_accessor :stream
 
@@ -7,8 +14,9 @@ module Rhino
     end
 
     def log(message)
-      self.stream.puts "#{message}"
+      self.stream.puts message
     end
 
   end
+
 end

data/lib/rhino/server.rb

@@ -1,5 +1,3 @@
-require 'socket'
-
 module Rhino
   class Server
     attr_accessor :application
@@ -22,16 +20,19 @@ module Rhino
     end
 
     def monitor
-      selections, _, _ = IO.select(self.sockets)
-      io, _ = selections
+      selections, = IO.select(self.sockets)
+      io, = selections
 
       begin
-        socket, _ = io.accept
-        http = Rhino::HTTP::new(socket)
-        http.handle(application)
-      rescue ::Errno::ECONNRESET , ::Errno::ENOTCONN
-      rescue::Exception => exception
+        socket, = io.accept
+        http = Rhino::HTTP::new(socket, application)
+        http.handle
+      rescue Rhino::HTTP::Exception => exception
         Rhino.logger.log("EXCEPTION: #{exception.message}")
+      rescue ::Errno::ECONNRESET
+      rescue ::Errno::ENOTCONN
+      rescue ::Errno::EPIPE
+      rescue ::Errno::EPROTOTYPE
       ensure
         socket.close
       end

data/lib/rhino/version.rb

@@ -1,3 +1,3 @@
 module Rhino
-  VERSION = '0.0.2'
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhino
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kevin Sylvestre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This should probably never be used unless you are feeling lucky.
+description: This should probably never be used.
 email:
 - kevin@ksylvest.com
 executables: