Merge branch 'faraday-0.9' of https://github.com/technoweenie/tinder …

…into technoweenie-faraday-0.9

* 'faraday-0.9' of https://github.com/technoweenie/tinder:
  Add support for Faraday v0.9.0 (rc5)

lib/tinder/connection.rb

@@ -1,11 +1,16 @@
 # encoding: UTF-8
 require 'faraday'
+require 'faraday/request/multipart'
 require 'faraday/response/raise_on_authentication_failure'
 require 'faraday/response/remove_whitespace'
 require 'faraday_middleware'
 require 'json'
 require 'uri'
 
+class Faraday::RequestOptions
+  attr_accessor :preserve_raw
+end
+
 module Tinder
   class Connection
     HOST = 'campfirenow.com'

spec/spec_helper.rb

@@ -5,6 +5,8 @@
 require 'tinder'
 require 'fakeweb'
 
+require 'faraday/adapter/test'
+
 FakeWeb.allow_net_connect = false
 
 def fixture(name)

spec/tinder/connection_spec.rb

@@ -82,7 +82,7 @@
       end
 
       connection = Tinder::Connection.new('test', :username => 'user', :password => 'pass', :ssl_verify => false)
-      connection.connection.ssl[:verify].should be == false
+      connection.connection.ssl.verify?.should be == false
     end
 
     it "should allow passing any ssl_options to Faraday" do
@@ -98,7 +98,7 @@
           :ca_file => "/etc/ssl/custom"
         }
       )
-      connection.connection.ssl.should eql(:verify => false, :ca_path => "/usr/lib/ssl/certs", :ca_file => "/etc/ssl/custom")
+      connection.connection.ssl.to_hash.should eql(:verify => false, :ca_path => "/usr/lib/ssl/certs", :ca_file => "/etc/ssl/custom")
     end
   end
 end

tinder.gemspec

@@ -4,7 +4,7 @@ require 'tinder/version'
 
 Gem::Specification.new do |gem|
   gem.add_dependency 'eventmachine', '~> 1.0'
-  gem.add_dependency 'faraday', '~> 0.8.9'
+  gem.add_dependency 'faraday', '~> 0.9.0.rc5'
   gem.add_dependency 'faraday_middleware', '~> 0.9'
   gem.add_dependency 'hashie', ['>= 1.0', '< 3']
   gem.add_dependency 'json', '~> 1.8.0'