ethon 0.5.2 → 0.5.3

data/CHANGELOG.md

@@ -2,7 +2,26 @@
 
 ## Master
 
-[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.5.1...master)
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.5.3...master)
+
+## 0.5.3
+
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.5.2...v0.5.3)
+
+Enhancements:
+
+* Deprecate Easy#prepare. It is no longer necessary.
+* Unroll metaprogramming for easy and multi options.
+* More specs.
+
+Bugfixes:
+
+* Correct size for FDSets
+* Add proxytypes to enums.
+
+## 0.5.2
+
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.5.1...v0.5.2)
 
 Enhancements:
 

data/Gemfile

@@ -9,14 +9,13 @@ group :development, :test do
   gem "sinatra", "~> 1.3"
   gem "json"
 
-  if RUBY_PLATFORM == "java"
-    gem "spoon"
-  else
-    gem "patron", "~> 0.4"
-    gem "curb", "~> 0.8.0"
-  end
-
   unless ENV["CI"]
     gem "guard-rspec", "~> 0.7"
+    gem 'rb-fsevent', '~> 0.9.1'
   end
 end
+
+group :perf do
+  gem "patron", "~> 0.4"
+  gem "curb", "~> 0.8.0"
+end

data/README.md

@@ -3,7 +3,7 @@
 In the greek mythology Ethon is a gigantic eagle the son of Typhoeus and Echidna. So much for the history.
 In the modern world Ethon is a very basic libcurl wrapper using ffi.
 
-* [Documentation](http://rubydoc.info/github/typhoeus/ethon)
+* [Documentation](http://rubydoc.info/github/typhoeus/ethon/frames/Ethon)
 * [Website](http://typhoeus.github.com/)
 * [Mailinglist](http://groups.google.com/group/typhoeus)
 
@@ -23,7 +23,6 @@ Making the first request is realy simple:
 
 ```ruby
 easy = Ethon::Easy.new(url: "www.example.com")
-easy.prepare
 easy.perform
 #=> :ok
 ```
@@ -32,7 +31,6 @@ You have access to various options like following redirects:
 
 ```ruby
 easy = Ethon::Easy.new(url: "www.example.com", followlocation: true)
-easy.prepare
 easy.perform
 #=> :ok
 ```
@@ -41,7 +39,6 @@ Once you're done you can look at the response code and body:
 
 ```ruby
 easy = Ethon::Easy.new(url: "www.example.com", followlocation: true)
-easy.prepare
 easy.perform
 easy.response_code
 #=> 200
@@ -56,7 +53,6 @@ In order to make life easier there are some helpers for doing http requests:
 ```ruby
 easy = Ethon::Easy.new
 easy.http_request("www.example.com", :get, { params: {a: 1} })
-easy.prepare
 easy.perform
 #=> :ok
 ```
@@ -64,7 +60,6 @@ easy.perform
 ```ruby
 easy = Ethon::Easy.new
 easy.http_request("www.example.com", :post, { params: { a: 1 }, body: { b: 2 } })
-easy.prepare
 easy.perform
 #=> :ok
 ```

data/lib/ethon.rb

@@ -1,15 +1,15 @@
 require 'logger'
 require 'ffi'
-require 'rbconfig'
 require 'thread'
 require 'mime/types'
 require 'tempfile'
 
+require 'ethon/libc'
 require 'ethon/curl'
-require 'ethon/errors'
 require 'ethon/easy'
-require 'ethon/multi'
+require 'ethon/errors'
 require 'ethon/loggable'
+require 'ethon/multi'
 require 'ethon/version'
 
 # Ethon is a very simple libcurl.
@@ -20,5 +20,9 @@ require 'ethon/version'
 # see how others use Ethon look at the Typhoeus code.
 #
 # @see https://www.github.com/typhoeus/typhoeus Typhoeus
+#
+# @note Please update to the latest libcurl version in order
+#   to benefit from all features and bugfixes.
+#   http://curl.haxx.se/download.html
 module Ethon
 end

data/lib/ethon/curls/classes.rb

@@ -18,7 +18,7 @@ module Ethon
     # :nodoc:
     class FDSet < ::FFI::Struct
       # XXX how does this work on non-windows? how can curl know the new size...
-      FD_SETSIZE = 524288 # set a higher maximum number of fds. this has never applied to windows, so just use the default there
+      FD_SETSIZE = ::Ethon::Libc.getdtablesize
 
       if Curl.windows?
         layout :fd_count, :u_int,

data/lib/ethon/curls/functions.rb

@@ -8,6 +8,7 @@ module Ethon
       # :nodoc:
       def self.extended(base)
         base.attach_function :global_init,            :curl_global_init,         [:long],                        :int
+        base.attach_function :free,                   :curl_free,                [:pointer],                      :void
 
         base.attach_function :easy_init,              :curl_easy_init,           [],                             :pointer
         base.attach_function :easy_cleanup,           :curl_easy_cleanup,        [:pointer],                     :void

data/lib/ethon/easy.rb

@@ -17,7 +17,6 @@ module Ethon
   # @example You can access the libcurl easy interface through this class, every request is based on it. The simplest setup looks like that:
   #
   #   e = Ethon::Easy.new(url: "www.example.com")
-  #   e.prepare
   #   e.perform
   #   #=> :ok
   #
@@ -26,7 +25,6 @@ module Ethon
   #   e.reset # reset easy handle
   #   e.url = "www.google.com"
   #   e.followlocation = true
-  #   e.prepare
   #   e.perform
   #   #=> :ok
   #
@@ -810,6 +808,7 @@ module Ethon
       Curl.init
       ObjectSpace.define_finalizer(self, self.class.finalizer(self))
       set_attributes(options)
+      set_callbacks
     end
 
     # Set given options.
@@ -839,10 +838,10 @@ module Ethon
     # @example Reset.
     #   easy.reset
     def reset
-      (instance_variables - [:@handle, :@header_list]).each do |ivar|
-        instance_variable_set(ivar, nil)
-      end
+      @url = nil
+      @hash = nil
       Curl.easy_reset(handle)
+      set_callbacks
     end
 
     # Url escapes the value.

data/lib/ethon/easy/header.rb

@@ -23,7 +23,10 @@ module Ethon
       #
       # @param [ Hash ] headers The headers.
       def headers=(headers)
-        @headers = headers
+        headers ||= {}
+        @header_list = nil
+        headers.each {|k, v| @header_list = Curl.slist_append(@header_list, compose_header(k,v)) }
+        Curl.set_option(:httpheader, @header_list, handle)
       end
 
       # Return header_list.
@@ -36,18 +39,6 @@ module Ethon
         @header_list ||= nil
       end
 
-      # Set previously defined headers in libcurl.
-      #
-      # @example Set headers in libcurl.
-      #   easy.set_headers
-      #
-      # @return [ Symbol ] The return value from Curl.set_option.
-      def set_headers
-        @header_list = nil
-        headers.each {|k, v| @header_list = Curl.slist_append(@header_list, compose_header(k,v)) }
-        Curl.set_option(:httpheader, @header_list, handle)
-      end
-
       # Compose libcurl header string from key and value.
       # Also replaces null bytes, because libcurl will complain about
       # otherwise.

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

@@ -70,23 +70,15 @@ module Ethon
         # @param [ easy ] easy the easy to setup.
         def setup(easy)
           @easy = easy
-          easy.url = url
-          set_nothing(easy) if params.empty? && form.empty?
-          set_params(easy) unless params.empty?
+          if params.empty?
+            easy.url = url
+          else
+            set_params(easy)
+          end
           set_form(easy) unless form.empty?
           easy.set_attributes(options)
         end
 
-        # Setup request as if there were no params and form.
-        #
-        # @example Setup nothing.
-        #   action.set_nothing(easy)
-        #
-        # @param [ Easy ] easy The easy to setup.
-        def set_nothing(easy)
-          easy.url = url
-        end
-
         # Setup request with params.
         #
         # @example Setup nothing.

data/lib/ethon/easy/http/postable.rb

@@ -4,6 +4,7 @@ module Ethon
 
       # This module contains logic for setting up a [multipart] POST body.
       module Postable
+
         # Set things up when form is provided.
         # Deals with multipart forms.
         #
@@ -19,8 +20,8 @@ module Ethon
             easy.httppost = form.first.read_pointer
           else
             form.escape = true
+            easy.postfieldsize = form.to_s.bytesize
             easy.copypostfields = form.to_s
-            easy.postfieldsize = easy.copypostfields.bytesize
           end
         end
       end

data/lib/ethon/easy/http/putable.rb

@@ -12,7 +12,6 @@ module Ethon
         #
         # @param [ Easy ] easy The easy to setup.
         def set_form(easy)
-          easy.url ||= url
           easy.upload = true
           form.escape = true
           easy.infilesize = form.to_s.bytesize

data/lib/ethon/easy/operations.rb

@@ -36,10 +36,14 @@ module Ethon
       #   easy.prepare
       #
       # @api public
+      #
+      # @deprecated It is no longer necessary to call prepare.
       def prepare
-        set_options
-        set_headers
-        set_callbacks
+        Ethon.logger.warn(
+          "ETHON: It is no longer necessay to call "+
+          "Easy#prepare. Its going to be removed "+
+          "in future versions."
+        )
       end
     end
   end

data/lib/ethon/easy/options.rb

@@ -7,81 +7,491 @@ module Ethon
     # @api private
     module Options
 
-      # :nodoc:
-      def self.included(base)
-        base.extend ClassMethods
-        base.const_set(:AVAILABLE_OPTIONS, [
-          :dns_cache_timeout, :httppost, :httpget, :nobody, :upload,
-          :customrequest, :cainfo, :capath, :connecttimeout, :connecttimeout_ms,
-          :forbid_reuse, :followlocation, :httpauth, :infilesize, :interface,
-          :keypasswd, :maxredirs, :nosignal, :postfieldsize, :copypostfields, :proxy,
-          :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
-
-      module ClassMethods # :nodoc:
-
-        # Return the available options.
-        #
-        # @example Return the available options.
-        #   easy.available_options
-        #
-        # @return [ Array ]  The available options.
-        def available_options
-          Ethon::Easy::AVAILABLE_OPTIONS
-        end
+      attr_reader :url
 
-        # Return the options which need to set as 0 or 1 for easy.
-        #
-        # @example Return the bool options.
-        #   easy.bool_options
-        #
-        # @return [ Array ] The bool options.
-        def bool_options
-          [
-            :followlocation, :forbid_reuse, :nosignal, :ssl_verifypeer,
-            :verbose, :httpget, :nobody, :upload
-          ]
-        end
+      # Sets cainfo option.
+      #
+      # @example Set cainfo option.
+      #   easy.cainfo = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def cainfo=(value)
+        Curl.set_option(:cainfo, value_for(value, :string), handle)
+      end
 
-        # Return the options which are an enum for easy.
-        #
-        # @example Return the enum options.
-        #   easy.enum_options
-        #
-        # @return [ Hash ] The enum options.
-        def enum_options
-          { :httpauth => Curl::Auth, :sslversion => Curl::SSLVersion }
-        end
+      # Sets capath option.
+      #
+      # @example Set capath option.
+      #   easy.capath = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def capath=(value)
+        Curl.set_option(:capath, value_for(value, :string), handle)
+      end
 
-        # Return the options which need to set as an integer for easy.
-        #
-        # @example Return the int options.
-        #   easy.int_options
-        #
-        # @return [ Array ] The int options.
-        def int_options
-          [
-            :connecttimeout, :connecttimeout_ms, :dns_cache_timeout, :infilesize, :maxredirs,
-            :postfieldsize, :proxyport, :ssl_verifyhost, :timeout, :timeout_ms
-          ]
-        end
+      # Sets connecttimeout option.
+      #
+      # @example Set connecttimeout option.
+      #   easy.connecttimeout = 1
+      #
+      # @param [ Integer ] value The value to set.
+      #
+      # @return [ void ]
+      def connecttimeout=(value)
+        Curl.set_option(:connecttimeout, value_for(value, :int), handle)
       end
 
-      # Set specified options on easy handle.
+      # Sets connecttimeout_ms option.
       #
-      # @example Set options.
-      #   easy.set_options
-      def set_options
-        self.class.available_options.each do |option|
-          Curl.set_option(option, value_for(option), handle)
-        end
+      # @example Set connecttimeout_ms option.
+      #   easy.connecttimeout_ms = 1
+      #
+      # @param [ Integer ] value The value to set.
+      #
+      # @return [ void ]
+      def connecttimeout_ms=(value)
+        Curl.set_option(:connecttimeout_ms, value_for(value, :int), handle)
+      end
+
+      # Sets copypostfields option.
+      #
+      # @example Set copypostfields option.
+      #   easy.copypostfields = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def copypostfields=(value)
+        Curl.set_option(:copypostfields, value_for(value, :string), handle)
+      end
+
+      # Sets customrequest option.
+      #
+      # @example Set customrequest option.
+      #   easy.customrequest = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def customrequest=(value)
+        Curl.set_option(:customrequest, value_for(value, :string), handle)
+      end
+
+      # Sets dns_cache_timeout option.
+      #
+      # @example Set dns_cache_timeout option.
+      #   easy.dns_cache_timeout = 1
+      #
+      # @param [ Integer ] value The value to set.
+      #
+      # @return [ void ]
+      def dns_cache_timeout=(value)
+        Curl.set_option(:dns_cache_timeout, value_for(value, :int), handle)
+      end
+
+      # Sets followlocation option.
+      #
+      # @example Set followlocation option.
+      #   easy.followlocation = true
+      #
+      # @param [ Boolean ] value The value to set.
+      #
+      # @return [ void ]
+      def followlocation=(value)
+        Curl.set_option(:followlocation, value_for(value, :bool), handle)
+      end
+
+      # Sets forbid_reuse option.
+      #
+      # @example Set forbid_reuse option.
+      #   easy.forbid_reuse = true
+      #
+      # @param [ Boolean ] value The value to set.
+      #
+      # @return [ void ]
+      def forbid_reuse=(value)
+        Curl.set_option(:forbid_reuse, value_for(value, :bool), handle)
+      end
+
+      # Sets httpauth option.
+      #
+      # @example Set httpauth option.
+      #   easy.httpauth = $value
+      #
+      # @param [ $type_doc ] value The value to set.
+      #
+      # @return [ void ]
+      def httpauth=(value)
+        Curl.set_option(:httpauth, value_for(value, :enum, :httpauth), handle)
+      end
+
+      # Sets httpget option.
+      #
+      # @example Set httpget option.
+      #   easy.httpget = true
+      #
+      # @param [ Boolean ] value The value to set.
+      #
+      # @return [ void ]
+      def httpget=(value)
+        Curl.set_option(:httpget, value_for(value, :bool), handle)
+      end
+
+      # Sets httppost option.
+      #
+      # @example Set httppost option.
+      #   easy.httppost = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def httppost=(value)
+        Curl.set_option(:httppost, value_for(value, :string), handle)
+      end
+
+      # Sets infilesize option.
+      #
+      # @example Set infilesize option.
+      #   easy.infilesize = 1
+      #
+      # @param [ Integer ] value The value to set.
+      #
+      # @return [ void ]
+      def infilesize=(value)
+        Curl.set_option(:infilesize, value_for(value, :int), handle)
+      end
+
+      # Sets interface option.
+      #
+      # @example Set interface option.
+      #   easy.interface = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def interface=(value)
+        Curl.set_option(:interface, value_for(value, :string), handle)
+      end
+
+      # Sets keypasswd option.
+      #
+      # @example Set keypasswd option.
+      #   easy.keypasswd = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def keypasswd=(value)
+        Curl.set_option(:keypasswd, value_for(value, :string), handle)
+      end
+
+      # Sets maxredirs option.
+      #
+      # @example Set maxredirs option.
+      #   easy.maxredirs = 1
+      #
+      # @param [ Integer ] value The value to set.
+      #
+      # @return [ void ]
+      def maxredirs=(value)
+        Curl.set_option(:maxredirs, value_for(value, :int), handle)
+      end
+
+      # Sets nobody option.
+      #
+      # @example Set nobody option.
+      #   easy.nobody = true
+      #
+      # @param [ Boolean ] value The value to set.
+      #
+      # @return [ void ]
+      def nobody=(value)
+        Curl.set_option(:nobody, value_for(value, :bool), handle)
+      end
+
+      # Sets nosignal option.
+      #
+      # @example Set nosignal option.
+      #   easy.nosignal = true
+      #
+      # @param [ Boolean ] value The value to set.
+      #
+      # @return [ void ]
+      def nosignal=(value)
+        Curl.set_option(:nosignal, value_for(value, :bool), handle)
+      end
+
+      # Sets postfieldsize option.
+      #
+      # @example Set postfieldsize option.
+      #   easy.postfieldsize = 1
+      #
+      # @param [ Integer ] value The value to set.
+      #
+      # @return [ void ]
+      def postfieldsize=(value)
+        Curl.set_option(:postfieldsize, value_for(value, :int), handle)
+      end
+
+      # Sets proxy option.
+      #
+      # @example Set proxy option.
+      #   easy.proxy = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def proxy=(value)
+        Curl.set_option(:proxy, value_for(value, :string), handle)
+      end
+
+      # Sets proxyauth option.
+      #
+      # @example Set proxyauth option.
+      #   easy.proxyauth = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def proxyauth=(value)
+        Curl.set_option(:proxyauth, value_for(value, :string), handle)
       end
 
+      # Sets proxyport option.
+      #
+      # @example Set proxyport option.
+      #   easy.proxyport = 1
+      #
+      # @param [ Integer ] value The value to set.
+      #
+      # @return [ void ]
+      def proxyport=(value)
+        Curl.set_option(:proxyport, value_for(value, :int), handle)
+      end
+
+      # Sets proxytype option.
+      #
+      # @example Set proxytype option.
+      #   easy.proxytype = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def proxytype=(value)
+        Curl.set_option(:proxytype, value_for(value, :string), handle)
+      end
+
+      # Sets proxyuserpwd option.
+      #
+      # @example Set proxyuserpwd option.
+      #   easy.proxyuserpwd = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def proxyuserpwd=(value)
+        Curl.set_option(:proxyuserpwd, value_for(value, :string), handle)
+      end
+
+      # Sets readdata option.
+      #
+      # @example Set readdata option.
+      #   easy.readdata = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def readdata=(value)
+        Curl.set_option(:readdata, value_for(value, :string), handle)
+      end
+
+      # Sets readfunction option.
+      #
+      # @example Set readfunction option.
+      #   easy.readfunction = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def readfunction=(value)
+        Curl.set_option(:readfunction, value_for(value, :string), handle)
+      end
+
+      # Sets ssl_verifyhost option.
+      #
+      # @example Set ssl_verifyhost option.
+      #   easy.ssl_verifyhost = 1
+      #
+      # @param [ Integer ] value The value to set.
+      #
+      # @return [ void ]
+      def ssl_verifyhost=(value)
+        Curl.set_option(:ssl_verifyhost, value_for(value, :int), handle)
+      end
+
+      # Sets ssl_verifypeer option.
+      #
+      # @example Set ssl_verifypeer option.
+      #   easy.ssl_verifypeer = true
+      #
+      # @param [ Boolean ] value The value to set.
+      #
+      # @return [ void ]
+      def ssl_verifypeer=(value)
+        Curl.set_option(:ssl_verifypeer, value_for(value, :bool), handle)
+      end
+
+      # Sets sslcert option.
+      #
+      # @example Set sslcert option.
+      #   easy.sslcert = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def sslcert=(value)
+        Curl.set_option(:sslcert, value_for(value, :string), handle)
+      end
+
+      # Sets sslcerttype option.
+      #
+      # @example Set sslcerttype option.
+      #   easy.sslcerttype = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def sslcerttype=(value)
+        Curl.set_option(:sslcerttype, value_for(value, :string), handle)
+      end
+
+      # Sets sslkey option.
+      #
+      # @example Set sslkey option.
+      #   easy.sslkey = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def sslkey=(value)
+        Curl.set_option(:sslkey, value_for(value, :string), handle)
+      end
+
+      # Sets sslkeytype option.
+      #
+      # @example Set sslkeytype option.
+      #   easy.sslkeytype = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def sslkeytype=(value)
+        Curl.set_option(:sslkeytype, value_for(value, :string), handle)
+      end
+
+      # Sets sslversion option.
+      #
+      # @example Set sslversion option.
+      #   easy.sslversion = $value
+      #
+      # @param [ $type_doc ] value The value to set.
+      #
+      # @return [ void ]
+      def sslversion=(value)
+        Curl.set_option(:sslversion, value_for(value, :enum, :sslversion), handle)
+      end
+
+      # Sets timeout option.
+      #
+      # @example Set timeout option.
+      #   easy.timeout = 1
+      #
+      # @param [ Integer ] value The value to set.
+      #
+      # @return [ void ]
+      def timeout=(value)
+        Curl.set_option(:timeout, value_for(value, :int), handle)
+      end
+
+      # Sets timeout_ms option.
+      #
+      # @example Set timeout_ms option.
+      #   easy.timeout_ms = 1
+      #
+      # @param [ Integer ] value The value to set.
+      #
+      # @return [ void ]
+      def timeout_ms=(value)
+        Curl.set_option(:timeout_ms, value_for(value, :int), handle)
+      end
+
+      # Sets upload option.
+      #
+      # @example Set upload option.
+      #   easy.upload = true
+      #
+      # @param [ Boolean ] value The value to set.
+      #
+      # @return [ void ]
+      def upload=(value)
+        Curl.set_option(:upload, value_for(value, :bool), handle)
+      end
+
+      # Sets url option.
+      #
+      # @example Set url option.
+      #   easy.url = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def url=(value)
+        @url = value
+        Curl.set_option(:url, value_for(value, :string), handle)
+      end
+
+      # Sets useragent option.
+      #
+      # @example Set useragent option.
+      #   easy.useragent = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def useragent=(value)
+        Curl.set_option(:useragent, value_for(value, :string), handle)
+      end
+
+      # Sets userpwd option.
+      #
+      # @example Set userpwd option.
+      #   easy.userpwd = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def userpwd=(value)
+        Curl.set_option(:userpwd, value_for(value, :string), handle)
+      end
+
+      # Sets verbose option.
+      #
+      # @example Set verbose option.
+      #   easy.verbose = true
+      #
+      # @param [ Boolean ] value The value to set.
+      #
+      # @return [ void ]
+      def verbose=(value)
+        Curl.set_option(:verbose, value_for(value, :bool), handle)
+      end
+
+      private
+
       # Return the value to set to easy handle. It is converted with the help
       # of bool_options, enum_options and int_options.
       #
@@ -95,19 +505,26 @@ module Ethon
       # @raise [ Ethon::Errors::InvalidValue ] If specified option
       #   points to an enum and the value doen't correspond to
       #   the valid values.
-      def value_for(option)
-        value = method(option).call
+      def value_for(value, type, option = nil)
         return nil if value.nil?
 
-        if self.class.bool_options.include?(option)
+        if type == :bool
           value ? 1 : 0
-        elsif self.class.enum_options.key?(option)
-          self.class.enum_options[option].to_h.fetch(value) do
+        elsif type == :int
+          value.to_i
+        elsif type == :enum && option == :httpauth
+          Curl::Auth.to_h.fetch(value) do
             raise Errors::InvalidValue.new(option, value)
           end
-        elsif self.class.int_options.include?(option)
-          value.to_i
-        elsif value.is_a?(::String)
+        elsif type == :enum && option == :sslversion
+          Curl::SSLVersion.to_h.fetch(value) do
+            raise Errors::InvalidValue.new(option, value)
+          end
+        elsif type == :enum && option == :proxytype
+          Curl::Proxy.to_h.fetch(value) do
+            raise Errors::InvalidValue.new(option, value)
+          end
+        elsif value.is_a?(String)
           Util.escape_zero_byte(value)
         else
           value

data/lib/ethon/libc.rb

@@ -0,0 +1,8 @@
+module Ethon
+  module Libc
+    extend FFI::Library
+    ffi_lib 'c'
+    attach_function :getdtablesize, [], :int
+    attach_function :free, [:pointer], :void
+  end
+end

data/lib/ethon/multi.rb

@@ -1,3 +1,4 @@
+require 'ethon/easy/util'
 require 'ethon/multi/stack'
 require 'ethon/multi/operations'
 require 'ethon/multi/options'

data/lib/ethon/multi/operations.rb

@@ -30,16 +30,6 @@ module Ethon
         @max_fd = ::FFI::MemoryPointer.new(:int)
       end
 
-      # Return wether the multi still requests or not.
-      #
-      # @example Return if ongoing.
-      #   multi.ongoing?
-      #
-      # @return [ Boolean ] True if ongoing, else false.
-      def ongoing?
-        easy_handles.size > 0 || (!defined?(@running_count) || running_count > 0)
-      end
-
       # Perform multi.
       #
       # @return [ nil ]
@@ -69,8 +59,26 @@ module Ethon
       #   multi.prepare
       #
       # @api public
+      #
+      # @deprecated It is no longer necessary to call prepare.
       def prepare
-        set_options
+        Ethon.logger.warn(
+          "ETHON: It is no longer necessay to call "+
+          "Multi#prepare. Its going to be removed "+
+          "in future versions."
+        )
+      end
+
+      private
+
+      # Return wether the multi still requests or not.
+      #
+      # @example Return if ongoing.
+      #   multi.ongoing?
+      #
+      # @return [ Boolean ] True if ongoing, else false.
+      def ongoing?
+        easy_handles.size > 0 || (!defined?(@running_count) || running_count > 0)
       end
 
       # Get timeout.

data/lib/ethon/multi/options.rb

@@ -5,63 +5,80 @@ module Ethon
     # available options on multi.
     module Options
 
-      # :nodoc:
-      def self.included(base)
-        base.extend ClassMethods
-        base.const_set(:AVAILABLE_OPTIONS, [
-          :socketfunction, :socketdata, :pipelining,
-          :timerfunction, :timerdata, :maxconnects
-        ])
-        base.send(:attr_accessor, *Ethon::Multi::AVAILABLE_OPTIONS)
+      # Sets maxconnects option.
+      #
+      # @example Set maxconnects option.
+      #   easy.maxconnects = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def maxconnects=(value)
+        Curl.set_option(:maxconnects, value_for(value, :int), handle)
       end
 
-      module ClassMethods # :nodoc:
+      # Sets pipelining option.
+      #
+      # @example Set pipelining option.
+      #   easy.pipelining = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def pipelining=(value)
+        Curl.set_option(:pipelining, value_for(value, :bool), handle)
+      end
 
-        # Return the available options.
-        #
-        # @example Return the available options.
-        #   multi.available_options
-        #
-        # @return [ Array ]  The available options.
-        def available_options
-          Ethon::Multi::AVAILABLE_OPTIONS
-        end
+      # Sets socketdata option.
+      #
+      # @example Set socketdata option.
+      #   easy.socketdata = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def socketdata=(value)
+        Curl.set_option(:socketdata, value_for(value, :string), handle)
+      end
 
-        # Return the options which need to set as 0 or 1 for multi.
-        #
-        # @example Return the bool options.
-        #   multi.bool_options
-        #
-        # @return [ Array ] The bool options.
-        def bool_options
-          [
-            :pipelining
-          ]
-        end
+      # Sets socketfunction option.
+      #
+      # @example Set socketfunction option.
+      #   easy.socketfunction = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def socketfunction=(value)
+        Curl.set_option(:socketfunction, value_for(value, :string), handle)
+      end
 
-        # Return the options which need to set as an integer for multi.
-        #
-        # @example Return the int options.
-        #   multi.int_options
-        #
-        # @return [ Array ] The int options.
-        def int_options
-          [
-            :maxconnects
-          ]
-        end
+      # Sets timerdata option.
+      #
+      # @example Set timerdata option.
+      #   easy.timerdata = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def timerdata=(value)
+        Curl.set_option(:timerdata, value_for(value, :string), handle)
       end
 
-      # Set specified options on multi handle.
+      # Sets timerfunction option.
       #
-      # @example Set options.
-      #   multi.set_options
-      def set_options
-        self.class.available_options.each do |option|
-          Curl.set_option(option, value_for(option), handle, :multi)
-        end
+      # @example Set timerfunction option.
+      #   easy.timerfunction = $value
+      #
+      # @param [ String ] value The value to set.
+      #
+      # @return [ void ]
+      def timerfunction=(value)
+        Curl.set_option(:timerfunction, value_for(value, :string), handle)
       end
 
+      private
+
       # Return the value to set to multi handle. It is converted with the help
       # of bool_options, enum_options and int_options.
       #
@@ -69,14 +86,15 @@ module Ethon
       #   multi.value_for(:verbose)
       #
       # @return [ Object ] The casted value.
-      def value_for(option)
-        value = method(option).call
+      def value_for(value, type, option = nil)
         return nil if value.nil?
 
-        if self.class.bool_options.include?(option)
+        if type == :bool
           value ? 1 : 0
-        elsif self.class.int_options.include?(option)
+        elsif type == :int
           value.to_i
+        elsif value.is_a?(String)
+          Ethon::Easy::Util.escape_zero_byte(value)
         else
           value
         end

data/lib/ethon/version.rb

@@ -3,5 +3,5 @@ module Ethon
   # Ethon version.
   #
   # @api public
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -95,6 +95,7 @@ files:
 - lib/ethon/errors/multi_timeout.rb
 - lib/ethon/errors/select.rb
 - lib/ethon/errors.rb
+- lib/ethon/libc.rb
 - lib/ethon/loggable.rb
 - lib/ethon/multi/operations.rb
 - lib/ethon/multi/options.rb
@@ -121,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2796817779069789218
+      hash: -3112365376601188521
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: