ethon 0.4.1 → 0.4.2

data/CHANGELOG.md

@@ -2,7 +2,18 @@
 
 ## Master
 
-[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.4.1...master)
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.4.2...master)
+
+# Changelog
+
+## 0.4.2
+
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.4.1...v0.4.2)
+
+Enhancements:
+
+* New libcurl option forbid_reuse
+* Use libcurls escape instead of CGI::escape
 
 ## 0.4.1
 

data/lib/ethon.rb

@@ -3,7 +3,6 @@ require 'ffi'
 require 'rbconfig'
 require 'thread'
 require 'mime/types'
-require 'cgi'
 require 'tempfile'
 
 require 'ethon/curl'

data/lib/ethon/easies/form.rb

@@ -19,7 +19,8 @@ module Ethon
       # @param [ Hash ] params The parameter to initialize the form with.
       #
       # @return [ Form ] A new Form.
-      def initialize(params)
+      def initialize(easy, params)
+        @easy = easy
         @params = params || {}
         ObjectSpace.define_finalizer(self, self.class.finalizer(self))
       end

data/lib/ethon/easies/http/actionable.rb

@@ -49,7 +49,7 @@ module Ethon
         #
         # @return [ Params ] The params.
         def params
-          @params ||= Params.new(options.delete(:params))
+          @params ||= Params.new(@easy, options.delete(:params))
         end
 
         # Return the form.
@@ -59,7 +59,7 @@ module Ethon
         #
         # @return [ Form ] The form.
         def form
-          @form ||= Form.new(options.delete(:body))
+          @form ||= Form.new(@easy, options.delete(:body))
         end
 
         # Setup everything necessary for a proper request.
@@ -69,6 +69,7 @@ module Ethon
         #
         # @param [ easy ] easy the easy to setup.
         def setup(easy)
+          @easy = easy
           set_nothing(easy) if params.empty? && form.empty?
           set_params(easy) unless params.empty?
           set_form(easy) unless form.empty?

data/lib/ethon/easies/options.rb

@@ -11,7 +11,7 @@ module Ethon
         base.const_set(:AVAILABLE_OPTIONS, [
           :dns_cache_timeout, :httppost, :put, :httpget, :nobody, :upload,
           :customrequest, :cainfo, :capath, :connecttimeout,
-          :followlocation, :httpauth, :infilesize, :interface,
+          :forbid_reuse, :followlocation, :httpauth, :infilesize, :interface,
           :maxredirs, :nosignal, :postfieldsize, :copypostfields, :proxy,
           :proxyauth, :proxyport, :proxytype, :timeout, :readdata, :sslcert,
           :ssl_verifypeer, :ssl_verifyhost, :sslcerttype, :sslkey, :sslkeytype,
@@ -40,7 +40,7 @@ module Ethon
         # @return [ Array ] The bool options.
         def bool_options
           [
-            :followlocation, :nosignal, :ssl_verifypeer,
+            :followlocation, :forbid_reuse, :nosignal, :ssl_verifypeer,
             :verbose, :httpget, :nobody, :upload
           ]
         end

data/lib/ethon/easies/params.rb

@@ -17,7 +17,8 @@ module Ethon
       # @param [ Hash ] params The params to use.
       #
       # @return [ Params ] A new Params.
-      def initialize(params)
+      def initialize(easy, params)
+        @easy = easy
         @params = params || {}
       end
     end

data/lib/ethon/easies/queryable.rb

@@ -31,7 +31,7 @@ module Ethon
           return pair if pair.is_a?(String)
 
           pair.map{ |e|
-            escape ? CGI::escape(e.to_s) : e
+            escape && @easy ? @easy.escape(e.to_s) : e
           }.join("=")
         }.join('&')
       end

data/lib/ethon/easy.rb

@@ -80,6 +80,8 @@ module Ethon
     #  http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTDNSCACHETIMEOUT.
     # @option options :followlocation [Boolean] See
     #  http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTFOLLOWLOCATION.
+    # @option options :forbid_reuse [Boolean] See
+    #  http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTFORBIDREUSE.
     # @option options :httpauth [String] See
     #  http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTHTTPAUTH.
     # @option options :httpget [Boolean] See
@@ -177,6 +179,10 @@ module Ethon
       Curl.easy_reset(handle)
     end
 
+    def escape(value)
+      Curl.easy_escape(handle, value, 0)
+    end
+
     # Returns a  pointer to the curl easy handle.
     #
     # @example Return the handle.

data/lib/ethon/version.rb

@@ -1,5 +1,5 @@
 module Ethon
 
   # Ethon version.
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -264,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1338934003639649204
+      hash: -4306933410699182262
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: