ethon 0.5.11 → 0.5.12

data/CHANGELOG.md

@@ -2,7 +2,25 @@
 
 ## Master
 
-[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.5.11...master)
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.5.12...master)
+
+## 0.5.12
+
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.5.11...v0.5.12)
+
+Enhancements:
+
+* Performance optimizations.
+  ([Kyle Oppenheim](https://github.com/koppenheim) and [Richie Vos](https://github.com/richievos), [\#48](https://github.com/typhoeus/ethon/pull/48))
+* Reuse memory pointer.
+  ([Richie Vos](https://github.com/richievos), [\#49](https://github.com/typhoeus/ethon/pull/49))
+
+Bugfixes:
+
+* Fix windows install.
+  ([Derik Olsson](https://github.com/derikolsson), [\#47](https://github.com/typhoeus/ethon/pull/47))
+* Handle urls that already contain query params.
+  ([Turner King](https://github.com/turnerking ), [\#45](https://github.com/typhoeus/ethon/pull/45))
 
 ## 0.5.11
 
@@ -16,12 +34,12 @@ Enhancements:
 * Relax ffi requirements.
   ([voxik](https://github.com/voxik), [\#40](https://github.com/typhoeus/ethon/pull/40))
 * Various documentation improvements.
-  ([craiglittle](https://github.com/craiglittle))
+  ([Craig Little](https://github.com/craiglittle))
 
 Bugfixes:
 
 * Fix the memory leaks.
-  ([richievos](https://github.com/richievos), [\#45](https://github.com/typhoeus/ethon/pull/45))
+  ([Richie Vos](https://github.com/richievos), [\#45](https://github.com/typhoeus/ethon/pull/45))
 
 ## 0.5.10
 
@@ -30,7 +48,7 @@ Bugfixes:
 Enhancements:
 
 * Allow custom requests.
-  ([nate](https://github.com/nate), [\#36](https://github.com/typhoeus/ethon/pull/36))
+  ([Nathan Sutton](https://github.com/nate), [\#36](https://github.com/typhoeus/ethon/pull/36))
 * Use updated version of FFI.
 
 Bugfixes:

data/Gemfile

@@ -6,7 +6,7 @@ gem "rake"
 group :development, :test do
   gem "rspec", "~> 2.11"
 
-  gem "sinatra", "~> 1.3"
+  gem "sinatra", git: "https://github.com/sinatra/sinatra.git"
   gem "json"
 
   unless ENV["CI"]

data/lib/ethon/curl.rb

@@ -35,12 +35,6 @@ module Ethon
       !(RbConfig::CONFIG['host_os'] !~ /mingw|mswin|bccwin/)
     end
 
-    if Curl.windows?
-      ffi_lib 'ws2_32'
-    else
-      ffi_lib ::FFI::Library::LIBC
-    end
-
     require 'ethon/curls/constants'
     require 'ethon/curls/settings'
     require 'ethon/curls/classes'

data/lib/ethon/curls/functions.rb

@@ -51,6 +51,12 @@ module Ethon
         base.attach_function :slist_free_all,         :curl_slist_free_all,      [:pointer],                     :void
         base.instance_variable_set(:@blocking, true)
 
+        if Curl.windows?
+            base.ffi_lib 'ws2_32'
+        else
+            base.ffi_lib ::FFI::Library::LIBC
+        end
+
         base.attach_function :select,                                            [:int, Curl::FDSet.ptr, Curl::FDSet.ptr, Curl::FDSet.ptr, Curl::Timeval.ptr], :int
       end
     end

data/lib/ethon/easy.rb

@@ -229,10 +229,11 @@ module Ethon
     # @see initialize
     def set_attributes(options)
       options.each_pair do |key, value|
-        unless respond_to?("#{key}=")
+        method = "#{key}="
+        unless respond_to?(method)
           raise Errors::InvalidOption.new(key)
         end
-        method("#{key}=").call(value)
+        send(method, value)
       end
     end
 
@@ -244,7 +245,7 @@ module Ethon
     def reset
       @url = nil
       @hash = nil
-      @on_complete = []
+      @on_complete = nil
       Curl.easy_reset(handle)
       set_callbacks
     end
@@ -278,7 +279,7 @@ module Ethon
         :response_body => response_body
       }
       Easy::Informations::AVAILABLE_INFORMATIONS.keys.each do |info|
-        @hash[info] = method(info).call
+        @hash[info] = send(info)
       end
       @hash
     end

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

@@ -87,7 +87,9 @@ module Ethon
         # @param [ Easy ] easy The easy to setup.
         def set_params(easy)
           params.escape = true
-          easy.url = "#{url}?#{params.to_s}"
+          base_url, base_params = url.split("?")
+          base_params += "&" if base_params
+          easy.url = "#{base_url}?#{base_params}#{params.to_s}"
         end
 
         # Setup request with form.

data/lib/ethon/easy/informations.rb

@@ -66,9 +66,7 @@ module Ethon
       }
 
       AVAILABLE_INFORMATIONS.each do |name, type|
-        define_method(name) do
-          Curl.method("get_info_#{type}").call(name, handle)
-        end
+        eval %Q|def #{name}; Curl.send(:get_info_#{type}, :#{name}, handle); end|
       end
 
       # Returns this curl version supports zlib.

data/lib/ethon/easy/operations.rb

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

data/lib/ethon/easy/options.rb

@@ -522,11 +522,29 @@ module Ethon
         Curl.set_option(:postfieldsize, value_for(value, :int), handle)
       end
 
+      # Pass a bitmask to control how libcurl acts on redirects after
+      # POSTs that get a 301, 302 or 303 response back. A parameter
+      # with bit 0 set (value CURL_REDIR_POST_301) tells the library
+      # to respect RFC 2616/10.3.2 and not convert POST requests into
+      # GET requests when following a 301 redirection. Setting bit 1
+      # (value CURL_REDIR_POST_302) makes libcurl maintain the request
+      # method after a 302 redirect whilst setting bit 2 (value
+      # CURL_REDIR_POST_303) makes libcurl maintain the request method
+      # after a 303 redirect. The value CURL_REDIR_POST_ALL is a
+      # convenience define that sets all three bits.
+      #
+      # The non-RFC behaviour is ubiquitous in web browsers, so the
+      # library does the conversion by default to maintain
+      # consistency. However, a server may require a POST to remain a
+      # POST after such a redirection. This option is meaningful only
+      # when setting CURLOPT_FOLLOWLOCATION. (Added in 7.17.1) (This
+      # option was known as CURLOPT_POST301 up to 7.19.0 as it only
+      # supported the 301 then)
+      #
+      # @example Set postredir option.
+      #   easy.postredir = :post_all
       #
-      # @example Set protocols option.
-      #   easy.protocols = :http
-      #
-      # @param [ Symbol ] value The value or array of values to set.
+      # @param [ Symbol ] value The value to set.
       #
       # @return [ void ]
       def postredir=(value)

data/lib/ethon/easy/queryable.rb

@@ -27,12 +27,14 @@ module Ethon
       #
       # @return [ String ] The string representation.
       def to_s
-        query_pairs.map{ |pair|
+        @to_s ||= query_pairs.map{ |pair|
           return pair if pair.is_a?(String)
 
-          pair.map{ |e|
-            escape && @easy ? @easy.escape(e.to_s) : e
-          }.join("=")
+          if escape && @easy
+            pair.map{ |e| @easy.escape(e.to_s) }.join("=")
+          else
+            pair.join("=")
+          end
         }.join('&')
       end
 
@@ -59,21 +61,7 @@ module Ethon
         return [hash] if hash.is_a?(String)
 
         pairs = []
-        recursive = Proc.new do |h, prefix|
-          case h
-          when Hash
-            h.each_pair do |k,v|
-              key = prefix == '' ? k : "#{prefix}[#{k}]"
-              pairs_for(v, key, pairs, recursive)
-            end
-          when Array
-            h.each_with_index do |v, i|
-              key = "#{prefix}[#{i}]"
-              pairs_for(v, key, pairs, recursive)
-            end
-          end
-        end
-        recursive.call(hash, '')
+        recursively_generate_pairs(hash, nil, pairs)
         pairs
       end
 
@@ -97,12 +85,27 @@ module Ethon
 
       private
 
-      def pairs_for(v, key, pairs,  recursive)
+      def recursively_generate_pairs(h, prefix, pairs)
+        case h
+        when Hash
+          h.each_pair do |k,v|
+            key = prefix.nil? ? k : "#{prefix}[#{k}]"
+            pairs_for(v, key, pairs)
+          end
+        when Array
+          h.each_with_index do |v, i|
+            key = "#{prefix}[#{i}]"
+            pairs_for(v, key, pairs)
+          end
+        end
+      end
+
+      def pairs_for(v, key, pairs)
         case v
         when Hash
-          recursive.call(v, key)
+          recursively_generate_pairs(v, key, pairs)
         when Array
-          recursive.call(v, key)
+          recursively_generate_pairs(v, key, pairs)
         when File, Tempfile
           pairs << [Util.escape_zero_byte(key), file_info(v)]
         else

data/lib/ethon/easy/response_callbacks.rb

@@ -40,7 +40,7 @@ module Ethon
       #   request.complete
       def complete
         if defined?(@on_complete)
-          @on_complete.map{ |callback| callback.call(self) }
+          @on_complete.each{ |callback| callback.call(self) }
         end
       end
     end

data/lib/ethon/multi/operations.rb

@@ -2,6 +2,9 @@ module Ethon
   class Multi # :nodoc
     # This module contains logic to run a multi.
     module Operations
+      STARTED_MULTI = "ETHON: started MULTI"
+      PERFORMED_MULTI = "ETHON: performed MULTI"
+
       # Return the multi handle. Inititialize multi handle,
       # in case it didn't happened already.
       #
@@ -35,7 +38,7 @@ module Ethon
       # @example Perform multi.
       #   multi.perform
       def perform
-        Ethon.logger.debug("ETHON: started MULTI")
+        Ethon.logger.debug(STARTED_MULTI)
         while ongoing?
           run
           timeout = get_timeout
@@ -43,7 +46,7 @@ module Ethon
           reset_fds
           set_fds(timeout)
         end
-        Ethon.logger.debug("ETHON: performed MULTI")
+        Ethon.logger.debug(PERFORMED_MULTI)
         nil
       end
 
@@ -140,7 +143,7 @@ module Ethon
           next if msg[:code] != :done
           easy = easy_handles.find{ |e| e.handle == msg[:easy_handle] }
           easy.return_code = msg[:data][:code]
-          Ethon.logger.debug("ETHON:         performed #{easy.log_inspect}")
+          Ethon.logger.debug { "ETHON:         performed #{easy.log_inspect}" }
           delete(easy)
           easy.complete
         end
@@ -153,7 +156,8 @@ module Ethon
       #
       # @return [ void ]
       def run
-        begin code = trigger end while code == :call_multi_perform
+        running_count_pointer = FFI::MemoryPointer.new(:int)
+        begin code = trigger(running_count_pointer) end while code == :call_multi_perform
         check
       end
 
@@ -163,10 +167,9 @@ module Ethon
       #   multi.trigger
       #
       # @return [ Symbol ] The Curl.multi_perform return code.
-      def trigger
-        running_count = FFI::MemoryPointer.new(:int)
-        code = Curl.multi_perform(handle, running_count)
-        @running_count = running_count.read_int
+      def trigger(running_count_pointer)
+        code = Curl.multi_perform(handle, running_count_pointer)
+        @running_count = running_count_pointer.read_int
         code
       end
 

data/lib/ethon/version.rb

@@ -1,5 +1,5 @@
 module Ethon
 
   # Ethon version.
-  VERSION = '0.5.11'
+  VERSION = '0.5.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3434979125068377231
+      hash: 2640646266244561120
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: