simpler query handling

phiggins · Nov 30, 2010 · 7ba2388 · 7ba2388
1 parent 02d3cae
commit 7ba2388
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/lib/excon/connection.rb b/lib/excon/connection.rb
@@ -47,20 +47,22 @@ def request(params, &block)
           params[:path].insert(0, '/')
         end
 
-        request = params[:method].to_s.upcase << ' ' << params[:path] << '?'
-        query = (params[:query] || @connection[:query] || '')
-        case query
-        when String
-          request << query
-        else
-          for key, values in query
-            for value in [*values]
-              value_string = value && ('=' << CGI.escape(value.to_s))
-              request << key.to_s << value_string << '&'
+        request = params[:method].to_s.upcase << ' ' << params[:path]
+        if query = (params[:query] || @connection[:query])
+          request << '?'
+          case query
+          when String
+            request << query
+          else
+            for key, values in query
+              for value in [*values]
+                value_string = value && ('=' << CGI.escape(value.to_s))
+                request << key.to_s << value_string << '&'
+              end
             end
+            request.chop! # remove trailing '&'
           end
         end
-        request.chop!
         request << HTTP_1_1
         params[:headers] ||= @connection[:headers]
         params[:headers]['Host'] ||= params[:host] || @connection[:host]