Make Docs:Requester#request accept an array of URLs

Thibaut committed 12 years ago

Commit c6be9b61 parent 562a4c72 files · +70 −35Browse files

Unified · Split

2 files

lib/docs/core/requester.rb +14 −7
test/lib/docs/core/requester_test.rb +56 −28

   class Requester < Typhoeus::Hydra
     attr_reader :request_options
-    def self.run(url, options = {}, &block)
+    def self.run(urls, options = {}, &block)
       requester = new(options)
       requester.on_response(&block) if block
-      requester.request(url)
+      requester.request(urls)
       requester.run
       requester
     end
       super
     end
-    def request(url, options = {}, &block)
+    def request(urls, options = {}, &block)
-      request = Request.new(url, request_options.merge(options))
+      requests = [urls].flatten.map do |url|
-      request.on_complete(&block) if block
+        build_and_queue_request(url, options, &block)
-      queue(request)
+      end
-      request
+      requests.length == 1 ? requests.first : requests
     end
     def queue(request)
     private
+    def build_and_queue_request(url, options, &block)
+      request = Request.new(url, request_options.merge(options))
+      request.on_complete(&block) if block
+      queue(request)
+      request
+    end
     def handle_response(response)
       on_response.each do |callback|
         result = callback.call(response)

test/lib/docs/core/requester_test.rb+56−28

     Docs::Requester.new(options)
   end
+  let :url do
+    'http://example.com'
+  end
   let :options do
     Hash.new
   end
-  let :url do
+  let :block do
-    'http://example.com'
+    Proc.new {}
   end
   after do
   end
   describe "#request" do
-    it "returns a request" do
+    context "with a url" do
-      assert_instance_of Docs::Request, requester.request(url)
+      it "returns a request" do
-    end
+        assert_instance_of Docs::Request, requester.request(url)
-    describe "the request" do
-      it "is queued" do
-        request = requester.request(url)
-        assert_includes requester.queued_requests, request
       end
-      it "has the given url" do
+      describe "the request" do
-        request = requester.request(url)
+        it "is queued" do
-        assert_equal url, request.base_url
+          request = requester.request(url)
+          assert_includes requester.queued_requests, request
+        end
+        it "has the given url" do
+          request = requester.request(url)
+          assert_equal url, request.base_url
+        end
+        it "has the default :request_options" do
+          options[:request_options] = { params: 'test' }
+          request = requester.request(url)
+          assert_equal 'test', request.options[:params]
+        end
+        it "has the given options" do
+          options[:request_options] = { params: '' }
+          request = requester.request(url, params: 'test')
+          assert_equal 'test', request.options[:params]
+        end
+        it "has the given block as an on_complete callback" do
+          request = requester.request(url, &block)
+          assert_includes request.on_complete, block
+        end
       end
+    end
-      it "has the default :request_options" do
+    context "with an array of urls" do
-        options[:request_options] = { params: 'test' }
+      let :urls do
-        request = requester.request(url)
+        ['one', 'two']
-        assert_equal 'test', request.options[:params]
       end
-      it "has the given options" do
+      it "returns an array of requests" do
-        options[:request_options] = { params: '' }
+        result = requester.request(urls, { params: 'test' }, &block)
-        request = requester.request(url, params: 'test')
+        assert_instance_of Array, result
-        assert_equal 'test', request.options[:params]
+        assert_equal urls.length, result.length
+        assert result.all? { |obj| obj.instance_of? Docs::Request }
+        urls.each_with_index do |url, i|
+          assert_equal url, result[i].base_url
+          assert_equal 'test', result[i].options[:params]
+          assert_includes result[i].on_complete, block
+        end
       end
-      it "has the given block as an on_complete callback" do
+      it "queues the requests in the given order" do
-        block = Proc.new {}
+        queue = []
-        request = requester.request(url, &block)
+        stub(requester).queue { |request| queue << request }
-        assert_includes request.on_complete, block
+        assert_equal urls, requester.request(urls).map(&:base_url)
       end
     end
   end
     end
     it "stores a callback" do
-      proc = Proc.new {}
+      requester.on_response(&block)
-      requester.on_response(&proc)
+      assert_includes requester.on_response, block
-      assert_includes requester.on_response, proc
     end
   end