ethon 0.7.0 → 0.7.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmNjNTQxNTQxNzI0YTBkMjgyNjYwOWU0YTZjYWIzMDcyYTYyYTdlNw==
+  data.tar.gz: !binary |-
+    YTFlM2RhMTE2ZWUxYzY1YzhhMzY2OTEwMGY5ZWMyNGMwNmM4OTViMA==
+SHA512:
+  metadata.gz: !binary |-
+    YWEzMGY4NTlhZWM5MGRmOTkyNGE2ZjNkOTVjMjBhMjVjODJjM2Q1MjAzMGZj
+    ZWMyOWIyZjUxNzE3YTBiZDA3N2Q0OWNlNWQwZjFiNmI5M2Y2NDZjOTY5NDQ4
+    ZjM2M2FjMDkwNzczMDQwYjhkMTkxM2U5MmM4MzNjODU2YmFiZDI=
+  data.tar.gz: !binary |-
+    OWMxNDk4NWIyZjAxZGNmNjRmMWViMTEzNGI5MGFhNzIwODFiYjYwMGU4NzE0
+    NDYxNjg1NjBlYjk0YzdmNWQ3NGU5ODU5YzcwODdkNDA1MjA1YzBkYTAwZTFh
+    MGE0ZDY5ODM2ZGUzNmIzMDI4YzVlZWFiYjIyZTc0ZWVjYWU5ODY=

data/CHANGELOG.md

@@ -2,14 +2,17 @@
 
 ## Master
 
-Not backwards compatible changes:
-
-* `mime-types` are no longer a dependency. The gem will be still used if available to determine the mime type of a file which is uploaded. That means you have to have take care of the gem installation yourself.
-
 [Full Changelog](https://github.com/typhoeus/ethon/compare/v0.7.0...master)
 
+* MS Windows determination delegated to `Gem.windows?` for better accuracy.
+* FFI data-types updated to work on MS Windows.
+
 ## 0.7.0
 
+Not backwards compatible changes:
+
+* `mime-types` are no longer a dependency. The gem will be still used if available to determine the mime type of a file which is uploaded. That means you have to have take care of the gem installation yourself.
+
 [Full Changelog](https://github.com/typhoeus/ethon/compare/v0.6.3...v0.7.0)
 
 ## 0.6.3

data/lib/ethon/curl.rb

@@ -20,7 +20,7 @@ module Ethon
 
     # :nodoc:
     def self.windows?
-      !(RbConfig::CONFIG['host_os'] !~ /mingw|mswin|bccwin/)
+      Libc.windows?
     end
 
     require 'ethon/curls/constants'

data/lib/ethon/curls/classes.rb

@@ -13,8 +13,8 @@ module Ethon
     # :nodoc:
     class FDSet < ::FFI::Struct
       if Curl.windows?
-        layout :fd_count, :u_int,
-               :fd_array, [:u_int, 64] # 2048 FDs
+        layout :fd_count, :uint,
+               :fd_array, [:uint, 64] # 2048 FDs
 
         def clear; self[:fd_count] = 0; end
       else
@@ -29,8 +29,13 @@ module Ethon
 
     # :nodoc:
     class Timeval < ::FFI::Struct
-      layout :sec, :time_t,
-             :usec, :suseconds_t
+      if Curl.windows?
+        layout :sec, :long,
+               :usec, :long
+      else
+        layout :sec, :time_t,
+               :usec, :suseconds_t
+      end
     end
   end
 end

data/lib/ethon/curls/options.rb

@@ -42,6 +42,12 @@ module Ethon
         when :string
           func=:string
           value=value.to_s unless value.nil?
+        when :string_as_pointer
+          func = :ffipointer
+          s = ''
+          s = value.to_s unless value.nil?
+          value = FFI::MemoryPointer.new(:char, s.bytesize)
+          value.put_bytes(0, s)
         when :string_escape_null
           func=:string
           value=Util.escape_zero_byte(value) unless value.nil?
@@ -107,6 +113,7 @@ module Ethon
                            # :all defaults to all bits set
         :string => :objectpoint,
         :string_escape_null => :objectpoint,
+        :string_as_pointer => :objectpoint,
         :ffipointer => :objectpoint, # FFI::Pointer
         :curl_slist => :objectpoint,
         :buffer => :objectpoint, # A memory buffer of size defined in the options
@@ -302,7 +309,7 @@ module Ethon
       option :easy, :postfields, :string, 15
       option :easy, :postfieldsize, :int, 60
       option :easy, :postfieldsize_large, :off_t, 120
-      option :easy, :copypostfields, :string, 165
+      option :easy, :copypostfields, :string_as_pointer, 165
       option :easy, :httppost, :ffipointer, 24
       option :easy, :referer, :string, 16
       option :easy, :useragent, :string, 18

data/lib/ethon/easy/callbacks.rb

@@ -40,10 +40,9 @@ module Ethon
             @headers_called = true
             headers
           end
-          if :unyielded == body(chunk = stream.read_string(size * num))
-            @response_body << chunk
-          end
-          size * num
+          result = body(chunk = stream.read_string(size * num))
+          @response_body << chunk if result == :unyielded
+          result != :abort ? size*num : -1
         }
       end
 

data/lib/ethon/easy/informations.rb

@@ -60,6 +60,8 @@ module Ethon
         # be read with http_connect_code and not this.
         :response_code => :long,
 
+        :request_size => :long,
+
         # Return the total number of redirections that were
         # actually followed.
         :redirect_count => :long

data/lib/ethon/easy/mirror.rb

@@ -10,7 +10,7 @@ module Ethon
       end
 
       def self.informations_to_log
-        [:url, :response_code, :return_code, :total_time]
+        [:effective_url, :response_code, :return_code, :total_time]
       end
 
       def self.from_easy(easy)

data/lib/ethon/easy/response_callbacks.rb

@@ -86,7 +86,12 @@ module Ethon
       # @return [ Object ] If there are no on_body callbacks, returns the symbol :unyielded.
       def body(chunk)
         if defined?(@on_body) and not @on_body.nil?
-          @on_body.each{ |callback| callback.call(chunk, self) }
+          result = nil
+          @on_body.each do |callback|
+            result = callback.call(chunk, self)
+            break if result == :abort
+          end
+          result
         else
           :unyielded
         end

data/lib/ethon/libc.rb

@@ -9,7 +9,7 @@ module Ethon
 
     # :nodoc:
     def self.windows?
-      !(RbConfig::CONFIG['host_os'] !~ /mingw|mswin|bccwin/)
+      Gem.win_platform?
     end
 
     unless windows?

data/lib/ethon/version.rb

@@ -1,5 +1,5 @@
 module Ethon
 
   # Ethon version.
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/spec/ethon/curl_spec.rb

@@ -6,20 +6,20 @@ describe Ethon::Curl do
 
     context "when global_init fails" do
       it "raises global init error" do
-        Ethon::Curl.should_receive(:global_init).and_return(1)
+        expect(Ethon::Curl).to receive(:global_init).and_return(1)
         expect{ Ethon::Curl.init }.to raise_error(Ethon::Errors::GlobalInit)
       end
     end
 
     context "when global_init works" do
-      before { Ethon::Curl.should_receive(:global_init).and_return(0) }
+      before { expect(Ethon::Curl).to receive(:global_init).and_return(0) }
 
       it "doesn't raises global init error" do
-        expect{ Ethon::Curl.init }.to_not raise_error(Ethon::Errors::GlobalInit)
+        expect{ Ethon::Curl.init }.to_not raise_error
       end
 
       it "logs" do
-        Ethon.logger.should_receive(:debug)
+        expect(Ethon.logger).to receive(:debug)
         Ethon::Curl.init
       end
     end

data/spec/ethon/easy/callbacks_spec.rb

@@ -5,7 +5,7 @@ describe Ethon::Easy::Callbacks do
 
   describe "#set_callbacks" do
     before do
-      Ethon::Curl.should_receive(:set_option).exactly(3).times
+      expect(Ethon::Curl).to receive(:set_option).exactly(3).times
     end
 
     it "sets write- and headerfunction" do
@@ -26,6 +26,27 @@ describe Ethon::Easy::Callbacks do
       easy.set_callbacks
       expect(easy.instance_variable_get(:@debug_info).to_a).to eq([])
     end
+  end
+
+  describe "#body_write_callback" do
+    let(:body_write_callback) { easy.instance_variable_get(:@body_write_callback) }
+    let(:stream) { double(read_string: "") }
+    context "when body returns not :abort" do
+      it "returns number bigger than 0" do
+        expect(body_write_callback.call(stream, 1, 1, nil) > 0).to be(true)
+      end
+    end
 
+    context "when body returns :abort" do
+      before do
+        easy.on_body.clear
+        easy.on_body { :abort }
+      end
+      let(:body_write_callback) { easy.instance_variable_get(:@body_write_callback) }
+
+      it "returns -1 to indicate abort to libcurl" do
+        expect(body_write_callback.call(stream, 1, 1, nil)).to eq(-1)
+      end
+    end
   end
 end

data/spec/ethon/easy/form_spec.rb

@@ -30,7 +30,7 @@ describe Ethon::Easy::Form do
       let(:pairs) { [['a', '1'], ['b', '2']] }
 
       it "returns false" do
-        expect(form.multipart?).to be_false
+        expect(form.multipart?).to be_falsey
       end
     end
 
@@ -38,7 +38,7 @@ describe Ethon::Easy::Form do
       let(:pairs) { [['a', '1'], ['b', ['path', 'encoding', 'abs_path']]] }
 
       it "returns true" do
-        expect(form.multipart?).to be_true
+        expect(form.multipart?).to be_truthy
       end
     end
   end
@@ -50,7 +50,7 @@ describe Ethon::Easy::Form do
       let(:pairs) { [['a', '1']] }
 
       it "adds params to form" do
-        Ethon::Curl.should_receive(:formadd)
+        expect(Ethon::Curl).to receive(:formadd)
         form.materialize
       end
     end
@@ -59,7 +59,7 @@ describe Ethon::Easy::Form do
       let(:pairs) { [['a', nil]] }
 
       it "adds params to form" do
-        Ethon::Curl.should_receive(:formadd)
+        expect(Ethon::Curl).to receive(:formadd)
         form.materialize
       end
     end
@@ -68,7 +68,7 @@ describe Ethon::Easy::Form do
       let(:pairs) { [['a', ["file", "type", "path/file"]]] }
 
       it "adds file to form" do
-        Ethon::Curl.should_receive(:formadd)
+        expect(Ethon::Curl).to receive(:formadd)
         form.materialize
       end
     end

data/spec/ethon/easy/header_spec.rb

@@ -7,8 +7,8 @@ describe Ethon::Easy::Header do
     let(:headers) { { 'User-Agent' => 'Ethon' } }
 
     it "sets header" do
-      Ethon::Easy.any_instance.should_receive(:set_callbacks)
-      Ethon::Curl.should_receive(:set_option)
+      expect_any_instance_of(Ethon::Easy).to receive(:set_callbacks)
+      expect(Ethon::Curl).to receive(:set_option)
       easy.headers = headers
     end
 

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

@@ -55,7 +55,7 @@ describe Ethon::Easy::Http::Custom do
         let(:form) { {:a => File.open(__FILE__, 'r')} }
 
         it "sets httppost" do
-          easy.should_receive(:httppost=)
+          expect(easy).to receive(:httppost=)
           custom.setup(easy)
         end
 
@@ -93,12 +93,12 @@ describe Ethon::Easy::Http::Custom do
         let(:encoded) { "a=1%26b%3D2" }
 
         it "sets escaped copypostfields" do
-          easy.should_receive(:copypostfields=).with(encoded)
+          expect(easy).to receive(:copypostfields=).with(encoded)
           custom.setup(easy)
         end
 
         it "sets postfieldsize" do
-          easy.should_receive(:postfieldsize=).with{ |value| expect(value).to be(encoded.bytesize) }
+          expect(easy).to receive(:postfieldsize=).with(encoded.bytesize)
           custom.setup(easy)
         end
 

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

@@ -17,14 +17,14 @@ describe Ethon::Easy::Http::Get do
       let(:form) { { :a => 1 } }
 
       it "sets customrequest" do
-        easy.should_receive(:customrequest=).with("GET")
+        expect(easy).to receive(:customrequest=).with("GET")
         get.setup(easy)
       end
     end
 
     context "when no body" do
       it "doesn't set customrequest" do
-        easy.should_receive(:customrequest=).never
+        expect(easy).to receive(:customrequest=).never
         get.setup(easy)
       end
     end

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

@@ -10,7 +10,7 @@ describe Ethon::Easy::Http::Head do
   describe "#setup" do
     context "when nothing" do
       it "sets nobody" do
-        easy.should_receive(:nobody=).with(true)
+        expect(easy).to receive(:nobody=).with(true)
         head.setup(easy)
       end
 
@@ -24,7 +24,7 @@ describe Ethon::Easy::Http::Head do
       let(:params) { {:a => "1&b=2"} }
 
       it "sets nobody" do
-        easy.should_receive(:nobody=).with(true)
+        expect(easy).to receive(:nobody=).with(true)
         head.setup(easy)
       end
 

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

@@ -9,7 +9,7 @@ describe Ethon::Easy::Http::Options do
 
   describe "#setup" do
     it "sets customrequest" do
-      easy.should_receive(:customrequest=).with("OPTIONS")
+      expect(easy).to receive(:customrequest=).with("OPTIONS")
       options.setup(easy)
     end
 

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

@@ -9,7 +9,7 @@ describe Ethon::Easy::Http::Patch do
 
   describe "#setup" do
     it "sets customrequest" do
-      easy.should_receive(:customrequest=).with("PATCH")
+      expect(easy).to receive(:customrequest=).with("PATCH")
       patch.setup(easy)
     end
 

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

@@ -15,12 +15,12 @@ describe Ethon::Easy::Http::Post do
       end
 
       it "sets postfield_size" do
-        easy.should_receive(:postfieldsize=).with(0)
+        expect(easy).to receive(:postfieldsize=).with(0)
         post.setup(easy)
       end
 
       it "sets copy_postfields" do
-        easy.should_receive(:copypostfields=).with("")
+        expect(easy).to receive(:copypostfields=).with("")
         post.setup(easy)
       end
 
@@ -40,12 +40,12 @@ describe Ethon::Easy::Http::Post do
       end
 
       it "sets postfieldsize" do
-        easy.should_receive(:postfieldsize=).with(0)
+        expect(easy).to receive(:postfieldsize=).with(0)
         post.setup(easy)
       end
 
       it "sets copypostfields" do
-        easy.should_receive(:copypostfields=).with("")
+        expect(easy).to receive(:copypostfields=).with("")
         post.setup(easy)
       end
 
@@ -99,7 +99,7 @@ describe Ethon::Easy::Http::Post do
         let(:form) { {:a => File.open(__FILE__, 'r')} }
 
         it "sets httppost" do
-          easy.should_receive(:httppost=)
+          expect(easy).to receive(:httppost=)
           post.setup(easy)
         end
 
@@ -137,12 +137,12 @@ describe Ethon::Easy::Http::Post do
         let(:encoded) { "a=1%26b%3D2" }
 
         it "sets escaped copypostfields" do
-          easy.should_receive(:copypostfields=).with(encoded)
+          expect(easy).to receive(:copypostfields=).with(encoded)
           post.setup(easy)
         end
 
         it "sets postfieldsize" do
-          easy.should_receive(:postfieldsize=).with{ |value| expect(value).to be(encoded.bytesize) }
+          expect(easy).to receive(:postfieldsize=).with(encoded.bytesize)
           post.setup(easy)
         end
 
@@ -194,6 +194,26 @@ describe Ethon::Easy::Http::Post do
           end
         end
       end
+
+      context "when binary with null bytes" do
+        let(:form) { [1, 0, 1].pack('c*') }
+
+        context "when requesting" do
+          before do
+            easy.headers = { 'Expect' => '' }
+            post.setup(easy)
+            easy.perform
+          end
+
+          it "returns ok" do
+            expect(easy.return_code).to eq(:ok)
+          end
+
+          it "sends binary data" do
+            expect(easy.response_body).to include('"body":"\\u0001\\u0000\\u0001"')
+          end
+        end
+      end
     end
 
     context "when params and body" do

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

@@ -15,12 +15,12 @@ describe Ethon::Easy::Http::Put do
       end
 
       it "sets upload" do
-        easy.should_receive(:upload=).with(true)
+        expect(easy).to receive(:upload=).with(true)
         put.setup(easy)
       end
 
       it "sets infilesize" do
-        easy.should_receive(:infilesize=).with(0)
+        expect(easy).to receive(:infilesize=).with(0)
         put.setup(easy)
       end
 
@@ -42,12 +42,12 @@ describe Ethon::Easy::Http::Put do
       end
 
       it "sets upload" do
-        easy.should_receive(:upload=).with(true)
+        expect(easy).to receive(:upload=).with(true)
         put.setup(easy)
       end
 
       it "sets infilesize" do
-        easy.should_receive(:infilesize=).with(0)
+        expect(easy).to receive(:infilesize=).with(0)
         put.setup(easy)
       end
 
@@ -67,17 +67,17 @@ describe Ethon::Easy::Http::Put do
       let(:form) { {:a => "1&b=2"} }
 
       it "sets infilesize" do
-        easy.should_receive(:infilesize=).with(11)
+        expect(easy).to receive(:infilesize=).with(11)
         put.setup(easy)
       end
 
       it "sets readfunction" do
-        easy.should_receive(:readfunction)
+        expect(easy).to receive(:readfunction)
         put.setup(easy)
       end
 
       it "sets upload" do
-        easy.should_receive(:upload=).with(true)
+        expect(easy).to receive(:upload=).with(true)
         put.setup(easy)
       end
 

data/spec/ethon/easy/http_spec.rb

@@ -12,8 +12,8 @@ describe Ethon::Easy::Http do
     let(:get_class) { Ethon::Easy::Http::Get }
 
     it "instanciates action" do
-      get.should_receive(:setup)
-      get_class.should_receive(:new).and_return(get)
+      expect(get).to receive(:setup)
+      expect(get_class).to receive(:new).and_return(get)
       easy.http_request(url, action_name, options)
     end
 

data/spec/ethon/easy/informations_spec.rb

@@ -74,9 +74,15 @@ describe Ethon::Easy::Informations do
     end
   end
 
+  describe "#request_size" do
+    it "returns 53" do
+      expect(easy.request_size).to eq(53)
+    end
+  end
+
   describe "#supports_zlib?" do
     it "returns true" do
-      expect(easy.supports_zlib?).to be_true
+      expect(easy.supports_zlib?).to be_truthy
     end
   end
 end

data/spec/ethon/easy/mirror_spec.rb

@@ -32,6 +32,12 @@ describe Ethon::Easy::Mirror do
       expect(mirror.log_informations).to be_a(Hash)
     end
 
+    it "only calls methods that exist" do
+      described_class.informations_to_log.each do |method_name|
+        expect(mirror.respond_to? method_name).to eql(true)
+      end
+    end
+
     it "includes return code" do
       expect(mirror.log_informations).to include(options)
     end

data/spec/ethon/easy/operations_spec.rb

@@ -46,17 +46,17 @@ describe Ethon::Easy::Operations do
     end
 
     it "calls Curl.easy_perform" do
-      Ethon::Curl.should_receive(:easy_perform)
+      expect(Ethon::Curl).to receive(:easy_perform)
       easy.perform
     end
 
     it "logs" do
-      Ethon.logger.should_receive(:debug)
+      expect(Ethon.logger).to receive(:debug)
       easy.perform
     end
 
     it "doesn't log after completing because completing could reset" do
-      easy.on_complete{ Ethon.logger.should_receive(:debug).never }
+      easy.on_complete{ expect(Ethon.logger).to receive(:debug).never }
       easy.perform
     end
 

data/spec/ethon/easy/options_spec.rb

@@ -20,10 +20,8 @@ describe Ethon::Easy::Options do
       end
 
       it "sets option" do
-        Ethon::Easy.any_instance.should_receive(:set_callbacks)
-        Ethon::Curl.should_receive(:set_option).with do |option, _, _|
-          expect(option).to be(name)
-        end
+        expect_any_instance_of(Ethon::Easy).to receive(:set_callbacks)
+        expect(Ethon::Curl).to receive(:set_option).with(name, anything, anything)
         value = case name
         when :http_version
           :httpv1_0

data/spec/ethon/easy/queryable_spec.rb

@@ -197,7 +197,7 @@ describe Ethon::Easy::Queryable do
   describe "#empty?" do
     context "when params empty" do
       it "returns true" do
-        expect(params.empty?).to be_true
+        expect(params.empty?).to be_truthy
       end
     end
 
@@ -205,7 +205,7 @@ describe Ethon::Easy::Queryable do
       let(:hash) { {:a => 1} }
 
       it "returns false" do
-        expect(params.empty?).to be_false
+        expect(params.empty?).to be_falsey
       end
     end
   end

data/spec/ethon/easy/response_callbacks_spec.rb

@@ -18,7 +18,7 @@ describe Ethon::Easy::ResponseCallbacks do
       context "when block given" do
         it "stores" do
           easy.send(callback_type) { p 1 }
-          expect(easy.instance_variable_get("@#{callback_type}")).to have(1).items
+          expect(easy.instance_variable_get("@#{callback_type}").size).to eq(1)
         end
       end
 
@@ -26,7 +26,7 @@ describe Ethon::Easy::ResponseCallbacks do
         it "stores" do
           easy.send(callback_type) { p 1 }
           easy.send(callback_type) { p 2 }
-          expect(easy.instance_variable_get("@#{callback_type}")).to have(2).items
+          expect(easy.instance_variable_get("@#{callback_type}").size).to eq(2)
         end
       end
     end
@@ -38,14 +38,14 @@ describe Ethon::Easy::ResponseCallbacks do
     end
 
     it "executes blocks and passes self" do
-      String.should_receive(:new).with(easy.url)
+      expect(String).to receive(:new).with(easy.url)
       easy.complete
     end
 
     context "when @on_complete nil" do
       it "doesn't raise" do
         easy.instance_variable_set(:@on_complete, nil)
-        expect{ easy.complete }.to_not raise_error(NoMethodError)
+        expect{ easy.complete }.to_not raise_error
       end
     end
   end
@@ -56,14 +56,14 @@ describe Ethon::Easy::ResponseCallbacks do
     end
 
     it "executes blocks and passes self" do
-      String.should_receive(:new).with(easy.url)
+      expect(String).to receive(:new).with(easy.url)
       easy.headers
     end
 
     context "when @on_headers nil" do
       it "doesn't raise" do
         easy.instance_variable_set(:@on_headers, nil)
-        expect{ easy.headers }.to_not raise_error(NoMethodError)
+        expect{ easy.headers }.to_not raise_error
       end
     end
   end
@@ -88,7 +88,7 @@ describe Ethon::Easy::ResponseCallbacks do
     context "when @on_body nil" do
       it "doesn't raise" do
         easy.instance_variable_set(:@on_body, nil)
-        expect{ easy.body("the chunk") }.to_not raise_error(NoMethodError)
+        expect{ easy.body("the chunk") }.to_not raise_error
       end
     end
   end

data/spec/ethon/easy_spec.rb

@@ -5,14 +5,14 @@ describe Ethon::Easy do
 
   describe ".new" do
     it "inits curl" do
-      Ethon::Curl.should_receive(:init)
+      expect(Ethon::Curl).to receive(:init)
       easy
     end
 
     context "when options are empty" do
       it "sets only callbacks" do
-        Ethon::Easy.any_instance.should_receive(:set_callbacks)
-        Ethon::Easy.should_receive(:set_option).never
+        expect_any_instance_of(Ethon::Easy).to receive(:set_callbacks)
+        expect(Ethon::Easy).to receive(:set_option).never
         easy
       end
     end
@@ -23,11 +23,8 @@ describe Ethon::Easy do
         let(:easy) { Ethon::Easy.new(options) }
 
         it "sets followlocation" do
-          Ethon::Easy.any_instance.should_receive(:set_callbacks)
-          Ethon::Curl.should_receive(:set_option).with do |option, value, _|
-            expect(option).to be(:followlocation)
-            expect(value).to be(true)
-          end
+          expect_any_instance_of(Ethon::Easy).to receive(:set_callbacks)
+          expect(Ethon::Curl).to receive(:set_option).with(:followlocation, true, anything)
           easy
         end
       end
@@ -37,8 +34,8 @@ describe Ethon::Easy do
   describe "#set_attributes" do
     context "when options are empty" do
       it "sets only callbacks" do
-        Ethon::Easy.any_instance.should_receive(:set_callbacks)
-        Ethon::Easy.should_receive(:set_option).never
+        expect_any_instance_of(Ethon::Easy).to receive(:set_callbacks)
+        expect(Ethon::Easy).to receive(:set_option).never
         easy
       end
     end
@@ -46,7 +43,7 @@ describe Ethon::Easy do
     context "when options aren't empty" do
       context "when valid key" do
         it "sets" do
-          easy.should_receive(:verbose=).with(true)
+          expect(easy).to receive(:verbose=).with(true)
           easy.set_attributes({:verbose => true})
         end
       end
@@ -73,7 +70,7 @@ describe Ethon::Easy do
     end
 
     it "resets easy handle" do
-      Ethon::Curl.should_receive(:easy_reset)
+      expect(Ethon::Curl).to receive(:easy_reset)
       easy.reset
     end
 
@@ -102,7 +99,7 @@ describe Ethon::Easy do
     end
 
     it "builds from easy" do
-      Ethon::Easy::Mirror.should_receive(:from_easy).with(easy)
+      expect(Ethon::Easy::Mirror).to receive(:from_easy).with(easy)
       easy.mirror
     end
   end

data/spec/ethon/libc_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe Ethon::Libc do
-  describe "#getdtablesize" do
+  describe "#getdtablesize", :if => !Ethon::Curl.windows? do
     it "returns an integer" do
       expect(Ethon::Libc.getdtablesize).to be_a(Integer)
     end
 
-    it "returns bigger zero" do
+    it "returns bigger zero", :if => !Ethon::Curl.windows? do
       expect(Ethon::Libc.getdtablesize).to_not be_zero
     end
   end

data/spec/ethon/multi/operations_spec.rb

@@ -52,7 +52,7 @@ describe Ethon::Multi::Operations do
       let(:timeout) { 1 }
 
       before do
-        Ethon::Curl.should_receive(:multi_timeout).and_return(:ok)
+        expect(Ethon::Curl).to receive(:multi_timeout).and_return(:ok)
         multi.instance_variable_set(:@timeout, double(:read_long => timeout))
       end
 
@@ -78,7 +78,7 @@ describe Ethon::Multi::Operations do
     end
 
     context "when code not ok" do
-      before { Ethon::Curl.should_receive(:multi_timeout).and_return(:not_ok) }
+      before { expect(Ethon::Curl).to receive(:multi_timeout).and_return(:not_ok) }
 
       it "raises MultiTimeout error" do
         expect{ multi.send(:get_timeout) }.to raise_error(Ethon::Errors::MultiTimeout)
@@ -91,10 +91,10 @@ describe Ethon::Multi::Operations do
     let(:max_fd) { 1 }
 
     context "when code ok" do
-      before { Ethon::Curl.should_receive(:multi_fdset).and_return(:ok) }
+      before { expect(Ethon::Curl).to receive(:multi_fdset).and_return(:ok) }
 
       it "doesn't raise" do
-        expect{ multi.method(:set_fds).call(timeout) }.to_not raise_error(Ethon::Errors::MultiFdset)
+        expect{ multi.method(:set_fds).call(timeout) }.to_not raise_error
       end
 
       context "when max_fd -1" do
@@ -102,7 +102,7 @@ describe Ethon::Multi::Operations do
 
         before do
           multi.instance_variable_set(:@max_fd, double(:read_int => max_fd))
-          multi.should_receive(:sleep).with(0.001)
+          expect(multi).to receive(:sleep).with(0.001)
         end
 
         it "waits 100ms" do
@@ -112,7 +112,7 @@ describe Ethon::Multi::Operations do
 
       context "when max_fd not -1" do
         context "when code smaller zero" do
-          before { Ethon::Curl.should_receive(:select).and_return(-1) }
+          before { expect(Ethon::Curl).to receive(:select).and_return(-1) }
 
           it "raises Select error" do
             expect{ multi.method(:set_fds).call(timeout) }.to raise_error(Ethon::Errors::Select)
@@ -120,17 +120,17 @@ describe Ethon::Multi::Operations do
         end
 
         context "when code bigger or equal zero" do
-          before { Ethon::Curl.should_receive(:select).and_return(0) }
+          before { expect(Ethon::Curl).to receive(:select).and_return(0) }
 
           it "doesn't raise" do
-            expect{ multi.method(:set_fds).call(timeout) }.to_not raise_error(Ethon::Errors::Select)
+            expect{ multi.method(:set_fds).call(timeout) }.to_not raise_error
           end
         end
       end
     end
 
     context "when code not ok" do
-      before { Ethon::Curl.should_receive(:multi_fdset).and_return(:not_ok) }
+      before { expect(Ethon::Curl).to receive(:multi_fdset).and_return(:not_ok) }
 
       it "raises MultiFdset error" do
         expect{ multi.method(:set_fds).call(timeout) }.to raise_error(Ethon::Errors::MultiFdset)
@@ -145,7 +145,7 @@ describe Ethon::Multi::Operations do
       end
 
       it "logs" do
-        Ethon.logger.should_receive(:debug).twice
+        expect(Ethon.logger).to receive(:debug).twice
         multi.perform
       end
     end
@@ -182,7 +182,7 @@ describe Ethon::Multi::Operations do
       end
 
       it "sets response codes" do
-        expect(easies.all?{ |e| e.response_code == 200 }).to be_true
+        expect(easies.all?{ |e| e.response_code == 200 }).to be_truthy
       end
     end
   end
@@ -195,7 +195,7 @@ describe Ethon::Multi::Operations do
         before { multi.instance_variable_set(:@running_count, 0) }
 
         it "returns true" do
-          expect(multi.method(:ongoing?).call).to be_true
+          expect(multi.method(:ongoing?).call).to be_truthy
         end
       end
 
@@ -203,7 +203,7 @@ describe Ethon::Multi::Operations do
         before { multi.instance_variable_set(:@running_count, 1) }
 
         it "returns true" do
-          expect(multi.method(:ongoing?).call).to be_true
+          expect(multi.method(:ongoing?).call).to be_truthy
         end
       end
     end
@@ -213,7 +213,7 @@ describe Ethon::Multi::Operations do
         before { multi.instance_variable_set(:@running_count, 0) }
 
         it "returns false" do
-          expect(multi.method(:ongoing?).call).to be_false
+          expect(multi.method(:ongoing?).call).to be_falsey
         end
       end
 
@@ -221,7 +221,7 @@ describe Ethon::Multi::Operations do
         before { multi.instance_variable_set(:@running_count, 1) }
 
         it "returns true" do
-          expect(multi.method(:ongoing?).call).to be_true
+          expect(multi.method(:ongoing?).call).to be_truthy
         end
       end
     end
@@ -257,29 +257,29 @@ describe Ethon::Multi::Operations do
     after { multi.method(:reset_fds).call }
 
     it "resets @fd_read" do
-      multi.instance_variable_get(:@fd_read).should_receive(:clear)
+      expect(multi.instance_variable_get(:@fd_read)).to receive(:clear)
     end
 
     it "resets @fd_write" do
-      multi.instance_variable_get(:@fd_write).should_receive(:clear)
+      expect(multi.instance_variable_get(:@fd_write)).to receive(:clear)
     end
 
     it "resets @fd_excep" do
-      multi.instance_variable_get(:@fd_excep).should_receive(:clear)
+      expect(multi.instance_variable_get(:@fd_excep)).to receive(:clear)
     end
   end
 
   describe "#check" do
-    it { pending("untested") }
+    it { skip("untested") }
   end
 
   describe "#run" do
-    it { pending("untested") }
+    it { skip("untested") }
   end
 
   describe "#trigger" do
     it "calls multi perform" do
-      Ethon::Curl.should_receive(:multi_perform)
+      expect(Ethon::Curl).to receive(:multi_perform)
       multi.send(:trigger, pointer)
     end
 
@@ -290,7 +290,7 @@ describe Ethon::Multi::Operations do
     end
 
     it "returns multi perform code" do
-      Ethon::Curl.should_receive(:multi_perform).and_return(:ok)
+      expect(Ethon::Curl).to receive(:multi_perform).and_return(:ok)
       expect(multi.send(:trigger, pointer)).to eq(:ok)
     end
   end

data/spec/ethon/multi/options_spec.rb

@@ -13,9 +13,7 @@ describe Ethon::Multi::Options do
       end
 
       it "sets option" do
-        Ethon::Curl.should_receive(:set_option).with do |option, _, _|
-          expect(option).to be(name)
-        end
+        expect(Ethon::Curl).to receive(:set_option).with(name, anything, anything, anything)
         multi.method("#{name}=").call(1)
       end
     end

data/spec/ethon/multi/stack_spec.rb

@@ -15,7 +15,7 @@ describe Ethon::Multi::Stack do
 
     context "when easy new" do
       it "adds easy to multi" do
-        Ethon::Curl.should_receive(:multi_add_handle).and_return(:ok)
+        expect(Ethon::Curl).to receive(:multi_add_handle).and_return(:ok)
         multi.add(easy)
       end
 
@@ -27,7 +27,7 @@ describe Ethon::Multi::Stack do
 
     context "when multi_add_handle fails" do
       it "raises multi add error" do
-        Ethon::Curl.should_receive(:multi_add_handle).and_return(:bad_easy_handle)
+        expect(Ethon::Curl).to receive(:multi_add_handle).and_return(:bad_easy_handle)
         expect{ multi.add(easy) }.to raise_error(Ethon::Errors::MultiAdd)
       end
     end
@@ -45,7 +45,7 @@ describe Ethon::Multi::Stack do
       before { multi.add(easy) }
 
       it "deletes easy from multi" do
-        Ethon::Curl.should_receive(:multi_remove_handle).and_return(:ok)
+        expect(Ethon::Curl).to receive(:multi_remove_handle).and_return(:ok)
         multi.delete(easy)
       end
 
@@ -57,7 +57,7 @@ describe Ethon::Multi::Stack do
 
     context "when easy is not in easy_handles" do
       it "does nothing" do
-        Ethon::Curl.should_receive(:multi_add_handle).and_return(:ok)
+        expect(Ethon::Curl).to receive(:multi_add_handle).and_return(:ok)
         multi.add(easy)
       end
 
@@ -71,7 +71,7 @@ describe Ethon::Multi::Stack do
       before { multi.add(easy) }
 
       it "raises multi remove error" do
-        Ethon::Curl.should_receive(:multi_remove_handle).and_return(:bad_easy_handle)
+        expect(Ethon::Curl).to receive(:multi_remove_handle).and_return(:bad_easy_handle)
         expect{ multi.delete(easy) }.to raise_error(Ethon::Errors::MultiRemove)
       end
     end

data/spec/ethon/multi_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Ethon::Multi do
   describe ".new" do
     it "inits curl" do
-      Ethon::Curl.should_receive(:init)
+      expect(Ethon::Curl).to receive(:init)
       Ethon::Multi.new
     end
 
@@ -12,7 +12,7 @@ describe Ethon::Multi do
         let(:options) { { :pipelining => true } }
 
         it "sets pipelining" do
-          Ethon::Multi.any_instance.should_receive(:pipelining=).with(true)
+          expect_any_instance_of(Ethon::Multi).to receive(:pipelining=).with(true)
           Ethon::Multi.new(options)
         end
       end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.7.0
-  prerelease: 
+  version: 0.7.1
 platform: ruby
 authors:
 - Hans Hasselberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -137,30 +134,26 @@ files:
 homepage: https://github.com/typhoeus/ethon
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1989061620893792868
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Libcurl wrapper.
 test_files:
 - spec/ethon/curl_spec.rb