ethon 0.9.1 → 0.13.0

data/lib/ethon/libc.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
 
   # FFI Wrapper module for Libc.
@@ -13,7 +14,21 @@ module Ethon
     end
 
     unless windows?
-      attach_function :getdtablesize, [], :int
+      fcg = FFI::ConstGenerator.new do |gen|
+        gen.include 'unistd.h'
+        %w[
+          _SC_OPEN_MAX
+        ].each do |const|
+          ruby_name = const.sub(/^_SC_/, '').downcase.to_sym
+          gen.const(const, "%d", nil, ruby_name, &:to_i)
+        end
+      end
+
+      CONF = enum(*fcg.constants.map{|_, const|
+        [const.ruby_name, const.converted_value]
+      }.flatten)
+
+      attach_function :sysconf, [CONF], :long
       attach_function :free, [:pointer], :void
     end
   end

data/lib/ethon/loggable.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Ethon
 
   # Contains logging behaviour.

data/lib/ethon/multi.rb

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

data/lib/ethon/multi/operations.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Multi # :nodoc
     # This module contains logic to run a multi.

data/lib/ethon/multi/options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Multi
 
@@ -38,7 +39,7 @@ module Ethon
       #
       # @return [ void ]
       def pipelining=(value)
-        Curl.set_option(:pipelining, value_for(value, :bool), handle, :multi)
+        Curl.set_option(:pipelining, value_for(value, :int), handle, :multi)
       end
 
       # Sets socketdata option.

data/lib/ethon/multi/stack.rb

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

data/lib/ethon/version.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Ethon
 
   # Ethon version.
-  VERSION = '0.9.1'
+  VERSION = '0.13.0'
 end

data/profile/benchmarks.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'ethon'
 require 'open-uri'
 require 'patron'

data/profile/memory_leaks.rb

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

data/profile/perf_spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #### SETUP
 require 'bundler'
 Bundler.setup

data/profile/support/memory_test_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'ruby_object_leak_tracker'
 require_relative 'os_memory_leak_tracker'
 

data/profile/support/os_memory_leak_tracker.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class OSMemoryLeakTracker
   attr_reader :current_run
 

data/profile/support/ruby_object_leak_tracker.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class RubyObjectLeakTracker
   attr_reader :previous_count_hash, :current_count_hash
 

data/spec/ethon/curl_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Curl do

data/spec/ethon/easy/callbacks_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Callbacks do
@@ -8,7 +9,7 @@ describe Ethon::Easy::Callbacks do
       expect(Ethon::Curl).to receive(:set_option).exactly(3).times
     end
 
-    it "sets write- and headerfunction" do
+    it "sets write-, debug-, and headerfunction" do
       easy.set_callbacks
     end
 
@@ -28,6 +29,12 @@ describe Ethon::Easy::Callbacks do
     end
   end
 
+  describe "#progress_callback" do
+    it "returns 0" do
+      expect(easy.progress_callback.call(0,1,1,1,1)).to be(0)
+    end
+  end
+
   describe "#body_write_callback" do
     let(:body_write_callback) { easy.instance_variable_get(:@body_write_callback) }
     let(:stream) { double(:read_string => "") }

data/spec/ethon/easy/debug_info_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::DebugInfo do
@@ -23,6 +24,7 @@ describe Ethon::Easy::DebugInfo do
       end
 
       after do
+        easy.verbose = false
         easy.reset
       end
 

data/spec/ethon/easy/features_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Informations do

data/spec/ethon/easy/form_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Form do
@@ -41,6 +42,15 @@ describe Ethon::Easy::Form do
         expect(form.multipart?).to be_truthy
       end
     end
+
+    context "when options contains multipart=true" do
+      before { form.instance_variable_set(:@multipart, true) }
+      let(:pairs) { [['a', '1'], ['b', '2']] }
+
+      it "returns true" do
+        expect(form.multipart?).to be_truthy
+      end
+    end
   end
 
   describe "#materialize" do
@@ -72,5 +82,23 @@ describe Ethon::Easy::Form do
         form.materialize
       end
     end
+
+    context "when query_pairs contains file and string values" do
+      let(:pairs) { [['a', ["file", "type", "path/file"]], ['b', '1']] }
+
+      it "adds file to form" do
+        expect(Ethon::Curl).to receive(:formadd).twice
+        form.materialize
+      end
+    end
+
+    context "when query_pairs contains file, string and int values" do
+      let(:pairs) { [['a', ["file", "type", "path/file"]], ['b', '1'], ['c', 1]] }
+
+      it "adds file to form" do
+        expect(Ethon::Curl).to receive(:formadd).exactly(3).times
+        form.materialize
+      end
+    end
   end
 end

data/spec/ethon/easy/header_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Header do

data/spec/ethon/easy/http/custom_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Custom do

data/spec/ethon/easy/http/delete_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Delete do

data/spec/ethon/easy/http/get_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Get do

data/spec/ethon/easy/http/head_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Head do

data/spec/ethon/easy/http/options_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Options do

data/spec/ethon/easy/http/patch_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Patch do

data/spec/ethon/easy/http/post_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Post do

data/spec/ethon/easy/http/put_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Put do

data/spec/ethon/easy/http_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http do

data/spec/ethon/easy/informations_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Informations do

data/spec/ethon/easy/mirror_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Mirror do

data/spec/ethon/easy/operations_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Operations do

data/spec/ethon/easy/options_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Options do
@@ -12,7 +13,7 @@ describe Ethon::Easy::Options do
     :proxyuserpwd, :readdata, :readfunction, :redir_protocols, :ssl_verifyhost,
     :ssl_verifypeer, :sslcert, :sslcerttype, :sslkey, :sslkeytype, :sslversion,
     :timeout, :timeout_ms, :unrestricted_auth, :upload, :url, :useragent,
-    :userpwd, :verbose
+    :userpwd, :verbose, :pipewait, :dns_shuffle_addresses, :path_as_is
   ].each do |name|
     describe "#{name}=" do
       it "responds_to" do
@@ -74,6 +75,35 @@ describe Ethon::Easy::Options do
     end
   end
 
+  describe '#multipart?' do
+    context 'by default' do
+      it 'returns false' do
+        expect(easy.multipart?).to be_falsey
+      end
+    end
+
+    context 'when #multipart=nil' do
+      it 'returns false' do
+        easy.multipart = nil
+        expect(easy.multipart?).to be_falsey
+      end
+    end
+
+    context 'when #multipart=true' do
+      it 'returns true' do
+        easy.multipart = true
+        expect(easy.multipart?).to be_truthy
+      end
+    end
+
+    context 'when #multipart=false' do
+      it 'returns false' do
+        easy.multipart = false
+        expect(easy.multipart?).to be_falsey
+      end
+    end
+  end
+
   describe "#httppost=" do
     it "raises unless given a FFI::Pointer" do
       expect{ easy.httppost = 1 }.to raise_error(Ethon::Errors::InvalidValue)

data/spec/ethon/easy/queryable_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Queryable do
@@ -122,6 +123,14 @@ describe Ethon::Easy::Queryable do
           expect(pairs).to include(["b[]", 3])
         end
       end
+
+      context "when params_encoding is :none" do
+        before { params.params_encoding = :none }
+        it "does no transformation" do
+          expect(pairs).to include([:a, 1])
+          expect(pairs).to include([:b, [2, 3]])
+        end
+      end
     end
 
     context "when params contains something nested in an array" do
@@ -152,9 +161,11 @@ describe Ethon::Easy::Queryable do
         end
 
         context "when MIME" do
-          context "when mime type" do
-            it "sets mime type to text" do
-              expect(mime_type).to eq("application/x-ruby")
+          if defined?(MIME)
+            context "when mime type" do
+              it "sets mime type to text" do
+                expect(mime_type).to eq("application/x-ruby")
+              end
             end
           end
 

data/spec/ethon/easy/response_callbacks_spec.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::ResponseCallbacks do
   let(:easy) { Ethon::Easy.new }
 
-  [:on_complete, :on_headers, :on_body].each do |callback_type|
+  [:on_complete, :on_headers, :on_body, :on_progress].each do |callback_type|
     describe "##{callback_type}" do
       it "responds" do
         expect(easy).to respond_to("#{callback_type}")
@@ -68,6 +69,62 @@ describe Ethon::Easy::ResponseCallbacks do
     end
   end
 
+  describe "#progress" do
+    context "when requesting for realz" do
+      it "executes callback" do
+        post = Ethon::Easy::Http::Post.new("http://localhost:3001", {:body => "bar=fu"})
+        post.setup(easy)
+        @called = false
+        @has_dltotal = false
+        @has_ultotal = false
+        easy.on_progress { @called = true }
+        easy.on_progress { |dltotal, _, _, _| @has_dltotal ||= true }
+        easy.on_progress { |_, _, ultotal, _| @has_ultotal ||= true }
+        easy.perform
+        expect(@called).to be true
+        expect(@has_dltotal).to be true
+        expect(@has_ultotal).to be true
+      end
+    end
+
+    context "when pretending" do
+      before do
+        @dltotal = nil
+        @dlnow = nil
+        @ultotal = nil
+        @ulnow = nil
+        easy.on_progress { |dltotal, dlnow, ultotal, ulnow| @dltotal = dltotal ; @dlnow = dlnow; @ultotal = ultotal; @ulnow = ulnow }
+      end
+
+      it "executes blocks and passes dltotal" do
+        easy.progress(1, 2, 3, 4)
+        expect(@dltotal).to eq(1)
+      end
+
+      it "executes blocks and passes dlnow" do
+        easy.progress(1, 2, 3, 4)
+        expect(@dlnow).to eq(2)
+      end
+
+      it "executes blocks and passes ultotal" do
+        easy.progress(1, 2, 3, 4)
+        expect(@ultotal).to eq(3)
+      end
+
+      it "executes blocks and passes ulnow" do
+        easy.progress(1, 2, 3, 4)
+        expect(@ulnow).to eq(4)
+      end
+
+      context "when @on_progress nil" do
+        it "doesn't raise" do
+          easy.instance_variable_set(:@on_progress, nil)
+          expect{ easy.progress(1, 2, 3, 4) }.to_not raise_error
+        end
+      end
+    end
+  end
+
   describe "#body" do
     before do
       @chunk = nil