minhttp 0.0.3 → 0.0.5

data/README.md

@@ -14,7 +14,7 @@ Example:
     HTTP
 
     EventMachine::run do
-      Http::Min.connect("www.yahoo.com", data) do |raw_response, parsed_response|
+      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]

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.5

data/examples/synchronous_example.rb

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

data/examples/synchronous_example.rb~

@@ -0,0 +1,20 @@
+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/minhttp.rb

@@ -45,6 +45,11 @@ module Http
       begin
         @@connections += 1
         @parser = Http::Parser.new
+        @headers_complete = false
+        @parser.on_headers_complete = proc do
+          @headers_complete = true
+          :stop
+        end
         @response_data = ""
       rescue Exception => e
         @@logger.error("Error in post_init: #{e}")
@@ -57,14 +62,15 @@ module Http
         start_tls(:verify_peer => true) if @ssl
         send_data @request_data
       rescue Exception => e
-        puts "Error in connection_completed: #{e}"
+        @@logger.error "Error in connection_completed: #{e}"
+        raise e
       end
     end
 
     def receive_data(data)
       @response_data << data
       begin
-        @parser << data
+        @parser << data unless @headers_complete
       rescue HTTP::Parser::Error => e
         @@logger.warn "Failed to parse: #{data}"
         raise e

data/lib/minparser.rb~

@@ -0,0 +1,20 @@
+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~

@@ -0,0 +1,23 @@
+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]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minhttp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-10 00:00:00.000000000Z
+date: 2011-05-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &14564580 !ruby/object:Gem::Requirement
+  requirement: &7850840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14564580
+  version_requirements: *7850840
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &14563700 !ruby/object:Gem::Requirement
+  requirement: &7850200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14563700
+  version_requirements: *7850200
 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,9 +46,13 @@ files:
 - Gemfile
 - Rakefile
 - cacert.pem
+- examples/synchronous_example.rb
+- examples/synchronous_example.rb~
 - examples/readme_example.rb
 - lib/ssl_validator.rb
+- lib/minparser.rb~
 - lib/minhttp.rb
+- lib/rawparser.rb~
 - test/simple_test.rb~
 - test/simple_test.rb
 homepage: http://github.com/ahfarmer/minhttp
@@ -71,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: minhttp
-rubygems_version: 1.8.1
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: An HTTP library for the minimalist.