pauldix-typhoeus 0.0.13 → 0.0.14

data/lib/typhoeus/remote.rb

@@ -26,7 +26,39 @@ module Typhoeus
       args[:time]    ||= 0
       url = args.delete(:url)
       url ||= :catch_all
-      @remote_mocks[method][url] = args
+      params = args.delete(:params)
+
+      key = mock_key_for(url, params)
+
+      @remote_mocks[method][key] = args
+    end
+
+    # Returns a key for a given URL and passed in 
+    # set of Typhoeus options to be used to store/retrieve
+    # a corresponding mock.
+    def mock_key_for(url, params = nil)
+      if url == :catch_all
+        url
+      else
+        key = url
+        if params and !params.empty?
+          key += flatten_and_sort_hash(params).to_s
+        end
+        key
+      end
+    end
+
+    def flatten_and_sort_hash(params)
+      params = params.dup
+
+      # Flatten any sub-hashes to a single string.
+      params.keys.each do |key|
+        if params[key].is_a?(Hash)
+          params[key] = params[key].sort_by { |k, v| k.to_s.downcase }.to_s
+        end
+      end
+
+      params.sort_by { |k, v| k.to_s.downcase }
     end
     
     def get_mock(method, url, options)
@@ -34,9 +66,10 @@ module Typhoeus
       if @remote_mocks.has_key? method
         extra_response_args = { :requested_http_method => method,
                                 :requested_url => url }
-        if @remote_mocks[method].has_key? url
+        mock_key = mock_key_for(url, options[:params])
+        if @remote_mocks[method].has_key? mock_key
           get_mock_and_run_handlers(method,
-                                    @remote_mocks[method][url].merge(
+                                    @remote_mocks[method][mock_key].merge(
                                       extra_response_args),
                                     options)
         elsif @remote_mocks[method].has_key? :catch_all
@@ -52,12 +85,18 @@ module Typhoeus
       end
     end
 
-    def enforce_allow_net_connect!(http_verb, url)
+    def enforce_allow_net_connect!(http_verb, url, params = nil)
       if !allow_net_connect
-        raise MockExpectedError,
-              "Real HTTP connections are disabled. Unregistered request: " <<
-              "#{http_verb.to_s.upcase} #{url}\n" <<
-              "  Try: mock(:#{http_verb}, :url => \"#{url}\")"
+        message = "Real HTTP connections are disabled. Unregistered request: " <<
+                  "#{http_verb.to_s.upcase} #{url}\n" <<
+                  "  Try: mock(:#{http_verb}, :url => \"#{url}\""
+        if params
+          message << ",\n            :params => #{params.inspect}"
+        end
+
+        message << ")"
+
+        raise MockExpectedError, message
       end
     end
     
@@ -80,44 +119,20 @@ module Typhoeus
       response
     end
     
-    def get(url, options = {})
-      mock_object = get_mock(:get, url, options)
-      unless mock_object.nil?
-        mock_object
-      else
-        enforce_allow_net_connect!(:get, url)  
-        remote_proxy_object(url, :get, options)
-      end
-    end
-    
-    def post(url, options = {}, &block)
-      mock_object = get_mock(:post, url, options)
-      unless mock_object.nil?
-        mock_object
-      else
-        enforce_allow_net_connect!(:post, url)
-        remote_proxy_object(url, :post, options)
-      end
-    end
-
-    def put(url, options = {}, &block)
-      mock_object = get_mock(:put, url, options)
-      unless mock_object.nil?
-        mock_object
-      else
-        enforce_allow_net_connect!(:put, url)
-        remote_proxy_object(url, :put, options)
-      end
-    end
-    
-    def delete(url, options = {}, &block)
-      mock_object = get_mock(:delete, url, options)
-      unless mock_object.nil?
-        mock_object
-      else
-        enforce_allow_net_connect!(:delete, url)
-        remote_proxy_object(url, :delete, options)
-      end
+    [:get, :post, :put, :delete].each do |method|
+      line = __LINE__ + 2  # get any errors on the correct line num
+      code = <<-SRC
+        def #{method.to_s}(url, options = {})
+          mock_object = get_mock(:#{method.to_s}, url, options)
+          unless mock_object.nil?
+            mock_object
+          else
+            enforce_allow_net_connect!(:#{method.to_s}, url, options[:params])
+            remote_proxy_object(url, :#{method.to_s}, options)
+          end
+        end
+      SRC
+      module_eval(code, "./lib/typhoeus/remote.rb", line)
     end
     
     def remote_proxy_object(url, method, options)

data/lib/typhoeus.rb

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

data/spec/typhoeus/remote_spec.rb

@@ -103,6 +103,22 @@ describe Typhoeus do
       
       @klass.get("http://localhost:234234234").code.should == 0
     end
+
+    it "should be able to mock using specific params as well" do
+      @klass.allow_net_connect = false
+      @klass.mock(:get, :url => "http://stuff")
+
+      lambda {
+        @klass.get("http://stuff", :params => { :a => 'test' })
+      }.should raise_error(Typhoeus::MockExpectedError)
+
+      @klass.mock(:get,
+                  :url => "http://stuff",
+                  :params => { :a => 'test' })
+      lambda {
+        @klass.get("http://stuff", :params => { :a => 'test' })
+      }.should_not raise_error(Typhoeus::MockExpectedError)
+    end
     
     describe "request body expectations" do
       before(:all) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pauldix-typhoeus
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors: 
 - Paul Dix