em-http-request 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/em-http/client.rb

@@ -256,6 +256,11 @@ module EventMachine
         head['cookie'] = encode_cookie(cookie)
       end
 
+      # Set content-type header if missing and body is a Ruby hash
+      if not head['content-type'] and options[:body].is_a? Hash
+        head['content-type'] = "application/x-www-form-urlencoded"
+      end
+
       # Build the request
       request_header = encode_request(@method, @uri.path, query)
       request_header << encode_headers(head)

data/test/stallion.rb

@@ -87,7 +87,11 @@ Stallion.saddle :spec do |stable|
       stable.response.status = 200
 
     elsif stable.request.post?
-      stable.response.write stable.request.body.read
+      if stable.request.path_info == '/echo_content_type'
+        stable.response.write stable.request.env["CONTENT_TYPE"]
+      else
+        stable.response.write stable.request.body.read
+      end
 
     elsif stable.request.path_info == '/set_cookie'
       stable.response["Set-Cookie"] = "id=1; expires=Tue, 09-Aug-2011 17:53:39 GMT; path=/;"

data/test/test_request.rb

@@ -390,4 +390,46 @@ describe EventMachine::HttpRequest do
       }
     end
   end
+
+  context "body content-type encoding" do
+    it "should not set content type on string in body" do
+      EventMachine.run {
+        http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/echo_content_type').post :body => "data"
+
+        http.errback { failed }
+        http.callback {
+          http.response_header.status.should == 200
+          http.response.should be_empty
+          EventMachine.stop
+        }
+      }
+    end
+
+    it "should set content-type automatically when passed a ruby hash/array for body" do
+      EventMachine.run {
+        http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/echo_content_type').post :body => {:a => :b}
+
+        http.errback { failed }
+        http.callback {
+          http.response_header.status.should == 200
+          http.response.should match("application/x-www-form-urlencoded")
+          EventMachine.stop
+        }
+      }
+    end
+
+     it "should not override content-type when passing in ruby hash/array for body" do
+      EventMachine.run {
+        http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/echo_content_type').post({
+            :body => {:a => :b}, :head => {'content-type' => 'text'}})
+
+        http.errback { failed }
+        http.callback {
+          http.response_header.status.should == 200
+          http.response.should match("text")
+          EventMachine.stop
+        }
+      }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: em-http-request
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-25 00:00:00 -04:00
+date: 2009-10-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency