ethon 0.2.0 → 0.3.0

data/CHANGELOG.md

@@ -2,7 +2,20 @@
 
 ## Master
 
-[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.2.0...master)
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.3.0...master)
+
+## 0.3.0
+
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.2.0...v0.3.0)
+
+Enhancements:
+
+* New libcurl option proxyport
+* Raise invalid value error when providing a wrong key for sslversion or httpauth
+
+Bugfixes:
+
+* Libcurl option sslversion is handled correct
 
 ## 0.2.0
 

data/lib/ethon/curl.rb

@@ -434,9 +434,12 @@ module Ethon
     attach_function :easy_cleanup, :curl_easy_cleanup, [:pointer], :void
     attach_function :easy_getinfo, :curl_easy_getinfo, [:pointer, :info, :pointer], :easy_code
     attach_function :easy_setopt, :curl_easy_setopt, [:pointer, :option, :pointer], :easy_code
+    attach_function :easy_setopt_ffi_pointer, :curl_easy_setopt, [:pointer, :option, :pointer], :easy_code
     attach_function :easy_setopt_string, :curl_easy_setopt, [:pointer, :option, :string], :easy_code
     attach_function :easy_setopt_long, :curl_easy_setopt, [:pointer, :option, :long], :easy_code
+    attach_function :easy_setopt_fixnum, :curl_easy_setopt, [:pointer, :option, :long], :easy_code
     attach_function :easy_setopt_callback, :curl_easy_setopt, [:pointer, :option, :callback], :easy_code
+    attach_function :easy_setopt_proc, :curl_easy_setopt, [:pointer, :option, :callback], :easy_code
     attach_function :easy_perform, :curl_easy_perform, [:pointer], :easy_code
     attach_function :easy_strerror, :curl_easy_strerror, [:int], :string
     attach_function :easy_escape, :curl_easy_escape, [:pointer, :pointer, :int], :string
@@ -498,16 +501,9 @@ module Ethon
 
       # Sets appropriate option for easy, depending on value type.
       def set_option(option, value, handle)
-        case value
-        when String
-          easy_setopt_string(handle, option, value.to_s)
-        when Integer
-          easy_setopt_long(handle, option, value)
-        when Proc, FFI::Function
-          easy_setopt_callback(handle, option, value)
-        else
-          easy_setopt(handle, option, value) if value
-        end
+        return unless value
+
+        method("easy_setopt_#{value.class.to_s.underscr}").call(handle, option, value)
       end
 
       # Return info as string.
@@ -522,7 +518,6 @@ module Ethon
       def get_info_string(option, handle)
         if easy_getinfo(handle, option, string_ptr) == :ok
           string_ptr.read_pointer.read_string
-        else nil
         end
       end
 
@@ -538,7 +533,6 @@ module Ethon
       def get_info_long(option, handle)
         if easy_getinfo(handle, option, long_ptr) == :ok
           long_ptr.read_long
-        else nil
         end
       end
 
@@ -554,7 +548,6 @@ module Ethon
       def get_info_double(option, handle)
         if easy_getinfo(handle, option, double_ptr) == :ok
           double_ptr.read_double
-        else nil
         end
       end
 

data/lib/ethon/easies/options.rb

@@ -13,9 +13,9 @@ module Ethon
           :customrequest, :cainfo, :capath, :connecttimeout,
           :followlocation, :httpauth, :infilesize, :interface,
           :maxredirs, :nosignal, :postfieldsize, :copypostfields, :proxy,
-          :proxyauth, :proxytype, :timeout, :readdata, :sslcert, :ssl_verifypeer, :ssl_verifyhost,
-          :sslcerttype, :sslkey, :sslkeytype, :sslversion,
-          :url, :useragent, :userpwd, :verbose, :readfunction
+          :proxyauth, :proxyport, :proxytype, :timeout, :readdata, :sslcert,
+          :ssl_verifypeer, :ssl_verifyhost, :sslcerttype, :sslkey, :sslkeytype,
+          :sslversion, :url, :useragent, :userpwd, :verbose, :readfunction
         ])
         base.send(:attr_accessor, *Ethon::Easy::AVAILABLE_OPTIONS)
       end
@@ -52,7 +52,7 @@ module Ethon
         #
         # @return [ Hash ] The enum options.
         def enum_options
-          { :httpauth => Curl::Auth }
+          { :httpauth => Curl::Auth, :sslversion => Curl::SSLVersion }
         end
 
         # Return the options which need to set as an integer for easy.
@@ -64,7 +64,7 @@ module Ethon
         def int_options
           [
             :connecttimeout, :dns_cache_timeout, :infilesize, :maxredirs,
-            :postfieldsize, :ssl_verifyhost, :timeout
+            :postfieldsize, :proxyport, :ssl_verifyhost, :timeout
           ]
         end
       end
@@ -75,10 +75,7 @@ module Ethon
       #   easy.set_options
       def set_options
         self.class.available_options.each do |option|
-          value = value_for(option)
-          next if value.nil?
-
-          Curl.set_option(option, value, handle)
+          Curl.set_option(option, value_for(option), handle)
         end
       end
 
@@ -96,7 +93,9 @@ module Ethon
         if self.class.bool_options.include?(option)
           value ? 1 : 0
         elsif self.class.enum_options.key?(option)
-          self.class.enum_options[option][value]
+          self.class.enum_options[option].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)

data/lib/ethon/easy.rb

@@ -104,6 +104,8 @@ module Ethon
     #  http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTPROXYAUTH.
     # @option options :proxytype [String] See
     #  http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTPROXYTYPE.
+    # @option options :proxyport [Integer] See
+    #  http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTPROXYPORT.
     # @option options :put [String] See
     #  http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTPUT.
     # @option options :readdata [String] See

data/lib/ethon/errors.rb

@@ -6,6 +6,7 @@ require 'ethon/errors/multi_add'
 require 'ethon/errors/multi_remove'
 require 'ethon/errors/select'
 require 'ethon/errors/invalid_option'
+require 'ethon/errors/invalid_value'
 
 module Ethon
 

data/lib/ethon/errors/invalid_value.rb

@@ -0,0 +1,12 @@
+module Ethon
+  module Errors
+
+    # Raises when option is invalid.
+    class InvalidValue < EthonError
+      def initialize(option, value)
+        super("The value: #{value} is invalid for option: #{option}.")
+      end
+    end
+  end
+end
+

data/lib/ethon/extensions.rb

@@ -1 +1 @@
-require 'ethon/extensions/string.rb' unless ''.respond_to?(:byteslice)
+require 'ethon/extensions/string.rb'

data/lib/ethon/extensions/string.rb

@@ -5,11 +5,33 @@ module Ethon
   module Extensions
     module String # :nodoc:
 
-      # Return part of the string.
+      unless ''.respond_to?(:byteslice)
+        # Return part of the string.
+        #
+        # @return [ String ] Part of the string.
+        def byteslice(*args)
+          self[*args]
+        end
+      end
+
+      # Convert string to underscore. Taken from
+      # activesupport, renamed in order to no collide
+      # with it.
+      #
+      # @example Underscore.
+      #   "ClassName".underscr
+      #   #=> "class_name"
       #
-      # @return [ String ] Part of the string.
-      def byteslice(*args)
-        self[*args]
+      # @return [ String ] Underscore string.
+      def underscr
+        word = self.dup
+        word.gsub!('::', '_')
+        word.gsub!(/(?:([A-Za-z\d])|^)(#{/(?=a)b/})(?=\b|[^a-z])/) { "#{$1}#{$1 && '_'}#{$2.downcase}" }
+        word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+        word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+        word.tr!("-", "_")
+        word.downcase!
+        word
       end
     end
   end

data/lib/ethon/multies/stack.rb

@@ -24,6 +24,7 @@ module Ethon
       # @raise [Ethon::Errors::MultiAdd] when adding an easy failed.
       def add(easy)
         return nil if easy_handles.include?(easy)
+
         code = Curl.multi_add_handle(handle, easy.handle)
         raise Errors::MultiAdd.new(code, easy) unless code == :ok
         easy_handles << easy

data/lib/ethon/version.rb

@@ -1,5 +1,5 @@
 module Ethon
 
   # Ethon version.
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -219,6 +219,7 @@ files:
 - lib/ethon/errors/ethon_error.rb
 - lib/ethon/errors/global_init.rb
 - lib/ethon/errors/invalid_option.rb
+- lib/ethon/errors/invalid_value.rb
 - lib/ethon/errors/multi_add.rb
 - lib/ethon/errors/multi_fdset.rb
 - lib/ethon/errors/multi_remove.rb
@@ -251,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2145906903079108779
+      hash: 1054475577707452411
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: