spec/httpi/httpi_spec.rb in httpi-1.1.1 vs spec/httpi/httpi_spec.rb in httpi-2.0.0.rc1

@@ -1,248 +1,213 @@
 require "spec_helper"
 require "httpi"
 
 describe HTTPI do
   let(:client) { HTTPI }
-  let(:httpclient) { HTTPI::Adapter.load(:httpclient)[1] }
-  let(:curb) { HTTPI::Adapter.load(:curb)[1] }
+  let(:httpclient) { HTTPI::Adapter.load(:httpclient) }
+  let(:net_http) { HTTPI::Adapter.load(:net_http) }
 
+  describe ".adapter=" do
+    it "sets the default adapter to use" do
+      HTTPI::Adapter.expects(:use=).with(:net_http)
+      HTTPI.adapter = :net_http
+    end
+  end
+
   describe ".get(request)" do
     it "executes a GET request using the default adapter" do
-      request = HTTPI::Request.new
-      httpclient.any_instance.expects(:get).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      httpclient.any_instance.expects(:request).with(:get)
 
-      client.get request
+      client.get(request)
     end
   end
 
   describe ".get(request, adapter)" do
     it "executes a GET request using the given adapter" do
-      request = HTTPI::Request.new
-      curb.any_instance.expects(:get).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      net_http.any_instance.expects(:request).with(:get)
 
-      client.get request, :curb
+      client.get(request, :net_http)
     end
   end
 
   describe ".get(url)" do
     it "executes a GET request using the default adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      httpclient.any_instance.expects(:get).with(instance_of(HTTPI::Request))
-
-      client.get "http://example.com"
+      httpclient.any_instance.expects(:request).with(:get)
+      client.get("http://example.com")
     end
   end
 
   describe ".get(url, adapter)" do
     it "executes a GET request using the given adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      curb.any_instance.expects(:get).with(instance_of(HTTPI::Request))
-
-      client.get "http://example.com", :curb
+      net_http.any_instance.expects(:request).with(:get)
+      client.get("http://example.com", :net_http)
     end
   end
 
   describe ".post(request)" do
     it "executes a POST request using the default adapter" do
-      request = HTTPI::Request.new
-      httpclient.any_instance.expects(:post).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      httpclient.any_instance.expects(:request).with(:post)
 
-      client.post request
+      client.post(request)
     end
   end
 
   describe ".post(request, adapter)" do
     it "executes a POST request using the given adapter" do
-      request = HTTPI::Request.new
-      curb.any_instance.expects(:post).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      net_http.any_instance.expects(:request).with(:post, anything)
 
-      client.post request, :curb
+      client.post(request, :net_http)
     end
   end
 
   describe ".post(url, body)" do
     it "executes a POST request using the default adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
-      httpclient.any_instance.expects(:post).with(instance_of(HTTPI::Request))
-
-      client.post "http://example.com", "<some>xml</some>"
+      httpclient.any_instance.expects(:request).with(:post)
+      client.post("http://example.com", "<some>xml</some>")
     end
   end
 
   describe ".post(url, body, adapter)" do
     it "executes a POST request using the given adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
-      curb.any_instance.expects(:post).with(instance_of(HTTPI::Request))
-
-      client.post "http://example.com", "<some>xml</some>", :curb
+      net_http.any_instance.expects(:request).with(:post)
+      client.post("http://example.com", "<some>xml</some>", :net_http)
     end
   end
 
   describe ".head(request)" do
     it "executes a HEAD request using the default adapter" do
-      request = HTTPI::Request.new
-      httpclient.any_instance.expects(:head).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      httpclient.any_instance.expects(:request).with(:head, anything)
 
-      client.head request
+      client.head(request)
     end
   end
 
   describe ".head(request, adapter)" do
     it "executes a HEAD request using the given adapter" do
-      request = HTTPI::Request.new
-      curb.any_instance.expects(:head).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      net_http.any_instance.expects(:request).with(:head, anything)
 
-      client.head request, :curb
+      client.head(request, :net_http)
     end
   end
 
   describe ".head(url)" do
     it "executes a HEAD request using the default adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      httpclient.any_instance.expects(:head).with(instance_of(HTTPI::Request))
-
-      client.head "http://example.com"
+      httpclient.any_instance.expects(:request).with(:head)
+      client.head("http://example.com")
     end
   end
 
   describe ".head(url, adapter)" do
     it "executes a HEAD request using the given adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      curb.any_instance.expects(:head).with(instance_of(HTTPI::Request))
-
-      client.head "http://example.com", :curb
+      net_http.any_instance.expects(:request).with(:head)
+      client.head("http://example.com", :net_http)
     end
   end
 
   describe ".put(request)" do
     it "executes a PUT request using the default adapter" do
-      request = HTTPI::Request.new
-      httpclient.any_instance.expects(:put).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      httpclient.any_instance.expects(:request).with(:put, anything)
 
-      client.put request
+      client.put(request)
     end
   end
 
   describe ".put(request, adapter)" do
     it "executes a PUT request using the given adapter" do
-      request = HTTPI::Request.new
-      curb.any_instance.expects(:put).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      net_http.any_instance.expects(:request).with(:put, anything)
 
-      client.put request, :curb
+      client.put(request, :net_http)
     end
   end
 
   describe ".put(url, body)" do
     it "executes a PUT request using the default adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
-      httpclient.any_instance.expects(:put).with(instance_of(HTTPI::Request))
-
-      client.put "http://example.com", "<some>xml</some>"
+      httpclient.any_instance.expects(:request).with(:put)
+      client.put("http://example.com", "<some>xml</some>")
     end
   end
 
   describe ".put(url, body, adapter)" do
     it "executes a PUT request using the given adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
-      curb.any_instance.expects(:put).with(instance_of(HTTPI::Request))
-
-      client.put "http://example.com", "<some>xml</some>", :curb
+      net_http.any_instance.expects(:request).with(:put)
+      client.put("http://example.com", "<some>xml</some>", :net_http)
     end
   end
 
   describe ".delete(request)" do
     it "executes a DELETE request using the default adapter" do
-      request = HTTPI::Request.new
-      httpclient.any_instance.expects(:delete).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      httpclient.any_instance.expects(:request).with(:delete, anything)
 
-      client.delete request
+      client.delete(request)
     end
   end
 
   describe ".delete(request, adapter)" do
     it "executes a DELETE request using the given adapter" do
-      request = HTTPI::Request.new
-      curb.any_instance.expects(:delete).with(request)
+      request = HTTPI::Request.new("http://example.com")
+      net_http.any_instance.expects(:request).with(:delete, anything)
 
-      client.delete request, :curb
+      client.delete(request, :net_http)
     end
   end
 
   describe ".delete(url)" do
     it "executes a DELETE request using the default adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      httpclient.any_instance.expects(:delete).with(instance_of(HTTPI::Request))
-
-      client.delete "http://example.com"
+      httpclient.any_instance.expects(:request).with(:delete)
+      client.delete("http://example.com")
     end
   end
 
   describe ".delete(url, adapter)" do
     it "executes a DELETE request using the given adapter" do
-      HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      curb.any_instance.expects(:delete).with(instance_of(HTTPI::Request))
-
-      client.delete "http://example.com", :curb
+      net_http.any_instance.expects(:request).with(:delete)
+      client.delete("http://example.com", :net_http)
     end
   end
 
   describe ".request" do
-    it "raises an ArgumentError in case of an invalid request method" do
-      expect { client.request :invalid, HTTPI::Request.new }.to raise_error(ArgumentError)
-    end
-  end
+    it "allows custom HTTP methods" do
+      request = HTTPI::Request.new("http://example.com")
+      httpclient.any_instance.expects(:request).with(:custom)
 
-  describe ".adapter=" do
-    it "sets the default adapter to use" do
-      HTTPI::Adapter.expects(:use=).with(:net_http)
-      HTTPI.adapter = :net_http
+      client.request(:custom, request, :httpclient)
     end
   end
 
   HTTPI::REQUEST_METHODS.each do |method|
-    describe ".request(#{method}, request, adapter)" do
-      it "delegates to the .#{method} method" do
-        HTTPI.expects(method)
-        client.request method, HTTPI::Request.new
-      end
-    end
-
     describe ".#{method}" do
-      let(:request) { HTTPI::Request.new :url => "http://example.com" }
+      let(:request) { HTTPI::Request.new("http://example.com") }
 
       it "raises an ArgumentError in case of an invalid adapter" do
         expect { client.request method, request, :invalid }.to raise_error(ArgumentError)
       end
 
-      it "raises an ArgumentError in case of an invalid request" do
-        expect { client.request method, "invalid" }.to raise_error(ArgumentError)
-      end
-
       HTTPI::Adapter::ADAPTERS.each do |adapter, opts|
-        client_class = {
-          :httpclient => lambda { HTTPClient },
-          :curb       => lambda { Curl::Easy },
-          :net_http   => lambda { Net::HTTP }
-        }
+        unless (adapter == :em_http && RUBY_VERSION =~ /1\.8/) || (adapter == :curb && RUBY_PLATFORM =~ /java/)
+          client_class = {
+            :httpclient => lambda { HTTPClient },
+            :curb       => lambda { Curl::Easy },
+            :net_http   => lambda { Net::HTTP },
+            :em_http    => lambda { EventMachine::WebMockHttpConnection } # in real life: EventMachine::HttpRequest
+          }
 
-        context "using #{adapter}" do
-          before { opts[:class].any_instance.expects(method) }
+          context "using #{adapter}" do
+            before { opts[:class].any_instance.expects(:request).with(method) }
 
-          it "logs that we're executing a request" do
-            HTTPI.expects(:log).with("HTTPI executes HTTP #{method.to_s.upcase} using the #{adapter} adapter")
-            client.request method, request, adapter
+            it "yields the HTTP client instance used for the request" do
+              expect { |b| client.request(method, request, adapter, &b) }.to yield_with_args(client_class[adapter].call)
+            end
           end
-
-          it "yields the HTTP client instance used for the request" do
-            block = lambda { |http| http.be_a(client_class[adapter].call) }
-            client.request(method, request, adapter, &block)
-          end
         end
       end
     end
   end
 
@@ -265,11 +230,11 @@
         HTTPI.logger.should be_a(Logger)
       end
     end
 
     describe ".log_level" do
-      it "defaults to :warn" do
-        HTTPI.log_level.should == :warn
+      it "defaults to :debug" do
+        HTTPI.log_level.should == :debug
       end
     end
 
     describe ".log" do
       it "logs the given messages" do