typhoeus 0.6.8 → 0.6.9

data/spec/typhoeus/request/cacheable_spec.rb

@@ -19,7 +19,7 @@ describe Typhoeus::Request::Cacheable do
 
         it "doesn't set cached on response" do
           request.response = response
-          expect(request.response.cached?).to be_false
+          expect(request.response.cached?).to be_falsey
         end
       end
 
@@ -27,13 +27,13 @@ describe Typhoeus::Request::Cacheable do
         before { cache.memory[request] = response }
 
         it "finishes request" do
-          request.should_receive(:finish).with(response)
+          expect(request).to receive(:finish).with(response)
           request.run
         end
 
         it "sets cached to true for response" do
           request.run
-          expect(request.response.cached?).to be_true
+          expect(request.response.cached?).to be_truthy
         end
       end
     end
@@ -51,7 +51,7 @@ describe Typhoeus::Request::Cacheable do
         before { cache.memory[request] = response }
 
         it "finishes request" do
-          request.should_receive(:finish).with(response)
+          expect(request).to receive(:finish).with(response)
           request.run
         end
       end

data/spec/typhoeus/request/callbacks_spec.rb

@@ -18,7 +18,7 @@ describe Typhoeus::Request::Callbacks do
       context "when block given" do
         it "stores" do
           request.method(callback).call { p 1 }
-          expect(request.instance_variable_get("@#{callback}")).to have(1).items
+          expect(request.instance_variable_get("@#{callback}").size).to eq(1)
         end
       end
 
@@ -26,7 +26,7 @@ describe Typhoeus::Request::Callbacks do
         it "stores" do
           request.method(callback).call { p 1 }
           request.method(callback).call { p 2 }
-          expect(request.instance_variable_get("@#{callback}")).to have(2).items
+          expect(request.instance_variable_get("@#{callback}").size).to eq(2)
         end
       end
     end
@@ -84,7 +84,7 @@ describe Typhoeus::Request::Callbacks do
 
     context "when local on_complete and gobal on_success" do
       it "runs all global callbacks first" do
-        pending
+        skip
       end
     end
   end

data/spec/typhoeus/request/operations_spec.rb

@@ -7,19 +7,19 @@ describe Typhoeus::Request::Operations do
 
   describe "#run" do
     let(:easy) { Ethon::Easy.new }
-    before { Typhoeus::Pool.should_receive(:get).and_return(easy) }
+    before { expect(Typhoeus::Pool).to receive(:get).and_return(easy) }
 
     it "grabs an easy" do
       request.run
     end
 
     it "generates settings" do
-      easy.should_receive(:http_request)
+      expect(easy).to receive(:http_request)
       request.run
     end
 
     it "performs" do
-      easy.should_receive(:perform)
+      expect(easy).to receive(:perform)
       request.run
     end
 
@@ -29,7 +29,7 @@ describe Typhoeus::Request::Operations do
     end
 
     it "releases easy" do
-      Typhoeus::Pool.should_receive(:release)
+      expect(Typhoeus::Pool).to receive(:release)
       request.run
     end
 
@@ -37,7 +37,7 @@ describe Typhoeus::Request::Operations do
       on_body_called = false
       request.on_body { |body, response| on_body_called = true }
       request.run
-      expect(on_body_called).to be_true
+      expect(on_body_called).to be_truthy
       expect(request.response.body).to satisfy { |v| v.nil? || v == '' }
     end
 
@@ -66,7 +66,7 @@ describe Typhoeus::Request::Operations do
 
     it "calls on_complete" do
       callback = double(:call)
-      callback.should_receive(:call)
+      expect(callback).to receive(:call)
       request.instance_variable_set(:@on_complete, [callback])
       request.run
     end
@@ -90,7 +90,7 @@ describe Typhoeus::Request::Operations do
     end
 
     it "executes callbacks" do
-      request.should_receive(:execute_callbacks)
+      expect(request).to receive(:execute_callbacks)
       request.finish(response)
     end
 

data/spec/typhoeus/request/stubbable_spec.rb

@@ -14,7 +14,7 @@ describe Typhoeus::Request::Stubbable do
 
     context "when expectation found" do
       it "finishes request" do
-        request.should_receive(:finish)
+        expect(request).to receive(:finish)
         request.run
       end
 

data/spec/typhoeus/request_spec.rb

@@ -22,8 +22,8 @@ describe Typhoeus::Request do
 
     it "pushes an easy back into the pool" do
       easy = double.as_null_object
-      Typhoeus::Pool.stub(:get).and_return(easy)
-      Typhoeus::Pool.should_receive(:release).with(easy)
+      allow(Typhoeus::Pool).to receive(:get).and_return(easy)
+      expect(Typhoeus::Pool).to receive(:release).with(easy)
       request.url
     end
   end
@@ -70,7 +70,7 @@ describe Typhoeus::Request do
       after { Typhoeus.configure { |config| config.verbose = false} }
 
       it "respects" do
-        expect(request.options[:verbose]).to be_true
+        expect(request.options[:verbose]).to be_truthy
       end
     end
 

data/spec/typhoeus/response/header_spec.rb

@@ -63,11 +63,11 @@ describe Typhoeus::Response::Header do
       end
 
       it "sets Set-Cookie" do
-        expect(header['set-cookie']).to have(3).items
+        expect(header['set-cookie'].size).to eq(3)
       end
 
       it "provides case insensitive access" do
-        expect(header['Set-CooKie']).to have(3).items
+        expect(header['Set-CooKie'].size).to eq(3)
       end
 
       [

data/spec/typhoeus/response/informations_spec.rb

@@ -176,6 +176,14 @@ describe Typhoeus::Response::Informations do
     end
   end
 
+  describe "#request_size" do
+    let(:options) { { :request_size => 2 } }
+
+    it "returns request_size from options" do
+      expect(response.request_size).to eq(2)
+    end
+  end
+
   describe "#headers" do
     context "when no response_headers" do
       it "returns nil" do
@@ -249,7 +257,7 @@ describe Typhoeus::Response::Informations do
       let(:options) { {:response_headers => "Server: A\r\n\r\nServer: B"} }
 
       it "returns response from all but last headers" do
-        expect(response.redirections).to have(1).item
+        expect(response.redirections.size).to eq(1)
       end
     end
   end

data/spec/typhoeus/response/status_spec.rb

@@ -101,7 +101,7 @@ describe Typhoeus::Response::Status do
           let(:return_code) { :ok }
 
           it "returns true" do
-            expect(response.success?).to be_true
+            expect(response.success?).to be_truthy
           end
         end
 
@@ -109,7 +109,7 @@ describe Typhoeus::Response::Status do
           let(:return_code) { nil }
 
           it "returns true" do
-            expect(response.success?).to be_true
+            expect(response.success?).to be_truthy
           end
         end
       end
@@ -121,7 +121,7 @@ describe Typhoeus::Response::Status do
           let(:return_code) { :ok }
 
           it "returns true" do
-            expect(response.success?).to be_true
+            expect(response.success?).to be_truthy
           end
         end
 
@@ -129,7 +129,7 @@ describe Typhoeus::Response::Status do
           let(:return_code) { nil }
 
           it "returns false" do
-            expect(response.success?).to be_false
+            expect(response.success?).to be_falsey
           end
         end
       end
@@ -139,7 +139,7 @@ describe Typhoeus::Response::Status do
       let(:options) { {:return_code => :ok, :response_code => 500} }
 
       it "returns false" do
-        expect(response.success?).to be_false
+        expect(response.success?).to be_falsey
       end
     end
   end
@@ -155,7 +155,7 @@ describe Typhoeus::Response::Status do
           let(:return_code) { :ok }
 
           it "returns false" do
-            expect(response.modified?).to be_false
+            expect(response.modified?).to be_falsey
           end
         end
 
@@ -163,7 +163,7 @@ describe Typhoeus::Response::Status do
           let(:return_code) { nil }
 
           it "returns false" do
-            expect(response.modified?).to be_false
+            expect(response.modified?).to be_falsey
           end
         end
       end
@@ -175,7 +175,7 @@ describe Typhoeus::Response::Status do
           let(:return_code) { :ok }
 
           it "returns false" do
-            expect(response.modified?).to be_false
+            expect(response.modified?).to be_falsey
           end
         end
 
@@ -183,7 +183,7 @@ describe Typhoeus::Response::Status do
           let(:return_code) { nil }
 
           it "returns true" do
-            expect(response.modified?).to be_false
+            expect(response.modified?).to be_falsey
           end
         end
       end
@@ -193,7 +193,7 @@ describe Typhoeus::Response::Status do
       let(:options) { {:return_code => :ok, :response_code => 500} }
 
       it "returns true" do
-        expect(response.modified?).to be_true
+        expect(response.modified?).to be_truthy
       end
     end
   end

data/spec/typhoeus/response_spec.rb

@@ -37,7 +37,7 @@ describe Typhoeus::Response do
       before { response.mock = true }
 
       it "returns @mock" do
-        expect(response.mock).to be_true
+        expect(response.mock).to be_truthy
       end
     end
 
@@ -45,7 +45,7 @@ describe Typhoeus::Response do
       let(:options) { {:mock => true} }
 
       it "returns options[:mock]" do
-        expect(response.mock).to be_true
+        expect(response.mock).to be_truthy
       end
     end
 
@@ -84,7 +84,7 @@ describe Typhoeus::Response do
       before { response.cached = true }
 
       it "returns cached status" do
-        expect(response.cached?).to be_true
+        expect(response.cached?).to be_truthy
       end
     end
 
@@ -92,7 +92,7 @@ describe Typhoeus::Response do
       before { response.cached = nil }
 
       it "returns false" do
-        expect(response.cached?).to be_false
+        expect(response.cached?).to be_falsey
       end
     end
 

data/spec/typhoeus_spec.rb

@@ -14,7 +14,7 @@ describe Typhoeus do
 
     it "sets values config" do
       Typhoeus::Config.verbose = true
-      expect(Typhoeus::Config.verbose).to be_true
+      expect(Typhoeus::Config.verbose).to be_truthy
     end
   end
 
@@ -43,7 +43,7 @@ describe Typhoeus do
 
       it "adds expectation" do
         Typhoeus.stub(:get, "")
-        expect(Typhoeus::Expectation.all).to have(1).item
+        expect(Typhoeus::Expectation.all.size).to eq(1)
       end
     end
 
@@ -59,7 +59,7 @@ describe Typhoeus do
 
       it "doesn't add expectation" do
         Typhoeus.stub(base_url)
-        expect(Typhoeus::Expectation.all).to have(1).item
+        expect(Typhoeus::Expectation.all.size).to eq(1)
       end
     end
   end
@@ -67,7 +67,7 @@ describe Typhoeus do
   describe ".before" do
     it "adds callback" do
       Typhoeus.before { true }
-      expect(Typhoeus.before).to have(1).item
+      expect(Typhoeus.before.size).to eq(1)
     end
   end
 

data/typhoeus.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.license = 'MIT'
 
-  s.add_dependency('ethon', [">= 0.7.0"])
+  s.add_dependency('ethon', [">= 0.7.1"])
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- spec/*`.split("\n")

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.6.8
-  prerelease: 
+  version: 0.6.9
 platform: ruby
 authors:
 - David Balatero
@@ -11,24 +10,22 @@ authors:
 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: ethon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
 description: Like a modern code version of the mythical beast with 100 serpent heads,
   Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.
 email:
@@ -131,30 +128,26 @@ files:
 homepage: https://github.com/typhoeus/typhoeus
 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: 1782230934011170024
 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: Parallel HTTP library on top of libcurl multi.
 test_files:
 - spec/rack/typhoeus/middleware/params_decoder/helper_spec.rb