alovak-network 1.2.0 → 1.2.1

data/lib/network/connection.rb

@@ -49,6 +49,8 @@ module Network
 
     def post(data)
       try_request do
+        data = post_data(data)
+
         log_request(data, "POST")
         response = nil
         ms = Benchmark.realtime do 
@@ -61,9 +63,11 @@ module Network
 
     def get(data)
       try_request do
+        data = post_data(data)
+
         log_request(data, "GET")
         response = nil
-        query_string = uri.path + data
+        query_string = uri.path + "?" + data
         ms = Benchmark.realtime do 
           response = http.get(query_string)
         end
@@ -111,6 +115,10 @@ 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

@@ -57,6 +57,40 @@ class TestConnectionLogging < Test::Unit::TestCase
   end
 end
 
+class TestConnectionWithParamsInURI < Test::Unit::TestCase
+  def setup
+    @connection = Network::Connection.new("http://example.com/path?route=some/where/else")
+    @http = mock('http')
+  end
+
+  def test_post_methods
+    sec = sequence('order')
+
+    default_headers = { 'Content-Type'   => 'application/x-www-form-urlencoded',
+                        'Content-Length' => 'hello&route=some/where/else'.bytesize.to_s }
+
+    @http.expects(:post).with('/path', 'hello&route=some/where/else', default_headers) 
+
+    @connection.expects(:log_request).in_sequence(sec)
+    @connection.expects(:http).in_sequence(sec).returns(@http)
+    @connection.expects(:log_response).in_sequence(sec)
+
+    @connection.post("hello")
+  end
+
+  def test_get_methods
+    sec = sequence('order')
+
+    @http.expects(:get).with('/path?query=hello&route=some/where/else') 
+
+    @connection.expects(:log_request).in_sequence(sec)
+    @connection.expects(:http).in_sequence(sec).returns(@http)
+    @connection.expects(:log_response).in_sequence(sec)
+
+    @connection.get("query=hello")
+  end
+end
+
 class TestConnection < Test::Unit::TestCase
 
   def setup
@@ -82,8 +116,14 @@ class TestConnection < Test::Unit::TestCase
 
   def test_post_methods
     sec = sequence('order')
+
+    default_headers = { 'Content-Type'   => 'application/x-www-form-urlencoded',
+                        'Content-Length' => 'hello'.bytesize.to_s }
+
+    @http.expects(:post).with('/path', 'hello', default_headers) 
+
     @connection.expects(:log_request).in_sequence(sec)
-    @connection.expects(:http).in_sequence(sec).returns(stub('http', :post => true))
+    @connection.expects(:http).in_sequence(sec).returns(@http)
     @connection.expects(:log_response).in_sequence(sec)
 
     @connection.post("hello")

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: alovak-network
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Pavel Gabriel
@@ -15,25 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 +03:00
+date: 2012-05-10 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mocha
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
-        segments: 
-        - 0
-        - 9
-        - 7
         version: 0.9.7
-  type: :runtime
-  version_requirements: *id001
+    version: 
 description: HTTP/HTTPS communication module with logging, filtering and easy SSL configuration
 email: alovak@gmail.com
 executables: []
@@ -45,9 +33,6 @@ extra_rdoc_files: []
 files: 
 - lib/network/connection.rb
 - lib/network.rb
-- test/network/test_network.rb
-- test/network/test_connection.rb
-- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/alovak/network/
 licenses: []
@@ -58,27 +43,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: HTTP/HTTPS communication module based on ruby net/http, net/https modules