Changed Faraday::Utils#escape to use block parameter instead of $1 to…

… sidestep a bug in ActiveSupport::SafeBuffer#gsub in Rails 3.1 (as described in rails/rails#3496)
technoweenie · Dec 30, 2011 · 3844d3a · 3844d3a
1 parent af27532
commit 3844d3a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/faraday/utils.rb b/lib/faraday/utils.rb
@@ -125,8 +125,8 @@ def build_nested_query(value, prefix = nil)
     # Be sure to URI escape '+' symbols to %2B. Otherwise, they get interpreted
     # as spaces.
     def escape(s)
-      s.to_s.gsub(/([^a-zA-Z0-9_.-]+)/n) do
-        '%' << $1.unpack('H2'*bytesize($1)).join('%').tap { |c| c.upcase! }
+      s.to_s.gsub(/([^a-zA-Z0-9_.-]+)/n) do |match|
+        '%' << match.unpack('H2'*bytesize(match)).join('%').tap { |c| c.upcase! }
       end
     end