segregate 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96b4059a490bf0c58abeae11ab8c0540799a7ec6
-  data.tar.gz: c1f1e6da2dc72b17051991272f1ddc34b9ef6737
+  metadata.gz: 650381fc8d34a02cc9c5a32f0a17d78063b4ff1b
+  data.tar.gz: 8d594fc4c8cd7602f43406aef2f10a4877a6a3e5
 SHA512:
-  metadata.gz: 8e10f62346236a7a67782334697c5ee1c9d796c2b4187d29970e277a2aac414bd7c7fe679efefc97bfd00740db0c420e9295dab648bd9188e850f159e742faf4
-  data.tar.gz: 3edd3f5888ce6a106ef259d4eb662ac4a5823cd0a126c21c1ce3c96d878e29da30a145d1135d555258b72c9e85abe7235c9c0f2b1b1ee0c9f5842331406b6c2d
+  metadata.gz: 786702d456df832d92e1be71e4dc0501dba0138a7d42a77509f38293631b8f762594d728aaa62d2e99b4cd253d3db08338fae0e1ae58f85458109d5ed36973b9
+  data.tar.gz: 969e1c8f52fc64d63506c918e6777ceedb405b3d3c99cde8904576adb712bfd71e1254d3b087ffde15db3f7162707732f17dfc8ba1ec91ea3b411684cfe914e4

data/lib/segregate/version.rb

@@ -1,4 +1,4 @@
 class Segregate
-	VERSION = "0.3.1".freeze
-  DATE = "2014-02-03".freeze
+	VERSION = "0.3.2".freeze
+  DATE = "2014-02-04".freeze
 end

data/lib/segregate.rb

@@ -97,8 +97,9 @@ class Segregate
     @header_orders.each do |header|
       raw_message << "%s: %s\r\n" % [header, headers[header]]
     end
+    raw_message << "\r\n"
 
-    raw_message << "\r\n" + @body + "\r\n\r\n"
+    raw_message << @body + "\r\n\r\n" unless @body.empty?
   end
 
   def parse data
@@ -107,10 +108,16 @@ class Segregate
     read_first_line data unless @first_line_complete
     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)
   end
 
   private
 
+  def no_body?
+    (@headers['content-length'].nil? && @headers['content-encoding'].nil?)
+  end
+
   def read data, size = nil
     if size
       data.read(size + 2).chomp("\r\n")
@@ -171,8 +178,6 @@ class Segregate
     elsif headers['content-encoding'] == 'chunked'
       parse_chunked_data data
     end
-
-    @callback.on_body_complete self if @callback.respond_to?(:on_body_complete) && @body_complete
   end
 
   def parse_body data

data/spec/segregate_spec.rb

@@ -520,13 +520,19 @@ describe Segregate do
       end
     end
 
-    describe 'on_body_complete' do
-      it 'calls the callback object' do
-        @callback_object.should_receive(:on_body_complete).with(@parser)
+    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 "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"
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: segregate
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ben Slaughter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake