nanoserve 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '019575a37a4493c4816afbe726f0c2a0495049ea'
-  data.tar.gz: bf54d9e145418838ce211764c5555ffaa68ae97d
+  metadata.gz: 36d89ee5855668e13996733662f4ef7c00a1cc56
+  data.tar.gz: 06c20ca6aeeaf09554954832c1241f82da2fc9a9
 SHA512:
-  metadata.gz: 5576fec9ea2afa3d053996248045c8df2d418a8eab235354727b983b7457f2aaebe0f88a847f745b5534c499bc58c081d3c1689283df38fb4118c7cf66a0b06f
-  data.tar.gz: 18c903426feae6ec6eb8c1d27e693f8cda25553635cff9087da1d71908245116e3d9573b21bba04d277264729accf8bddb4d4f3e660f2d410eba28b71f791741
+  metadata.gz: 98b1070c92caf9a53c8372ee688b6436be393f70d360635429690bd4e054bca84942d494f336fc9abdd37bc9165120a235faa755fd59e54968ecc71b95b11733
+  data.tar.gz: edaf2f744b271f6134561cd42ee9f841dd8a2059d0734b48e18900fa449e136e9689e66cfd17daf4ae91b7887177c74f53b71bbfb82ebaf1e6bc2df1efdcfbaf

data/lib/nanoserve.rb

@@ -11,14 +11,15 @@ module NanoServe
       @port  = port
       @block = block
       @thr   = nil
+      @srv   = nil
     end
 
     def start(y)
-      server = TCPServer.new(@port)
+      @srv = TCPServer.new(@port)
 
       @thr = Thread.new do
         Thread.abort_on_exception = true
-        conn = server.accept
+        conn = @srv.accept
         port, host = conn.peeraddr[1, 2]
         client = "#{host}:#{port}"
         logger.debug "#{client}: connected"
@@ -27,8 +28,9 @@ module NanoServe
           @block.call(conn, y)
         rescue EOFError
           logger.debug "#{client}: disconnected"
-        ensure
+        else
           logger.debug "#{client}: closed"
+        ensure
           conn.close
         end
       end
@@ -38,18 +40,22 @@ module NanoServe
       yield
 
       @thr.join
-      server.close
 
       y
     end
 
     def stop
+      @srv.close
       @thr.kill
     end
 
     def logger
       @logger ||= Logger.new(STDOUT).tap { |l| l.level = Logger::INFO }
     end
+
+    def logger=(logger)
+      @logger = logger
+    end
   end
 
   class HTTPResponder < TCPResponder
@@ -59,11 +65,18 @@ module NanoServe
         buf = +''
         loop do
           line = conn.readline
-          break if line.chomp == ''
           req << line
-          buf << line
+          buf << line if logger.debug?
+          break if req.headers?
         end
         logger.debug "request:\n" + buf.gsub(/^/, '    ')
+        length = 0
+        while req.content_length? && length < req.content_length
+          data = conn.readpartial(1024)
+          length += data.size
+          req << data
+        end
+        logger.debug "request body: #{length} bytes read"
 
         res = Response.new
         logger.debug 'calling'
@@ -82,6 +95,7 @@ module NanoServe
         @http_version = nil
         @sep          = nil
         @headers      = {}
+        @body         = +''.encode('ASCII-8BIT')
       end
 
       def params
@@ -94,10 +108,24 @@ module NanoServe
         elsif @sep.nil?
           parse_header(line.chomp)
         else
-          @body << line
+          parse_body(line)
         end
       end
 
+      def headers?
+        @sep
+      end
+
+      def content_length
+        @headers['content-length'].to_i
+      end
+
+      def content_length?
+        @headers.key?('content-length')
+      end
+
+      private
+
       REQ_RE = %r{(?<method>[A-Z]+)\s+(?<path>\S+)\s+(?<version>HTTP/\d+.\d+)$}
 
       def parse_request(str)
@@ -123,13 +151,20 @@ module NanoServe
       end
 
       def parse_header(str)
-        (@sep = '' && return) if str == ''
+        if str == ''
+          @sep = true
+          return
+        end
 
-        unless (m = str.match(/(?<header>[A-Z][-A-Za-z]*):\s+(?<value>.+)$/))
+        unless (m = str.match(/(?<header>[A-Za-z][-A-Za-z]*):\s+(?<value>.+)$/))
           raise RequestError, "cannot parse header: '#{str}'"
         end
 
-        @headers[m[:header]] = m[:value]
+        @headers[m[:header].downcase] = m[:value]
+      end
+
+      def parse_body(line)
+        @body << line
       end
     end
 
@@ -151,7 +186,7 @@ module NanoServe
       end
 
       def body=(value)
-        @body = value.tap { @content_length = body.bytes.count.to_s }
+        @body = value.tap { @content_length = value.bytes.count.to_s }
       end
 
       def to_s
@@ -181,7 +216,7 @@ module NanoServe
       end
 
       def content_length
-        @content_length ||= body.bytes.count.to_s
+        @content_length || '0'
       end
 
       def content_type

data/test/test_nanoserve.rb

@@ -24,6 +24,8 @@ class TestNanoServe < MiniTest::Test
       s.close
     end
 
+    r.stop
+
     assert_equal(uuid, buf)
   end
 
@@ -50,6 +52,8 @@ class TestNanoServe < MiniTest::Test
       Net::HTTP.get(uri + "test?uuid=#{uuid}")
     end
 
+    r.stop
+
     assert_equal(uuid, req.first.params['uuid'])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoserve
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Loic Nageleisen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest