ethon 0.9.1 → 0.13.0

data/lib/ethon/curls/settings.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
 module Ethon
   module Curl
     callback :callback, [:pointer, :size_t, :size_t, :pointer], :size_t
     callback :debug_callback, [:pointer, :debug_info_type, :pointer, :size_t, :pointer], :int
+    callback :progress_callback, [:pointer, :long_long, :long_long, :long_long, :long_long], :int
     ffi_lib_flags :now, :global
     ffi_lib ['libcurl', 'libcurl.so.4']
   end

data/lib/ethon/easy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/easy/informations'
 require 'ethon/easy/features'
 require 'ethon/easy/callbacks'
@@ -159,7 +160,6 @@ module Ethon
     #   * :recv_error: Failure with receiving network data.
     #   * :ssl_certproblem: problem with the local client certificate.
     #   * :ssl_cipher: Couldn't use specified cipher.
-    #   * :ssl_cacert: Peer certificate cannot be authenticated with known CA certificates.
     #   * :bad_content_encoding: Unrecognized transfer encoding.
     #   * :ldap_invalid_url: Invalid LDAP URL.
     #   * :filesize_exceeded: Maximum file size exceeded.
@@ -253,6 +253,7 @@ module Ethon
       @on_complete = nil
       @on_headers = nil
       @on_body = nil
+      @on_progress = nil
       @procs = nil
       @mirror = nil
       Curl.easy_reset(handle)
@@ -267,6 +268,7 @@ module Ethon
       e.instance_variable_set(:@body_write_callback, nil)
       e.instance_variable_set(:@header_write_callback, nil)
       e.instance_variable_set(:@debug_callback, nil)
+      e.instance_variable_set(:@progress_callback, nil)
       e.set_callbacks
       e
     end

data/lib/ethon/easy/callbacks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
 
@@ -22,8 +23,8 @@ module Ethon
         Curl.set_option(:writefunction, body_write_callback, handle)
         Curl.set_option(:headerfunction, header_write_callback, handle)
         Curl.set_option(:debugfunction, debug_callback, handle)
-        @response_body = ""
-        @response_headers = ""
+        @response_body = String.new
+        @response_headers = String.new
         @headers_called = false
         @debug_info = Ethon::Easy::DebugInfo.new
       end
@@ -60,7 +61,7 @@ module Ethon
       # write the raw http request headers.
       #
       # @example Return the callback.
-      #   easy.body_write_callback
+      #   easy.debug_callback
       #
       # @return [ Proc ] The callback.
       def debug_callback
@@ -72,6 +73,27 @@ module Ethon
         }
       end
 
+      def set_progress_callback
+        if Curl.version_info[:version] >= "7.32.0"
+          Curl.set_option(:xferinfofunction, progress_callback, handle)
+        else
+          Curl.set_option(:progressfunction, progress_callback, handle)
+        end
+      end
+
+      # Returns the progress callback.
+      #
+      # @example Return the callback.
+      #   easy.progress_callback
+      #
+      # @return [ Proc ] The callback.
+      def progress_callback
+        @progress_callback ||= proc { |_, dltotal, dlnow, ultotal, ulnow|
+          progress(dltotal, dlnow, ultotal, ulnow)
+          0
+        }
+      end
+
       # Set the read callback. This callback is used by libcurl to
       # read data when performing a PUT request.
       #

data/lib/ethon/easy/debug_info.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
 

data/lib/ethon/easy/features.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
 

data/lib/ethon/easy/form.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/easy/util'
 require 'ethon/easy/queryable'
 
@@ -21,9 +22,10 @@ module Ethon
       # @param [ Hash ] params The parameter with which to initialize the form.
       #
       # @return [ Form ] A new Form.
-      def initialize(easy, params)
+      def initialize(easy, params, multipart = nil)
         @easy = easy
         @params = params || {}
+        @multipart = multipart
       end
 
       # Return a pointer to the first form element in libcurl.
@@ -47,13 +49,14 @@ module Ethon
       end
 
       # Return if form is multipart. The form is multipart
-      # when it contains a file.
+      # when it contains a file or multipart option is set on the form during creation.
       #
       # @example Return if form is multipart.
       #   form.multipart?
       #
       # @return [ Boolean ] True if form is multipart, else false.
       def multipart?
+        return true if @multipart
         query_pairs.any?{|pair| pair.respond_to?(:last) && pair.last.is_a?(Array)}
       end
 
@@ -82,8 +85,8 @@ module Ethon
           Curl.formadd(first, last,
                        :form_option, :copyname, :pointer, name,
                        :form_option, :namelength, :long, name.bytesize,
-                       :form_option, :copycontents, :pointer, content,
-                       :form_option, :contentslength, :long, content ? content.bytesize : 0,
+                       :form_option, :copycontents, :pointer, content.to_s,
+                       :form_option, :contentslength, :long, content ? content.to_s.bytesize : 0,
                        :form_option, :end
                       )
         end

data/lib/ethon/easy/header.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     # This module contains the logic around adding headers to libcurl.

data/lib/ethon/easy/http.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/easy/http/actionable'
 require 'ethon/easy/http/post'
 require 'ethon/easy/http/get'

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/easy/http/putable'
 require 'ethon/easy/http/postable'
 
@@ -71,7 +72,7 @@ module Ethon
         #
         # @return [ Form ] The form.
         def form
-          @form ||= Form.new(@easy, query_options.fetch(:body, nil))
+          @form ||= Form.new(@easy, query_options.fetch(:body, nil), options.fetch(:multipart, nil))
         end
 
         # Get the requested array encoding. By default it's

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

data/lib/ethon/easy/informations.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
 

data/lib/ethon/easy/mirror.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     class Mirror

data/lib/ethon/easy/operations.rb

@@ -1,8 +1,23 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     # This module contains the logic to prepare and perform
     # an easy.
     module Operations
+      
+      class PointerHelper
+        class<<self
+          def synchronize( &block )
+            (@mutex ||= Mutex.new).synchronize( &block )
+          end
+
+          def release( pointer )
+            synchronize { Curl.easy_cleanup pointer }
+          end
+        end
+        synchronize{}
+      end
+
       # Returns a pointer to the curl easy handle.
       #
       # @example Return the handle.
@@ -10,7 +25,7 @@ module Ethon
       #
       # @return [ FFI::Pointer ] A pointer to the curl easy handle.
       def handle
-        @handle ||= FFI::AutoPointer.new(Curl.easy_init, Curl.method(:easy_cleanup))
+        @handle ||= FFI::AutoPointer.new(Curl.easy_init, PointerHelper.method(:release) )
       end
 
       # Sets a pointer to the curl easy handle.

data/lib/ethon/easy/options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
 
@@ -16,8 +17,16 @@ module Ethon
       end
 
       def escape?
-        return true if @escape
-        @escape.nil? ? true : false
+        return true if !defined?(@escape) || @escape.nil?
+        @escape
+      end
+
+      def multipart=(b)
+        @multipart = b
+      end
+
+      def multipart?
+        !!@multipart
       end
 
       Curl.easy_options(nil).each do |opt, props|

data/lib/ethon/easy/params.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/easy/util'
 require 'ethon/easy/queryable'
 

data/lib/ethon/easy/queryable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
 
@@ -102,6 +103,8 @@ module Ethon
             encode_rack_array_pairs(h, prefix, pairs)
           elsif params_encoding == :multi
             encode_multi_array_pairs(h, prefix, pairs)
+          elsif params_encoding == :none
+            pairs << [prefix, h]
           else
             encode_indexed_array_pairs(h, prefix, pairs)
           end
@@ -128,7 +131,7 @@ module Ethon
           pairs_for(v, key, pairs)
         end
       end
-      
+
     def encode_multi_array_pairs(h, prefix, pairs)
       h.each_with_index do |v, i|
         key = prefix

data/lib/ethon/easy/response_callbacks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
 
@@ -69,6 +70,32 @@ module Ethon
         end
       end
 
+      # Set on_progress callback.
+      #
+      # @example Set on_progress.
+      #   request.on_progress {|dltotal, dlnow, ultotal, ulnow| p "#{dltotal} #{dlnow} #{ultotal} #{ulnow}" }
+      #
+      # @param [ Block ] block The block to execute.
+      def on_progress(&block)
+        @on_progress ||= []
+        if block_given?
+          @on_progress << block
+          set_progress_callback
+          self.noprogress = 0
+        end
+        @on_progress
+      end
+
+      # Execute on_progress callbacks.
+      #
+      # @example Execute on_progress.
+      #   request.body(1, 1, 1, 1)
+      def progress(dltotal, dlnow, ultotal, ulnow)
+        if defined?(@on_progress) and not @on_progress.nil?
+          @on_progress.each{ |callback| callback.call(dltotal, dlnow, ultotal, ulnow) }
+        end
+      end
+
       # Set on_body callback.
       #
       # @example Set on_body.

data/lib/ethon/easy/util.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy # :nodoc:
 

data/lib/ethon/errors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/errors/ethon_error'
 require 'ethon/errors/global_init'
 require 'ethon/errors/multi_timeout'

data/lib/ethon/errors/ethon_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/global_init.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/invalid_option.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/invalid_value.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/multi_add.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/multi_fdset.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/multi_remove.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/multi_timeout.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/select.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors