segregate 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d07a86adbce8db21d2dbd7e56b09fae123a8f8b
-  data.tar.gz: 0947b2007442a95c5551c576a7bd1a6cbbd4c021
+  metadata.gz: 3833b2308a42a52d8cb2653791a74c65969e3d41
+  data.tar.gz: fd57d0d27816e1feb03b4fcfee76c45ca5d046aa
 SHA512:
-  metadata.gz: 0c1d9a9965dc30280f5de06c98dfe1054b50185e9e195a58d9ef3b79851757539796e0edf1eda41cd14125d77eed1926b14451db4b6302623dd470c5b13ba68d
-  data.tar.gz: 837f9599d5a0a90438f499f9f8260c625fd06a092da183831a947c3eddf1f24a362c5865c87ae553005be2c6636f1afde2f7a28845c9a1a1098521eeca46874e
+  metadata.gz: d27cdf818ec8f9085253af8fe597ab4cb991a8bedb3f45797dc3323b71cd643a0bceaaa7440dada5f35a6be38ef5146111374c2d29ef29b15bc428718e896b43
+  data.tar.gz: bfb1a25758b85f72afac2723558bbf1a49f1cf8e4dd4b7b93f5d12d06dc32856f22ae7436cd79173d0220c442b26dfe522811c1d8114de77433b03fc79b77497

data/lib/segregate.rb

@@ -124,15 +124,30 @@ class Segregate
   end
 
   def build_body raw_message
+    new_body, size = deflate_if_needed(@body)
     if @headers['content-length']
-      raw_message << @body
+      raw_message << new_body
+      raw_message << "\r\n\r\n"
     elsif @headers['transfer-encoding'] == 'chunked'
-      raw_message << "%s\r\n" % (@body.size.to_s(16))
-      raw_message << @body + "\r\n"
+      raw_message << "%s\r\n" % (size.to_s(16))
+      raw_message << new_body + "\r\n"
       raw_message << "0\r\n\r\n"
     end
   end
 
+  def deflate_if_needed(body)
+    return [body, body.size] unless gzip_encoded_body?
+
+    str_io = StringIO.new('w')
+    w_gz = Zlib::GzipWriter.new(str_io)
+    w_gz.write(body)
+    w_gz.close
+
+    # To specify the number of bytes for a gzip string
+    # we should check for the buffer size instead of the string size
+    [str_io.string, str_io.size]
+  end
+
   def parse_data data
     data = StringIO.new(@stashed_data + data)
     @stashed_data = ""
@@ -182,7 +197,7 @@ class Segregate
     elsif line =~ STATUS_LINE
       parse_status_line line
     else
-      debug "Unknown first line: %s" % line
+      raise "ERROR: Unknown first line: %s" % line
     end
 
     @state.next
@@ -236,7 +251,9 @@ class Segregate
     @stashed_body = ""
 
     if line.length >= headers['content-length'].to_i
-      @body = line
+      # Removing delimiters characters from the HTTP protocol
+      line = line[0..-3]
+      @body = inflate_body_if_needed(line)
       @callback.on_body @body if @callback.respond_to?(:on_body)
       @state.next
     else
@@ -244,6 +261,18 @@ class Segregate
     end
   end
 
+  def inflate_body_if_needed(body)
+    return body unless gzip_encoded_body?
+
+    gzip_str  = StringIO.new(body)
+    gzip_body = Zlib::GzipReader.new( gzip_str )
+    gzip_body.read()
+  end
+
+  def gzip_encoded_body?
+    headers.key?('content-encoding') && headers['content-encoding'].eql?('gzip')
+  end
+
   def parse_chunked_data line
     @chunked_body_state ||= Juncture.new :size, :chunk, default: :size
 
@@ -270,6 +299,8 @@ class Segregate
 
     if line.length >= @chunk_size
       @body << line
+      @original_body = @body
+      @body = inflate_body_if_needed(@body)
       @callback.on_body line if @callback.respond_to?(:on_body)
       @chunked_body_state.next
     else

data/lib/segregate/version.rb

@@ -1,4 +1,4 @@
 class Segregate
-	VERSION = "0.5.6".freeze
-  DATE = "2015-06-02".freeze
+	VERSION = "0.6.0".freeze
+  DATE = "2016-12-13".freeze
 end

data/spec/segregate_spec.rb

@@ -23,12 +23,12 @@ describe Segregate do
     end
 
     describe '#parse_data' do
-      it 'raises an error if an incorret fist line is passed' do
+      it 'raises an error if an incorrect fist line is passed' do
         expect{ @parser.parse_data("NOT A HTTP LINE\r\n") }.to raise_error RuntimeError, 'ERROR: Unknown first line: NOT A HTTP LINE'
       end
 
       it 'raises an error if an incorret request method is passed' do
-        expect{ @parser.parse_data("FAIL /endpoint HTTP/1.1\r\n") }.to raise_error RuntimeError, 'ERROR: Unknown http method: FAIL'
+        expect{ @parser.parse_data("FAIL /endpoint HTTP/1.1\r\n") }.to raise_error RuntimeError, 'ERROR: Unknown first line: FAIL /endpoint HTTP/1.1'
       end
 
       it 'can accept partial first lines' do
@@ -48,17 +48,18 @@ describe Segregate do
         @parser.parse_data "GET /endpoint HTTP/1.1\r\n"
         @parser.parse_data "transfer-encoding: chunked\r\n\r\n"
         @parser.parse_data "9\r\n"
-        @parser.parse_data "12345\r\n"
+        @parser.parse_data "12345"
         @parser.parse_data "6789\r\n"
         expect(@parser.body).to eq "123456789"
       end
 
-      it 'can accept partial body' do
+      it 'can accept partial body including CRLF' do
         @parser.parse_data "GET /endpoint HTTP/1.1\r\n"
-        @parser.parse_data "content-length: 9\r\n\r\n"
+        @parser.parse_data "transfer-encoding: chunked\r\n\r\n"
+        @parser.parse_data "B\r\n"
         @parser.parse_data "12345\r\n"
         @parser.parse_data "6789\r\n"
-        expect(@parser.body).to eq "123456789"
+        expect(@parser.body).to eq "12345\r\n6789"
       end
     end
 
@@ -130,25 +131,25 @@ describe Segregate do
 
     describe '#request?' do
       it 'returns false' do
-        expect(@parser.request?).to be_false
+        expect(@parser.request?).to be false
       end
     end
 
     describe '#response?' do
       it 'returns false' do
-        expect(@parser.response?).to be_false
+        expect(@parser.response?).to be false
       end
     end
 
     describe '#headers_complete?' do
       it 'returns false' do
-        expect(@parser.headers_complete?).to be_false
+        expect(@parser.headers_complete?).to be false
       end
     end
 
     describe '#done?' do
       it 'returns false' do
-        expect(@parser.done?).to be_false
+        expect(@parser.done?).to be false
       end
     end
 
@@ -195,11 +196,11 @@ describe Segregate do
 
       describe '#respond_to?' do
         it 'responds to segregate methods' do
-          expect(@parser.respond_to?(:request_line)).to be_true
+          expect(@parser.respond_to?(:request_line)).to be true
         end
 
         it 'responds to uri methods' do
-          expect(@parser.respond_to?(:hostname)).to be_true
+          expect(@parser.respond_to?(:hostname)).to be true
         end
       end
 
@@ -253,25 +254,25 @@ describe Segregate do
 
       describe '#request?' do
         it 'returns false' do
-          expect(@parser.request?).to be_true
+          expect(@parser.request?).to be true
         end
       end
 
       describe '#response?' do
         it 'returns false' do
-          expect(@parser.response?).to be_false
+          expect(@parser.response?).to be false
         end
       end
 
       describe '#headers_complete?' do
         it 'returns false' do
-          expect(@parser.headers_complete?).to be_false
+          expect(@parser.headers_complete?).to be false
         end
       end
 
       describe '#done?' do
         it 'returns false' do
-          expect(@parser.done?).to be_false
+          expect(@parser.done?).to be false
         end
       end
 
@@ -334,13 +335,13 @@ describe Segregate do
 
         describe '#headers_complete?' do
           it 'returns true' do
-            expect(@parser.headers_complete?).to be_true
+            expect(@parser.headers_complete?).to be true
           end
         end
 
         describe '#done?' do
           it 'returns false' do
-            expect(@parser.done?).to be_false
+            expect(@parser.done?).to be false
           end
         end
 
@@ -348,6 +349,7 @@ describe Segregate do
           before(:each) do
             @parser.parse_data "1234567890\r\n"
           end
+
           describe '#state' do
             it 'is in a done state' do
               expect(@parser.state.state).to eq :done
@@ -362,7 +364,7 @@ describe Segregate do
 
           describe '#done?' do
             it 'returns true' do
-              expect(@parser.done?).to be_true
+              expect(@parser.done?).to be true
             end
           end
 
@@ -407,6 +409,18 @@ describe Segregate do
             end
           end
         end
+
+        context 'a body with CRLF has been parsed' do
+          before(:each) do
+            @parser.parse_data "12\r\n567890\r\n"
+          end
+
+          describe '#body' do
+            it 'has the correct data' do
+              expect(@parser.body).to eq "12\r\n567890"
+            end
+          end
+        end
       end
 
       context 'non body headers have been parsed' do
@@ -438,13 +452,13 @@ describe Segregate do
 
         describe '#headers_complete?' do
           it 'returns true' do
-            expect(@parser.headers_complete?).to be_true
+            expect(@parser.headers_complete?).to be true
           end
         end
 
         describe '#done?' do
           it 'returns true' do
-            expect(@parser.done?).to be_true
+            expect(@parser.done?).to be true
           end
         end
       end
@@ -511,25 +525,25 @@ describe Segregate do
 
       describe '#request?' do
         it 'returns false' do
-          expect(@parser.request?).to be_false
+          expect(@parser.request?).to be false
         end
       end
 
       describe '#response?' do
         it 'returns false' do
-          expect(@parser.response?).to be_true
+          expect(@parser.response?).to be true
         end
       end
 
       describe '#headers_complete?' do
         it 'returns false' do
-          expect(@parser.headers_complete?).to be_false
+          expect(@parser.headers_complete?).to be false
         end
       end
 
       describe '#done?' do
         it 'returns false' do
-          expect(@parser.done?).to be_false
+          expect(@parser.done?).to be false
         end
       end
 
@@ -592,13 +606,13 @@ describe Segregate do
 
         describe '#headers_complete?' do
           it 'returns true' do
-            expect(@parser.headers_complete?).to be_true
+            expect(@parser.headers_complete?).to be true
           end
         end
 
         describe '#done?' do
           it 'returns false' do
-            expect(@parser.done?).to be_false
+            expect(@parser.done?).to be false
           end
         end
 
@@ -620,13 +634,13 @@ describe Segregate do
 
           describe '#done?' do
             it 'returns true' do
-              expect(@parser.done?).to be_true
+              expect(@parser.done?).to be true
             end
           end
 
           describe '#raw_data' do
             it 'returns the message in string form' do
-              expect(@parser.raw_data).to eq "HTTP/1.1 200 OK\r\nhost: www.google.com\r\ncontent-length: 9\r\n\r\n123456789\r\n\r\n"
+              expect(@parser.raw_data).to eq "HTTP/1.1 200 OK\r\nhost: www.google.com\r\ntransfer-encoding: chunked\r\n\r\n9\r\n123456789\r\n0\r\n\r\n"
             end
           end
 
@@ -661,7 +675,7 @@ describe Segregate do
           describe '#body=' do
             it 'updates the body' do
               @parser.body = 'this is the body'
-              expect(@parser.raw_data).to eq "HTTP/1.1 200 OK\r\nhost: www.google.com\r\ncontent-length: 16\r\n\r\nthis is the body\r\n\r\n"
+              expect(@parser.raw_data).to eq "HTTP/1.1 200 OK\r\nhost: www.google.com\r\ntransfer-encoding: chunked\r\n\r\n10\r\nthis is the body\r\n0\r\n\r\n"
             end
           end
         end
@@ -696,13 +710,13 @@ describe Segregate do
 
         describe '#headers_complete?' do
           it 'returns true' do
-            expect(@parser.headers_complete?).to be_true
+            expect(@parser.headers_complete?).to be true
           end
         end
 
         describe '#done?' do
           it 'returns true' do
-            expect(@parser.done?).to be_true
+            expect(@parser.done?).to be true
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: segregate
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Ben Slaughter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -130,11 +130,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Segregate http parser
 test_files:
 - spec/segregate_spec.rb
 - spec/spec_helper.rb
-has_rdoc: