alovak-network 1.1.4 → 1.2.0

data/lib/network/connection.rb

@@ -26,18 +26,30 @@ module Network
     VERIFY_NONE  = OpenSSL::SSL::VERIFY_NONE
     VERIFY_PEER  = OpenSSL::SSL::VERIFY_PEER
 
-    def initialize(uri)
+    # options are:
+    #   :read_timeout
+    #   :open_timeout
+    #   :verify_peer
+    #   :proxy_addr
+    #   :proxy_port
+    #   :proxy_user
+    #   :proxy_pass
+    def initialize(uri, options = {})
       @uri = URI.parse(uri)
-      @read_timeout = READ_TIMEOUT
-      @open_timeout = OPEN_TIMEOUT
-      @verify_peer  = false
+      @read_timeout = options[:read_timeout] || READ_TIMEOUT
+      @open_timeout = options[:open_timeout] || OPEN_TIMEOUT
+      @verify_peer  = options[:verify_peer] || false
       @debugger_stream = nil
       @headers = {}
+      @proxy_addr = options[:proxy_addr]
+      @proxy_port = options[:proxy_port]
+      @proxy_user = options[:proxy_user]
+      @proxy_pass = options[:proxy_pass]
     end
 
     def post(data)
       try_request do
-        log_request(data)
+        log_request(data, "POST")
         response = nil
         ms = Benchmark.realtime do 
           response = http.post(uri.path, data, post_headers(data))
@@ -47,6 +59,19 @@ module Network
       end
     end
 
+    def get(data)
+      try_request do
+        log_request(data, "GET")
+        response = nil
+        query_string = uri.path + data
+        ms = Benchmark.realtime do 
+          response = http.get(query_string)
+        end
+        log_response(response, ms)
+        response
+      end
+    end
+    
     def use_ssl?
       @uri.scheme == "https"
     end
@@ -58,7 +83,7 @@ module Network
     private
 
     def http
-      http = Net::HTTP.new(uri.host, uri.port)
+      http = Net::HTTP.new(uri.host, uri.port, @proxy_addr, @proxy_port, @proxy_user, @proxy_pass)
       configure_timeouts(http)
       configure_debugging(http)
 
@@ -123,9 +148,9 @@ module Network
       logger.info(message) if logger
     end
 
-    def log_request(data)
+    def log_request(data, method)
       log "[#{sender}]" if sender
-      log "POST #{uri}"
+      log "#{method} #{uri}"
       log "--->"
       log (request_filter ? request_filter.call(data) : data)
     end

data/lib/network.rb

@@ -3,7 +3,12 @@ require 'net/https'
 require 'network/connection'
 
 module Network
-  def self.post(url, data)
-    Connection.new(url).post(data)
+  def self.post(url, data, options = {})
+    Connection.new(url, options).post(data)
   end
+
+  def self.get(url, data, options = {})
+    Connection.new(url, options).get(data)
+  end
+
 end

data/test/network/test_connection.rb

@@ -19,7 +19,7 @@ class TestConnectionLogging < Test::Unit::TestCase
   end
 
   def test_log_request
-    @connection.send(:log_request, "request data")
+    @connection.send(:log_request, "request data", "POST")
     log = @connection.logger.log
 
     assert_match /POST http:\/\/example.com\/path/,  log
@@ -29,7 +29,7 @@ class TestConnectionLogging < Test::Unit::TestCase
 
   def test_log_request_with_sender
     @connection.sender = "ModuleName"
-    @connection.send(:log_request, "request data")
+    @connection.send(:log_request, "request data", "POST")
     assert_match /ModuleName/, @connection.logger.log  
   end
 
@@ -45,7 +45,7 @@ class TestConnectionLogging < Test::Unit::TestCase
 
   def test_request_filtering
     @connection.request_filter = Proc.new {|req| "#{req} is filtered"}
-    @connection.send(:log_request, "request")
+    @connection.send(:log_request, "request", "POST")
     assert_match /request is filtered/, @connection.logger.log
   end
 
@@ -89,6 +89,15 @@ class TestConnection < Test::Unit::TestCase
     @connection.post("hello")
   end
 
+  def test_get_methods
+    sec = sequence('order')
+    @connection.expects(:log_request).in_sequence(sec)
+    @connection.expects(:http).in_sequence(sec).returns(stub('http', :get => true))
+    @connection.expects(:log_response).in_sequence(sec)
+    
+    @connection.get("query=hello")
+  end
+  
   def test_default_timeouts
     assert_equal Network::Connection::READ_TIMEOUT, @connection.read_timeout
     assert_equal Network::Connection::OPEN_TIMEOUT, @connection.open_timeout

data/test/network/test_network.rb

@@ -5,4 +5,9 @@ class TestNetwork < Test::Unit::TestCase
     Network::Connection.any_instance.expects(:post)
     Network.post('http://site.com/', "some data")
   end
+
+  def test_make_get_throught_connection
+    Network::Connection.any_instance.expects(:get)
+    Network.get('http://site.com/', 'query=helo')
+  end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alovak-network
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  hash: 31
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Pavel Gabriel
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 +02:00
+date: 2010-09-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 53
+        segments: 
+        - 0
+        - 9
+        - 7
         version: 0.9.7
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: HTTP/HTTPS communication module with logging, filtering and easy SSL configuration
 email: alovak@gmail.com
 executables: []
@@ -33,6 +45,9 @@ 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: []
@@ -43,21 +58,27 @@ 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.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: HTTP/HTTPS communication module based on ruby net/http, net/https modules