typhoeus 0.6.8 → 0.6.9

data/spec/typhoeus/hydra/addable_spec.rb

@@ -6,17 +6,17 @@ describe Typhoeus::Hydra::Addable do
 
   it "asks easy factory for an easy" do
     multi = double
-    Typhoeus::EasyFactory.should_receive(:new).with(request, hydra).and_return(double(:get => 1))
-    hydra.should_receive(:multi).and_return(multi)
-    multi.should_receive(:add).with(1)
+    expect(Typhoeus::EasyFactory).to receive(:new).with(request, hydra).and_return(double(:get => 1))
+    expect(hydra).to receive(:multi).and_return(multi)
+    expect(multi).to receive(:add).with(1)
     hydra.add(request)
   end
 
   it "adds easy to multi" do
     multi = double
-    Typhoeus::EasyFactory.should_receive(:new).with(request, hydra).and_return(double(:get => 1))
-    hydra.should_receive(:multi).and_return(multi)
-    multi.should_receive(:add).with(1)
+    expect(Typhoeus::EasyFactory).to receive(:new).with(request, hydra).and_return(double(:get => 1))
+    expect(hydra).to receive(:multi).and_return(multi)
+    expect(multi).to receive(:add).with(1)
     hydra.add(request)
   end
 end

data/spec/typhoeus/hydra/before_spec.rb

@@ -9,14 +9,14 @@ describe Typhoeus::Hydra::Before do
       context "when one" do
         it "executes" do
           Typhoeus.before { |r| String.new(r.base_url) }
-          String.should_receive(:new).and_return("")
+          expect(String).to receive(:new).and_return("")
           hydra.add(request)
         end
 
         context "when true" do
           it "calls super" do
             Typhoeus.before { true }
-            Typhoeus::Expectation.should_receive(:response_for)
+            expect(Typhoeus::Expectation).to receive(:response_for)
             hydra.add(request)
           end
         end
@@ -37,7 +37,7 @@ describe Typhoeus::Hydra::Before do
           context "when false" do
             it "doesn't call super" do
               Typhoeus.before { false }
-              Typhoeus::Expectation.should_receive(:response_for).never
+              expect(Typhoeus::Expectation).to receive(:response_for).never
               hydra.add(request)
             end
           end
@@ -45,7 +45,7 @@ describe Typhoeus::Hydra::Before do
           context "when response" do
             it "doesn't call super" do
               Typhoeus.before { Typhoeus::Response.new }
-              Typhoeus::Expectation.should_receive(:response_for).never
+              expect(Typhoeus::Expectation).to receive(:response_for).never
               hydra.add(request)
             end
           end
@@ -57,12 +57,12 @@ describe Typhoeus::Hydra::Before do
           before { 3.times { Typhoeus.before { |r| String.new(r.base_url) } } }
 
           it "calls super" do
-            Typhoeus::Expectation.should_receive(:response_for)
+            expect(Typhoeus::Expectation).to receive(:response_for)
             hydra.add(request)
           end
 
           it "executes all" do
-            String.should_receive(:new).exactly(3).times.and_return("")
+            expect(String).to receive(:new).exactly(3).times.and_return("")
             hydra.add(request)
           end
         end
@@ -75,12 +75,12 @@ describe Typhoeus::Hydra::Before do
           end
 
           it "doesn't call super" do
-            Typhoeus::Expectation.should_receive(:response_for).never
+            expect(Typhoeus::Expectation).to receive(:response_for).never
             hydra.add(request)
           end
 
           it "executes only two" do
-            String.should_receive(:new).exactly(2).times.and_return("")
+            expect(String).to receive(:new).exactly(2).times.and_return("")
             hydra.add(request)
           end
         end
@@ -89,7 +89,7 @@ describe Typhoeus::Hydra::Before do
 
     context "when no before" do
       it "calls super" do
-        Typhoeus::Expectation.should_receive(:response_for)
+        expect(Typhoeus::Expectation).to receive(:response_for)
         hydra.add(request)
       end
     end

data/spec/typhoeus/hydra/cacheable_spec.rb

@@ -18,7 +18,7 @@ describe Typhoeus::Hydra::Cacheable do
         end
 
         it "doesn't call complete" do
-          request.should_receive(:complete).never
+          expect(request).to receive(:complete).never
           hydra.add(request)
         end
       end
@@ -29,14 +29,14 @@ describe Typhoeus::Hydra::Cacheable do
 
         it "returns response with cached status" do
           hydra.add(request)
-          expect(response.cached?).to be_true
+          expect(response.cached?).to be_truthy
         end
 
         context "when no queued requests" do
           it "finishes request" do
-            request.should_receive(:finish).with(response)
+            expect(request).to receive(:finish).with(response)
             hydra.add(request)
-            expect(response.cached?).to be_true
+            expect(response.cached?).to be_truthy
           end
         end
 
@@ -47,8 +47,8 @@ describe Typhoeus::Hydra::Cacheable do
 
           it "finishes both requests" do
             hydra.queue(queued_request)
-            request.should_receive(:finish).with(response)
-            queued_request.should_receive(:finish).with(response)
+            expect(request).to receive(:finish).with(response)
+            expect(queued_request).to receive(:finish).with(response)
             hydra.add(request)
           end
         end

data/spec/typhoeus/hydra/memoizable_spec.rb

@@ -16,7 +16,7 @@ describe Typhoeus::Hydra::Memoizable do
         end
 
         it "doesn't call complete" do
-          request.should_receive(:complete).never
+          expect(request).to receive(:complete).never
           hydra.add(request)
         end
       end
@@ -26,7 +26,7 @@ describe Typhoeus::Hydra::Memoizable do
         before { hydra.memory[request] = response }
 
         it "finishes request" do
-          request.should_receive(:finish).with(response, true)
+          expect(request).to receive(:finish).with(response, true)
           hydra.add(request)
         end
 
@@ -35,8 +35,8 @@ describe Typhoeus::Hydra::Memoizable do
 
           it "dequeues" do
             hydra.queue(queued_request)
-            request.should_receive(:finish).with(response, true)
-            queued_request.should_receive(:finish).with(response, true)
+            expect(request).to receive(:finish).with(response, true)
+            expect(queued_request).to receive(:finish).with(response, true)
             hydra.add(request)
           end
         end
@@ -46,7 +46,7 @@ describe Typhoeus::Hydra::Memoizable do
 
   describe "#run" do
     it "clears memory before starting" do
-      hydra.memory.should_receive(:clear)
+      expect(hydra.memory).to receive(:clear)
       hydra.run
     end
   end

data/spec/typhoeus/hydra/queueable_spec.rb

@@ -36,4 +36,53 @@ describe Typhoeus::Hydra::Queueable do
       expect(hydra.queued_requests).to be_empty
     end
   end
+
+  describe "#dequeue_many" do
+    before do
+      requests.each { |r| hydra.queue r }
+    end
+
+    context "when no request queued" do
+      let(:requests) { [] }
+
+      it "does nothing" do
+        expect(hydra).to_not receive(:add)
+        hydra.dequeue_many
+      end
+    end
+
+    context "when request queued" do
+      let(:first) { Typhoeus::Request.new("localhost:3001/first") }
+      let(:requests) { [first] }
+
+      it "adds request from queue to multi" do
+        expect(hydra).to receive(:add).with(first)
+        hydra.dequeue_many
+      end
+    end
+
+    context "when three request queued" do
+      let(:first) { Typhoeus::Request.new("localhost:3001/first") }
+      let(:second) { Typhoeus::Request.new("localhost:3001/second") }
+      let(:third) { Typhoeus::Request.new("localhost:3001/third") }
+      let(:requests) { [first, second, third] }
+
+      it "adds requests from queue to multi" do
+        expect(hydra).to receive(:add).with(first)
+        expect(hydra).to receive(:add).with(second)
+        expect(hydra).to receive(:add).with(third)
+        hydra.dequeue_many
+      end
+
+      context "when max_concurrency is two" do
+        let(:options) { {:max_concurrency => 2} }
+        it "adds requests from queue to multi" do
+          expect(hydra).to receive(:add).with(first)
+          expect(hydra).to receive(:add).with(second)
+          expect(hydra).to_not receive(:add).with(third)
+          hydra.dequeue_many
+        end
+      end
+    end
+  end
 end

data/spec/typhoeus/hydra/runnable_spec.rb

@@ -6,33 +6,26 @@ describe Typhoeus::Hydra::Runnable do
   let(:hydra) { Typhoeus::Hydra.new(options) }
 
   describe "#run" do
+    let(:requests) { [] }
+
     before do
       requests.each { |r| hydra.queue r }
     end
 
-    context "when no request queued" do
-      let(:requests) { [] }
+    it "runs multi#dequeue_many" do
+      expect(hydra).to receive(:dequeue_many)
+      hydra.run
+    end
 
-      it "does nothing" do
-        hydra.multi.should_receive(:perform)
-        hydra.run
-      end
+    it "runs multi#perform" do
+      expect(hydra.multi).to receive(:perform)
+      hydra.run
     end
 
     context "when request queued" do
       let(:first) { Typhoeus::Request.new("localhost:3001/first") }
       let(:requests) { [first] }
 
-      it "adds request from queue to multi" do
-        hydra.should_receive(:add).with(first)
-        hydra.run
-      end
-
-      it "runs multi#perform" do
-        hydra.multi.should_receive(:perform)
-        hydra.run
-      end
-
       it "sends" do
         hydra.run
         expect(first.response).to be
@@ -45,18 +38,6 @@ describe Typhoeus::Hydra::Runnable do
       let(:third) { Typhoeus::Request.new("localhost:3001/third") }
       let(:requests) { [first, second, third] }
 
-      it "adds requests from queue to multi" do
-        hydra.should_receive(:add).with(first)
-        hydra.should_receive(:add).with(second)
-        hydra.should_receive(:add).with(third)
-        hydra.run
-      end
-
-      it "runs multi#perform" do
-        hydra.multi.should_receive(:perform)
-        hydra.run
-      end
-
       it "sends first" do
         hydra.run
         expect(first.response).to be
@@ -134,7 +115,7 @@ describe Typhoeus::Hydra::Runnable do
           let(:options) { {} }
 
           it "calls on_complete callback once for every response" do
-            String.should_receive(:new).exactly(2).times
+            expect(String).to receive(:new).exactly(2).times
             hydra.run
           end
         end
@@ -145,7 +126,7 @@ describe Typhoeus::Hydra::Runnable do
           before { Typhoeus.before{ |request|  request.finish(Typhoeus::Response.new) } }
 
           it "simulates real multi run and adds and finishes both requests" do
-            String.should_receive(:new).exactly(2).times
+            expect(String).to receive(:new).exactly(2).times
             hydra.run
           end
         end

data/spec/typhoeus/hydra/stubbable_spec.rb

@@ -15,7 +15,7 @@ describe Typhoeus::Hydra::Stubbable do
 
     context "when expectation found" do
       it "finishes response" do
-        request.should_receive(:finish)
+        expect(request).to receive(:finish)
         hydra.add(request)
       end
 

data/spec/typhoeus/hydra_spec.rb

@@ -9,7 +9,7 @@ describe Typhoeus::Hydra do
     let(:options) { {:pipeling => true} }
 
     it "passes options to multi" do
-      Ethon::Multi.should_receive(:new).with(options)
+      expect(Ethon::Multi).to receive(:new).with(options)
       hydra
     end
   end

data/spec/typhoeus/pool_spec.rb

@@ -12,7 +12,7 @@ describe Typhoeus::Pool do
 
   describe "#release" do
     it "resets easy" do
-      easy.should_receive(:reset)
+      expect(easy).to receive(:reset)
       Typhoeus::Pool.release(easy)
     end
 
@@ -28,7 +28,7 @@ describe Typhoeus::Pool do
             Typhoeus::Pool.release(Ethon::Easy.new)
           end
         end.map(&:join)
-        expect(Typhoeus::Pool.send(:easies)).to have(10).easies
+        expect(Typhoeus::Pool.send(:easies).size).to eq(10)
       end
     end
   end
@@ -55,7 +55,7 @@ describe Typhoeus::Pool do
               array << Typhoeus::Pool.get
             end
           end.map(&:join)
-          expect(array.uniq).to have(10).easies
+          expect(array.uniq.size).to eq(10)
         end
       end
     end
@@ -73,7 +73,7 @@ describe Typhoeus::Pool do
           end
         end
       end
-      expect(array.uniq).to have(3).easies
+      expect(array.uniq.size).to eq(3)
     end
   end
 end

data/spec/typhoeus/request/before_spec.rb

@@ -8,14 +8,14 @@ describe Typhoeus::Request::Before do
       context "when one" do
         it "executes" do
           Typhoeus.before { |r| String.new(r.base_url) }
-          String.should_receive(:new).and_return("")
+          expect(String).to receive(:new).and_return("")
           request.run
         end
 
         context "when true" do
           it "calls super" do
             Typhoeus.before { true }
-            Typhoeus::Expectation.should_receive(:response_for)
+            expect(Typhoeus::Expectation).to receive(:response_for)
             request.run
           end
         end
@@ -23,7 +23,7 @@ describe Typhoeus::Request::Before do
         context "when false" do
           it "doesn't call super" do
             Typhoeus.before { false }
-            Typhoeus::Expectation.should_receive(:response_for).never
+            expect(Typhoeus::Expectation).to receive(:response_for).never
             request.run
           end
 
@@ -36,7 +36,7 @@ describe Typhoeus::Request::Before do
         context "when a response" do
           it "doesn't call super" do
             Typhoeus.before { Typhoeus::Response.new }
-            Typhoeus::Expectation.should_receive(:response_for).never
+            expect(Typhoeus::Expectation).to receive(:response_for).never
             request.run
           end
 
@@ -52,12 +52,12 @@ describe Typhoeus::Request::Before do
           before { 3.times { Typhoeus.before { |r| String.new(r.base_url) } } }
 
           it "calls super" do
-            Typhoeus::Expectation.should_receive(:response_for)
+            expect(Typhoeus::Expectation).to receive(:response_for)
             request.run
           end
 
           it "executes all" do
-            String.should_receive(:new).exactly(3).times.and_return("")
+            expect(String).to receive(:new).exactly(3).times.and_return("")
             request.run
           end
         end
@@ -70,12 +70,12 @@ describe Typhoeus::Request::Before do
           end
 
           it "doesn't call super" do
-            Typhoeus::Expectation.should_receive(:response_for).never
+            expect(Typhoeus::Expectation).to receive(:response_for).never
             request.run
           end
 
           it "executes only two" do
-            String.should_receive(:new).exactly(2).times.and_return("")
+            expect(String).to receive(:new).exactly(2).times.and_return("")
             request.run
           end
         end
@@ -84,7 +84,7 @@ describe Typhoeus::Request::Before do
 
     context "when no before" do
       it "calls super" do
-        Typhoeus::Expectation.should_receive(:response_for)
+        expect(Typhoeus::Expectation).to receive(:response_for)
         request.run
       end
     end

data/spec/typhoeus/request/block_connection_spec.rb

@@ -28,7 +28,7 @@ describe Typhoeus::Request::BlockConnection do
         before { request.block_connection = true }
 
         it "returns true" do
-          expect(request.blocked?).to be_true
+          expect(request.blocked?).to be_truthy
         end
       end
 
@@ -36,7 +36,7 @@ describe Typhoeus::Request::BlockConnection do
         before { request.block_connection = false }
 
         it "returns false" do
-          expect(request.blocked?).to be_false
+          expect(request.blocked?).to be_falsey
         end
       end
     end
@@ -47,7 +47,7 @@ describe Typhoeus::Request::BlockConnection do
         after { Typhoeus::Config.block_connection = false }
 
         it "returns true" do
-          expect(request.blocked?).to be_true
+          expect(request.blocked?).to be_truthy
         end
       end
 
@@ -55,7 +55,7 @@ describe Typhoeus::Request::BlockConnection do
         before { Typhoeus::Config.block_connection = false }
 
         it "returns false" do
-          expect(request.blocked?).to be_false
+          expect(request.blocked?).to be_falsey
         end
       end
     end
@@ -68,7 +68,7 @@ describe Typhoeus::Request::BlockConnection do
       after { Typhoeus::Config.block_connection = false }
 
       it "takes local" do
-        expect(request.blocked?).to be_false
+        expect(request.blocked?).to be_falsey
       end
     end
   end