midori.rb 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ffac6eac2b627e157f087d6c92d6e7e52f0e76af114a8a575e2e0fef512d388
-  data.tar.gz: 48c09ef3b224fc67f74a3eead572bf729b9110643b0f837c1034147c57eddada
+  metadata.gz: a07247036ade5e265e7cdeecad88340fcc0facfb27d84c4c9e16cf37453e62e6
+  data.tar.gz: 4698c72c5b546788f037c88d3ca93993bc17199a6eea89b0d1ac402220ea1767
 SHA512:
-  metadata.gz: faccb4442498bf24e101933af5b7f46c9c4f6ecf5c6f2a3fe912254b3171b3c0e8ebec73b41dc10916250aeca8e36ef5cc78e58b33e3860d8812e5b4616cc3de
-  data.tar.gz: 68b22b8a8a053546a1131ac67cb7201b60856d7f2012519d19e8ee40766788954079782cc4dea96233c3ba7df6fd23111f5c90b41b800f3319bac70644264151
+  metadata.gz: 2ddbba65cd94493229a768566b1f64815c4a0020340a1158a15a9ed1373f565fc73fb542887fe7eda402371f50ddc6ec57e89f5a2dece8cd60cd2cb29fdba90a
+  data.tar.gz: c7d1007d47da1dea0572ef33a3d70b373c3d6189a48afd798212669c6f2d25989c6808328eaab0b01fca45210ff0c233b11688411f9be40cc401a1b3a89c5429

data/lib/midori/connection.rb

@@ -14,7 +14,7 @@ class Midori::Connection
     @socket = socket
     @monitor = nil
     @close_flag = false
-    @data = ''
+    @buffer = ''
     listen(socket)
   end
 
@@ -27,12 +27,8 @@ class Midori::Connection
         receive_data(monitor)
       end
       if monitor.writable?
-        if !@data == ''
-          # :nocov:
-          # Leave for corner cases
-          monitor.io.write_nonblock(@data)
-          @data = ''
-          # :nocov:
+        if !@buffer.empty?
+          send_buffer
         elsif @close_flag
           close_connection
         end
@@ -41,9 +37,25 @@ class Midori::Connection
   end
 
   # Send message to client
-  # @param [String] data data to send
+  # @param [Midori::Response | String] data data to send
   def send_data(data)
-    @monitor.writable? ? @socket.write_nonblock(data) : @data << data
+    @buffer << (data.is_a?(String) ? data : data.to_s)
+    send_buffer
+    nil
+  end
+
+  # Send buffer immediately
+  private def send_buffer
+    if @monitor.writable?
+      written = @socket.write_nonblock(@buffer)
+      @buffer = @buffer.byteslice(written..-1)
+    end
+    nil
+  rescue IO::EAGAINWaitWritable => _e
+    # :nocov:
+    # Unknown Reason Resource Conflict
+    nil
+    # :nocov:
   end
 
   # Close the connection

data/lib/midori/response.rb

@@ -21,6 +21,7 @@ class Midori::Response
   # Generate header string from hash
   # @return [String] generated string
   def generate_header
+    @header['Content-Length'] = @body.bytesize if @header['Content-Length'].nil? && !@body.empty?
     @header.map do |key, value|
       "#{key}: #{value}\r\n"
     end.join

data/lib/midori/server.rb

@@ -43,8 +43,11 @@ module Midori::Server
           close_connection
           # Ignore client's disconnection
         rescue => e
+          # :nocov:
+          # Leave for corner cases
           close_connection
           @logger.warn "#{@request.ip} - - #{e.class} #{e.backtrace.join("\n")}".yellow
+          # :nocov:
         end
       end)
     end.call

data/lib/midori/version.rb

@@ -1,5 +1,5 @@
 # Midori Module
 module Midori
   # Current Version Code
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midori.rb
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: murasaki