tmm1-em-http-request 0.1.0 → 0.1.1

data/README.rdoc

@@ -0,0 +1,51 @@
+= EM-HTTP-Client
+
+EventMachine based HTTP Request interface. Supports streaming response processing, uses Ragel HTTP parser. 
+- Simple interface for single & parallel requests via deferred callbacks
+- Automatic gzip & deflate decoding
+- Basic-Auth support 
+
+== Simple client example
+
+  EventMachine.run {
+    http = EventMachine::HttpRequest.new('http://127.0.0.1/').get :query => {'keyname' => 'value'}
+ 
+    http.callback {
+      p http.response_header.status
+      p http.response_header
+      p http.response
+    
+      EventMachine.stop
+    }
+  }
+
+== Multi request example
+
+  EventMachine.run {
+    multi = EventMachine::MultiRequest.new
+      
+    # add multiple requests to the multi-handler
+    multi.add(EventMachine::HttpRequest.new('http://www.google.com/').get)
+    multi.add(EventMachine::HttpRequest.new('http://www.yahoo.com/').get)
+      
+    multi.callback  {
+      p multi.responses[:succeeded]
+      p multi.responses[:failed]
+       
+      EventMachine.stop
+    }
+  }
+
+== Basic-Auth example
+
+  EventMachine.run {
+    http = EventMachine::HttpRequest.new('http://www.website.com/').get :head => {'authorization' => ['user', 'pass']}
+ 
+    http.errback { failed }
+    http.callback {
+      p http.response_header
+
+      EventMachine.stop
+    }
+  }
+

data/Rakefile

@@ -5,6 +5,13 @@ require 'rake/gempackagetask'
 require 'fileutils'
 include FileUtils
 
+# copied from EventMachine.
+MAKE = ENV['MAKE'] || if RUBY_PLATFORM =~ /mswin/ # mingw uses make.
+  'nmake'
+else
+  'make'
+end
+
 # Default Rake task is compile
 task :default => :compile
 
@@ -28,7 +35,7 @@ task :ragel do
 end
 
 def make(makedir)
-  Dir.chdir(makedir) { sh 'make' }
+  Dir.chdir(makedir) { sh MAKE }
 end
 
 def extconf(dir)
@@ -51,13 +58,14 @@ def setup_extension(dir, extension)
   end
 
   desc "Builds just the #{extension} extension"
-  task extension.to_sym => ["#{ext}/Makefile", ext_so ]
 
-  file "#{ext}/Makefile" => ["#{ext}/extconf.rb"] do
+  mf = (extension + '_makefile').to_sym
+
+  task mf do |t|
     extconf "#{ext}"
   end
 
-  file ext_so => ext_files do
+  task extension.to_sym => [mf] do
     make "#{ext}"
     cp ext_so, "lib"
   end

data/ext/buffer/em_buffer.c

@@ -11,9 +11,14 @@
 
 #include <string.h>
 #include <time.h>
-#include <unistd.h>
 #include <errno.h>
 
+#ifndef GetReadFile
+#define FPTR_TO_FD(fptr) (fptr->fd)
+#else
+#define FPTR_TO_FD(fptr) (fileno(GetReadFile(fptr)))
+#endif
+
 /* Default number of bytes in each node's buffer */
 #define DEFAULT_NODE_SIZE 16384
 

data/lib/em-http.rb

@@ -8,9 +8,10 @@ require 'rubygems'
 require 'eventmachine'
 require 'zlib'
 
-require 'http11_client'
-require 'em_buffer'
 
-require 'em-http/client'
-require 'em-http/multi'
-require 'em-http/request'
+require File.dirname(__FILE__) + '/http11_client'
+require File.dirname(__FILE__) + '/em_buffer'
+
+require File.dirname(__FILE__) + '/em-http/client'
+require File.dirname(__FILE__) + '/em-http/multi'
+require File.dirname(__FILE__) + '/em-http/request'

data/lib/em-http/client.rb

@@ -94,7 +94,11 @@ module EventMachine
 
     def encode_query(path, query)
       return path unless query
-      path + "?" + query.map { |k, v| encode_param(k, v) }.join('&')
+      if query.kind_of? String
+        return "#{path}?#{query}"
+      else
+        return path + "?" + query.map { |k, v| encode_param(k, v) }.join('&')
+      end
     end
 
     # URL encodes query parameters:
@@ -234,7 +238,7 @@ module EventMachine
     end
 
     def unbind
-      (@state == :finished) ? succeed : fail
+      (@state == :finished) ? succeed(self) : fail
       close_connection
     end
 

data/test/test_request.rb

@@ -54,7 +54,7 @@ describe EventMachine::HttpRequest do
     }
   end
 
-  it "should pass query parameters" do
+  it "should build query parameters from Hash" do
     EventMachine.run {
       http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get :query => {:q => 'test'}
 
@@ -67,6 +67,19 @@ describe EventMachine::HttpRequest do
     }
   end
 
+  it "should pass query parameters string" do
+    EventMachine.run {
+      http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get :query => "q=test"
+
+      http.errback { failed }
+      http.callback {
+        http.response_header.status.should == 200
+        http.response.should match(/test/)
+        EventMachine.stop
+      }
+    }
+  end
+
   it "should encode an array of query parameters" do
     EventMachine.run {
       http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/echo_query').get :query => {:hash => ['value1', 'value2']}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tmm1-em-http-request
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -34,7 +34,7 @@ extra_rdoc_files: []
 files: 
 - .autotest
 - LICENSE
-- README
+- README.rdoc
 - Rakefile
 - ext/buffer/em_buffer.c
 - ext/buffer/extconf.rb
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: em-http-request
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2

data/README

@@ -1,36 +0,0 @@
-EventMachine based HTTP Request interface. Supports streaming response processing / based on Zed Shaw's Ragel HTTP parser. 
- - Borrows a lot of good concepts from Rev's HttpClient, Curb, and other libraries.
- - Offers support for single or parallel request queries & via deferred callbacks
-
-Simple client example: 
---------
-
-EventMachine.run {
-  http = EventMachine::HttpRequest.new('http://127.0.0.1/').get :query => {'keyname' => 'value'}
- 
-  http.callback {
-    p http.response_header.status
-    p http.response_header
-    p http.response
-    
-    EventMachine.stop
-  }
-}
-
-Multi request example:
-----------
-
-EventMachine.run {
-  multi = EventMachine::MultiRequest.new
-      
-  # add multiple requests to the multi-handler
-  multi.add(EventMachine::HttpRequest.new('http://www.google.com/').get)
-  multi.add(EventMachine::HttpRequest.new('http://www.yahoo.com/').get)
-      
-  multi.callback  {
-    p multi.responses[:succeeded]
-    p multi.responses[:failed]
-       
-    EventMachine.stop
-  }
-}