faraday 0.8.4 → 0.8.5

data/Gemfile

@@ -7,7 +7,7 @@ end
 group :test do
   gem 'em-http-request', '~> 1.0', :require => 'em-http'
   gem 'em-synchrony', '~> 1.0', :require => ['em-synchrony', 'em-synchrony/em-http'], :platforms => :ruby_19
-  gem 'excon', '>= 0.14.1'
+  gem 'excon', '>= 0.16.1'
   gem 'net-http-persistent', '~> 2.5', :require => false
   gem 'leftright', '~> 0.9', :require => false
   gem 'rack-test', '~> 0.6', :require => 'rack/test'

data/Rakefile

@@ -1,4 +1,6 @@
 require 'date'
+require 'fileutils'
+require 'openssl'
 require 'rake/testtask'
 
 task :default => :test
@@ -26,6 +28,23 @@ def replace_header(head, header_name)
   head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
 end
 
+# Adapted from WEBrick::Utils. Skips cert extensions so it
+# can be used as a CA bundle
+def create_self_signed_cert(bits, cn, comment)
+  rsa = OpenSSL::PKey::RSA.new(bits)
+  cert = OpenSSL::X509::Certificate.new
+  cert.version = 2
+  cert.serial = 1
+  name = OpenSSL::X509::Name.new(cn)
+  cert.subject = name
+  cert.issuer = name
+  cert.not_before = Time.now
+  cert.not_after = Time.now + (365*24*60*60)
+  cert.public_key = rsa.public_key
+  cert.sign(rsa, OpenSSL::Digest::SHA1.new)
+  return [cert, rsa]
+end
+
 ## standard tasks
 
 desc "Run all tests"
@@ -33,6 +52,17 @@ task :test do
   exec 'script/test'
 end
 
+desc "Generate certificates for SSL tests"
+task :'test:generate_certs' do
+  cert, key = create_self_signed_cert(1024, [['CN', 'localhost']], 'Faraday Test CA')
+  FileUtils.mkdir_p 'tmp'
+  File.open('tmp/faraday-cert.key', 'w') {|f| f.puts(key) }
+  File.open('tmp/faraday-cert.crt', 'w') {|f| f.puts(cert.to_s) }
+end
+
+file 'tmp/faraday-cert.key' => :'test:generate_certs'
+file 'tmp/faraday-cert.crt' => :'test:generate_certs'
+
 desc "Open an irb session preloaded with this library"
 task :console do
   sh "irb -rubygems -r ./lib/#{name}.rb"
@@ -51,7 +81,7 @@ end
 
 desc "Build #{gem_file} into the pkg directory"
 task :build => :gemspec do
-  sh "mkdir -p pkg"
+  FileUtils.mkdir_p 'pkg'
   sh "gem build #{gemspec_file}"
   sh "mv #{gem_file} pkg"
 end

data/lib/faraday.rb

@@ -1,5 +1,5 @@
 module Faraday
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 
   class << self
     attr_accessor :root_path, :lib_path

data/lib/faraday/adapter/em_synchrony.rb

@@ -71,7 +71,9 @@ require 'faraday/adapter/em_synchrony/parallel_manager'
 
 # add missing patch(), options() methods
 EventMachine::HTTPMethods.module_eval do
-  ([:patch, :options] - instance_methods).each do |type|
+  [:patch, :options].each do |type|
+    next if method_defined? :"a#{type}"
+    alias_method :"a#{type}", type if method_defined? type
     module_eval %[
       def #{type}(options = {}, &blk)
         f = Fiber.current

data/lib/faraday/adapter/excon.rb

@@ -11,6 +11,10 @@ module Faraday
           opts[:ssl_verify_peer] = !!ssl.fetch(:verify, true)
           opts[:ssl_ca_path] = ssl[:ca_path] if ssl[:ca_path]
           opts[:ssl_ca_file] = ssl[:ca_file] if ssl[:ca_file]
+
+          # https://github.com/geemus/excon/issues/106
+          # https://github.com/jruby/jruby-ossl/issues/19
+          opts[:nonblock] = false
         end
 
         if ( req = env[:request] )

data/lib/faraday/adapter/net_http.rb

@@ -13,6 +13,7 @@ module Faraday
         EOFError,
         Errno::ECONNABORTED,
         Errno::ECONNREFUSED,
+        Errno::ENETUNREACH,
         Errno::ECONNRESET,
         Errno::EINVAL,
         Net::HTTPBadResponse,

data/lib/faraday/adapter/patron.rb

@@ -53,6 +53,7 @@ module Faraday
 
       def create_session
         session = ::Patron::Session.new
+        session.insecure = true
         @block.call(session) if @block
         session
       end

data/lib/faraday/adapter/rack.rb

@@ -31,7 +31,8 @@ module Faraday
         super
         rack_env = {
           :method => env[:method],
-          :input  => env[:body].respond_to?(:read) ? env[:body].read : env[:body]
+          :input  => env[:body].respond_to?(:read) ? env[:body].read : env[:body],
+          'rack.url_scheme' => env[:url].scheme
         }
 
         env[:request_headers].each do |name, value|

data/lib/faraday/connection.rb

@@ -13,11 +13,22 @@ module Faraday
     attr_reader :params, :headers, :url_prefix, :builder, :options, :ssl, :parallel_manager
     attr_writer :default_parallel_manager
 
-    # :url
-    # :params
-    # :headers
-    # :request
-    # :ssl
+    # Public: Initializes a new Faraday::Connection.
+    #
+    # url     - URI or String base URL to use as a prefix for all
+    #           requests (optional).
+    # options - Hash of settings that will be applied to every request made
+    #           from this Connection (default: {}).
+    #           :url     - URI or String base URL (default: "http:/").
+    #           :params  - Hash of URI query unencoded key/value pairs.
+    #           :headers - Hash of unencoded HTTP header key/value pairs.
+    #           :request - Hash of request options.
+    #           :ssl     - Hash of SSL options.
+    #           :proxy   - URI, String or Hash of HTTP proxy options
+    #                     (default: "http_proxy" environment variable).
+    #                     :uri      - URI or String
+    #                     :user     - String (optional)
+    #                     :password - String (optional)
     def initialize(url = nil, options = {})
       if url.is_a?(Hash)
         options = url
@@ -154,11 +165,19 @@ module Faraday
       return @proxy if arg.nil?
 
       @proxy = if arg.is_a? Hash
-        uri = arg.fetch(:uri) { raise ArgumentError, "no :uri option" }
-        arg.merge :uri => self.class.URI(uri)
+        uri = self.class.URI arg.fetch(:uri) { raise ArgumentError, "missing :uri" }
+        arg.merge :uri => uri
       else
-        {:uri => self.class.URI(arg)}
+        uri = self.class.URI(arg)
+        {:uri => uri}
+      end
+
+      with_uri_credentials(uri) do |user, password|
+        @proxy[:user]     ||= user
+        @proxy[:password] ||= password
       end
+
+      @proxy
     end
 
     # normalize URI() behavior across Ruby versions
@@ -193,8 +212,8 @@ module Faraday
       params.merge_query(uri.query)
       uri.query = nil
 
-      if uri.user && uri.password
-        basic_auth(CGI.unescape(uri.user), CGI.unescape(uri.password))
+      with_uri_credentials(uri) do |user, password|
+        basic_auth user, password
         uri.user = uri.password = nil
       end
 
@@ -282,5 +301,12 @@ module Faraday
     def dup
       self.class.new(build_url(''), :headers => headers.dup, :params => params.dup, :builder => builder.dup, :ssl => ssl.dup)
     end
+
+    # Internal: Yields username and password extracted from a URI if they both exist.
+    def with_uri_credentials(uri)
+      if uri.user and uri.password
+        yield Utils.unescape(uri.user), Utils.unescape(uri.password)
+      end
+    end
   end
 end

data/lib/faraday/utils.rb

@@ -126,7 +126,7 @@ module Faraday
 
       def merge_query(query)
         if query && !query.empty?
-          update Utils.parse_query(query)
+          update Utils.parse_nested_query(query)
         end
         self
       end
@@ -170,7 +170,13 @@ module Faraday
       end
     end
 
-    def escape(s) CGI.escape s.to_s end
+    ESCAPE_RE = /[^\w .~-]+/
+
+    def escape(s)
+      s.to_s.gsub(ESCAPE_RE) {
+        '%' + $&.unpack('H2' * $&.bytesize).join('%').upcase
+      }.tr(' ', '+')
+    end
 
     def unescape(s) CGI.unescape s.to_s end
 

data/script/test

@@ -10,6 +10,7 @@
 #   $ script/test
 #   $ script/test test/env_test.rb
 #   $ script/test excon typhoeus
+#   $ SSL=yes script/test net_http -- -n /ssl/
 
 require 'rubygems'
 require 'bundler'
@@ -24,10 +25,19 @@ end
 
 $VERBOSE = true
 
-host      = '127.0.0.1'
+host      = 'localhost'
 logfile   = 'log/test.log'
 test_glob = 'test/**/*_test.rb'
 
+if ssl_mode = ENV['SSL'] == 'yes'
+  unless ENV['SSL_KEY'] and ENV['SSL_FILE']
+    key_file  = ENV['SSL_KEY']  = 'tmp/faraday-cert.key'
+    cert_file = ENV['SSL_FILE'] = 'tmp/faraday-cert.crt'
+    system 'rake', key_file, cert_file
+    abort unless $?.success?
+  end
+end
+
 require 'fileutils'
 FileUtils.mkdir_p 'log'
 
@@ -42,6 +52,8 @@ end
 
 server = nil
 
+Thread.abort_on_exception = true
+
 # start test server in a separate thread
 thread = Thread.new do
   old_verbose, $VERBOSE = $VERBOSE, nil
@@ -57,6 +69,14 @@ thread = Thread.new do
     :Port => port, :Logger => WEBrick::Log::new(log_io),
     :AccessLog => [[log_io, "[%{X-Faraday-Adapter}i] %m  %U  ->  %s %b"]]
   }
+  if ssl_mode
+    require 'webrick/https'
+    webrick_opts.update \
+      :SSLEnable       => true,
+      :SSLPrivateKey   => OpenSSL::PKey::RSA.new(File.read(key_file)),
+      :SSLCertificate  => OpenSSL::X509::Certificate.new(File.read(cert_file)),
+      :SSLVerifyClient => OpenSSL::SSL::VERIFY_NONE
+  end
   Rack::Handler::WEBrick.run(Faraday::LiveServer, webrick_opts) {|serv| server = serv }
 end
 
@@ -76,28 +96,36 @@ if ARGV.any?
   test_files.concat extra_args
 end
 
-require 'net/http'
+require 'net/https'
 conn = Net::HTTP.new host, port
-conn.open_timeout = conn.read_timeout = 0.05
+conn.open_timeout = conn.read_timeout = 0.1
+conn.use_ssl      = ssl_mode
+conn.verify_mode  = OpenSSL::SSL::VERIFY_NONE
 
 # test if test server is accepting requests
 responsive = lambda { |path|
   begin
     res = conn.start { conn.get(path) }
     res.is_a?(Net::HTTPSuccess)
-  rescue Errno::ECONNREFUSED, Errno::EBADF, Timeout::Error
+  rescue Errno::ECONNREFUSED, Errno::EBADF, Timeout::Error, Net::HTTPBadResponse
     false
   end
 }
 
-require 'timeout'
-Timeout.timeout 40 do
+server_pings = 0
+begin
   # block until test server is ready
-  thread.join 0.05 until responsive.call('/echo')
-end
+  thread.join 0.05
+  server_pings += 1
+  abort "test server didn't manage to start" if server_pings >= 50
+end until responsive.call('/echo')
 
-ENV['LIVE'] = "http://#{host}:#{port}"
-system 'ruby', '-Ilib:test', '-S', 'testrb', *test_files
+ENV['LIVE'] = "http#{ssl_mode ? 's' : ''}://#{host}:#{port}"
+ok = system 'ruby', '-Ilib:test',
+  '-e', 'load(ARGV.shift) while ARGV.first =~ /^[^-]/',
+  *test_files
 
 server.respond_to?(:stop!) ? server.stop! : server.stop
 thread.join
+
+exit 1 unless ok

data/test/adapters/em_http_test.rb

@@ -8,7 +8,8 @@ module Adapters
     Integration.apply(self, :Parallel) do
       # https://github.com/eventmachine/eventmachine/pull/289
       undef :test_timeout
-    end
+    end unless jruby? and ssl_mode?
+    # https://github.com/eventmachine/eventmachine/issues/180
 
   end
 end

data/test/adapters/em_synchrony_test.rb

@@ -8,7 +8,7 @@ module Adapters
     Integration.apply(self, :Parallel) do
       # https://github.com/eventmachine/eventmachine/pull/289
       undef :test_timeout
-    end
+    end unless RUBY_VERSION < '1.9' or jruby?
 
-  end unless RUBY_VERSION < '1.9' or (defined? RUBY_ENGINE and 'jruby' == RUBY_ENGINE)
+  end
 end

data/test/adapters/excon_test.rb

@@ -5,6 +5,9 @@ module Adapters
 
     def adapter() :excon end
 
-    Integration.apply(self, :NonParallel)
+    Integration.apply(self, :NonParallel) do
+      # https://github.com/geemus/excon/issues/126 ?
+      undef :test_timeout if ssl_mode?
+    end
   end
 end

data/test/adapters/integration.rb

@@ -7,9 +7,11 @@ module Adapters
   # `#adapter` required. returns a symbol for the adapter middleware name
   # `#adapter_options` optional. extra arguments for building an adapter
   module Integration
-    def self.apply(base, *extras)
+    def self.apply(base, *extra_features)
       if base.live_server?
-        ([:Common] + extras).each {|name| base.send(:include, self.const_get(name)) }
+        features = [:Common]
+        features.concat extra_features
+        features.each {|name| base.send(:include, self.const_get(name)) }
         yield if block_given?
       elsif !defined? @warned
         warn "Warning: Not running integration tests against a live server."
@@ -93,6 +95,11 @@ module Adapters
         assert_equal 'Agent Faraday', response.body
       end
 
+      def test_GET_ssl
+        expected = self.class.ssl_mode?.to_s
+        assert_equal expected, get('ssl').body
+      end
+
       def test_POST_send_url_encoded_params
         assert_equal %(post {"name"=>"zack"}), post('echo', :name => 'zack').body
       end
@@ -180,7 +187,10 @@ module Adapters
         end
 
         server = self.class.live_server
-        url = 'http://%s:%d' % [server.host, server.port]
+        url = '%s://%s:%d' % [server.scheme, server.host, server.port]
+
+        options[:ssl] ||= {}
+        options[:ssl][:ca_file] ||= ENV['SSL_FILE']
 
         Faraday::Connection.new(url, options, &builder_block).tap do |conn|
           conn.headers['X-Faraday-Adapter'] = adapter.to_s

data/test/adapters/net_http_test.rb

@@ -10,11 +10,5 @@ module Adapters
 
     Integration.apply(self, *behaviors)
 
-    def test_configure_ssl
-      http = Net::HTTP.new 'disney.com', 443
-      # this should not raise an error
-      Faraday::Adapter::NetHttp.new.configure_ssl(http, :ssl => {:verify => true})
-    end
-
   end
 end

data/test/adapters/patron_test.rb

@@ -11,7 +11,7 @@ module Adapters
 
       # https://github.com/toland/patron/issues/52
       undef :test_GET_with_body
-    end
+    end unless jruby?
 
-  end unless defined? RUBY_ENGINE and 'jruby' == RUBY_ENGINE
+  end
 end

data/test/adapters/typhoeus_test.rb

@@ -8,7 +8,7 @@ module Adapters
     Integration.apply(self, :Parallel) do
       # https://github.com/dbalatero/typhoeus/issues/75
       undef :test_GET_with_body
-    end
+    end unless jruby?
 
-  end unless defined? RUBY_ENGINE and 'jruby' == RUBY_ENGINE
+  end
 end

data/test/connection_test.rb

@@ -3,13 +3,17 @@ require 'uri'
 
 class TestConnection < Faraday::TestCase
 
-  def with_proxy_env(proxy)
-    old_proxy = ENV['http_proxy']
-    ENV['http_proxy'] = proxy
+  def with_env(key, proxy)
+    old_value = ENV.fetch(key, false)
+    ENV[key] = proxy
     begin
       yield
     ensure
-      ENV['http_proxy'] = old_proxy
+      if old_value == false
+        ENV.delete key
+      else
+        ENV[key] = old_value
+      end
     end
   end
 
@@ -175,6 +179,12 @@ class TestConnection < Faraday::TestCase
     assert_equal "a%5Bb%5D=1+%2B+2", uri.query
   end
 
+  def test_build_url_escapes_per_spec
+    conn = Faraday::Connection.new
+    uri = conn.build_url('http:/', 'a' => '1+2 foo~bar.-baz')
+    assert_equal "a=1%2B2+foo~bar.-baz", uri.query
+  end
+
   def test_build_url_bracketizes_nested_params_in_query
     conn = Faraday::Connection.new
     uri = conn.build_url("http://sushi.com/sake.html", 'a' => {'b' => 'c'})
@@ -203,7 +213,7 @@ class TestConnection < Faraday::TestCase
   end
 
   def test_proxy_accepts_string
-    with_proxy_env "http://duncan.proxy.com:80" do
+    with_env 'http_proxy', "http://duncan.proxy.com:80" do
       conn = Faraday::Connection.new
       conn.proxy 'http://proxy.com'
       assert_equal 'proxy.com', conn.proxy[:uri].host
@@ -212,7 +222,7 @@ class TestConnection < Faraday::TestCase
   end
 
   def test_proxy_accepts_uri
-    with_proxy_env "http://duncan.proxy.com:80" do
+    with_env 'http_proxy', "http://duncan.proxy.com:80" do
       conn = Faraday::Connection.new
       conn.proxy URI.parse('http://proxy.com')
       assert_equal 'proxy.com', conn.proxy[:uri].host
@@ -221,7 +231,7 @@ class TestConnection < Faraday::TestCase
   end
 
   def test_proxy_accepts_hash_with_string_uri
-    with_proxy_env "http://duncan.proxy.com:80" do
+    with_env 'http_proxy', "http://duncan.proxy.com:80" do
       conn = Faraday::Connection.new
       conn.proxy :uri => 'http://proxy.com', :user => 'rick'
       assert_equal 'proxy.com', conn.proxy[:uri].host
@@ -230,7 +240,7 @@ class TestConnection < Faraday::TestCase
   end
 
   def test_proxy_accepts_hash
-    with_proxy_env "http://duncan.proxy.com:80" do
+    with_env 'http_proxy', "http://duncan.proxy.com:80" do
       conn = Faraday::Connection.new
       conn.proxy :uri => URI.parse('http://proxy.com'), :user => 'rick'
       assert_equal 'proxy.com', conn.proxy[:uri].host
@@ -239,12 +249,20 @@ class TestConnection < Faraday::TestCase
   end
 
   def test_proxy_accepts_http_env
-    with_proxy_env "http://duncan.proxy.com:80" do
+    with_env 'http_proxy', "http://duncan.proxy.com:80" do
       conn = Faraday::Connection.new
       assert_equal 'duncan.proxy.com', conn.proxy[:uri].host
     end
   end
 
+  def test_proxy_accepts_http_env_with_auth
+    with_env 'http_proxy', "http://a%40b:my%20pass@duncan.proxy.com:80" do
+      conn = Faraday::Connection.new
+      assert_equal 'a@b',     conn.proxy[:user]
+      assert_equal 'my pass', conn.proxy[:password]
+    end
+  end
+
   def test_proxy_requires_uri
     conn = Faraday::Connection.new
     assert_raises ArgumentError do
@@ -252,12 +270,6 @@ class TestConnection < Faraday::TestCase
     end
   end
 
-  def test_params_to_query_converts_hash_of_params_to_uri_escaped_query_string
-    conn = Faraday::Connection.new
-    url = conn.build_url('', 'a[b]' => '1 + 2')
-    assert_equal "a%5Bb%5D=1+%2B+2", url.query
-  end
-
   def test_dups_connection_object
     conn = Faraday::Connection.new 'http://sushi.com/foo',
       :ssl => { :verify => :none },
@@ -372,4 +384,16 @@ class TestRequestParams < Faraday::TestCase
     end
     assert_query_equal %w[b=b], query
   end
+
+  def test_array_params_in_url
+    create_connection 'http://a.co/page1?color[]=red&color[]=blue'
+    query = get
+    assert_equal "color%5B%5D=red&color%5B%5D=blue", query
+  end
+
+  def test_array_params_in_params
+    create_connection 'http://a.co/page1', :params => {:color => ['red', 'blue']}
+    query = get
+    assert_equal "color%5B%5D=red&color%5B%5D=blue", query
+  end
 end

data/test/helper.rb

@@ -69,5 +69,17 @@ module Faraday
         $stderr = old
       end
     end
+
+    def self.jruby?
+      defined? RUBY_ENGINE and 'jruby' == RUBY_ENGINE
+    end
+
+    def self.rbx?
+      defined? RUBY_ENGINE and 'rbx' == RUBY_ENGINE
+    end
+
+    def self.ssl_mode?
+      ENV['SSL'] == 'yes'
+    end
   end
 end

data/test/live_server.rb

@@ -42,6 +42,10 @@ class LiveServer < Sinatra::Base
     [200, {}, 'ok']
   end
 
+  get '/ssl' do
+    request.secure?.to_s
+  end
+
   error do |e|
     "#{e.class}\n#{e.to_s}\n#{e.backtrace.join("\n")}"
   end

metadata

@@ -1,80 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 0.8.4
   prerelease: 
+  version: 0.8.5
 platform: ruby
 authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multipart-post
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+    none: false
+  name: multipart-post
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  name: rake
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: simplecov
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: 
 email: technoweenie@gmail.com
 executables: []
@@ -85,12 +69,9 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- faraday.gemspec
-- lib/faraday.rb
-- lib/faraday/adapter.rb
 - lib/faraday/adapter/em_http.rb
-- lib/faraday/adapter/em_synchrony.rb
 - lib/faraday/adapter/em_synchrony/parallel_manager.rb
+- lib/faraday/adapter/em_synchrony.rb
 - lib/faraday/adapter/excon.rb
 - lib/faraday/adapter/net_http.rb
 - lib/faraday/adapter/net_http_persistent.rb
@@ -98,23 +79,24 @@ files:
 - lib/faraday/adapter/rack.rb
 - lib/faraday/adapter/test.rb
 - lib/faraday/adapter/typhoeus.rb
+- lib/faraday/adapter.rb
 - lib/faraday/builder.rb
 - lib/faraday/connection.rb
 - lib/faraday/error.rb
 - lib/faraday/middleware.rb
-- lib/faraday/request.rb
 - lib/faraday/request/authorization.rb
 - lib/faraday/request/basic_authentication.rb
 - lib/faraday/request/multipart.rb
 - lib/faraday/request/retry.rb
 - lib/faraday/request/token_authentication.rb
 - lib/faraday/request/url_encoded.rb
-- lib/faraday/response.rb
+- lib/faraday/request.rb
 - lib/faraday/response/logger.rb
 - lib/faraday/response/raise_error.rb
+- lib/faraday/response.rb
 - lib/faraday/upload_io.rb
 - lib/faraday/utils.rb
-- script/test
+- lib/faraday.rb
 - test/adapters/default_test.rb
 - test/adapters/em_http_test.rb
 - test/adapters/em_synchrony_test.rb
@@ -136,49 +118,30 @@ files:
 - test/middleware_stack_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb
-homepage: https://github.com/technoweenie/faraday
-licenses: []
+- script/test
+homepage: https://github.com/lostisland/faraday
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.5
+      version: 1.3.6
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: HTTP/REST API client library.
-test_files:
-- test/adapters/default_test.rb
-- test/adapters/em_http_test.rb
-- test/adapters/em_synchrony_test.rb
-- test/adapters/excon_test.rb
-- test/adapters/integration.rb
-- test/adapters/logger_test.rb
-- test/adapters/net_http_persistent_test.rb
-- test/adapters/net_http_test.rb
-- test/adapters/patron_test.rb
-- test/adapters/rack_test.rb
-- test/adapters/test_middleware_test.rb
-- test/adapters/typhoeus_test.rb
-- test/authentication_middleware_test.rb
-- test/connection_test.rb
-- test/env_test.rb
-- test/helper.rb
-- test/live_server.rb
-- test/middleware/retry_test.rb
-- test/middleware_stack_test.rb
-- test/request_middleware_test.rb
-- test/response_middleware_test.rb
+test_files: []

data/faraday.gemspec

@@ -1,81 +0,0 @@
-Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
-
-  s.name    = 'faraday'
-  s.version = '0.8.4'
-
-  s.summary     = "HTTP/REST API client library."
-  # TODO: s.description
-
-  s.authors  = ["Rick Olson"]
-  s.email    = 'technoweenie@gmail.com'
-  s.homepage = 'https://github.com/technoweenie/faraday'
-
-  s.add_dependency 'multipart-post', '~> 1.1'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'test-unit'
-
-  # = MANIFEST =
-  s.files = %w[
-    Gemfile
-    LICENSE.md
-    README.md
-    Rakefile
-    faraday.gemspec
-    lib/faraday.rb
-    lib/faraday/adapter.rb
-    lib/faraday/adapter/em_http.rb
-    lib/faraday/adapter/em_synchrony.rb
-    lib/faraday/adapter/em_synchrony/parallel_manager.rb
-    lib/faraday/adapter/excon.rb
-    lib/faraday/adapter/net_http.rb
-    lib/faraday/adapter/net_http_persistent.rb
-    lib/faraday/adapter/patron.rb
-    lib/faraday/adapter/rack.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/middleware.rb
-    lib/faraday/request.rb
-    lib/faraday/request/authorization.rb
-    lib/faraday/request/basic_authentication.rb
-    lib/faraday/request/multipart.rb
-    lib/faraday/request/retry.rb
-    lib/faraday/request/token_authentication.rb
-    lib/faraday/request/url_encoded.rb
-    lib/faraday/response.rb
-    lib/faraday/response/logger.rb
-    lib/faraday/response/raise_error.rb
-    lib/faraday/upload_io.rb
-    lib/faraday/utils.rb
-    script/test
-    test/adapters/default_test.rb
-    test/adapters/em_http_test.rb
-    test/adapters/em_synchrony_test.rb
-    test/adapters/excon_test.rb
-    test/adapters/integration.rb
-    test/adapters/logger_test.rb
-    test/adapters/net_http_persistent_test.rb
-    test/adapters/net_http_test.rb
-    test/adapters/patron_test.rb
-    test/adapters/rack_test.rb
-    test/adapters/test_middleware_test.rb
-    test/adapters/typhoeus_test.rb
-    test/authentication_middleware_test.rb
-    test/connection_test.rb
-    test/env_test.rb
-    test/helper.rb
-    test/live_server.rb
-    test/middleware/retry_test.rb
-    test/middleware_stack_test.rb
-    test/request_middleware_test.rb
-    test/response_middleware_test.rb
-  ]
-  # = MANIFEST =
-
-  s.test_files = s.files.select { |path| path =~ %r{^test/*/.+\.rb} }
-end