faraday 0.1.2 → 0.2.0

data/test/adapters/test_middleware_test.rb

@@ -0,0 +1,28 @@
+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')
+      end
+
+      it "sets status" do
+        assert_equal 200, @resp.status
+      end
+
+      it "sets headers" do
+        assert_equal 'text/html', @resp.headers['Content-Type']
+      end
+
+      it "sets body" do
+        assert_equal 'hello', @resp.body
+      end
+    end
+  end
+end

data/test/adapters/typhoeus_test.rb

@@ -0,0 +1,28 @@
+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
+      end
+    end
+  end
+end

data/test/connection_app_test.rb

@@ -0,0 +1,49 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class TestConnectionApps < Faraday::TestCase
+  class TestAdapter
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      [200, {}, env[:test]]
+    end
+  end
+
+  class TestMiddleWare
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      env[:test] = 'hi'
+      @app.call(env)
+    end
+  end
+
+  before do
+    @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
+
+    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
+  end
+
+  describe "#to_app" do
+    it "returns rack-compatible object" do
+      assert @conn.to_app.respond_to?(:call)
+    end
+  end
+end

data/test/connection_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
-class ConnectionTest < Faraday::TestCase
+class TestConnection < Faraday::TestCase
   describe "#initialize" do
     it "parses @host out of given url" do
       conn = Faraday::Connection.new "http://sushi.com"
@@ -39,92 +39,118 @@ class ConnectionTest < Faraday::TestCase
 
     it "stores default params from options" do
       conn = Faraday::Connection.new :params => {:a => 1}
-      assert_equal 1, conn.params[:a]
+      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
 
     it "stores default headers from options" do
       conn = Faraday::Connection.new :headers => {:a => 1}
-      assert_equal 1, conn.headers[:a]
+      assert_equal '1', conn.headers['A']
     end
   end
 
-  describe "#build_uri" do
+  describe "#build_url" do
     it "uses Connection#host as default URI host" do
       conn = Faraday::Connection.new
       conn.host = 'sushi.com'
-      uri = conn.build_uri("/sake.html")
+      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_uri("http://sushi.com")
+      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_uri("/sake.html")
+      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_uri("sake.html")
+      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_uri("sake.html")
+      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_uri("sake.html")
+      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_uri("sake.html")
+      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_uri("/sake.html")
+      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_uri("http://sushi.com/sake.html")
+      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_uri("http://sushi.com/sake.html", 'a[b]' => '1 + 2')
+      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
+
+    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
+
     it "parses url into #host" do
       conn = Faraday::Connection.new
-      uri = conn.build_uri("http://sushi.com/sake.html")
+      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_uri("http://sushi.com/sake.html")
+      uri = conn.build_url("http://sushi.com/sake.html")
       assert_nil uri.port
     end
   end
@@ -132,7 +158,10 @@ class ConnectionTest < Faraday::TestCase
   describe "#params_to_query" do
     it "converts hash of params to URI-escaped query string" do
       conn = Faraday::Connection.new
-      assert_equal "a%5Bb%5D=1%20%2B%202", conn.params_to_query('a[b]' => '1 + 2')
+      class << conn
+        public :build_query
+      end
+      assert_equal "a%5Bb%5D=1%20%2B%202", conn.build_query('a[b]' => '1 + 2')
     end
   end
-end
+end

data/test/env_test.rb

@@ -0,0 +1,35 @@
+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'
+      @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
+
+    it "stores Addressable::URI in :url" do
+      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], @env[:request_headers]
+    end
+
+    it "stores body in :body" do
+      assert_equal @input[:body], @env[:body]
+    end
+  end
+end

data/test/helper.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'context'
-require 'ruby-debug'
 if ENV['LEFTRIGHT']
   require 'leftright'
 end
@@ -17,6 +16,10 @@ end
 
 module Faraday
   class TestCase < Test::Unit::TestCase
-    LIVE_SERVER = 'http://localhost:4567'
+    LIVE_SERVER = case ENV['LIVE']
+      when /^http/ then ENV['LIVE']
+      when nil     then nil
+      else 'http://localhost:4567'
+    end
   end
 end

data/test/live_server.rb

@@ -17,16 +17,12 @@ get '/hello' do
   "hello #{params[:name]}"
 end
 
-put '/hello' do
-  "hello #{params[:name]}"
-end
-
 post '/echo_name' do
-  %/{"name":#{params[:name].inspect}}/
+  params[:name].inspect
 end
 
 put '/echo_name' do
-  %/{"name":#{params[:name].inspect}}/
+  params[:name].inspect
 end
 
 delete '/delete_with_json' do
@@ -36,12 +32,3 @@ end
 delete '/delete_with_params' do
   params[:deleted]
 end
-
-get '/params' do
-  %(params[:a] == #{params[:a]})
-end
-
-get "/headers" do
-  %(env[HTTP_X_TEST] == #{env["HTTP_X_TEST"]})
-end
-

data/test/request_middleware_test.rb

@@ -0,0 +1,19 @@
+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
+      end
+    end
+  end
+end

data/test/response_middleware_test.rb

@@ -0,0 +1,21 @@
+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}" 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
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: faraday
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - rick
@@ -9,10 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 -08:00
+date: 2010-01-12 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: addressable
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: HTTP/REST API client library with pluggable components
 email: technoweenie@gmail.com
 executables: []
@@ -31,23 +50,30 @@ files:
 - VERSION
 - faraday.gemspec
 - lib/faraday.rb
-- lib/faraday/adapter/mock_request.rb
 - lib/faraday/adapter/net_http.rb
+- lib/faraday/adapter/patron.rb
+- lib/faraday/adapter/test.rb
 - lib/faraday/adapter/typhoeus.rb
+- lib/faraday/builder.rb
 - lib/faraday/connection.rb
 - lib/faraday/error.rb
-- lib/faraday/loadable.rb
-- lib/faraday/request/post_request.rb
-- lib/faraday/request/yajl_request.rb
+- lib/faraday/middleware.rb
+- lib/faraday/request.rb
+- lib/faraday/request/active_support_json.rb
+- lib/faraday/request/yajl.rb
 - lib/faraday/response.rb
-- lib/faraday/response/yajl_response.rb
-- lib/faraday/test_connection.rb
-- test/adapter/typhoeus_test.rb
-- test/adapter_test.rb
+- lib/faraday/response/active_support_json.rb
+- lib/faraday/response/yajl.rb
+- test/adapters/live_test.rb
+- test/adapters/test_middleware_test.rb
+- test/adapters/typhoeus_test.rb
+- test/connection_app_test.rb
 - test/connection_test.rb
+- test/env_test.rb
 - test/helper.rb
 - test/live_server.rb
-- test/response_test.rb
+- test/request_middleware_test.rb
+- test/response_middleware_test.rb
 has_rdoc: true
 homepage: http://github.com/technoweenie/faraday
 licenses: []
@@ -77,9 +103,13 @@ signing_key:
 specification_version: 3
 summary: HTTP/REST API client library
 test_files: 
-- test/adapter/typhoeus_test.rb
-- test/adapter_test.rb
+- test/adapters/live_test.rb
+- test/adapters/test_middleware_test.rb
+- test/adapters/typhoeus_test.rb
+- test/connection_app_test.rb
 - test/connection_test.rb
+- test/env_test.rb
 - test/helper.rb
 - test/live_server.rb
-- test/response_test.rb
+- test/request_middleware_test.rb
+- test/response_middleware_test.rb