alovak-network 1.2.1 → 1.2.2

data/lib/network/connection.rb

@@ -49,12 +49,10 @@ module Network
 
     def post(data)
       try_request do
-        data = post_data(data)
-
         log_request(data, "POST")
         response = nil
         ms = Benchmark.realtime do 
-          response = http.post(uri.path, data, post_headers(data))
+          response = http.post(uri.request_uri, data, post_headers(data))
         end
         log_response(response, ms)
         response
@@ -63,13 +61,11 @@ module Network
 
     def get(data)
       try_request do
-        data = post_data(data)
-
         log_request(data, "GET")
         response = nil
-        query_string = uri.path + "?" + data
+        uri.query = (uri.select(:query) << data).join("&")
         ms = Benchmark.realtime do 
-          response = http.get(query_string)
+          response = http.get(uri.request_uri)
         end
         log_response(response, ms)
         response
@@ -115,10 +111,6 @@ module Network
       @headers
     end
 
-    def post_data(data)
-      uri.query ? [data, uri.query].join("&") : data
-    end
-
     def configure_ssl(http)
       http.use_ssl     = true
 

data/test/network/test_connection.rb

@@ -67,9 +67,9 @@ class TestConnectionWithParamsInURI < Test::Unit::TestCase
     sec = sequence('order')
 
     default_headers = { 'Content-Type'   => 'application/x-www-form-urlencoded',
-                        'Content-Length' => 'hello&route=some/where/else'.bytesize.to_s }
+                        'Content-Length' => 'hello'.bytesize.to_s }
 
-    @http.expects(:post).with('/path', 'hello&route=some/where/else', default_headers) 
+    @http.expects(:post).with('/path?route=some/where/else', 'hello', default_headers) 
 
     @connection.expects(:log_request).in_sequence(sec)
     @connection.expects(:http).in_sequence(sec).returns(@http)
@@ -81,7 +81,7 @@ class TestConnectionWithParamsInURI < Test::Unit::TestCase
   def test_get_methods
     sec = sequence('order')
 
-    @http.expects(:get).with('/path?query=hello&route=some/where/else') 
+    @http.expects(:get).with('/path?route=some/where/else&query=hello') 
 
     @connection.expects(:log_request).in_sequence(sec)
     @connection.expects(:http).in_sequence(sec).returns(@http)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: alovak-network
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Pavel Gabriel