simple-client 0.0.2 → 0.0.3

data/.bundle/config

@@ -1,4 +1,4 @@
---- 
-BUNDLE_DISABLE_SHARED_GEMS: "1"
-BUNDLE_BIN: bin
+---
 BUNDLE_PATH: vendor/bundle
+BUNDLE_BIN: bin
+BUNDLE_DISABLE_SHARED_GEMS: '1'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-client (0.0.2)
+    simple-client (0.0.3)
 
 GEM
   remote: http://rubygems.org/

data/lib/simple-client/simple-client.rb

@@ -110,7 +110,7 @@ module SimpleClient
     # @return [Net::HTTPResponse] Net::HTTP Response object
     def request(url, params)
       connection = prepare_connection(url, params)
-      req = create_request(params[:body])
+      req = create_request(params[:body], params[:headers])
       do_request(req, params[:headers], connection)
     end
 
@@ -127,7 +127,7 @@ module SimpleClient
       connection.request req
     end
 
-    def create_request(body)
+    def create_request(body, headers=nil)
       raise "Not supported in base class"
     end
 
@@ -189,7 +189,7 @@ module SimpleClient
 
     protected 
 
-    def create_request(body)
+    def create_request(body, headers=nil)
       query = @parts[:query] ? "?#{@parts[:query]}" : ""
       Net::HTTP::Get.new(@parts[:path] + query)
     end
@@ -197,11 +197,18 @@ module SimpleClient
 
   class PostRequest < Request
 
+    attr_accessor :encoding
+
     protected 
 
-    def create_request(body)
+    def create_request(body, headers=nil)
       post = Net::HTTP::Post.new(@parts[:path])
-      post.body = body
+      if headers && headers['Content-Type'] == 'application/x-www-form-urlencoded'
+        headers.delete 'Content-Type' #Net:HTTP will add this
+        post.set_form_data(body) #x-www-form-urlencoded
+      else
+        post.body = body
+      end
       post
     end
   end
@@ -210,7 +217,7 @@ module SimpleClient
 
     protected 
 
-    def create_request(body)
+    def create_request(body, headers=nil)
       put = Net::HTTP::Put.new(@parts[:path])
       put.body = body
       put
@@ -221,7 +228,7 @@ module SimpleClient
 
     protected 
 
-    def create_request(body)
+    def create_request(body, headers=nil)
       Net::HTTP::Delete.new(@parts[:path])
     end
   end

data/lib/simple-client/version.rb

@@ -1,4 +1,3 @@
 module SimpleClient
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end
-

data/test/test_simple-client.rb

@@ -171,6 +171,41 @@ class SimpleClient::ClientTest < Test::Unit::TestCase
     assert_equal({'cache-control' => 'private'}, s.response_headers)
   end
 
+  def test_post_with_request_and_response_headers_and_setting_x_www_form_urlencoding
+    #stub
+    stub_request(:post, "http://www.foo.co.uk/sport").
+      with(:body => {'foo' => 'bar', 'baz' => 'qux'}, :headers => {'X-Test1'=>'foo', 'X-Test2' => 'bar'}).
+      to_return(:status => 200, :headers => {'Cache-Control' => 'private'})
+
+    #run
+    s = SimpleClient::Client.new
+    s.post('http://www.foo.co.uk/sport', :headers => {'X-Test1'=>'foo', 'X-Test2' => 'bar', 'Content-Type' => 'application/x-www-form-urlencoded'}, :body => { 'foo'=>'bar', 'baz'=>'qux' })
+
+    #assert
+    assert_requested :post, "http://www.foo.co.uk/sport",
+      :headers => {'X-Test1'=>'foo', 'X-Test2' => 'bar'},
+      :body => "foo=bar&baz=qux", :times => 1    # ===> Success
+    assert_equal({'cache-control' => 'private'}, s.response_headers)
+  end
+
+ def test_post_with_request_and_response_header_and_setting_x_www_form_urlencoding_using_api
+    #stub
+    stub_request(:post, "http://www.foo.co.uk/sport").
+      with(:body => {'foo' => 'bar', 'baz' => 'qux'}, :headers => {'X-Test1'=>'foo', 'X-Test2' => 'bar'}).
+      to_return(:status => 200, :headers => {'Cache-Control' => 'private'})
+
+    #run
+    s = SimpleClient::Client.new
+    s.request_headers = {'X-Test1'=>'foo', 'X-Test2' => 'bar', 'Content-Type' => 'application/x-www-form-urlencoded'}
+    s.body = { 'foo'=>'bar', 'baz'=>'qux' } 
+    s.post 'http://www.foo.co.uk/sport'
+
+    #assert
+    assert_requested :post, "http://www.foo.co.uk/sport",
+      :headers => {'X-Test1'=>'foo', 'X-Test2' => 'bar'},
+      :body => "foo=bar&baz=qux", :times => 1    # ===> Success
+    assert_equal({'cache-control' => 'private'}, s.response_headers)
+  end
 
   def test_simple_put
     #stub

data/vendor/bundle/ruby/{1.8 → 1.9.1}/bin/rake

@@ -10,9 +10,13 @@ require 'rubygems'
 
 version = ">= 0"
 
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-  version = $1
-  ARGV.shift
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
 end
 
 gem 'rake', version