minhttp 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/chunk.rb

@@ -0,0 +1,32 @@
+module MinHttp
+  class Chunk
+    def initialize(body)
+      @body = body
+      @newbody = ""
+    end
+  
+    def read_chunk_size
+      chunk_info, @body = @body.split("\r\n", 2)
+      chunk_info.to_i(16)
+    end
+  
+    def read_chunk
+      @newbody << @body[0, @chunk_size]
+      new_body_len =  @body.length - @chunk_size
+      @body = @body[@chunk_size+2, new_body_len-2]
+    end
+  
+    def parse
+      @length = 0
+      @chunk_size = read_chunk_size
+
+      while (@chunk_size > 0)
+        read_chunk
+        @length = @length + @chunk_size
+        @chunk_size = read_chunk_size
+      end
+
+      return @newbody
+    end
+  end
+end

data/lib/chunk.rb~

@@ -0,0 +1,33 @@
+module MinHttp
+
+  class Chunk
+    def initialize(header, body)
+      @header = header
+      @body = body
+      @newbody = ""
+    end
+  
+    def read_chunk_size
+      chunk_info, @body = @body.split("\r\n", 2)
+      chunk_info.to_i(16)
+    end
+  
+    def read_chunk
+      @newbody << @body[0, @chunk_size]
+      new_body_len =  @body.length - @chunk_size
+      @body = @body[@chunk_size+2, new_body_len-2]
+    end
+  
+    def parse
+      @length = 0
+      @chunk_size = read_chunk_size
+      while (@chunk_size > 0)
+        read_chunk
+        @length = @length + @chunk_size
+        @chunk_size = read_chunk_size
+      end
+
+      return @header, @newbody
+    end
+  end
+end

data/lib/exception.rb

@@ -0,0 +1,4 @@
+module MinHttp
+  class PersistentConnectionException < Exception
+  end
+end

data/lib/exception.rb~

@@ -0,0 +1,4 @@
+module MinHTTP
+  class PersistentConnectionException < Exception
+  end
+end

data/lib/minhttp.rb

@@ -2,6 +2,8 @@ require 'http/parser'
 require 'eventmachine'
 require 'logger'
 require_relative "ssl_validator"
+require_relative "chunk"
+require_relative "exception"
 
 #
 # The minimal HTTP client
@@ -32,6 +34,9 @@ module Http
 
     def self.connect(host, data, port=80, ssl=false, &callback)
       configure unless configured?
+      unless (data =~ /\A[^\r\n]+HTTP\/1\.0/ || data =~ /Connection[^\r\n]+close/)
+        raise MinHttp::PersistentConnectionException.new("MinHTTP does not support persistent connections, so the request data must indicate HTTP 1.0 or it must include a 'Connection: close' header")
+      end
 
       EventMachine.connect(host, port, self) do |c|
         # this code runs after 'post_init', before 'connection_completed'
@@ -81,6 +86,14 @@ module Http
     def unbind
       begin
         @@connections -= 1
+
+        # combine the chunks of a chunked response
+        if @parser.headers["Transfer-Encoding"] == "chunked"
+          headers, body = @response_data.split("\r\n\r\n", 2)
+          body = MinHttp::Chunk.new(body).parse
+          @response_data = "#{headers}\r\n\r\n#{body}"
+        end
+
         @callback.call(@response_data, @parser)
       rescue Exception => e
         @@logger.error("Error in unbind: #{e}")

data/test/simple_test.rb

@@ -2,6 +2,7 @@ require 'minitest/autorun'
 require_relative "../lib/minhttp"
 
 class SimpleTest < MiniTest::Unit::TestCase
+
   def test_simple_google
     data = <<-HTTP
 GET / HTTP/1.0\r
@@ -12,11 +13,68 @@ HTTP
     EventMachine::run do
       Http::Min.connect("www.google.com", data) do |raw_response, parsed_response|
         assert(parsed_response.status_code == 200, "Response from google should be 200 but is #{parsed_response.status_code}")
-        assert(raw_response.length > 0, "Raw response from google should be have size larger than 0")
+        assert(raw_response.length > 0, "Raw response from google should have size larger than 0")
         EM::stop
       end
     end
+  end
 
+  def test_chunked
+    data = <<-HTTP
+GET /httpgallery/chunked/ HTTP/1.1\r
+Host: www.httpwatch.com\r
+Connection: close
+
+HTTP
+
+    EventMachine::run do
+      Http::Min.connect("www.httpwatch.com", data) do |raw_response, parsed_response|
+        assert(parsed_response.status_code == 200, "Response from httpwatch should be 200 but is #{parsed_response.status_code}")
+        assert(raw_response.length > 0, "Raw response from httpwatch should have size larger than 0")
+        EM::stop
+      end
+    end
   end
+
+
+  # MinHttp does not support persistent HTTP connections
+  def test_http11_with_connection_close
+    data = <<-HTTP
+GET / HTTP/1.1\r
+Host: www.google.com\r
+Connection: close
+
+HTTP
+
+    EventMachine::run do
+      Http::Min.connect("www.google.com", data) do |raw_response, parsed_response|
+        assert(parsed_response.status_code == 200, "Response from google should be 200 but is #{parsed_response.status_code}")
+        assert(raw_response.length > 0, "Raw response from google should have size larger than 0")
+        EM::stop
+      end
+    end
+  end
+
+
+  # When the 'connection: close' header is not present, the
+  # connection is presumed to be persistent. MinHTTP does
+  # not support persistent connections so it throws an
+  # exception
+  def test_http11_without_connection_close
+    data = <<-HTTP
+GET / HTTP/1.1\r
+Host: www.google.com\r
+
+HTTP
+
+    assert_raises(MinHttp::PersistentConnectionException) do
+      EventMachine::run do
+        Http::Min.connect("www.google.com", data) do |raw_response, parsed_response|
+          EM::stop
+        end
+      end
+    end
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minhttp
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-01 00:00:00.000000000Z
+date: 2011-10-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &13044100 !ruby/object:Gem::Requirement
+  requirement: &70258984044100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13044100
+  version_requirements: *70258984044100
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &13043560 !ruby/object:Gem::Requirement
+  requirement: &70258984043140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13043560
+  version_requirements: *70258984043140
 description: MinHTTP allows one to send and receive raw HTTP requests. It's a very
   thin wrapper around EventMachine's connect method with some SSL validation added.
 email:
@@ -46,14 +46,14 @@ files:
 - Gemfile
 - Rakefile
 - cacert.pem
-- examples/synchronous_example.rb
-- examples/synchronous_example.rb~
 - examples/readme_example.rb
-- lib/ssl_validator.rb
-- lib/minparser.rb~
+- examples/synchronous_example.rb
+- lib/chunk.rb
+- lib/chunk.rb~
+- lib/exception.rb
+- lib/exception.rb~
 - lib/minhttp.rb
-- lib/rawparser.rb~
-- test/simple_test.rb~
+- lib/ssl_validator.rb
 - test/simple_test.rb
 homepage: http://github.com/ahfarmer/minhttp
 licenses: []
@@ -75,10 +75,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: minhttp
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: An HTTP library for the minimalist.
 test_files:
-- test/simple_test.rb~
 - test/simple_test.rb

data/examples/synchronous_example.rb~

@@ -1,20 +0,0 @@
-require_relative '../lib/minhttp'
-require 'em-synchrony'
-
-data = <<-HTTP
-GET / HTTP/1.0\r
-Host: www.google.com\r
-
-HTTP
-
-EventMachine::run do
-  Http::Min.connect("www.google.com", data) do |raw_response, parsed_response|
-    puts "Received #{parsed_response.status_code} status from Google"
-    puts "First 100 characters of raw HTTP response:"
-    puts raw_response[0..100]
-#    EM::stop
-    Fiber.yield
-  end
-end
-
-fiber.resume

data/lib/minparser.rb~

@@ -1,20 +0,0 @@
-require 'http/parser'
-require 'eventmachine'
-require 'logger'
-require_relative "ssl_validator"
-
-#
-# The minimal HTTP client
-#   Sends a raw http request (bytes)
-#   Parses the response and provides both the parsed and the raw response
-#   Supports ssl
-#
-module Http
-  class MinParser
-    
-
-parser = Http::Parser.new
-parser.on_headers_complete = proc{ :stop }
-
-offset = parser << request_data
-body = request_data[offset..-1]

data/lib/rawparser.rb~

@@ -1,23 +0,0 @@
-require 'http/parser'
-require 'eventmachine'
-require 'logger'
-require_relative "ssl_validator"
-
-#
-# The minimal HTTP parser
-#   Simple wrapper around http_parser.rb that supplies access to the raw
-#
-module Http
-  class RawParser
-    def initialize
-
-    end
-
-    def <<
-        
-
-parser = Http::Parser.new
-parser.on_headers_complete = proc{ :stop }
-
-offset = parser << request_data
-body = request_data[offset..-1]

data/test/simple_test.rb~

@@ -1,10 +0,0 @@
-require 'minitest/autorun'
-
-class SimpleTest < MiniTest::Unit::TestCase
-  #TEST_DIR = File.dirname(__FILE__)
-
-  def simple_test(test_name)
-
-  end
-end
-