em-net-http 0.1.1 → 0.1.2

data/Gemfile

@@ -5,4 +5,5 @@ group :development do
   gem 'rspec', '>= 1.2.9'
   gem 'weary'
   gem 'right_aws'
+  gem 'tumblr-rb'
 end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/em-net-http.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{em-net-http}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Fairbairn"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "em-net-http.gemspec",
      "lib/em-net-http.rb",
+     "lib/em-net-http/weary.rb",
      "lib/test.rb",
      "lib/test_weary.rb",
      "spec/em-net-http_spec.rb",

data/lib/em-net-http.rb

@@ -64,6 +64,7 @@ module Net
     def request(req, body = nil, &block)
       f=Fiber.current
       uri = Addressable::URI.parse("#{use_ssl? ? 'https://' : 'http://'}#{addr_port}#{req.path}")
+      body = body || req.body
       opts = body.nil? ? {} : {:body => body}
       if use_ssl?
         sslopts = opts[:ssl] = {}
@@ -71,6 +72,11 @@ module Net
         sslopts[:private_key_file] = key if key
         sslopts[:cert_chain_file] = ca_file if ca_file
       end
+      headers = opts[:head] = {}
+      req.each do |k, v|
+        headers[k] = v
+      end
+      headers['content-type'] ||= "application/x-www-form-urlencoded"
       httpreq = EM::HttpRequest.new(uri).send(req.class::METHOD.downcase.to_sym, opts)
       httpreq.callback {|res|f.resume(EM::NetHTTPResponse.new(res))}
       httpreq.errback {|res|f.resume(EM::NetHTTPResponse.new(res))}
@@ -82,3 +88,6 @@ module Net
   end
 end
 
+# Other bits and bobs.
+
+

data/lib/em-net-http/weary.rb

@@ -0,0 +1,24 @@
+module Weary
+  class Response
+    # Weary doesn't like Content-Type headers with extra bits on the end, like '; encoding=utf-8'.
+    def content_type ; @content_type.split(';').first ; end
+    
+    def value ; self ; end
+  end
+ 
+  # Weary runs multi-threaded by default. The thread is spawned in perform!(). Let's not do that.
+  class Request
+    def perform!(&block)
+      @on_complete = block if block_given?
+      before_send.call(self) if before_send
+      req = http.request(request)
+      response = Response.new(req, self)
+      if response.redirected? && follows?
+        response.follow_redirect
+      else
+        on_complete.call(response) if on_complete
+        response
+      end
+    end
+  end
+end

data/lib/test_weary.rb

@@ -1,29 +1,7 @@
-$: << '.'
-require File.dirname(__FILE__) + '/em-net-http'
+$: << File.dirname(__FILE__)
+require 'em-net-http'
 require 'weary'
-
-module Weary
-  class Response
-    def content_type ; @content_type.split(';').first ; end
-    
-    def value ; self ; end
-  end
- 
-  class Request
-    def perform!(&block)
-      @on_complete = block if block_given?
-      before_send.call(self) if before_send
-      req = http.request(request)
-      response = Response.new(req, self)
-      if response.redirected? && follows?
-        response.follow_redirect
-      else
-        on_complete.call(response) if on_complete
-        response
-      end
-    end
-  end
-end
+require 'em-net-http/weary'
 
 EM.run do
   Fiber.new do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - James Fairbairn
@@ -77,6 +77,7 @@ files:
 - VERSION
 - em-net-http.gemspec
 - lib/em-net-http.rb
+- lib/em-net-http/weary.rb
 - lib/test.rb
 - lib/test_weary.rb
 - spec/em-net-http_spec.rb