segregate 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ce3262155d92f2dfc9d0514d29f2050b2e76d68
-  data.tar.gz: 21669f16fe1694d92522d9732327ce1073377296
+  metadata.gz: 0e0d78f2e3626e434f62af51a9bd25dc6f2f7608
+  data.tar.gz: cb81f3d82418ea3d07cebf692418a901ca305969
 SHA512:
-  metadata.gz: 76c66988f1b2e8f74531ba4ddd6132d1833d693e1a8cf5247a823ee3011662513a940bc9390c13955a7ec74db5a19d07da48f6a4a77b9b5b1ddc4e11473ed043
-  data.tar.gz: aeadb91c05e05d14a83ec076b9edf023817b15fe9d8cdd254ddbf075337e6dec7ea613ec9e100cd7a16c1963addf79ecd458b33a34a0b5430c3b34ad09c11494
+  metadata.gz: 2586ce6b36f3f33d41923bea19d07b7227b1de6c5fa00e9283e7b5514285ad896457ff36bd57a8d81c590fce74cea1fd0f458e02dcaf0638abf0e47d1661df6e
+  data.tar.gz: dc606c644b5d5221c870412a5afee531a1882782d56298a273fb1c8aa5f48124359a818e5a35f5b5707dcf6a97a478d887d5825e31f80c03081411d431108b35

data/lib/segregate/version.rb

@@ -1,4 +1,4 @@
 class Segregate
-	VERSION = "0.3.4".freeze
+	VERSION = "0.4.0".freeze
   DATE = "2014-02-04".freeze
 end

data/lib/segregate.rb

@@ -81,10 +81,10 @@ class Segregate
 
   def update_content_length
     if @body_complete
-      @headers['content-length'] = @body.length.to_s
+      @headers['content-length'] = @body.size.to_s
       @header_orders.push 'content-length' unless @header_orders.include? 'content-length'
-      @headers.delete 'content-encoding'
-      @header_orders.delete 'content-encoding'
+      @headers.delete 'transfer-encoding' 
+      @header_orders.delete 'transfer-encoding'
     end
   end
 
@@ -97,7 +97,7 @@ class Segregate
       raw_message << "%s: %s\r\n" % [header, headers[header]]
     end
 
-    raw_message << "\r\n" + @body + "\r\n" unless @body.empty?
+    raw_message << "\r\n" + @body + "\r\n" if @body_complete
     raw_message << "\r\n"
   end
 
@@ -108,13 +108,13 @@ class Segregate
     read_headers data unless @headers_complete
     read_body data unless data.eof?
 
-    @callback.on_message_complete self if @callback.respond_to?(:on_message_complete) && @headers_complete && (no_body? || @body_complete)
+    @callback.on_message_complete self if @callback.respond_to?(:on_message_complete) && message_complete?
   end
 
   private
 
-  def no_body?
-    (@headers['content-length'].nil? && @headers['content-encoding'].nil?)
+  def message_complete?
+    @body_complete || (@headers_complete && @headers['content-length'].nil? && @headers['transfer-encoding'].nil?)
   end
 
   def read data, size = nil
@@ -133,6 +133,10 @@ class Segregate
       parse_request_line line
     elsif line =~ STATUS_LINE
       parse_status_line line
+    elsif line =~ UNKNOWN_REQUEST_LINE
+      raise "ERROR: Unknown http method: %s" % line[/^\S+/]
+    else
+      raise "ERROR: Unknown first line: %s" % line
     end
 
     @first_line_complete = true
@@ -174,7 +178,7 @@ class Segregate
   def read_body data
     if headers.key? 'content-length'
       parse_body data
-    elsif headers['content-encoding'] == 'chunked'
+    elsif headers['transfer-encoding'] == 'chunked'
       parse_chunked_data data
     end
   end
@@ -187,7 +191,7 @@ class Segregate
 
   def parse_chunked_data data
     while !data.eof? && !@body_complete
-      chunk_size = read(data).to_i
+      chunk_size = read(data).to_i(16)
       if chunk_size == 0
         @body_complete = true
       else

data/spec/segregate_spec.rb

@@ -38,6 +38,14 @@ describe Segregate do
       it 'accepts one argument' do
         expect(@parser).to respond_to(:parse).with(1).argument
       end
+
+      it 'errors if an incorrect first line is received' do
+        expect{ @parser.parse "fail\r\n" }.to raise_error RuntimeError, 'ERROR: Unknown first line: fail'
+      end
+
+      it 'errors if an incorrect http method is received' do
+        expect{ @parser.parse "FAIL /endpoint HTTP/1.1\r\n" }.to raise_error RuntimeError, 'ERROR: Unknown http method: FAIL'
+      end
     end
 
     context 'a request line has been parsed' do
@@ -175,6 +183,10 @@ describe Segregate do
         it 'returns the uri methods' do
           expect(@parser.path).to eq '/endpoint'
         end
+
+        it 'raises an error if uri does not respond to the method' do
+          expect{ @parser.not_present }.to raise_error NoMethodError, /undefined method `not_present'/
+        end
       end
 
       describe '#respond_to?' do
@@ -307,8 +319,7 @@ describe Segregate do
 
     context 'a header has been parsed' do
       before(:each) do
-        @parser.parse "GET /endpoint HTTP/1.1\r\n"
-        @parser.parse "Accept: application/json\r\n"
+        @parser.parse "GET /endpoint HTTP/1.1\r\nAccept: application/json\r\n"
       end
 
       describe '#headers' do
@@ -331,10 +342,7 @@ describe Segregate do
 
     context 'all headers have been parsed' do
       before(:each) do
-        @parser.parse "GET /endpoint HTTP/1.1\r\n"
-        @parser.parse "Accept: application/json\r\n"
-        @parser.parse "Host: www.google.com\r\n"
-        @parser.parse "\r\n"
+        @parser.parse "GET /endpoint HTTP/1.1\r\nAccept: application/json\r\nHost: www.google.com\r\n\r\n"
       end
 
       describe '#headers' do
@@ -365,10 +373,7 @@ describe Segregate do
 
     context 'a body has been parsed' do
       before(:each) do
-        @parser.parse "GET /endpoint HTTP/1.1\r\n"
-        @parser.parse "Host: www.google.com\r\n"
-        @parser.parse "Content-Length: 20\r\n"
-        @parser.parse "\r\n"
+        @parser.parse "GET /endpoint HTTP/1.1\r\nHost: www.google.com\r\nContent-Length: 20\r\n\r\n"
         @parser.parse "This is the content!\r\n\r\n"
       end
 
@@ -406,11 +411,8 @@ describe Segregate do
 
     context 'a partial chunked body has been parsed' do
       before(:each) do
-        @parser.parse "GET /endpoint HTTP/1.1\r\n"
-        @parser.parse "Host: www.google.com\r\n"
-        @parser.parse "Content-Encoding: chunked\r\n"
-        @parser.parse "\r\n"
-        @parser.parse "26\r\nThis is the first content!\r\n"
+        @parser.parse "GET /endpoint HTTP/1.1\r\nHost: www.google.com\r\nTransfer-Encoding: chunked\r\n\r\n"
+        @parser.parse "1a\r\nThis is the first content!\r\n"
       end
 
       describe '#body' do
@@ -431,8 +433,7 @@ describe Segregate do
 
       context 'the body parsing is completed' do
         before(:each) do
-          @parser.parse "27\r\nThis is the second content!\r\n"
-          @parser.parse "0\r\n\r\n"
+          @parser.parse "1b\r\nThis is the second content!\r\n0\r\n\r\n"
         end
 
         describe '#body' do
@@ -459,11 +460,11 @@ describe Segregate do
         describe '#update_content_length' do
           it 'updates the content lenght header' do
             expect(@parser.headers['content-length']).to be_nil
-            expect(@parser.headers['content-encoding']).to eq 'chunked'
+            expect(@parser.headers['transfer-encoding']).to eq 'chunked'
             @parser.body = 'new content'
             @parser.update_content_length
             expect(@parser.headers['content-length']).to eq '11'
-            expect(@parser.headers['content-encoding']).to be_nil
+            expect(@parser.headers['transfer-encoding']).to be_nil
           end
         end
 
@@ -506,16 +507,14 @@ describe Segregate do
     describe 'on_headers_complete' do
       it 'calls the callback object' do
         @callback_object.should_receive(:on_headers_complete).with(@parser)
-        @parser.parse "GET /endpoint HTTP/1.1\r\n"
-        @parser.parse "Host: www.google.com\r\n\r\n"
+        @parser.parse "GET /endpoint HTTP/1.1\r\nHost: www.google.com\r\n\r\n"
       end
     end
 
     describe 'on_body' do
       it 'calls the callback object' do
         @callback_object.should_receive(:on_body).with("TestData")
-        @parser.parse "GET /endpoint HTTP/1.1\r\n"
-        @parser.parse "Content-Length: 8\r\n\r\n"
+        @parser.parse "GET /endpoint HTTP/1.1\r\nContent-Length: 8\r\n\r\n"
         @parser.parse "TestData\r\n\r\n"
       end
     end
@@ -523,15 +522,13 @@ describe Segregate do
     describe 'on_message_complete' do
       it 'calls the callback object with a body' do
         @callback_object.should_receive(:on_message_complete).with(@parser)
-        @parser.parse "GET /endpoint HTTP/1.1\r\n"
-        @parser.parse "Content-Length: 8\r\n\r\n"
+        @parser.parse "GET /endpoint HTTP/1.1\r\nContent-Length: 8\r\n\r\n"
         @parser.parse "TestData\r\n\r\n"
       end
 
       it 'calls the callback object without a body' do
         @callback_object.should_receive(:on_message_complete).with(@parser)
-        @parser.parse "GET /endpoint HTTP/1.1\r\n"
-        @parser.parse "host: www.google.com\r\n\r\n"
+        @parser.parse "GET /endpoint HTTP/1.1\r\nhost: www.google.com\r\n\r\n"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: segregate
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Ben Slaughter