faraday 0.4.6 → 0.5.0

data/test/adapters/test_middleware_test.rb

@@ -22,5 +22,16 @@ module Adapters
     def test_middleware_with_simple_path_sets_body
       assert_equal 'hello', @resp.body
     end
+
+    def test_middleware_can_be_called_several_times
+      assert_equal 'hello', @conn.get("/hello").body
+    end
+
+    def test_middleware_allow_different_outcomes_for_the_same_request
+      @stubs.get('/hello') { [200, {'Content-Type' => 'text/html'}, 'hello'] }
+      @stubs.get('/hello') { [200, {'Content-Type' => 'text/html'}, 'world'] }
+      assert_equal 'hello', @conn.get("/hello").body
+      assert_equal 'world', @conn.get("/hello").body
+    end
   end
 end

data/test/connection_test.rb

@@ -58,6 +58,11 @@ class TestConnection < Faraday::TestCase
     assert_equal 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==', conn.headers['Authorization']
   end
 
+  def test_auto_parses_basic_auth_from_url
+    conn = Faraday::Connection.new :url => "http://aladdin:opensesame@sushi.com/fish"
+    assert_equal 'Basic YWxhZGRpbjpvcGVuc2VzYW1l', conn.headers['Authorization']
+  end
+
   def test_token_auth_sets_authorization_header
     conn = Faraday::Connection.new
     conn.token_auth 'abcdef'
@@ -174,12 +179,6 @@ class TestConnection < Faraday::TestCase
     assert_equal 'https://sushi.com/sushi/sake.html', uri.to_s
   end
 
-  def test_proxy_accepts_string
-    conn = Faraday::Connection.new
-    conn.proxy 'http://proxy.com'
-    assert_equal 'proxy.com', conn.proxy.host
-  end
-
   def test_proxy_accepts_string
     conn = Faraday::Connection.new
     conn.proxy 'http://proxy.com'
@@ -276,4 +275,4 @@ class TestConnection < Faraday::TestCase
     mware = conn.builder.handlers[1].call({})
     assert_kind_of Faraday::Adapter::NetHttp, mware
   end
-end
+end

data/test/env_test.rb

@@ -34,7 +34,7 @@ class TestEnv < Faraday::TestCase
     assert_equal @input[:body], @env[:body]
   end
 
-  def test_request_create_stores_ssl_options
+  def test_request_create_stores_timeout_options
     assert_equal 3, @env[:request][:timeout]
     assert_equal 5, @env[:request][:open_timeout]
   end
@@ -53,4 +53,4 @@ class TestEnv < Faraday::TestCase
     end
     env_setup.to_env_hash(connection, :get)
   end
-end
+end

data/test/form_post_test.rb

@@ -0,0 +1,42 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class FormPostTest < Faraday::TestCase
+  def setup
+    @app = Faraday::Adapter.new nil
+    @env = {:request_headers => {}}
+  end
+
+  def test_processes_nested_body
+    @env[:body] = {:a => 1, :b => {:c => 2}}
+    @app.process_body_for_request @env
+    assert_match /^|\&a=1/,      @env[:body]
+    assert_match /^|\&b\[c\]=2/, @env[:body]
+    assert_equal Faraday::Adapter::FORM_TYPE, @env[:request_headers]['Content-Type']
+  end
+
+  def test_processes_with_custom_type
+    @env[:body] = {:a => 1}
+    @env[:request_headers]['Content-Type'] = 'test/type'
+    @app.process_body_for_request @env
+    assert_equal 'a=1', @env[:body]
+    assert_equal 'test/type', @env[:request_headers]['Content-Type']
+  end
+
+  def test_processes_nil_body
+    @env[:body] = nil
+    @app.process_body_for_request @env
+    assert_nil @env[:body]
+  end
+
+  def test_processes_empty_body
+    @env[:body] = ''
+    @app.process_body_for_request @env
+    assert_equal '', @env[:body]
+  end
+
+  def test_processes_string_body
+    @env[:body] = 'abc'
+    @app.process_body_for_request @env
+    assert_equal 'abc', @env[:body]
+  end
+end

data/test/helper.rb

@@ -1,10 +1,14 @@
 require 'rubygems'
 gem 'rack',        '>= 1.0.1'
-gem 'addressable', '2.1.1'
+gem 'addressable', '>= 2.1.1'
 
 require 'test/unit'
 if ENV['LEFTRIGHT']
-  require 'leftright'
+  begin
+    require 'leftright'
+  rescue LoadError
+    puts "Run `gem install leftright` to install leftright."
+  end
 end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/live_server.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'sinatra'
 
 get '/hello_world' do
@@ -9,6 +8,12 @@ get '/json' do
   "[1,2,3]"
 end
 
+post '/file' do
+  "file %s %s" % [
+    params[:uploaded_file][:filename],
+    params[:uploaded_file][:type]]
+end
+
 post '/hello' do
   "hello #{params[:name]}"
 end

data/test/multipart_test.rb

@@ -0,0 +1,48 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+Faraday::CompositeReadIO.send :attr_reader, :ios
+
+class MultipartTest < Faraday::TestCase
+  def setup
+    @app = Faraday::Adapter.new nil
+    @env = {:request_headers => {}}
+  end
+
+  def test_processes_nested_body
+    # assume params are out of order
+    regexes = [
+      /name\=\"a\"/,
+      /name=\"b\[c\]\"\; filename\=\"multipart_test\.rb\"/,
+      /name=\"b\[d\]\"/]
+    @env[:body] = {:a => 1, :b => {:c => Faraday::UploadIO.new(__FILE__, 'text/x-ruby'), :d => 2}}
+    @app.process_body_for_request @env
+    @env[:body].send(:ios).map(&:read).each do |io|
+      if re = regexes.detect { |r| io =~ r }
+        regexes.delete re
+      end
+    end
+    assert_equal [], regexes
+    assert_kind_of CompositeReadIO, @env[:body]
+    assert_equal "%s;boundary=%s" %
+      [Faraday::Adapter::MULTIPART_TYPE, Faraday::Adapter::DEFAULT_BOUNDARY],
+      @env[:request_headers]['Content-Type']
+  end
+
+  def test_processes_nil_body
+    @env[:body] = nil
+    @app.process_body_for_request @env
+    assert_nil @env[:body]
+  end
+
+  def test_processes_empty_body
+    @env[:body] = ''
+    @app.process_body_for_request @env
+    assert_equal '', @env[:body]
+  end
+
+  def test_processes_string_body
+    @env[:body] = 'abc'
+    @app.process_body_for_request @env
+    assert_equal 'abc', @env[:body]
+  end
+end

data/test/request_middleware_test.rb

@@ -6,9 +6,11 @@ class RequestMiddlewareTest < Faraday::TestCase
     next if !encoder.loaded?
 
     define_method "test_encodes_json_with_#{key}" do
-      raw_json = create_json_connection(encoder).post('echo_body', :a => 1).body
+      resp = create_json_connection(encoder).post('echo_body', :a => 1)
+      raw_json = resp.body
       raw_json.gsub! /: 1/, ':1' # sometimes rails_json adds a space
       assert_equal %({"a":1}), raw_json
+      assert_match /json/, resp.headers['Content-Type']
     end
   end
 
@@ -17,7 +19,12 @@ private
     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]] }
+        stub.post('echo_body') do |env|
+          [200,
+            {'Content-Type' => env[:request_headers]['Content-Type']},
+            env[:body]
+          ]
+        end
       end
     end
   end

data/test/response_middleware_test.rb

@@ -4,7 +4,7 @@ class ResponseMiddlewareTest < Faraday::TestCase
   [: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?
@@ -22,6 +22,12 @@ class ResponseMiddlewareTest < Faraday::TestCase
       assert response.success?
       assert !response.body
     end
+
+    define_method "test_use_#{key}_to_raise_Faraday_Error_Parsing_with_no_json_content" do
+      assert_raises Faraday::Error::ParsingError do
+        response = create_json_connection(encoder).get('bad_json')
+      end
+    end
   end
 
   def create_json_connection(encoder)
@@ -30,6 +36,7 @@ class ResponseMiddlewareTest < Faraday::TestCase
         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] }
+        stub.get("bad_json") {[200, {'Content-Type' => 'text/html'}, '<body></body>']}
       end
       b.use encoder
     end

metadata

@@ -4,39 +4,53 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 6
-  version: 0.4.6
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
-- rick
+- Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-28 00:00:00 -07:00
+date: 2010-10-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 0
-        - 1
-        version: 1.0.1
-  type: :runtime
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: addressable
+  name: sinatra
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: addressable
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 2
@@ -44,25 +58,53 @@ dependencies:
         - 1
         version: 2.1.1
   type: :runtime
-  version_requirements: *id002
-description: HTTP/REST API client library with pluggable components
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: multipart-post
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 1
+        version: 1.2.1
+  type: :runtime
+  version_requirements: *id005
+description: HTTP/REST API client library.
 email: technoweenie@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .document
-- .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
-- VERSION
 - faraday.gemspec
 - lib/faraday.rb
+- lib/faraday/adapter.rb
+- lib/faraday/adapter/action_dispatch.rb
 - lib/faraday/adapter/net_http.rb
 - lib/faraday/adapter/patron.rb
 - lib/faraday/adapter/test.rb
@@ -77,14 +119,18 @@ files:
 - lib/faraday/response.rb
 - lib/faraday/response/active_support_json.rb
 - lib/faraday/response/yajl.rb
+- lib/faraday/upload_io.rb
+- lib/faraday/utils.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/form_post_test.rb
 - test/helper.rb
 - test/live_server.rb
+- test/multipart_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb
 has_rdoc: true
@@ -92,8 +138,8 @@ homepage: http://github.com/technoweenie/faraday
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -112,11 +158,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: faraday
 rubygems_version: 1.3.6
 signing_key: 
-specification_version: 3
-summary: HTTP/REST API client library
+specification_version: 2
+summary: HTTP/REST API client library.
 test_files: 
 - test/adapters/live_test.rb
 - test/adapters/test_middleware_test.rb
@@ -124,7 +170,7 @@ test_files:
 - test/connection_app_test.rb
 - test/connection_test.rb
 - test/env_test.rb
-- test/helper.rb
-- test/live_server.rb
+- test/form_post_test.rb
+- test/multipart_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC