From ca548f1470c1254298a70f75d16d40fb91d77ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Pr=C3=A9vost?= <remi@exomel.com>
Date: Mon, 29 Oct 2012 06:29:57 -0400
Subject: [PATCH] Prepare for new Faraday behavior with constructors

---
 lib/her.rb     | 1 +
 lib/her/api.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/her.rb b/lib/her.rb
index a3ae78b3..dae89bc9 100644
--- a/lib/her.rb
+++ b/lib/her.rb
@@ -4,6 +4,7 @@
 require "faraday"
 require "active_support"
 require "active_support/inflector"
+require "active_support/core_ext/hash"
 
 require "her/model"
 require "her/api"
diff --git a/lib/her/api.rb b/lib/her/api.rb
index 1f891076..1eb55e7e 100644
--- a/lib/her/api.rb
+++ b/lib/her/api.rb
@@ -53,7 +53,7 @@ def setup(attrs={}) # {{{
       attrs[:url] = attrs.delete(:base_uri) if attrs.include?(:base_uri) # Support legacy :base_uri option
       @base_uri = attrs[:url]
       @options = attrs
-      @connection = Faraday.new(attrs) do |connection|
+      @connection = Faraday.new(attrs.slice(:url)) do |connection|
         yield connection if block_given?
       end
     end # }}}