pauldix-typhoeus 0.0.10 → 0.0.11

data/lib/typhoeus/remote.rb

@@ -22,9 +22,9 @@ module Typhoeus
       return nil unless @remote_mocks
       if @remote_mocks.has_key? method
         if @remote_mocks[method].has_key? url
-          get_mock_and_run_handlers(@remote_mocks[method][url], options)
+          get_mock_and_run_handlers(method, @remote_mocks[method][url], options)
         elsif @remote_mocks[method].has_key? :catch_all
-          get_mock_and_run_handlers(@remote_mocks[method][:catch_all], options)
+          get_mock_and_run_handlers(method, @remote_mocks[method][:catch_all], options)
         else
           nil
         end
@@ -33,8 +33,16 @@ module Typhoeus
       end
     end
     
-    def get_mock_and_run_handlers(response_args, options)
+    def get_mock_and_run_handlers(method, response_args, options)
       response = Response.new(response_args[:code], response_args[:headers], response_args[:body], response_args[:time])
+      if response_args.has_key? :expected_body
+        raise "#{method} expected body of \"#{response_args[:expected_body]}\" but received #{options[:body]}" if response_args[:expected_body] != options[:body]
+      end
+      
+      if response_args.has_key? :expected_headers
+        raise "#{method} expected body of \"#{response_args[:expected_headers].inspect}\" but received #{options[:headers].inspect}" if response_args[:expected_headers] != options[:headers]
+      end
+      
       if response.code >= 200 && response.code < 300 && options.has_key?(:on_success)
         response = options[:on_success].call(response)
       elsif options.has_key?(:on_failure)
@@ -72,6 +80,7 @@ module Typhoeus
       
       easy.url                   = url
       easy.method                = method
+      easy.headers               = options[:headers] if options.has_key? :headers
       easy.headers["User-Agent"] = (options[:user_agent] || Typhoeus::USER_AGENT)
       easy.params                = options[:params] if options[:params]
       easy.request_body          = options[:body] if options[:body]

data/lib/typhoeus.rb

@@ -12,7 +12,7 @@ require 'typhoeus/remote_proxy_object'
 require 'typhoeus/response'
 
 module Typhoeus
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
   
   def self.easy_object_pool
     @easy_objects ||= []

data/spec/typhoeus/remote_spec.rb

@@ -63,6 +63,44 @@ describe Typhoeus do
       @klass.get("http://localhost:234234234").code.should == 0
     end
     
+    describe "request body expectations" do
+      before(:all) do
+        @body_klass = Class.new do
+          include Typhoeus
+        end
+        @body_klass.mock(:put, :url => "http://whatev", :expected_body => "hi")
+      end
+      
+      it "should take an expected request body" do
+        @body_klass.put("http://whatev", :body => "hi").code.should == 200
+      end
+      
+      it "should raise if the expected request body doesn't match" do
+        lambda {
+          @body_klass.put("http://whatev", :body => "not what we expect")
+        }.should raise_error
+      end
+    end
+    
+    describe "request header expectations" do
+      before(:all) do
+        @header_klass = Class.new do
+          include Typhoeus
+        end
+        @header_klass.mock(:get, :url => "http://asdf", :expected_headers => {"If-None-Match" => "\"lkjsd90823\""})
+      end
+      
+      it "should take expected request headers" do
+        @header_klass.get("http://asdf", :headers => {"If-None-Match" => "\"lkjsd90823\""})
+      end
+      
+      it "should raise if the expected request headers don't match" do
+        lambda {
+          @header_klass.get("http://asdf")
+        }.should raise_error
+      end
+    end
+    
     describe "remote methods" do
       it "should work for defined remote methods" do
         @klass.instance_eval do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pauldix-typhoeus
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Paul Dix
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-12 00:00:00 -07:00
+date: 2009-07-03 00:00:00 -07:00
 default_executable: 
 dependencies: []