faraday 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/faraday.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{faraday}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["rick"]
-  s.date = %q{2010-02-06}
+  s.date = %q{2010-02-18}
   s.description = %q{HTTP/REST API client library with pluggable components}
   s.email = %q{technoweenie@gmail.com}
   s.extra_rdoc_files = [

data/lib/faraday/adapter/test.rb

@@ -73,7 +73,7 @@ module Faraday
 
       class Stub < Struct.new(:path, :body, :block)
         def matches?(request_path, request_body)
-          request_path == path && request_body == body
+          request_path == path && (body.to_s.size.zero? || request_body == body)
         end
 
         def to_s

data/test/adapters/live_test.rb

@@ -4,152 +4,121 @@ if Faraday::TestCase::LIVE_SERVER
   module Adapters
     class LiveTest < Faraday::TestCase
       Faraday::Adapter.all_loaded_constants.each do |adapter|
-        describe "with #{adapter} adapter" do
-          before do
-            @connection = Faraday::Connection.new LIVE_SERVER do
-              use adapter
-            end
-          end
+        define_method "test_#{adapter}_GET_retrieves_the_response_body" do
+          assert_equal 'hello world', create_connection(adapter).get('hello_world').body
+        end
 
-          describe "#get" do
-            it "raises on 404" do
-              assert_raise(Faraday::Error::ResourceNotFound) { @connection.get('/nothing') }
-            end
+        define_method "test_#{adapter}_GET_send_url_encoded_params" do
+          resp = create_connection(adapter).get do |req|
+            req.url 'hello', 'name' => 'zack'
+          end
+          assert_equal('hello zack', resp.body)
+        end
 
-            it "retrieves the response body" do
-              assert_equal 'hello world', @connection.get('hello_world').body
-            end
+        define_method "test_#{adapter}_GET_retrieves_the_response_headers" do
+          assert_equal 'text/html', create_connection(adapter).get('hello_world').headers['content-type']
+        end
 
-            it "send url-encoded params" do
-              resp = @connection.get do |req|
-                req.url 'hello', 'name' => 'zack'
-              end
-              assert_equal('hello zack', resp.body)
-            end
+        define_method "test_#{adapter}_POST_send_url_encoded_params" do
+          resp = create_connection(adapter).post do |req|
+            req.url 'echo_name'
+            req.body = {'name' => 'zack'}
+          end
+          assert_equal %("zack"), resp.body
+        end
 
-            it "retrieves the response headers" do
-              assert_equal 'text/html', @connection.get('hello_world').headers['content-type']
-            end
+        define_method "test_#{adapter}_POST_send_url_encoded_nested_params" do
+          resp = create_connection(adapter).post do |req|
+            req.url 'echo_name'
+            req.body = {'name' => {'first' => 'zack'}}
           end
+          assert_equal %({"first"=>"zack"}), resp.body
+        end
 
-          describe "#post" do
-            it "raises on 404" do
-              assert_raise(Faraday::Error::ResourceNotFound) { @connection.post('/nothing') }
-            end
+        define_method "test_#{adapter}_POST_retrieves_the_response_headers" do
+          assert_equal 'text/html', create_connection(adapter).post('echo_name').headers['content-type']
+        end
 
-            it "send url-encoded params" do
-              resp = @connection.post do |req|
-                req.url 'echo_name'
-                req.body = {'name' => 'zack'}
-              end
-              assert_equal %("zack"), resp.body
+        # http://github.com/toland/patron/issues/#issue/9
+        if ENV['FORCE'] || adapter != Faraday::Adapter::Patron
+          define_method "test_#{adapter}_PUT_send_url_encoded_params" do
+            resp = create_connection(adapter).put do |req|
+              req.url 'echo_name'
+              req.body = {'name' => 'zack'}
             end
+            assert_equal %("zack"), resp.body
+          end
 
-            it "send url-encoded nested params" do
-              resp = @connection.post do |req|
-                req.url 'echo_name'
-                req.body = {'name' => {'first' => 'zack'}}
-              end
-              assert_equal %({"first"=>"zack"}), resp.body
+          define_method "test_#{adapter}_PUT_send_url_encoded_nested_params" do
+            resp = create_connection(adapter).put do |req|
+              req.url 'echo_name'
+              req.body = {'name' => {'first' => 'zack'}}
             end
+            assert_equal %({"first"=>"zack"}), resp.body
+          end
 
-            it "retrieves the response headers" do
-              assert_equal 'text/html', @connection.post('echo_name').headers['content-type']
-            end
+          define_method "test_#{adapter}_PUT_retrieves_the_response_headers" do
+            assert_equal 'text/html', create_connection(adapter).put('echo_name').headers['content-type']
           end
+        end
 
-          # http://github.com/toland/patron/issues/#issue/9
-          if ENV['FORCE'] || adapter != Faraday::Adapter::Patron
-            describe "#put" do
-              it "raises on 404" do
-                assert_raise(Faraday::Error::ResourceNotFound) { @connection.put('/nothing') }
-              end
-
-              it "send url-encoded params" do
-                resp = @connection.put do |req|
-                  req.url 'echo_name'
-                  req.body = {'name' => 'zack'}
-                end
-                assert_equal %("zack"), resp.body
-              end
-
-              it "send url-encoded nested params" do
-                resp = @connection.put do |req|
-                  req.url 'echo_name'
-                  req.body = {'name' => {'first' => 'zack'}}
-                end
-                assert_equal %({"first"=>"zack"}), resp.body
-              end
-
-              it "retrieves the response headers" do
-                assert_equal 'text/html', @connection.put('echo_name').headers['content-type']
-              end
+        # http://github.com/pauldix/typhoeus/issues#issue/7
+        if ENV['FORCE'] || adapter != Faraday::Adapter::Typhoeus
+          define_method "test_#{adapter}_HEAD_send_url_encoded_params" do
+            resp = create_connection(adapter).head do |req|
+              req.url 'hello', 'name' => 'zack'
             end
+            assert_equal 'text/html', resp.headers['content-type']
           end
 
-          # http://github.com/pauldix/typhoeus/issues#issue/7
-          if ENV['FORCE'] || adapter != Faraday::Adapter::Typhoeus
-            describe "#head" do
-              it "raises on 404" do
-                assert_raise(Faraday::Error::ResourceNotFound) { @connection.head('/nothing') }
-              end
-
-              it "send url-encoded params" do
-                resp = @connection.head do |req|
-                  req.url 'hello', 'name' => 'zack'
-                end
-                assert_equal 'text/html', resp.headers['content-type']
-              end
-
-              it "retrieves no response body" do
-                assert_equal '', @connection.head('hello_world').body.to_s
-              end
-
-              it "retrieves the response headers" do
-                assert_equal 'text/html', @connection.head('hello_world').headers['content-type']
-              end
-            end
+          define_method "test_#{adapter}_HEAD_retrieves_no_response_body" do
+            assert_equal '', create_connection(adapter).head('hello_world').body.to_s
           end
 
-          describe "#delete" do
-            it "raises on 404" do
-              assert_raise(Faraday::Error::ResourceNotFound) { @connection.delete('/nothing') }
-            end
+          define_method "test_#{adapter}_HEAD_retrieves_the_response_headers" do
+            assert_equal 'text/html', create_connection(adapter).head('hello_world').headers['content-type']
+          end
+        end
 
-            it "retrieves the response headers" do
-              assert_equal 'text/html', @connection.delete('delete_with_json').headers['content-type']
-            end
+        define_method "test_#{adapter}_DELETE_retrieves_the_response_headers" do
+          assert_equal 'text/html', create_connection(adapter).delete('delete_with_json').headers['content-type']
+        end
 
-            it "retrieves the body" do
-              assert_match /deleted/, @connection.delete('delete_with_json').body
-            end
-          end
+        define_method "test_#{adapter}_DELETE_retrieves_the_body" do
+          assert_match /deleted/, create_connection(adapter).delete('delete_with_json').body
+        end
 
-          describe "async requests" do
-            it "clears parallel manager after running a single request" do
-              assert !@connection.in_parallel?
-              resp = @connection.get('hello_world')
-              assert !@connection.in_parallel?
-              assert_equal 'hello world', @connection.get('hello_world').body
-            end
+        define_method "test_#{adapter}_async_requests_clear_parallel_manager_after_running_a_single_request" do
+          connection = create_connection(adapter)
+          assert !connection.in_parallel?
+          resp = connection.get('hello_world')
+          assert !connection.in_parallel?
+          assert_equal 'hello world', connection.get('hello_world').body
+        end
+      
+        define_method "test_#{adapter}_async_requests_uses_parallel_manager_to_run_multiple_json_requests" do
+          resp1, resp2 = nil, nil
 
-            it "uses parallel manager to run multiple json requests" do
-              resp1, resp2 = nil, nil
-
-              @connection.in_parallel(adapter.setup_parallel_manager) do
-                resp1 = @connection.get('json')
-                resp2 = @connection.get('json')
-                if adapter.supports_parallel_requests?
-                  assert @connection.in_parallel?
-                  assert_nil resp1.body
-                  assert_nil resp2.body
-                end
-              end
-              assert !@connection.in_parallel?
-              assert_equal '[1,2,3]', resp1.body
-              assert_equal '[1,2,3]', resp2.body
+          connection = create_connection(adapter)
+
+          connection.in_parallel(adapter.setup_parallel_manager) do
+            resp1 = connection.get('json')
+            resp2 = connection.get('json')
+            if adapter.supports_parallel_requests?
+              assert connection.in_parallel?
+              assert_nil resp1.body
+              assert_nil resp2.body
             end
           end
+          assert !connection.in_parallel?
+          assert_equal '[1,2,3]', resp1.body
+          assert_equal '[1,2,3]', resp2.body
+        end
+      end
+
+      def create_connection(adapter)
+        Faraday::Connection.new LIVE_SERVER do |b|
+          b.use adapter
         end
       end
     end

data/test/adapters/test_middleware_test.rb

@@ -2,27 +2,25 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
 
 module Adapters
   class TestMiddleware < Faraday::TestCase
-    describe "Test Middleware with simple path" do
-      before :all do
-        @stubs = Faraday::Adapter::Test::Stubs.new
-        @conn  = Faraday::Connection.new do |builder|
-          builder.adapter :test, @stubs
-        end
-        @stubs.get('/hello') { [200, {'Content-Type' => 'text/html'}, 'hello'] }
-        @resp = @conn.get('/hello')
+    def setup
+      @stubs = Faraday::Adapter::Test::Stubs.new
+      @conn  = Faraday::Connection.new do |builder|
+        builder.adapter :test, @stubs
       end
+      @stubs.get('/hello') { [200, {'Content-Type' => 'text/html'}, 'hello'] }
+      @resp = @conn.get('/hello')
+    end
 
-      it "sets status" do
-        assert_equal 200, @resp.status
-      end
+    def test_middleware_with_simple_path_sets_status
+      assert_equal 200, @resp.status
+    end
 
-      it "sets headers" do
-        assert_equal 'text/html', @resp.headers['Content-Type']
-      end
+    def test_middleware_with_simple_path_sets_headers
+      assert_equal 'text/html', @resp.headers['Content-Type']
+    end
 
-      it "sets body" do
-        assert_equal 'hello', @resp.body
-      end
+    def test_middleware_with_simple_path_sets_body
+      assert_equal 'hello', @resp.body
     end
   end
 end

data/test/adapters/typhoeus_test.rb

@@ -3,25 +3,23 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
 if Faraday::Adapter::Typhoeus.loaded?
   module Adapters
     class TestTyphoeus < Faraday::TestCase
-      describe "#parse_response_headers" do
-        before do
-          @adapter = Faraday::Adapter::Typhoeus.new
-        end
-      
-        it "leaves http status line out" do
-          headers = @adapter.parse_response_headers("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n")
-          assert_equal %w(content-type), headers.keys
-        end
-      
-        it "parses lower-cased header name and value" do
-          headers = @adapter.parse_response_headers("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n")
-          assert_equal 'text/html', headers['content-type']
-        end
-      
-        it "parses lower-cased header name and value with colon" do
-          headers = @adapter.parse_response_headers("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nLocation: http://sushi.com/\r\n\r\n")
-          assert_equal 'http://sushi.com/', headers['location']
-        end
+      def setup
+        @adapter = Faraday::Adapter::Typhoeus.new
+      end
+
+      def test_parse_response_headers_leaves_http_status_line_out
+        headers = @adapter.parse_response_headers("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n")
+        assert_equal %w(content-type), headers.keys
+      end
+
+      def test_parse_response_headers_parses_lower_cased_header_name_and_value
+        headers = @adapter.parse_response_headers("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n")
+        assert_equal 'text/html', headers['content-type']
+      end
+
+      def test_parse_response_headers_parses_lower_cased_header_name_and_value_with_colon
+        headers = @adapter.parse_response_headers("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nLocation: http://sushi.com/\r\n\r\n")
+        assert_equal 'http://sushi.com/', headers['location']
       end
     end
   end

data/test/connection_app_test.rb

@@ -22,28 +22,24 @@ class TestConnectionApps < Faraday::TestCase
     end
   end
 
-  before do
+  def setup
     @conn = Faraday::Connection.new do |b|
       b.use TestMiddleWare
       b.use TestAdapter
     end
   end
 
-  describe "#builder" do
-    it "is built from Faraday::Connection constructor" do
-      assert_kind_of Faraday::Builder, @conn.builder
-      assert_equal 3, @conn.builder.handlers.size
-    end
+  def test_builder_is_built_from_faraday_connection
+    assert_kind_of Faraday::Builder, @conn.builder
+    assert_equal 3, @conn.builder.handlers.size
+  end
 
-    it "adds middleware to the Builder stack" do
-      assert_kind_of TestMiddleWare, @conn.builder.handlers[2].call(nil)
-      assert_kind_of TestAdapter,    @conn.builder.handlers[1].call(nil)
-    end
+  def test_builder_adds_middleware_to_builder_stack
+    assert_kind_of TestMiddleWare, @conn.builder.handlers[2].call(nil)
+    assert_kind_of TestAdapter,    @conn.builder.handlers[1].call(nil)
   end
 
-  describe "#to_app" do
-    it "returns rack-compatible object" do
-      assert @conn.to_app.respond_to?(:call)
-    end
+  def test_to_app_returns_rack_object
+    assert @conn.to_app.respond_to?(:call)
   end
 end

data/test/connection_test.rb

@@ -1,167 +1,161 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class TestConnection < Faraday::TestCase
-  describe "#initialize" do
-    it "parses @host out of given url" do
-      conn = Faraday::Connection.new "http://sushi.com"
-      assert_equal 'sushi.com', conn.host
-    end
+  def test_initialize_parses_host_out_of_given_url
+    conn = Faraday::Connection.new "http://sushi.com"
+    assert_equal 'sushi.com', conn.host
+  end
 
-    it "parses nil @port out of given url" do
-      conn = Faraday::Connection.new "http://sushi.com"
-      assert_nil conn.port
-    end
+  def test_initialize_parses_nil_port_out_of_given_url
+    conn = Faraday::Connection.new "http://sushi.com"
+    assert_nil conn.port
+  end
 
-    it "parses @scheme out of given url" do
-      conn = Faraday::Connection.new "http://sushi.com"
-      assert_equal 'http', conn.scheme
-    end
+  def test_initialize_parses_scheme_out_of_given_url
+    conn = Faraday::Connection.new "http://sushi.com"
+    assert_equal 'http', conn.scheme
+  end
 
-    it "parses @port out of given url" do
-      conn = Faraday::Connection.new "http://sushi.com:815"
-      assert_equal 815, conn.port
-    end
+  def test_initialize_parses_port_out_of_given_url
+    conn = Faraday::Connection.new "http://sushi.com:815"
+    assert_equal 815, conn.port
+  end
 
-    it "parses nil @path_prefix out of given url" do
-      conn = Faraday::Connection.new "http://sushi.com"
-      assert_equal '/', conn.path_prefix
-    end
+  def test_initialize_parses_nil_path_prefix_out_of_given_url
+    conn = Faraday::Connection.new "http://sushi.com"
+    assert_equal '/', conn.path_prefix
+  end
 
-    it "parses @path_prefix out of given url" do
-      conn = Faraday::Connection.new "http://sushi.com/fish"
-      assert_equal '/fish', conn.path_prefix
-    end
+  def test_initialize_parses_path_prefix_out_of_given_url
+    conn = Faraday::Connection.new "http://sushi.com/fish"
+    assert_equal '/fish', conn.path_prefix
+  end
 
-    it "parses @path_prefix out of given url option" do
-      conn = Faraday::Connection.new :url => "http://sushi.com/fish"
-      assert_equal '/fish', conn.path_prefix
-    end
+  def test_initialize_parses_path_prefix_out_of_given_url_option
+    conn = Faraday::Connection.new :url => "http://sushi.com/fish"
+    assert_equal '/fish', conn.path_prefix
+  end
 
-    it "stores default params from options" do
-      conn = Faraday::Connection.new :params => {:a => 1}
-      assert_equal 1, conn.params['a']
-    end
+  def test_initialize_stores_default_params_from_options
+    conn = Faraday::Connection.new :params => {:a => 1}
+    assert_equal 1, conn.params['a']
+  end
 
-    it "stores default params from uri" do
-      conn = Faraday::Connection.new "http://sushi.com/fish?a=1", :params => {'b' => '2'}
-      assert_equal '1', conn.params['a']
-      assert_equal '2', conn.params['b']
-    end
+  def test_initialize_stores_default_params_from_uri
+    conn = Faraday::Connection.new "http://sushi.com/fish?a=1", :params => {'b' => '2'}
+    assert_equal '1', conn.params['a']
+    assert_equal '2', conn.params['b']
+  end
 
-    it "stores default headers from options" do
-      conn = Faraday::Connection.new :headers => {:a => 1}
-      assert_equal '1', conn.headers['A']
-    end
+  def test_initialize_stores_default_headers_from_options
+    conn = Faraday::Connection.new :headers => {:a => 1}
+    assert_equal '1', conn.headers['A']
   end
 
-  describe "#build_url" do
-    it "uses Connection#host as default URI host" do
-      conn = Faraday::Connection.new
-      conn.host = 'sushi.com'
-      uri = conn.build_url("/sake.html")
-      assert_equal 'sushi.com', uri.host
-    end
+  def test_build_url_uses_connection_host_as_default_uri_host
+    conn = Faraday::Connection.new
+    conn.host = 'sushi.com'
+    uri = conn.build_url("/sake.html")
+    assert_equal 'sushi.com', uri.host
+  end
 
-    it "uses Connection#port as default URI port" do
-      conn = Faraday::Connection.new
-      conn.port = 23
-      uri = conn.build_url("http://sushi.com")
-      assert_equal 23, uri.port
-    end
+  def test_build_url_uses_connection_port_as_default_uri_port
+    conn = Faraday::Connection.new
+    conn.port = 23
+    uri = conn.build_url("http://sushi.com")
+    assert_equal 23, uri.port
+  end
 
-    it "uses Connection#scheme as default URI scheme" do
-      conn = Faraday::Connection.new 'http://sushi.com'
-      uri = conn.build_url("/sake.html")
-      assert_equal 'http', uri.scheme
-    end
+  def test_build_url_uses_connection_scheme_as_default_uri_scheme
+    conn = Faraday::Connection.new 'http://sushi.com'
+    uri = conn.build_url("/sake.html")
+    assert_equal 'http', uri.scheme
+  end
 
-    it "uses Connection#path_prefix to customize the path" do
-      conn = Faraday::Connection.new
-      conn.path_prefix = '/fish'
-      uri = conn.build_url("sake.html")
-      assert_equal '/fish/sake.html', uri.path
-    end
+  def test_build_url_uses_connection_path_prefix_to_customize_path
+    conn = Faraday::Connection.new
+    conn.path_prefix = '/fish'
+    uri = conn.build_url("sake.html")
+    assert_equal '/fish/sake.html', uri.path
+  end
 
-    it "uses '/' Connection#path_prefix to customize the path" do
-      conn = Faraday::Connection.new
-      conn.path_prefix = '/'
-      uri = conn.build_url("sake.html")
-      assert_equal '/sake.html', uri.path
-    end
+  def test_build_url_uses_root_connection_path_prefix_to_customize_path
+    conn = Faraday::Connection.new
+    conn.path_prefix = '/'
+    uri = conn.build_url("sake.html")
+    assert_equal '/sake.html', uri.path
+  end
 
-    it "forces Connection#path_prefix to be absolute" do
-      conn = Faraday::Connection.new
-      conn.path_prefix = 'fish'
-      uri = conn.build_url("sake.html")
-      assert_equal '/fish/sake.html', uri.path
-    end
+  def test_build_url_forces_connection_path_prefix_to_be_absolute
+    conn = Faraday::Connection.new
+    conn.path_prefix = 'fish'
+    uri = conn.build_url("sake.html")
+    assert_equal '/fish/sake.html', uri.path
+  end
 
-    it "ignores Connection#path_prefix trailing slash" do
-      conn = Faraday::Connection.new
-      conn.path_prefix = '/fish/'
-      uri = conn.build_url("sake.html")
-      assert_equal '/fish/sake.html', uri.path
-    end
+  def test_build_url_ignores_connection_path_prefix_trailing_slash
+    conn = Faraday::Connection.new
+    conn.path_prefix = '/fish/'
+    uri = conn.build_url("sake.html")
+    assert_equal '/fish/sake.html', uri.path
+  end
 
-    it "allows absolute URI to ignore Connection#path_prefix" do
-      conn = Faraday::Connection.new
-      conn.path_prefix = '/fish'
-      uri = conn.build_url("/sake.html")
-      assert_equal '/sake.html', uri.path
-    end
+  def test_build_url_allows_absolute_uri_to_ignore_connection_path_prefix
+    conn = Faraday::Connection.new
+    conn.path_prefix = '/fish'
+    uri = conn.build_url("/sake.html")
+    assert_equal '/sake.html', uri.path
+  end
 
-    it "parses url/params into #path" do
-      conn = Faraday::Connection.new
-      uri = conn.build_url("http://sushi.com/sake.html")
-      assert_equal '/sake.html', uri.path
-    end
+  def test_build_url_parses_url_params_into_path
+    conn = Faraday::Connection.new
+    uri = conn.build_url("http://sushi.com/sake.html")
+    assert_equal '/sake.html', uri.path
+  end
 
-    it "parses url/params into #query" do
-      conn = Faraday::Connection.new
-      uri = conn.build_url("http://sushi.com/sake.html", 'a[b]' => '1 + 2')
-      assert_equal "a%5Bb%5D=1%20%2B%202", uri.query
-    end
+  def test_build_url_parses_url_params_into_query
+    conn = Faraday::Connection.new
+    uri = conn.build_url("http://sushi.com/sake.html", 'a[b]' => '1 + 2')
+    assert_equal "a%5Bb%5D=1%20%2B%202", uri.query
+  end
 
-    it "mashes default params and given params together" do
-      conn = Faraday::Connection.new 'http://sushi.com/api?token=abc', :params => {'format' => 'json'}
-      url = conn.build_url("nigiri?page=1", :limit => 5)
-      assert_match /limit=5/,      url.query
-      assert_match /page=1/,       url.query
-      assert_match /format=json/,  url.query
-      assert_match /token=abc/,    url.query
-    end
+  def test_build_url_mashes_default_and_given_params_together
+    conn = Faraday::Connection.new 'http://sushi.com/api?token=abc', :params => {'format' => 'json'}
+    url = conn.build_url("nigiri?page=1", :limit => 5)
+    assert_match /limit=5/,      url.query
+    assert_match /page=1/,       url.query
+    assert_match /format=json/,  url.query
+    assert_match /token=abc/,    url.query
+  end
 
-    it "overrides default params with given params" do
-      conn = Faraday::Connection.new 'http://sushi.com/api?token=abc', :params => {'format' => 'json'}
-      url = conn.build_url("nigiri?page=1", :limit => 5, :token => 'def', :format => 'xml')
-      assert_match /limit=5/,        url.query
-      assert_match /page=1/,         url.query
-      assert_match /format=xml/,     url.query
-      assert_match /token=def/,      url.query
-      assert_no_match /format=json/, url.query
-      assert_no_match /token=abc/,   url.query
-    end
+  def test_build_url_overrides_default_params_with_given_params
+    conn = Faraday::Connection.new 'http://sushi.com/api?token=abc', :params => {'format' => 'json'}
+    url = conn.build_url("nigiri?page=1", :limit => 5, :token => 'def', :format => 'xml')
+    assert_match /limit=5/,        url.query
+    assert_match /page=1/,         url.query
+    assert_match /format=xml/,     url.query
+    assert_match /token=def/,      url.query
+    assert_no_match /format=json/, url.query
+    assert_no_match /token=abc/,   url.query
+  end
 
-    it "parses url into #host" do
-      conn = Faraday::Connection.new
-      uri = conn.build_url("http://sushi.com/sake.html")
-      assert_equal "sushi.com", uri.host
-    end
+  def test_build_url_parses_url_into_host
+    conn = Faraday::Connection.new
+    uri = conn.build_url("http://sushi.com/sake.html")
+    assert_equal "sushi.com", uri.host
+  end
 
-    it "parses url into #port" do
-      conn = Faraday::Connection.new
-      uri = conn.build_url("http://sushi.com/sake.html")
-      assert_nil uri.port
-    end
+  def test_build_url_parses_url_into_port
+    conn = Faraday::Connection.new
+    uri = conn.build_url("http://sushi.com/sake.html")
+    assert_nil uri.port
   end
 
-  describe "#params_to_query" do
-    it "converts hash of params to URI-escaped query string" do
-      conn = Faraday::Connection.new
-      class << conn
-        public :build_query
-      end
-      assert_equal "a%5Bb%5D=1%20%2B%202", conn.build_query('a[b]' => '1 + 2')
+  def test_params_to_query_converts_hash_of_params_to_uri_escaped_query_string
+    conn = Faraday::Connection.new
+    class << conn
+      public :build_query
     end
+    assert_equal "a%5Bb%5D=1%20%2B%202", conn.build_query('a[b]' => '1 + 2')
   end
 end

data/test/env_test.rb

@@ -1,35 +1,33 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class TestEnv < Faraday::TestCase
-  describe "Request#create" do
-    before :all do
-      @conn = Faraday::Connection.new :url => 'http://sushi.com/api', :headers => {'Mime-Version' => '1.0'}
-      @input = {
-        :body    => 'abc',
-        :headers => {'Server' => 'Faraday'}}
-      @env_setup = Faraday::Request.create do |req|
-        req.url 'foo.json', 'a' => 1
-        req['Server'] = 'Faraday'
-        req.body = @input[:body]
-      end
-      @env  = @env_setup.to_env_hash(@conn, :get)
+  def setup
+    @conn = Faraday::Connection.new :url => 'http://sushi.com/api', :headers => {'Mime-Version' => '1.0'}
+    @input = {
+      :body    => 'abc',
+      :headers => {'Server' => 'Faraday'}}
+    @env_setup = Faraday::Request.create do |req|
+      req.url 'foo.json', 'a' => 1
+      req['Server'] = 'Faraday'
+      req.body = @input[:body]
     end
+    @env  = @env_setup.to_env_hash(@conn, :get)
+  end
 
-    it "stores method in :method" do
-      assert_equal :get, @env[:method]
-    end
+  def test_request_create_stores_method
+    assert_equal :get, @env[:method]
+  end
 
-    it "stores Addressable::URI in :url" do
-      assert_equal 'http://sushi.com/api/foo.json?a=1', @env[:url].to_s
-    end
+  def test_request_create_stores_addressable_uri
+    assert_equal 'http://sushi.com/api/foo.json?a=1', @env[:url].to_s
+  end
 
-    it "stores headers in :headers" do
-      assert_kind_of Rack::Utils::HeaderHash, @env[:request_headers]
-      assert_equal @input[:headers].merge('Mime-Version' => '1.0'), @env[:request_headers]
-    end
+  def test_request_create_stores_headers
+    assert_kind_of Rack::Utils::HeaderHash, @env[:request_headers]
+    assert_equal @input[:headers].merge('Mime-Version' => '1.0'), @env[:request_headers]
+  end
 
-    it "stores body in :body" do
-      assert_equal @input[:body], @env[:body]
-    end
+  def test_request_create_stores_body
+    assert_equal @input[:body], @env[:body]
   end
 end

data/test/helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'context'
+require 'test/unit'
 if ENV['LEFTRIGHT']
   require 'leftright'
 end
@@ -21,5 +21,9 @@ module Faraday
       when nil     then nil
       else 'http://localhost:4567'
     end
+
+    def test_default
+      assert true
+    end
   end
 end

data/test/request_middleware_test.rb

@@ -1,18 +1,23 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class RequestMiddlewareTest < Faraday::TestCase
-  describe "encoding json" do
-    [:yajl, :rails_json].each do |key|
-      encoder = Faraday::Request.lookup_module(key)
-      next if !encoder.loaded?
-      it "uses #{encoder}" do
-        @connection = Faraday::Connection.new do |b|
-          b.use encoder
-          b.adapter :test do |stub|
-            stub.post('echo_body', '{"a":1}') { |env| [200, {'Content-Type' => 'text/html'}, env[:body]] }
-          end
-        end
-        assert_equal %({"a":1}), @connection.post('echo_body', :a => 1).body
+  [:yajl, :rails_json].each do |key|
+    encoder = Faraday::Request.lookup_module(key)
+    next if !encoder.loaded?
+
+    define_method "test_encodes_json_with_#{key}" do
+      raw_json = create_json_connection(encoder).post('echo_body', :a => 1).body
+      raw_json.gsub! /: 1/, ':1' # sometimes rails_json adds a space
+      assert_equal %({"a":1}), raw_json
+    end
+  end
+
+private
+  def create_json_connection(encoder)
+    Faraday::Connection.new do |b|
+      b.use encoder
+      b.adapter :test do |stub|
+        stub.post('echo_body') { |env| [200, {'Content-Type' => 'text/html'}, env[:body]] }
       end
     end
   end

data/test/response_middleware_test.rb

@@ -1,45 +1,37 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class ResponseMiddlewareTest < Faraday::TestCase
-  describe "parsing json" do
-    [:yajl, :rails_json].each do |key|
-      parser = Faraday::Response.lookup_module(key)
-      next if !parser.loaded?
-      it "uses #{parser} to parse json content" do
-        @connection = Faraday::Connection.new do |b|
-          b.adapter :test do |stub|
-            stub.get('json')  { [200, {'Content-Type' => 'text/html'}, "[1,2,3]"] }
-          end
-          b.use parser
-        end
-        response = @connection.get('json')
-        assert response.success?
-        assert_equal [1,2,3], response.body
-      end
+  [:yajl, :rails_json].each do |key|
+    encoder = Faraday::Response.lookup_module(key)
+    next if !encoder.loaded?
+    
+    define_method "test_uses_#{key}_to_parse_json_content" do
+      response = create_json_connection(encoder).get('json')
+      assert response.success?
+      assert_equal [1,2,3], response.body
+    end
 
-      it "uses #{parser} to skip blank content" do
-        @connection = Faraday::Connection.new do |b|
-          b.adapter :test do |stub|
-            stub.get('blank') { [200, {'Content-Type' => 'text/html'}, ''] }
-          end
-          b.use parser
-        end
-        response = @connection.get('blank')
-        assert response.success?
-        assert_equal nil, response.body
-      end
+    define_method "test_uses_#{key}_to_skip_blank_content" do
+      response = create_json_connection(encoder).get('blank')
+      assert response.success?
+      assert !response.body
+    end
+
+    define_method "test_uses_#{key}_to_skip_nil_content" do
+      response = create_json_connection(encoder).get('nil')
+      assert response.success?
+      assert !response.body
+    end
+  end
 
-      it "uses #{parser} to skip nil content" do
-        @connection = Faraday::Connection.new do |b|
-          b.adapter :test do |stub|
-            stub.get('nil') { [200, {'Content-Type' => 'text/html'}, nil] }
-          end
-          b.use parser
-        end
-        response = @connection.get('nil')
-        assert response.success?
-        assert_equal nil, response.body
+  def create_json_connection(encoder)
+    Faraday::Connection.new do |b|
+      b.adapter :test do |stub|
+        stub.get('json')  { [200, {'Content-Type' => 'text/html'}, "[1,2,3]"] }
+        stub.get('blank') { [200, {'Content-Type' => 'text/html'}, ''] }
+        stub.get('nil')   { [200, {'Content-Type' => 'text/html'}, nil] }
       end
+      b.use encoder
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: faraday
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - rick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 -08:00
+date: 2010-02-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency