em-http-server 0.1.6 → 0.1.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 530fe32e11627dd6b6889f1dfe18ff14f09b27fc
+  data.tar.gz: e7b4dc4ff5fb5391a6c1378bb28278f75b4cd593
+SHA512:
+  metadata.gz: 7cc141f2eb7be20f0c24b89391927406fef09abd02557150bb8757e973e713611bf13f8dce0c760afadaf36f45085299f54bed6ca421ceadaebcb74f670bc829
+  data.tar.gz: 90d4f5ae859931153636e4bd00fd157a1526b5a1046a625eac48b32f407879862b027a8fd24fd9a8e8eed7abded55cf1449bea41ae407370d7a7da152aa7babd

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
     require 'eventmachine'
     require 'em-http-server'
 
-    class HTTPHandler < EM::Http::Server
+    class HTTPHandler < EM::HttpServer::Server
 
         def process_http_request
               puts  @http_request_method

data/em-http-server.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "em-http-server"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.6"
+  gem.version       = "0.1.7"
 
   gem.add_runtime_dependency "eventmachine"
 end

data/lib/em-http-server/response.rb

@@ -53,6 +53,7 @@ module EventMachine
 
 		def initialize
 			@headers = {}
+      @keep_connection_open = false
 		end
 
 		def keep_connection_open arg=true

data/lib/em-http-server/server.rb

@@ -41,11 +41,11 @@ module EventMachine
       def parse_first_header(line)
 
         # split the line into:  METHOD URI PROTOCOL
-        # eg:  GET / HTTP1/1
+        # eg:  GET / HTTP/1.1
         parsed = line.split(' ')
 
         # a correct request has three parts
-        send_error(400, "Bad request") unless parsed.size == 3
+        return bad_parsing unless parsed.size == 3
 
         @http_request_method, uri, @http_protocol = parsed
 
@@ -53,16 +53,26 @@ module EventMachine
         @http_request_uri, @http_query_string = uri.split('?')
       end
 
-      # send back to the client an HTTP error
-      def send_error(code, desc)
-        string = "HTTP1/1 #{code} #{desc}\r\n"
+      def bad_parsing
+        code = 400
+        desc = "Bad request"
+        string = respond_to?(:http_error_string) ? http_error_string(code, desc) : default_error_string(code, desc)
+        send_error string
+        raise("#{code} #{desc}")
+      end
+
+      def default_error_string(code, desc)
+        string = "HTTP/1.1 #{code} #{desc}\r\n"
         string << "Connection: close\r\n"
         string << "Content-type: text/plain\r\n"
         string << "\r\n"
         string << "Detected error: HTTP code #{code}"
+      end
+
+      # send back to the client an HTTP error
+      def send_error(string)
         send_data string
         close_connection_after_writing
-        raise("server error #{code}")
       end
 
     end
@@ -72,7 +82,7 @@ end
 
 if __FILE__ == $0
 
-  class HTTPHandler < EM::Http::Server
+  class HTTPHandler < EM::HttpServer::Server
 
     def process_http_request
       puts  @http_request_method

data/test/test_app.rb

@@ -1,22 +1,13 @@
 require 'test/unit'
 require 'em-http-server'
 
-begin
-  once = false
-  require 'eventmachine'
-rescue LoadError => e
-  raise e if once
-  once = true
-  require 'rubygems'
-  retry
-end
-
+require 'eventmachine'
 
 
 #--------------------------------------
 
 module EventMachine
-  class HttpServer < EM::Http::Server
+  class HttpHandler < EM::HttpServer::Server
     def process_http_request
       send_data generate_response()
       close_connection_after_writing
@@ -47,7 +38,7 @@ EORESP
   def test_simple_get
     received_response = nil
 
-    EventMachine::HttpServer.class_eval do
+    EventMachine::HttpHandler.class_eval do
       def generate_response
         TestResponse_1
       end
@@ -55,7 +46,7 @@ EORESP
 
 
     EventMachine.run do
-      EventMachine.start_server TestHost, TestPort, EventMachine::HttpServer
+      EventMachine.start_server TestHost, TestPort, EventMachine::HttpHandler
       EventMachine.add_timer(1) {raise "timed out"} # make sure the test completes
 
       cb = proc do
@@ -75,7 +66,7 @@ EORESP
 
   # This frowsy-looking protocol handler allows the test harness to make some
   # its local variables visible, so we can set them here and they can be asserted later.
-  class MyTestServer < EventMachine::HttpServer
+  class MyTestServer < EventMachine::HttpHandler
 
     def initialize *args
       super
@@ -251,7 +242,42 @@ EORESP
       cb = proc do
         tcp = TCPSocket.new TestHost, TestPort
         data = [
-          "GET foo HTTP/1.1\r\n",
+          "GET HTTP/1.1\r\n",
+          "\r\n"
+        ].join
+        tcp.write data
+        received_response = tcp.read
+      end
+      eb = proc { EventMachine.stop }
+      EventMachine.defer cb, eb
+
+      EventMachine.add_timer(1) {raise "timed out"} # make sure the test completes
+    end
+
+    assert_equal( "HTTP/1.1 400 Bad request\r\nConnection: close\r\nContent-type: text/plain\r\n\r\nDetected error: HTTP code 400", received_response )
+  end
+
+  def test_invalid_custom
+    received_response = nil
+
+    MyTestServer.class_eval do
+      def http_error_string(code, desc)
+        return 'custom'
+      end
+    end
+
+    EventMachine.run do
+      EventMachine.start_server(TestHost, TestPort, MyTestServer) do |conn|
+        conn.instance_eval do
+          @assertions = proc do
+          end
+        end
+      end
+
+      cb = proc do
+        tcp = TCPSocket.new TestHost, TestPort
+        data = [
+          "GET HTTP/1.1\r\n",
           "\r\n"
         ].join
         tcp.write data
@@ -263,7 +289,7 @@ EORESP
       EventMachine.add_timer(1) {raise "timed out"} # make sure the test completes
     end
 
-    assert_equal( "HTTP1/1 400 Bad request\r\nConnection: close\r\nContent-type: text/plain\r\n\r\nDetected error: HTTP code 400", received_response )
+    assert_equal( "custom", received_response )
   end
 
 

data/test/test_delegated.rb

@@ -1,16 +1,7 @@
 require 'test/unit'
 require 'em-http-server'
 
-begin
-  once = false
-  require 'eventmachine'
-rescue LoadError => e
-  raise e if once
-  once = true
-  require 'rubygems'
-  retry
-end
-
+require 'eventmachine'
 
 #--------------------------------------
 

data/test/test_response.rb

@@ -1,16 +1,7 @@
 require 'test/unit'
 require 'em-http-server'
 
-begin
-  once = false
-  require 'eventmachine'
-rescue LoadError => e
-  raise e if once
-  once = true
-  require 'rubygems'
-  retry
-end
-
+require 'eventmachine'
 
 #--------------------------------------
 

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: em-http-server
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors:
 - alor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple http server for eventmachine
@@ -49,30 +46,28 @@ files:
 - test/test_response.rb
 homepage: https://github.com/alor/em-http-server
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple http server for eventmachine with the same interface as evma_httpserver
 test_files:
 - test/test_app.rb
 - test/test_delegated.rb
 - test/test_response.rb
-has_rdoc: