ethon 0.4.4 → 0.5.0

data/CHANGELOG.md

@@ -2,7 +2,14 @@
 
 ## Master
 
-[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.4.4...master)
+## 0.5.0
+
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.4.4...0.5.0)
+
+Enhancements:
+
+* New libcurl option proxyuserpwd
+* Rename response_header to response_headers
 
 ## 0.4.4
 

data/lib/ethon/easy.rb

@@ -475,6 +475,10 @@ module Ethon
     # @option options :proxyport [Integer]
     #  Pass a long with this option to set the proxy port to connect to
     #  unless it is specified in the proxy string CURLOPT_PROXY.
+    # @option options :proxyuserpwd [String]
+    #  Pass a char * as parameter, which should be [user name]:[password]
+    #  to use for the connection to the HTTP proxy. Use CURLOPT_PROXYAUTH
+    #  to decide the authentication method.
     # @option options :readdata [String]
     #  Data pointer to pass to the file read function. If you use the
     #  CURLOPT_READFUNCTION option, this is the pointer you'll get as input.
@@ -846,7 +850,7 @@ module Ethon
       return @hash if defined?(@hash) && @hash
       @hash = {
         :return_code => return_code,
-        :response_header => response_header,
+        :response_headers => response_headers,
         :response_body => response_body
       }
       Easy::Informations::AVAILABLE_INFORMATIONS.keys.each do |info|

data/lib/ethon/easy/callbacks.rb

@@ -7,7 +7,7 @@ module Ethon
 
       # :nodoc:
       def self.included(base)
-        base.send(:attr_accessor, *[:response_body, :response_header])
+        base.send(:attr_accessor, *[:response_body, :response_headers])
       end
 
       # Set writefunction and headerfunction callback.
@@ -20,7 +20,7 @@ module Ethon
         Curl.set_option(:writefunction, body_write_callback, handle)
         Curl.set_option(:headerfunction, header_write_callback, handle)
         @response_body = ""
-        @response_header = ""
+        @response_headers = ""
       end
 
       # Returns the body write callback.
@@ -44,7 +44,7 @@ module Ethon
       # @return [ Proc ] The callback.
       def header_write_callback
         @header_write_callback ||= proc {|stream, size, num, object|
-          @response_header << stream.read_string(size * num)
+          @response_headers << stream.read_string(size * num)
           size * num
         }
       end

data/lib/ethon/easy/operations.rb

@@ -23,7 +23,7 @@ module Ethon
       def perform
         @return_code = Curl.easy_perform(handle)
         complete
-        Ethon.logger.debug("ETHON: performed #{self.log_inspect}") if Ethon.logger
+        Ethon.logger.debug("ETHON: performed #{self.log_inspect}")
         @return_code
       end
 

data/lib/ethon/easy/options.rb

@@ -13,9 +13,10 @@ module Ethon
           :customrequest, :cainfo, :capath, :connecttimeout, :connecttimeout_ms,
           :forbid_reuse, :followlocation, :httpauth, :infilesize, :interface,
           :maxredirs, :nosignal, :postfieldsize, :copypostfields, :proxy,
-          :proxyauth, :proxyport, :proxytype, :timeout, :timeout_ms, :readdata, :sslcert,
-          :ssl_verifypeer, :ssl_verifyhost, :sslcerttype, :sslkey, :sslkeytype,
-          :sslversion, :url, :useragent, :userpwd, :verbose, :readfunction
+          :proxyauth, :proxyport, :proxytype, :proxyuserpwd, :timeout, :timeout_ms,
+          :readdata, :sslcert, :ssl_verifypeer, :ssl_verifyhost, :sslcerttype,
+          :sslkey, :sslkeytype, :sslversion, :url, :useragent, :userpwd,
+          :verbose, :readfunction
         ])
         base.send(:attr_accessor, *Ethon::Easy::AVAILABLE_OPTIONS)
       end

data/lib/ethon/multi/operations.rb

@@ -43,7 +43,7 @@ module Ethon
       # @example Perform multi.
       #   multi.perform
       def perform
-        Ethon.logger.debug("ETHON: started MULTI") if Ethon.logger
+        Ethon.logger.debug("ETHON: started MULTI")
         while ongoing?
           run
           timeout = get_timeout
@@ -51,7 +51,7 @@ module Ethon
           reset_fds
           set_fds(timeout)
         end
-        Ethon.logger.debug("ETHON: performed MULTI") if Ethon.logger
+        Ethon.logger.debug("ETHON: performed MULTI")
         nil
       end
 
@@ -122,7 +122,7 @@ module Ethon
           easy.return_code = msg[:data][:code]
           delete(easy)
           easy.complete
-          Ethon.logger.debug("ETHON:         performed #{easy.log_inspect}") if Ethon.logger
+          Ethon.logger.debug("ETHON:         performed #{easy.log_inspect}")
         end
       end
 

data/lib/ethon/version.rb

@@ -1,5 +1,5 @@
 module Ethon
 
   # Ethon version.
-  VERSION = '0.4.4'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3523421791018447107
+      hash: 3228494030236225352
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: