segregate 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13ff1b7cc5c95ae45abf27d4edaa5fd80365fa19
-  data.tar.gz: 59dd6532dd4a5be947c24c7ac0bb9378950f9b88
+  metadata.gz: 71d89f3c3e90e41fb84af4faeb638c55b1e57f42
+  data.tar.gz: f0de163082142414642801e392f12c7d13448d38
 SHA512:
-  metadata.gz: c0efb2a197c27af4005ee120feac38dfcec61d41628f5ffd05c9726ec4aade1fa5b9efcb7cf8690246b2a1462966b79e44616b908de2368242fbb12b459a817b
-  data.tar.gz: e470e38d363523ea15a042119b85d4835d98d784c15f8a19423c10f146562117f9ba8a051f10667d7345f48d9f189d636e389eeb92e4a66d06df165d0b8caddd
+  metadata.gz: 6996697e014269c5a661f51ad4dff60b6b11fbc400a849c18ac62987db430b5cba85b168f489cff1eaa7176c7cd1887ef3b1296bf10ab9cdb5d64797331eb4ce
+  data.tar.gz: 2549fd7247b7acbf4c7d3f8823f3679c4eccc4675bfe23b7ddaf120b4d78f464cb912d9bb1afbf9d06d6eedaeb98d9f80e5f7eb4303bbfb1f11241801ddb01a5

data/lib/segregate.rb

@@ -22,7 +22,14 @@ class Segregate
     @uri.respond_to?(meth, include_private) || super
   end
 
-  def initialize callback = nil 
+  def debug message
+    if @debug
+      puts "DEBUG: " + message.t_s
+    end
+  end
+
+  def initialize callback = nil, *args, **kwargs
+    @debug = kwargs[:debug] ? true : false
     @callback = callback
     @http_version = [nil, nil]
 
@@ -35,6 +42,8 @@ class Segregate
 
     @stashed_data = ""
     @stashed_body = ""
+
+    @header_order = []
   end
 
   def request?
@@ -83,24 +92,46 @@ class Segregate
 
   def update_content_length
     unless @body.empty?
-      @headers['content-length'] = @body.size.to_s
-      @headers.delete 'transfer-encoding' 
+      if @body.length > 99999999999
+        @headers['transfer-encoding'] = 'chunked'
+        @headers.delete 'content-length'
+      else
+        @headers['content-length'] = @body.length.to_s
+        @headers.delete 'transfer-encoding'
+      end
     end
   end
 
   def raw_data
     raw_message = ""
     update_content_length
-    
+
+    build_headers raw_message
+    build_body raw_message
+
+    return raw_message
+  end
+
+  def build_headers raw_message
     request? ? raw_message << request_line + "\r\n" : raw_message << status_line + "\r\n"
-    ALL_HEADERS.each do |header|
-      raw_message << "%s: %s\r\n" % [header, headers[header]] if headers[header]
+    @header_order.each do |header|
+      raw_message << "%s: %s\r\n" % [header, headers[header.downcase]]
     end
-
-    raw_message << "\r\n" + @body + "\r\n" unless @body.empty?
     raw_message << "\r\n"
   end
 
+  def build_body raw_message
+    if @headers['content-length']
+      raw_message << @body
+    elsif @headers['transfer-encoding'] == 'chunked'
+      @body.scan(/.{1,65535}/).each do |chunk|
+        raw_message << "%s\r\n" % chunk.length.to_s(16)
+        raw_message << chunk + "\r\n"
+      end
+      raw_message << "0\r\n\r\n"
+    end
+  end
+
   def parse_data data
     data = StringIO.new(@stashed_data + data)
     @stashed_data = ""
@@ -109,6 +140,8 @@ class Segregate
       line, complete_line = get_next_line data
       complete_line ? parse_line(line) : @stashed_data = line
     end
+
+    data.close
   end
 
   def parse_line line
@@ -127,8 +160,17 @@ class Segregate
   private
 
   def get_next_line data
-    line = data.readline("\r\n")
-    [line.chomp("\r\n"), line.end_with?("\r\n") || line.length == headers['content-length'].to_i && @state >= :body]
+    if @headers['content-length'] && @state >= :body
+      line = data.readline("\r\n")
+      @inital_line = line
+      [line, true]
+    else
+      line = data.readline("\r\n")
+      @inital_line = line
+      result = line.end_with?("\r\n")
+      line = line[0..-3] if result
+      [line, result]
+    end
   end
 
   def read_in_first_line line
@@ -139,9 +181,9 @@ class Segregate
     elsif line =~ STATUS_LINE
       parse_status_line line
     elsif line =~ UNKNOWN_REQUEST_LINE
-      raise "ERROR: Unknown http method: %s" % line[/^\S+/]
+      debug "Unknown http method: %s" % line[/^\S+/]
     else
-      raise "ERROR: Unknown first line: %s" % line
+      debug "Unknown first line: %s" % line
     end
 
     @state.next
@@ -169,8 +211,9 @@ class Segregate
     if line.empty?
       @state.next
     else
-      key, value = line.split(":")
-      @headers[key.downcase] = value.strip
+      key, value = line.split(": ",2)
+      @header_order << key
+      @headers[key.downcase] = value
     end
 
     if headers_complete?
@@ -193,7 +236,7 @@ class Segregate
     line = @stashed_body + line
     @stashed_body = ""
 
-    if line.length == headers['content-length'].to_i
+    if line.length >= headers['content-length'].to_i
       @body = line
       @callback.on_body @body if @callback.respond_to?(:on_body)
       @state.next
@@ -226,12 +269,12 @@ class Segregate
     line = @stashed_body + line
     @stashed_body = ""
 
-    if line.length == @chunk_size
+    if line.length >= @chunk_size
       @body << line
       @callback.on_body line if @callback.respond_to?(:on_body)
       @chunked_body_state.next
     else
-      @stashed_body = line
+      @stashed_body = @inital_line.end_with?("\r\n") ? (line + "\r\n") : line
     end
   end
 end

data/lib/segregate/http_regular_expressions.rb

@@ -1,5 +1,5 @@
 class Segregate
 	REQUEST_LINE = /^(#{HTTP_METHODS.join("|")})\s(\*|\S+)\sHTTP\/(\d).(\d)$/
-	STATUS_LINE = /^HTTP\/(\d).(\d)\s(\d{3})\s([\w\s\-]+)$/
+	STATUS_LINE = /^HTTP\/(\d).(\d)\s(\d{3})\s([\w\s-]+)$/
 	UNKNOWN_REQUEST_LINE = /^(\w+)\s(\*|\S+)\sHTTP\/(\d).(\d)$/
 end

data/lib/segregate/version.rb

@@ -1,4 +1,4 @@
 class Segregate
-	VERSION = "0.5.0".freeze
-  DATE = "2014-02-04".freeze
+	VERSION = "0.5.2".freeze
+  DATE = "2014-02-10".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: segregate
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Ben Slaughter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -101,13 +101,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - LICENSE
+- README.md
+- lib/segregate.rb
 - lib/segregate/http_headers.rb
 - lib/segregate/http_methods.rb
 - lib/segregate/http_regular_expressions.rb
 - lib/segregate/version.rb
-- lib/segregate.rb
 - spec/segregate_spec.rb
 - spec/spec_helper.rb
 homepage: http://benslaughter.github.io/segregate/
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Segregate http parser