crap_server 0.0.2.1 → 0.0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fec671da6d4ad0911a4471409620d7fb6de1d25b
-  data.tar.gz: 18b77248eb31818771cf374ba71b6bac2d6db5c6
+  metadata.gz: 636e155531fe01738c575fc3d23dcd24557cd866
+  data.tar.gz: eb2b425befbd907828b6bdf55d1981643ef4f05d
 SHA512:
-  metadata.gz: 0468c1a3e10ec024543ad56a5d8a948a0b6313e0d58e7a9e780d099787ccf1cbd33e10f771cf31b0c0fd08539df033cb837186556ed8d687d87fd3072ce37af7
-  data.tar.gz: 12fd50db239ae0fdc63ff31086baaeece7cfbb96798cc1c6b8b488069fc8a120a790b8eaf47b8d96977da42941117ffa9db04ae7487eaaeca23e9b5a9f5bb86e
+  metadata.gz: 07230fa972fdf9f4b9fc5cf10043a0a4593fee1811012d9f1d93785dd585b82eb03bf02d7b225478bfb3b553286bfac0b54438ceb2f71f4effffb61d81e5c3fc
+  data.tar.gz: a3e470a6d2e4c3043b2c872da4e8cbfca3166e28f7795c8008d4cb50bf67b4ea6a8514e9b184c5e704cb534c02f2d4d2bb89fba4517daf008532ca938be50add

data/README.md

@@ -1,7 +1,8 @@
 # CrapServer
+[![Gem Version](https://badge.fury.io/rb/crap_server.svg)](http://badge.fury.io/rb/crap_server)
 [![Code Climate](https://codeclimate.com/github/anga/crap_server/badges/gpa.svg)](https://codeclimate.com/github/anga/crap_server)
 
-Really thin and non intuitive ruby server and framework. Made to be fast and ready for really heavy servers (not only http server).
+Really thin and non intuitive ruby server. Made to be fast and ready for really heavy servers (not only http server).
 
 # Another one?
 

data/crap_server.gemspec

@@ -6,10 +6,10 @@ require 'crap_server/version'
 Gem::Specification.new do |spec|
   spec.name          = 'crap_server'
   spec.version       = CrapServer::VERSION
-  spec.authors       = ['Andres Joser Borek']
+  spec.authors       = ['Andres Jose Borek']
   spec.email         = ['andres.b.dev@gmail.com']
-  spec.summary       = %q{Really thin a non intuitive ruby server and framework.}
-  spec.description   = %q{Really thin and non intuitive ruby server and framework. Made to be fast and ready for really heavy servers (not only http server).}
+  spec.summary       = %q{Really thin a non intuitive ruby server.}
+  spec.description   = %q{Really thin and non intuitive ruby server. Made to be fast and ready for really heavy servers (not only http server).}
   spec.homepage      = 'https://rubygems.org/gems/crap_server'
   spec.license       = 'MIT'
 
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.2'
   spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'rspec', '>= 3.0'
   # celluloid is for future use. Right now is not used
   # spec.add_dependency "celluloid", '~> 0.15.2'
 end

data/lib/crap_server/application.rb

@@ -185,7 +185,7 @@ module CrapServer
       # Main configuration.
       # See Crap::Configure
       def config
-        @config
+        @config ||= CrapServer::Configure.new
       end
 
       def logger=(value)
@@ -195,7 +195,7 @@ module CrapServer
       def logger
         if not @logger
           @logger = Logger.new(config.log_file)
-          @logger.level = @config.log_level
+          @logger.level = config.log_level
         end
         @logger
       end

data/lib/crap_server/configure.rb

@@ -27,6 +27,8 @@ module CrapServer
     attr_accessor :log_file
     # The log level used
     attr_accessor :log_level
+    # The timeout using when we use non-blocking method
+    attr_accessor :timeout
     def initialize
       @port = 7331
       @manual_read = false
@@ -36,6 +38,7 @@ module CrapServer
       @auto_close_connection = true
       @log_file = STDOUT
       @log_level = Logger::DEBUG
+      @timeout = nil # By default, no timeout. Used to allow persistent connections.
     end
   end
 end

data/lib/crap_server/connection_instance.rb

@@ -26,10 +26,14 @@ module CrapServer
 
     # Write to the client the given string
     def write(string)
-      if @method == :normal or @method == :partial
-        @socket.write(string)
-      elsif  @method == :non_blocking
-        @socket.write_nonblock(string)
+      begin
+        if @method == :normal or @method == :partial
+          @socket.write(string)
+        elsif  @method == :non_blocking
+          @socket.write_nonblock(string)
+        end
+      rescue IO::WaitWritable, Errno::EINTR
+        IO.select(nil, [@socket], nil, config.timeout)
       end
     end
 
@@ -50,7 +54,7 @@ module CrapServer
           @socket.read_nonblock(config.read_buffer_size)
         end
       rescue Errno::EAGAIN
-        IO.select([connection])
+        IO.select([connection],nil,nil, config.timeout)
         retry
       end
     end

data/lib/crap_server/version.rb

@@ -1,3 +1,3 @@
 module CrapServer
-  VERSION = '0.0.2.1'
+  VERSION = '0.0.2.2'
 end

data/spec/application_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+describe CrapServer::Application do
+  before do
+    # Reset to nil the configuration
+    CrapServer::Application.class_eval do
+      @config = nil
+    end
+    # Reset the logger to nil
+    CrapServer::Application.class_eval do
+      @logger = Dummy
+    end
+  end
+  context 'run!' do
+
+    it 'should accept a block' do
+      expect(CrapServer::Application.method(:run!).parameters[-1][0]).to eq(:block)
+    end
+
+    context 'without loop' do
+      before do
+        # We don't want to block the specs because the sockets
+        allow(Socket).to receive(:accept_loop).and_return(nil)
+        allow(Socket).to receive(:new) do |*args|
+          Dummy
+        end
+      end
+
+      it 'should bind IPv4 and IPv6' do
+        @v4 = false
+        @v6 = false
+        allow(Socket).to receive(:new) do |*args|
+          @v4 = true if args[0] == :INET and args[1] == :STREAM and args.size == 2
+          @v6 = true if args[0] == :INET and args[1] == :STREAM and args.size == 2
+          Dummy
+        end
+        CrapServer::Application.run! do
+        end
+        expect(@v4).to eq(true)
+        expect(@v6).to eq(true)
+      end
+
+      it 'if the user does not configure the app, should start the default configuration' do
+        expect(CrapServer::Configure).to receive(:new) do
+          Dummy
+        end
+        CrapServer::Application.run! do
+        end
+      end
+
+      it 'should bump to the maximum allowed opened files' do
+        expect(Process).to receive(:setrlimit).with(:NOFILE, Process.getrlimit(:NOFILE)[1])
+        CrapServer::Application.run! do
+        end
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+require 'bundler/setup'
+Bundler.setup
+
+require 'crap_server' # and any other gems you need
+
+RSpec.configure do |config|
+end
+
+class Dummy
+  def self.method_missing(method, *args, &blk)
+  end
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: crap_server
 version: !ruby/object:Gem::Version
-  version: 0.0.2.1
+  version: 0.0.2.2
 platform: ruby
 authors:
-- Andres Joser Borek
+- Andres Jose Borek
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -24,8 +24,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-description: Really thin and non intuitive ruby server and framework. Made to be fast
-  and ready for really heavy servers (not only http server).
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: Really thin and non intuitive ruby server. Made to be fast and ready
+  for really heavy servers (not only http server).
 email:
 - andres.b.dev@gmail.com
 executables: []
@@ -44,6 +58,8 @@ files:
 - lib/crap_server/connection_instance.rb
 - lib/crap_server/helpers/socket_reader.rb
 - lib/crap_server/version.rb
+- spec/application_spec.rb
+- spec/spec_helper.rb
 homepage: https://rubygems.org/gems/crap_server
 licenses:
 - MIT
@@ -67,5 +83,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Really thin a non intuitive ruby server and framework.
-test_files: []
+summary: Really thin a non intuitive ruby server.
+test_files:
+- spec/application_spec.rb
+- spec/spec_helper.rb