reifier 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ef0dbfbe852ecb662c263830e7f6d3203cc9142
-  data.tar.gz: 5c3bff16df006254617c1db3dcb25137a405f986
+  metadata.gz: b9851d78945b3c347db66a2abaf1226e042250e8
+  data.tar.gz: e3995204dda21f2d7b920f62f5015af09fef0b24
 SHA512:
-  metadata.gz: 04e3c84227f271e0d9425bb2c16ea2b7082f8a5ee2178e076cdce7027b3d045a5f964b0c06ecf7d2590a682cd6fbe3fcf33d08745b183f7b69a7877d0f74b837
-  data.tar.gz: b614d7e7e1781a66954abbaca89b23d80696d8bc1a446a2ba106a57309d308e1f297409f1a4fdc776d903c256e376a04750a56bbcd0ff32e53a784e8e797ecd0
+  metadata.gz: fd6c52d68405d750ba5ea58b0bb8fbfb919479113dedea8896f1b459a586b1564a42fb0e5e6575e3505eaf19ce95b29d7abd36e13307b47684366c986be2b5c7
+  data.tar.gz: 53015621be965b1e53ae5b499fb1728a320617850136e9d8e2d5f246a15de6db3870898e6ca2f53bad026b5abcdf90863a39f31fa877d53c5c588eb185d955a2

data/README.md

@@ -28,6 +28,12 @@ Use it through rackup:
 
     $ rackup -s reifier
 
+## Available Options
+
+You can adapt the ThreadPool sized with following option:
+
+    $ rackup -s reifier -O Threads=16
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -38,7 +44,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/tak1n/reifier.
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/rack/handler/reifier.rb

@@ -9,6 +9,12 @@ module Rack
         server = ::Reifier::Server.new(app, options)
         server.start
       end
+
+      def self.valid_options
+        {
+          'Threads=THREADS' => 'Number of threads (default: 5)'
+        }
+      end
     end
 
     register :reifier, Reifier

data/lib/reifier/response.rb

@@ -1,11 +1,18 @@
 module Reifier
   class Response
-    attr_accessor :request_method, :request_uri, :status, :headers, :body, :protocol
+    attr_accessor :status, :headers, :body, :protocol
+
+    def initialize
+      @response = ''
+    end
 
     def handle(socket)
-      handle_request_line(socket)
-      handle_headers(socket)
-      handle_body(socket)
+      handle_request_line
+      handle_headers
+      handle_body
+
+      socket.write @response
+      socket.close
     end
 
     def <<(rack_return)
@@ -16,31 +23,26 @@ module Reifier
 
     private
 
-    def handle_request_line(socket)
-      socket.write "#{@protocol} #{@status} #{HTTP_STATUS_CODES[@status]}" + CRLF
+    def handle_request_line
+      @response << "#{@protocol} #{@status} #{HTTP_STATUS_CODES[@status]}" + CRLF
     end
 
-    def handle_headers(socket)
-      headers = ''
+    def handle_headers
       @headers.each do |k, v|
-        headers << "#{k}: #{v}" + CRLF
+        @response << "#{k}: #{v}" + CRLF
       end
-      headers << 'Connection: close' + CRLF
-      headers << CRLF
-
-      socket.write headers
+      @response << 'Connection: close' + CRLF
+      @response << CRLF
     end
 
-    def handle_body(socket)
-      body = ''
+    def handle_body
       @body.each do |chunk|
-        body << chunk
+        @response << chunk
       end
 
-      body << CRLF
-
-      socket.write body
-      socket.close
+      @response << CRLF
+    ensure
+      @body.close if @body.respond_to? :close
     end
   end
 end

data/lib/reifier/server.rb

@@ -13,16 +13,20 @@ module Reifier
       end
 
       server = TCPServer.new(@options[:Host], @options[:Port])
-      pool   = Concurrent::FixedThreadPool.new(5)
+
+      threads = @options[:Threads] || 5
+      pool   = Concurrent::FixedThreadPool.new(@options[:Threads] || 5)
 
       puts "# Environment: #{@options[:environment]}"
       puts "# Listening on tcp://#{@options[:Host]}:#{@options[:Port]}"
       puts "# PID: #{Process.pid}"
+      puts "# Number of Threads used: #{threads}"
 
       loop do
         socket = server.accept
         socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
 
+        # Thread.new do
         pool.post do
           begin
             request  = Request.new(@options)
@@ -30,22 +34,14 @@ module Reifier
 
             request.handle(socket)
 
-            response.request_method = request.request_method
-            response.request_uri    = request.request_uri
-            response.protocol       = request.protocol
-
+            response.protocol = request.protocol
             response << @app.call(request.rack_env)
 
             response.handle(socket)
 
-            log(request, response) if @options[:environment] == 'development'
-          rescue EOFError
-            puts 'Request Line is empty'
-          rescue HTTPParseError
-            puts 'Request Line must include HTTP (HTTPS enabled?)'
-          rescue Errno::EPIPE
-            puts 'Writing to client failed :|'
-          ensure
+            log_request request, response if development?
+          rescue Exception => e
+            log "\nError: #{e.class}\nMessage: #{e.message}\n\nBacktrace:\n\t#{e.backtrace.join("\n\t")}" if development?
             socket.close
           end
         end
@@ -54,7 +50,15 @@ module Reifier
 
     private
 
-    def log(request, response)
+    def development?
+      @options[:environment] == 'development'
+    end
+
+    def log(message)
+      puts "[#{Time.now}] #{message}"
+    end
+
+    def log_request(request, response)
       puts "[#{Time.now}] \"#{request.request_method} #{request.request_path} #{request.protocol}\" #{response.status}"
     end
   end

data/lib/reifier/version.rb

@@ -1,3 +1,3 @@
 module Reifier
-  VERSION = "0.1.0".freeze
+  VERSION = "0.2.0".freeze
 end

data/reifier.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
   spec.add_development_dependency 'rubocop', '~> 0.37'
-  spec.add_development_dependency 'rack'
+  spec.add_development_dependency 'rack', '~> 2.0.0.alpha'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reifier
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Benny Klotz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -112,16 +112,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.alpha
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.alpha
 description: A rack app server written in pure ruby
 email:
 - benny.klotz92@gmail.com