crap_server 0.0.4.1 → 0.0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 153311cb4783062e2a2ff30c82bde05b90eabd31
-  data.tar.gz: c1b552c709961e5673f398f285e89d27e3767a4d
+  metadata.gz: b8f32930965a763afe13876581ab27b27c5c4803
+  data.tar.gz: 29ae4fb42d5d261b4e2a4d4e48e3a38f2d5a6282
 SHA512:
-  metadata.gz: 88a68cec8ed174dd4dcbffd60e84ab78d24cd1d34d6f5c4e54d62ff60ae4b3e046b84edd311fac55326a792c49a35c089ceae253de68695c9ce3c2faae754a99
-  data.tar.gz: 047d1427c76f4e6d5a82deaea1f0471231eefb2ebf315d83d59333b2339e7a6a1fdb815d7e44a218231d51b6d2523e6951dd838da51c02d9c831dc27a4c084b0
+  metadata.gz: fbb0d3e5004bdafdafffb4b9b6d72188f771e7976ef60d411bb394d30bc35cbe5c1fa059af2c1c09beea38ddee2642cd3400daf535a66ca7036fc28f6cd09c77
+  data.tar.gz: f7d46b54a5e050e13d7f664ccb1f6034a89c45891b287d2ebfffebbc3aa2f16916d54b7be6d2cfa14d2cf3b642cb7dbc20aea742108f554ab7f8c6143bf005bb

data/README.md

@@ -45,6 +45,10 @@ By default, the pool size run 10 threads per core. You can change it with the po
 
 ruby my_app.rb
 
+# More info.
+
+More info in the [wiki](https://github.com/anga/crap_server/wiki) of the gem. 
+
 # Production ready?
 
 No. Use it under your own risk. Right now, the interface can change.

data/lib/crap_server/application.rb

@@ -22,6 +22,10 @@ module CrapServer
         block.yield @config
       end
 
+      def per_process(&block)
+        @per_process_block = block
+      end
+
       # Main method. This setup all the connections and make the logic of the app
       def run!(&block)
         begin
@@ -63,6 +67,10 @@ module CrapServer
 
       protected
 
+      def per_process_block
+        @per_process_block
+      end
+
       # Open TCP connection (IPv4 and IPv6)
       def open_connections
         start_ipv4_socket

data/lib/crap_server/configure.rb

@@ -3,23 +3,12 @@ module CrapServer
     # The port used.
     # Default: 7331
     attr_accessor :port
-    # Set to true if you want to manage the read.
-    # Default false
-    attr_accessor :manual_read
     # Max read buffer size
     # Default: 16K
     attr_accessor :read_buffer_size
     # The number of maximum penning connections.
     # Default: Max allowed by the OS
     attr_accessor :max_pending_connections
-    # Working method (read, write, accept, connect).
-    # Available values are:
-    #   :normal
-    #   :partial
-    #   :non_blocking
-    # If :non_blocking is used TODO
-    # Default :readpartial
-    attr_accessor :method
     # Set to false if you want to manage the close of the connection.
     # Note that this require manual_read set to true.
     # DEPERCATED
@@ -28,9 +17,6 @@ module CrapServer
     attr_accessor :log_file
     # The log level used
     attr_accessor :log_level
-    # The timeout using when we use non-blocking method
-    # NOT USED
-    attr_accessor :timeout
     # Thread pool size. 10 per cor by default
     attr_accessor :pool_size
     def initialize
@@ -42,7 +28,6 @@ module CrapServer
       @auto_close_connection = true
       @log_file = STDOUT
       @log_level = Logger::DEBUG
-      @timeout = nil # By default, no timeout. Used to allow persistent connections.
       @pool_size = 10
     end
   end

data/lib/crap_server/connection_handler.rb

@@ -18,6 +18,7 @@ module CrapServer
     end
 
     def remove_to_write(io)
+      @buffer ||= {}
       @to_write.delete io.fileno
       @buffer.delete io.fileno
     end
@@ -80,6 +81,7 @@ module CrapServer
     def close(io)
       remove_to_read io
       remove_to_write io
+      @closeaw ||= {}
       @closeaw.delete io.fileno
       io.close
     end
@@ -91,7 +93,6 @@ module CrapServer
         instance.socket = remote_socket
         instance.config = config
         instance.address = address_info
-        instance.send(:method=, config.method)
         instance.handler = self
         instance.run data, &block
       end
@@ -117,6 +118,8 @@ module CrapServer
             begin
               _, data = socket, socket.read_nonblock(config.read_buffer_size)
               yield data, socket, address(socket)
+              # We close the connection if we auto_close_connection is true and the user didn't write in the buffer.
+              close socket if config.auto_close_connection && buffer(socket).nil?
             rescue Errno::EAGAIN
             rescue EOFError
               remove_to_read socket

data/lib/crap_server/connection_instance.rb

@@ -5,7 +5,6 @@ module CrapServer
     attr_accessor :socket
     attr_accessor :address
     attr_accessor :config
-    attr_accessor :method
     attr_accessor :handler
     def initialize; end
 
@@ -15,15 +14,7 @@ module CrapServer
       undef :call if self.respond_to? :call
       # Define the new method to bind the block with this class.
       self.class.send :define_method, :call, &block
-      # Running the code depending of the number of args
-      if block.parameters.size == 1
-        self.call(data)
-      elsif block.parameters.size == 2
-        self.call(data, socket)
-      else
-        self.call(data, socket, address)
-      end
-      @socket.flush
+      self.call(data)
     end
 
     # Write to the client the given string
@@ -42,7 +33,7 @@ module CrapServer
 
     # Give access to logger class to the user
     def logger
-      @config.logger
+      CrapServer::Application.send(:logger)
     end
   end
 end

data/lib/crap_server/forker.rb

@@ -41,6 +41,8 @@ module CrapServer
     def spawn_child
       fork do
         begin
+
+          CrapServer::Application.send(:per_process_block).call if not CrapServer::Application.send(:per_process_block).nil?
           pool = CrapServer::ThreadPool.new @sockets
           pool.run &@block_proc
         rescue Interrupt

data/lib/crap_server/version.rb

@@ -1,3 +1,3 @@
 module CrapServer
-  VERSION = '0.0.4.1'
+  VERSION = '0.0.4.2'
 end

data/spec/connection_handler_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe CrapServer::ConnectionHandler do
+
+end

data/spec/thread_pool_spec.rb

@@ -1,3 +1,36 @@
+require 'spec_helper'
+
 describe CrapServer::ThreadPool do
+  context 'run' do
+    before do
+      allow_any_instance_of(CrapServer::ThreadPool).to receive(:spawn_thread).and_return(true)
+      allow(ThreadGroup).to receive(:new).and_return(Dummy)
+      allow_any_instance_of(CrapServer::ThreadPool).to receive(:sleep).and_return(true)
+    end
+    it 'should abort on exception' do
+      pool = CrapServer::ThreadPool.new([Dummy, Dummy])
+      expect(Thread).to receive(:abort_on_exception=).with(true)
+      pool.run do
+      end
+    end
+
+    it 'should spawn pool_size thread' do
+      pool = CrapServer::ThreadPool.new([Dummy, Dummy])
+      size = rand(2..20) # We make sure that is a random number and is not a selected test :P
+      CrapServer::Application.configure do |c|
+        c.pool_size = size
+      end
+      expect_any_instance_of(CrapServer::ThreadPool).to receive(:spawn_thread).exactly(size).times()
+      pool.run do
+      end
+    end
+  end
 
+  context 'spawn_thread' do
+    it 'should spawn a new thread' do
+      expect(Thread).to receive(:new).and_return(true)
+      pool = CrapServer::ThreadPool.new([Dummy, Dummy])
+      pool.send(:spawn_thread)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crap_server
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1
+  version: 0.0.4.2
 platform: ruby
 authors:
 - Andres Jose Borek
@@ -61,6 +61,7 @@ files:
 - lib/crap_server/thread_pool.rb
 - lib/crap_server/version.rb
 - spec/application_spec.rb
+- spec/connection_handler_spec.rb
 - spec/forker_spec.rb
 - spec/spec_helper.rb
 - spec/thread_pool_spec.rb
@@ -90,6 +91,7 @@ specification_version: 4
 summary: Really thin a non intuitive ruby server.
 test_files:
 - spec/application_spec.rb
+- spec/connection_handler_spec.rb
 - spec/forker_spec.rb
 - spec/spec_helper.rb
 - spec/thread_pool_spec.rb