chase 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72eefdf46b326be759f69345fb5234e1a873137c
-  data.tar.gz: a603c8ce78dba15cfe203aeb18b84cfc7c72a436
+  metadata.gz: ee9333b640a39435b60f37505f2ece8c5b6ac2b9
+  data.tar.gz: 51b7403cbfa7d7ce518e74e4a8078ad5a7e0761f
 SHA512:
-  metadata.gz: f3e270e13da9d72c0f22a7ae199499295455befd9b035c6ee3f625516a9942ea90262b9a7ee22cdc592a436167fad2bf4dafefe7acb7e5b3452a6e7a88b81b11
-  data.tar.gz: 92856fd255a979f89b91a664e651ab91d456c8263e0feac5858a823d118490b8c19ebd557e13daf24a0ae7eac7a3947e6531b1dbaf7cb19350c34940efcc08c1
+  metadata.gz: a6f6dedf96b6ace4439e22b824c87645ceb0c2b39127e965d93266209089ff5d0c8acfa9b30fb8f201117e21e75ddee45f272a3539ca8f64cb6e39be6b807694
+  data.tar.gz: cb26c5997b6f85604c3218bd76f085611bd39af61db8b249bc5a4989802c5b0423353c726e6dd8b9fca5491c3031edeaecfa7fb48e490e8a1e8efc320e47b39c

data/lib/chase/http_parser.rb

@@ -14,7 +14,7 @@ module Chase
         parser.on_url do |url|
           raise HTTP::Parser::Error, 'Invalid method' unless VALID_METHODS.include?(http_method)
 
-          set_env('HTTP_METHOD', http_method)
+          set_env('REQUEST_METHOD', http_method)
           set_env('REQUEST_URI', url)
           matches = url.match(/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/)
           matches ||= Hash.new('')
@@ -35,13 +35,14 @@ module Chase
 
         parser.on_body { |body| set_env('POST_CONTENT', body) }
 
-        # parser.on_message_begin do
-        #   puts "message begin"
-        # end
-        #
-        # parser.on_message_complete do
-        #   puts "message complete"
-        # end
+        parser.on_message_begin do
+          set_env('HTTP_COOKIE', '')
+          set_env('POST_CONTENT', '')
+        end
+
+        parser.on_message_complete do
+          request.emit(:created)
+        end
       end
     end
 

data/lib/chase/response.rb

@@ -60,12 +60,16 @@ module Chase
       @content = value.to_s
     end
 
+    def headers=(value)
+      @headers = value.to_h
+    end
+
     def flush
       return if flushed?
 
-      send_headers
-      send("\r\n")
-      send(content)
+      write_headers
+      write("\r\n")
+      write(content)
 
       emit(:flushed)
     end
@@ -76,13 +80,22 @@ module Chase
 
     private
 
-    def send(data)
-      emit(:send, data)
+    def write(data)
+      emit(:write, data)
+    end
+
+    def write_headers
+      write "HTTP/1.1 #{STATUS_CODES[status] || '200 OK'}\r\n"
+      headers['Content-Length'] ||= content.bytesize
+      headers.each { |key, value| write_header(key, value) }
     end
 
-    def send_headers
-      send "HTTP/1.1 #{STATUS_CODES[status] || '200 OK'}\r\n"
-      headers.each { |key, value| send("#{key}: #{value}\r\n") }
+    def write_header(key, value)
+      if value.is_a?(Array)
+        value.each { |subvalue| write_header(key, subvalue) }
+      else
+        write("#{key}: #{value}\r\n")
+      end
     end
   end
 end

data/lib/chase/server.rb

@@ -9,15 +9,13 @@ module Chase
     include HttpParser
 
     def receive_data(data)
-      parse_request data
-      prepare_response
-      handle
+      http_parser << data
     rescue ServerError, HTTP::Parser::Error
       send_error('400 Bad Request')
     end
 
     def request
-      @request ||= Request.new
+      @request ||= prepare_request
     end
 
     def response
@@ -29,14 +27,19 @@ module Chase
       close_connection_after_writing
     end
 
-    def parse_request(data)
-      http_parser << data
-      raise ServerError unless request.env['HTTP_METHOD']
+    def prepare_request
+      Request.new.tap do |request|
+        request.on(:created) do
+          raise ServerError unless request.env['REQUEST_METHOD']
+          prepare_response
+          handle
+        end
+      end
     end
 
     def prepare_response
       response.on(:flushed) { close_connection_after_writing }
-      response.on(:send) { |data| send_data(data) }
+      response.on(:write) { |data| send_data(data) }
     end
   end
 end

data/lib/chase/version.rb

@@ -1,3 +1,3 @@
 module Chase
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

data/spec/chase/response_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Chase::Response do
 
     it 'emits the headers and content' do
       output = ''
-      subject.on(:send) { |data| output += data }
+      subject.on(:write) { |data| output += data }
 
       subject.flush
 
@@ -33,8 +33,8 @@ RSpec.describe Chase::Response do
 
       it 'does not emit content again' do
         output = ''
-        subject.on(:send) { |data| output += data }
-        
+        subject.on(:write) { |data| output += data }
+
         subject.flush
         expect(output).to eq('')
       end

data/spec/chase/server_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe Chase::Server do
     context 'valid request' do
       it 'calls #handle' do
         expect(subject).to receive(:handle)
-        subject.receive_data('GET / HTTP/1.1')
+        subject.receive_data("GET / HTTP/1.1\r\n\r\n\0")
       end
 
       it 'creates a request object' do
@@ -49,7 +49,8 @@ RSpec.describe Chase::Server do
 
             Some-Post-Content=Value&Some-Other=abc2
           eos
-          expect(subject.request.env['HTTP_METHOD']).to eq('PATCH')
+
+          expect(subject.request.env['REQUEST_METHOD']).to eq('PATCH')
           expect(subject.request.env['REQUEST_URI']).to eq('https://www.google.com/chase/request?key=value&other=123')
           expect(subject.request.env['PROTOCOL']).to eq('https')
           expect(subject.request.env['PATH_INFO']).to eq('/chase/request')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chase
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Joe Osburn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine