astro-em-http-request 0.2.9 → 0.2.10

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/astro-em-http-request.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{astro-em-http-request}
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Grigorik", "Stephan Maka", "Julien Genestoux"]
-  s.date = %q{2010-04-07}
+  s.date = %q{2010-04-16}
   s.description = %q{EventMachine based, async HTTP Request interface}
   s.email = %q{ilya@igvita.com}
   s.extensions = ["ext/buffer/extconf.rb", "ext/http11_client/extconf.rb"]
@@ -43,8 +43,6 @@ Gem::Specification.new do |s|
      "lib/em-http/mock.rb",
      "lib/em-http/multi.rb",
      "lib/em-http/request.rb",
-     "lib/em_buffer.so",
-     "lib/http11_client.so",
      "spec/fixtures/google.ca",
      "spec/hash_spec.rb",
      "spec/helper.rb",

data/ext/http11_client/http11_client.c

@@ -35,6 +35,44 @@ static VALUE rb_hash_lookup(VALUE hash, VALUE key)
 }
 #endif
 
+/* Expects upper-case, client_http_field() already does that */
+static int header_field_needed(VALUE f)
+{
+  if (RSTRING_LEN(f) < 4)  /* Minimum length of one header field */
+    return 0;
+
+  if (strncmp(RSTRING_PTR(f), "CON", 3) == 0)
+  {
+    if (strncmp(RSTRING_PTR(f), "CONTENT_TYPE", RSTRING_LEN(f)) == 0)
+      return 1;
+    if (strncmp(RSTRING_PTR(f), "CONTENT_ENCODING", RSTRING_LEN(f)) == 0)
+      return 1;
+    if (strncmp(RSTRING_PTR(f), "CONTENT_LENGTH", RSTRING_LEN(f)) == 0)
+      return 1;
+    if (strncmp(RSTRING_PTR(f), "CONNECTION", RSTRING_LEN(f)) == 0)
+      return 1;
+    return 0;
+  }
+  else
+  {
+    if (strncmp(RSTRING_PTR(f), "TRANSFER_ENCODING", RSTRING_LEN(f)) == 0)
+      return 1;
+    if (strncmp(RSTRING_PTR(f), "SET_COOKIE", RSTRING_LEN(f)) == 0)
+      return 1;
+    if (strncmp(RSTRING_PTR(f), "LOCATION", RSTRING_LEN(f)) == 0)
+      return 1;
+    if (strncmp(RSTRING_PTR(f), "HOST", RSTRING_LEN(f)) == 0)
+      return 1;
+    if (strncmp(RSTRING_PTR(f), "LAST_MODIFIED", RSTRING_LEN(f)) == 0)
+      return 1;
+    if (strncmp(RSTRING_PTR(f), "ETAG", RSTRING_LEN(f)) == 0)
+      return 1;
+    if (strncmp(RSTRING_PTR(f), "UPGRADE", RSTRING_LEN(f)) == 0)
+      return 1;
+    return 0;
+  }
+}
+
 void client_http_field(void *data, const char *field, size_t flen, const char *value, size_t vlen)
 {
   char *ch, *end;
@@ -56,8 +94,10 @@ void client_http_field(void *data, const char *field, size_t flen, const char *v
     }
   }
 
-  el = rb_hash_lookup(req, f);
-  switch(TYPE(el)) {
+  if (header_field_needed(f))
+  {
+    el = rb_hash_lookup(req, f);
+    switch(TYPE(el)) {
     case T_ARRAY:
       rb_ary_push(el, v);
       break;
@@ -67,6 +107,7 @@ void client_http_field(void *data, const char *field, size_t flen, const char *v
     default:
       rb_hash_aset(req, f, v);
       break;
+    }
   }
 }
 

data/lib/em-http/client.rb

@@ -23,12 +23,12 @@ module EventMachine
     
     # E-Tag
     def etag
-      self["ETag"]
+      self[HttpClient::ETAG]
     end
     
     def last_modified
-      time = self["Last-Modified"]
-      Time.parse(time) if time
+      time = self[HttpClient::LAST_MODIFIED]
+      time ? Time.parse(time) : nil
     end
 
     # HTTP response status as an integer
@@ -180,17 +180,19 @@ module EventMachine
     include EventMachine::Deferrable
     include HttpEncoding
 
-    TRANSFER_ENCODING="TRANSFER_ENCODING"
-    CONTENT_ENCODING="CONTENT_ENCODING"
-    CONTENT_LENGTH="CONTENT_LENGTH"
-    KEEP_ALIVE="CONNECTION"
-    SET_COOKIE="SET_COOKIE"
-    LOCATION="LOCATION"
-    HOST="HOST"
-    CRLF="\r\n"
+    TRANSFER_ENCODING="TRANSFER_ENCODING".freeze
+    CONTENT_ENCODING="CONTENT_ENCODING".freeze
+    CONTENT_LENGTH="CONTENT_LENGTH".freeze
+    KEEP_ALIVE="CONNECTION".freeze
+    SET_COOKIE="SET_COOKIE".freeze
+    LOCATION="LOCATION".freeze
+    HOST="HOST".freeze
+    LAST_MODIFIED="LAST_MODIFIED".freeze
+    ETAG="ETAG".freeze
+    CRLF="\r\n".freeze
 
     attr_accessor :method, :options, :uri
-    attr_reader   :response, :response_header, :errors
+    attr_reader   :response_header, :errors
 
     def post_init
       @max_duration_timer = nil
@@ -199,7 +201,7 @@ module EventMachine
       @chunk_header = HttpChunkHeader.new
       @response_header = HttpResponseHeader.new
       @parser_nbytes = 0
-      @response = ''
+      @response = nil
       @errors = ''
       @content_decoder = nil
       @stream = nil
@@ -208,6 +210,11 @@ module EventMachine
       @options = {}
     end
 
+    # Simple getter, because @response is expected to be a String
+    def response
+      @response || ''
+    end
+
     # start HTTP request once we establish connection to host
     def connection_completed              
       # if connecting to proxy, then first negotiate the connection
@@ -376,6 +383,7 @@ module EventMachine
       if @stream
         @stream.call(data)
       else
+        @response ||= ''
         @response << data
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astro-em-http-request
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 +02:00
+date: 2010-04-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,8 +60,6 @@ files:
 - lib/em-http/mock.rb
 - lib/em-http/multi.rb
 - lib/em-http/request.rb
-- lib/em_buffer.so
-- lib/http11_client.so
 - spec/fixtures/google.ca
 - spec/hash_spec.rb
 - spec/helper.rb