ethon 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a8e3e2daabb0f28d13cfec209027f4a3dfb588f
-  data.tar.gz: b5dc230d462c0972fa15bb811906e70ca4b6d8a7
+  metadata.gz: 6fabe1040444c048c297b35b8785962b405cf22b
+  data.tar.gz: 024c7e7ed7c3ef61dbbae1375b25626e1e5bbdf4
 SHA512:
-  metadata.gz: ba31326c9c9dd60a8635a32edde9b4936307e602097b2ca696333410aea60746fbda37b7c2d179ac2be01a46ccee66debfdd014deb073f87ffeb1fdeae00540b
-  data.tar.gz: 9f2b01584a1f175f9032febbd0fbc1b80a56dcda094a2825746e6e7ccca8254f07fc3ae7bf5c5249e7b75f52914a9229201dfb1a0e26fb17af457a6cfae5efe9
+  metadata.gz: 9e5e32e36f44d8f909d5d90e5a337959ced86643e16792e346fac504e6c53e34b548fae11a5f8334ac36b9594cbdeacc6c9fa2014a6ed73ed3e57a89a19e2801
+  data.tar.gz: f350cc872574938c24a4080dde53bd6fc97dbc78b30399bac1a9b5e68702f64920bc722ed53fa77dca41a4a3298b53955e151e1d19826be0d7a9a75c1733a316

data/.travis.yml

@@ -1,19 +1,26 @@
-script: "bundle exec rake"
+language: ruby
+cache: bundler
 sudo: false
+
 bundler_args: --without perf
+script: bundle exec rake
+
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - 2.0.0
+  - 2.0.0-p648
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - ruby-head
   - ree
-  - jruby-head
   - jruby-18mode
   - jruby-19mode
+  - jruby-head
+  - rbx-2
+
 matrix:
   allow_failures:
+    - rvm: ree
     - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode

data/CHANGELOG.md

@@ -2,10 +2,16 @@
 
 ## Master
 
-[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.8.1...master)
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.9.0...master)
+
+## 0.9.0
+
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.8.1...v0.9.0)
 
 ## 0.8.1
 
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.8.0...v0.8.1)
+
 * Support optional escaping of params.
   ([Tasos Laskos](https://github.com/zapotek)
 * `Easy::Mirror`: Reduced object allocations and method calls during info handling.
@@ -13,6 +19,11 @@
 
 ## 0.8.0
 
+[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.7.3...v0.7.4)
+
+* `Easy::Mirror`: Reduced object allocations and method calls during info handling.
+  ([Tasos Laskos](https://github.com/zapotek)
+
 ## 0.7.4
 
 [Full Changelog](https://github.com/typhoeus/ethon/compare/v0.7.3...v0.7.4)

data/Gemfile

@@ -1,22 +1,27 @@
 source "https://rubygems.org"
 gemspec
 
-gem "rake"
+if Gem.ruby_version < Gem::Version.new("1.9.3")
+  gem "rake", "< 11"
+else
+  gem "rake"
+end
 
 group :development, :test do
-  gem "rspec", "~> 2.11"
+  gem "rspec", "~> 3.4"
 
-  gem "sinatra", :git => "https://github.com/sinatra/sinatra.git"
+  gem "sinatra"
   gem "json"
   gem "mime-types", "~> 1.18"
 
   unless ENV["CI"]
     gem "guard-rspec", "~> 0.7"
-    gem 'rb-fsevent', '~> 0.9.1'
+    gem "rb-fsevent", "~> 0.9.1"
   end
 end
 
 group :perf do
-  gem "patron", "~> 0.4"
-  gem "curb", "~> 0.8.0"
+  gem "benchmark-ips"
+  gem "patron"
+  gem "curb"
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 Hans Hasselberg
+Copyright (c) 2012-2016 Hans Hasselberg
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -71,7 +71,7 @@ everything up correctly.
 
 (The MIT License)
 
-Copyright © 2012-2014 [Hans Hasselberg](http://www.hans.io)
+Copyright © 2012-2016 [Hans Hasselberg](http://www.hans.io)
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

data/lib/ethon/curls/functions.rb

@@ -25,6 +25,7 @@ module Ethon
         base.attach_function :easy_strerror,              :curl_easy_strerror,       [:easy_code],                   :string
         base.attach_function :easy_escape,                :curl_easy_escape,         [:pointer, :pointer, :int],     :pointer
         base.attach_function :easy_reset,                 :curl_easy_reset,          [:pointer],                     :void
+        base.attach_function :easy_duphandle,             :curl_easy_duphandle,      [:pointer],                     :pointer
 
         base.attach_function :formadd,                    :curl_formadd,             [:pointer, :pointer, :varargs], :int
         base.attach_function :formfree,                   :curl_formfree,            [:pointer],                     :void

data/lib/ethon/curls/options.rb

@@ -5,10 +5,15 @@ module Ethon
     # easy or multi interface.
     module Options
 
+      OPTION_STRINGS = { :easy => 'easy_options', :multi => 'multi_options' }.freeze
+      FOPTION_STRINGS = { :easy => 'EASY_OPTIONS', :multi => 'MULTI_OPTIONS' }.freeze
+      FTYPES = [:long, :string, :ffipointer, :callback, :debug_callback, :off_t]
+      FUNCS = Hash[*[:easy, :multi].zip([:easy, :multi].map { |t| Hash[*FTYPES.zip(FTYPES.map { |ft| "#{t}_setopt_#{ft}" }).flatten] }).flatten]
       # Sets appropriate option for easy, depending on value type.
       def set_option(option, value, handle, type = :easy)
-        raise NameError, "Ethon::Curls::Options unknown type #{type}." unless respond_to?("#{type.to_s.downcase}_options")
-        opthash=send("#{type.to_s.downcase}_options")
+        type = type.to_sym unless type.is_a?(Symbol)
+        raise NameError, "Ethon::Curls::Options unknown type #{type}." unless respond_to?(OPTION_STRINGS[type])
+        opthash=send(OPTION_STRINGS[type], nil)
         raise Errors::InvalidOption.new(option) unless opthash.include?(option)
 
         case opthash[option][:type]
@@ -90,8 +95,7 @@ module Ethon
             tv=((value<0) ? value.abs-1 : value)
             raise Errors::InvalidValue.new(option,value) unless tv<(1<<bits)
         end
-
-        send("#{type}_setopt_#{func}", handle, opthash[option][:opt], value)
+        send(FUNCS[type][func], handle, opthash[option][:opt], value)
       end
 
       OPTION_TYPE_BASE = {
@@ -174,25 +178,24 @@ module Ethon
         else
           raise ArgumentError, "Ethon::Curls::Options #{ftype} #{name} Expected no opts." unless opts.nil?
         end
-
-        opthash=const_get("#{ftype.to_s.upcase}_OPTIONS")
-        opthash[name]={:type=>type, :opt=>OPTION_TYPE_BASE[OPTION_TYPE_MAP[type]]+num, :opts=>opts}
+        opthash=const_get(FOPTION_STRINGS[ftype])
+        opthash[name] = { :type => type,
+                          :opt => OPTION_TYPE_BASE[OPTION_TYPE_MAP[type]] + num,
+                          :opts => opts }
       end
 
       def self.option_alias(ftype,name,*aliases)
-        opthash=const_get("#{ftype.to_s.upcase}_OPTIONS")
+        opthash=const_get(FOPTION_STRINGS[ftype])
         aliases.each { |a| opthash[a]=opthash[name] }
       end
 
       def self.option_type(type)
-        cname="#{type.to_s.upcase}_OPTIONS"
-        c=const_set(cname,{})
-        eval %Q<
-          def #{type.to_s.downcase}_options(rt=nil)
-            return #{cname}.map { |k,v| [k,v[:opt]] } if rt==:enum
-            #{cname}
-          end
-        >
+        cname = FOPTION_STRINGS[type]
+        const_set(cname, {})
+        define_method(OPTION_STRINGS[type]) do |rt|
+          return Ethon::Curls::Options.const_get(cname).map { |k, v| [k, v[:opt]] } if rt == :enum
+          Ethon::Curls::Options.const_get(cname)
+        end
       end
 
       # Curl multi options, refer
@@ -415,7 +418,7 @@ module Ethon
       option_alias :easy, :keypasswd, :sslkeypasswd
       option :easy, :sslengine, :string, 89
       option :easy, :sslengine_default, :none, 90
-      option :easy, :sslversion, :enum, 32, [:default, :tlsv1, :sslv2, :sslv3]
+      option :easy, :sslversion, :enum, 32, [:default, :tlsv1, :sslv2, :sslv3, :tlsv1_0, :tlsv1_1, :tlsv1_2]
       option :easy, :ssl_verifypeer, :bool, 64
       option :easy, :cainfo, :string, 65
       option :easy, :issuercert, :string, 170

data/lib/ethon/easy.rb

@@ -259,6 +259,17 @@ module Ethon
       set_callbacks
     end
 
+    # Clones libcurl session handle. This means that all options that is set in
+    #   the current handle will be set on duplicated handle.
+    def dup
+      e = super
+      e.handle = Curl.easy_duphandle(handle)
+      e.instance_variable_set(:@body_write_callback, nil)
+      e.instance_variable_set(:@header_write_callback, nil)
+      e.instance_variable_set(:@debug_callback, nil)
+      e.set_callbacks
+      e
+    end
     # Url escapes the value.
     #
     # @example Url escape.

data/lib/ethon/easy/operations.rb

@@ -13,6 +13,12 @@ module Ethon
         @handle ||= FFI::AutoPointer.new(Curl.easy_init, Curl.method(:easy_cleanup))
       end
 
+      # Sets a pointer to the curl easy handle.
+      # @param [ ::FFI::Pointer ] Easy handle that will be assigned.
+      def handle=(h)
+        @handle = h
+      end
+
       # Perform the easy request.
       #
       # @example Perform the request.
@@ -21,7 +27,9 @@ module Ethon
       # @return [ Integer ] The return code.
       def perform
         @return_code = Curl.easy_perform(handle)
-        Ethon.logger.debug { "ETHON: performed #{self.log_inspect}" }
+        if Ethon.logger.level.zero?
+          Ethon.logger.debug { "ETHON: performed #{log_inspect}" }
+        end
         complete
         @return_code
       end

data/lib/ethon/easy/options.rb

@@ -20,22 +20,20 @@ module Ethon
         @escape.nil? ? true : false
       end
 
-      Curl.easy_options.each do |opt,props|
-        eval %Q<
-          def #{opt}=(value)
-            Curl.set_option(:#{opt}, value, handle)
+      Curl.easy_options(nil).each do |opt, props|
+        method_name = "#{opt}=".freeze
+        unless method_defined? method_name
+          define_method(method_name) do |value|
+            Curl.set_option(opt, value, handle)
             value
           end
-        > unless method_defined? opt.to_s+"="
-        if props[:type]==:callback then
-          eval %Q<
-            def #{opt}(&block)
-              @procs ||= {}
-              @procs[:#{opt}]=block
-              Curl.set_option(:#{opt}, block, handle)
-              nil
-            end
-          > unless method_defined? opt.to_s
+        end
+        next if props[:type] != :callback || method_defined?(opt)
+        define_method(opt) do |&block|
+          @procs ||= {}
+          @procs[opt.to_sym] = block
+          Curl.set_option(opt, block, handle)
+          nil
         end
       end
     end

data/lib/ethon/version.rb

@@ -1,5 +1,5 @@
 module Ethon
 
   # Ethon version.
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
 end

data/profile/benchmarks.rb

@@ -3,111 +3,79 @@ require 'ethon'
 require 'open-uri'
 require 'patron'
 require 'curb'
-require "net/http"
+require 'net/http'
 require 'cgi'
-require 'benchmark'
-
-Benchmark.bm do |bm|
+require 'benchmark/ips'
+
+require_relative '../spec/support/server'
+require_relative '../spec/support/localhost_server'
+
+LocalhostServer.new(TESTSERVER.new, 3000)
+LocalhostServer.new(TESTSERVER.new, 3001)
+LocalhostServer.new(TESTSERVER.new, 3002)
+
+url = 'http://localhost:3000/'.freeze
+uri = URI.parse('http://localhost:3000/').freeze
+ethon = Ethon::Easy.new(url: url)
+patron = Patron::Session.new
+patron_url = Patron::Session.new(base_url: url)
+curb = Curl::Easy.new(url)
+
+puts '[Creation]'
+Benchmark.ips do |x|
+  x.report('String.new') { '' }
+  x.report('Easy.new') { Ethon::Easy.new }
+end
 
-  [100_000].each do |i|
-    puts "[ #{i} Creations]"
+puts '[Escape]'
+Benchmark.ips do |x|
+  x.report('CGI.escape') { CGI.escape("まつもと") }
+  x.report('Easy.escape') { ethon.escape("まつもと") }
+end
 
-    bm.report("String.new        ") do
-      i.times { String.new }
-    end
+puts '[Requests]'
+Benchmark.ips do |x|
+  x.report('net/http') { Net::HTTP.get_response(uri) }
+  x.report('open-uri') { open url }
 
-    bm.report("Easy.new          ") do
-      i.times { Ethon::Easy.new }
-    end
+  x.report('patron') do
+    patron.base_url = url
+    patron.get('/')
   end
 
-  GC.start
-
-  [100_000].each do |i|
-    puts "[ #{i} Escapes]"
-
-    bm.report("CGI::escape       ") do
-      i.times { CGI::escape("まつもと") }
-    end
+  x.report('patron reuse') { patron_url.get('/') }
 
-    bm.report("Easy.escape       ") do
-      e = Ethon::Easy.new
-      i.times { e.escape("まつもと") }
-    end
+  x.report('curb') do
+    curb.url = url
+    curb.perform
   end
 
-  GC.start
-
-  [1000].each do |i|
-    puts "[ #{i} Requests]"
-
-    bm.report("net/http          ") do
-      uri = URI.parse("http://localhost:3001/")
-      i.times { Net::HTTP.get_response(uri) }
-    end
-
-    bm.report("open-uri          ") do
-      i.times { open "http://localhost:3001/" }
-    end
+  x.report('curb reuse') { curb.perform }
 
-    bm.report("patron            ") do
-      sess = Patron::Session.new
-      i.times do
-        sess.base_url = "http://localhost:3001"
-        sess.get("/")
-      end
-    end
-
-    bm.report("patron reuse      ") do
-      sess = Patron::Session.new
-      sess.base_url = "http://localhost:3001"
-      i.times do
-        sess.get("/")
-      end
-    end
-
-    bm.report("curb reuse        ") do
-      easy = Curl::Easy.new("http://localhost:3001")
-      i.times do
-        easy.perform
-      end
-    end
-
-    bm.report("Easy.perform      ") do
-      easy = Ethon::Easy.new
-      i.times do
-        easy.url = "http://localhost:3001/"
-        easy.prepare
-        easy.perform
-      end
-    end
-
-    bm.report("Easy.perform reuse") do
-      easy = Ethon::Easy.new
-      easy.url = "http://localhost:3001/"
-      easy.prepare
-      i.times { easy.perform }
-    end
+  x.report('Easy.perform') do
+    ethon.url = url
+    ethon.perform
   end
 
-  GC.start
-
-  puts "[ 4 delayed Requests ]"
+  x.report('Easy.perform reuse') { ethon.perform }
+end
 
-  bm.report("net/http          ") do
+puts "[ 4 delayed Requests ]"
+Benchmark.ips do |x|
+  x.report('net/http') do
     3.times do |i|
       uri = URI.parse("http://localhost:300#{i}/?delay=1")
       Net::HTTP.get_response(uri)
     end
   end
 
-  bm.report("open-uri          ") do
+  x.report("open-uri") do
     3.times do |i|
       open("http://localhost:300#{i}/?delay=1")
     end
   end
 
-  bm.report("patron            ") do
+  x.report("patron") do
     sess = Patron::Session.new
     3.times do |i|
       sess.base_url = "http://localhost:300#{i}/?delay=1"
@@ -115,21 +83,19 @@ Benchmark.bm do |bm|
     end
   end
 
-  bm.report("Easy.perform      ") do
+  x.report("Easy.perform") do
     easy = Ethon::Easy.new
     3.times do |i|
       easy.url = "http://localhost:300#{i}/?delay=1"
-      easy.prepare
       easy.perform
     end
   end
 
-  bm.report("Multi.perform     ") do
+  x.report("Multi.perform") do
     multi = Ethon::Multi.new
     3.times do |i|
       easy = Ethon::Easy.new
       easy.url = "http://localhost:300#{i}/?delay=1"
-      easy.prepare
       multi.add(easy)
     end
     multi.perform

data/spec/ethon/easy/informations_spec.rb

@@ -88,7 +88,7 @@ describe Ethon::Easy::Informations do
 
   describe "#supports_zlib?" do
     it "returns true" do
-      Kernel.should_receive(:warn) #deprecation warning
+      expect(Kernel).to receive(:warn)
       expect(easy.supports_zlib?).to be_truthy
     end
   end

data/spec/ethon/easy/operations_spec.rb

@@ -25,6 +25,7 @@ describe Ethon::Easy::Operations do
     let(:password) { nil }
 
     before do
+      Ethon.logger.level = Logger::DEBUG
       easy.url = url
       easy.timeout = timeout
       easy.connecttimeout = connect_timeout
@@ -51,7 +52,7 @@ describe Ethon::Easy::Operations do
     end
 
     it "calls Curl.easy_cleanup" do
-      FFI::AutoPointer.any_instance.should_receive(:free)
+      expect_any_instance_of(FFI::AutoPointer).to receive(:free)
       easy.cleanup
     end
 

data/spec/ethon/easy_spec.rb

@@ -99,6 +99,83 @@ describe Ethon::Easy do
     end
   end
 
+  describe "#dup" do
+    let!(:easy) do
+      easy = Ethon::Easy.new
+      easy.url = "http://localhost:3001/"
+      easy.on_complete { 'on_complete' }
+      easy.on_headers { 'on_headers' }
+      easy.response_body = 'test_body'
+      easy.response_headers = 'test_headers'
+      easy
+    end
+    let!(:e) { easy.dup }
+
+    it "sets a new handle" do
+      expect(e.handle).not_to eq(easy.handle)
+    end
+
+    it "preserves url" do
+      expect(e.url).to eq(easy.url)
+    end
+
+    it "preserves on_complete callback" do
+      expect(e.on_complete).to be(easy.on_complete)
+    end
+
+    it "preserves on_headers callback" do
+      expect(e.on_headers).to be(easy.on_headers)
+    end
+
+    it 'preserves body_write_callback of original handle' do
+      expect { easy.perform }.to change { easy.response_body }
+      expect { easy.perform }.not_to change { e.response_body }
+    end
+
+    it 'sets new body_write_callback of duplicated handle' do
+      expect { e.perform }.to change { e.response_body }
+      expect { e.perform }.not_to change { easy.response_body }
+    end
+
+    it 'preserves headers_write_callback of original handle' do
+      expect { easy.perform }.to change { easy.response_headers }
+      expect { easy.perform }.not_to change { e.response_headers }
+    end
+
+    it 'sets new headers_write_callback of duplicated handle' do
+      expect { e.perform }.to change { e.response_headers }
+      expect { e.perform }.not_to change { easy.response_headers }
+    end
+
+    it "resets response_body" do
+      expect(e.response_body).to be_empty
+    end
+
+    it "resets response_headers" do
+      expect(e.response_headers).to be_empty
+    end
+
+    it "sets response_body for duplicated Easy" do
+      e.perform
+      expect(e.response_body).not_to be_empty
+    end
+
+    it "sets response_headers for duplicated Easy" do
+      e.perform
+      expect(e.response_headers).not_to be_empty
+    end
+
+    it "preserves response_body for original Easy" do
+      e.perform
+      expect(easy.response_body).to eq('test_body')
+    end
+
+    it "preserves response_headers for original Easy" do
+      e.perform
+      expect(easy.response_headers).to eq('test_headers')
+    end
+  end
+
   describe "#mirror" do
     it "returns a Mirror" do
       expect(easy.mirror).to be_a(Ethon::Easy::Mirror)

data/spec/support/server.rb

@@ -4,7 +4,7 @@ require 'zlib'
 require 'sinatra/base'
 
 TESTSERVER = Sinatra.new do
-  set :logging, false
+  set :logging, nil
 
   fail_count = 0
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Hans Hasselberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi