caricature 0.5.0 → 0.6.0

data/doc/lib/caricature/verification_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">Sat May 16 00:22:26 +0200 2009</dd>
+			<dd class="modified-date">Tue May 19 14:10:02 +0200 2009</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/caricature_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">Mon May 18 14:57:22 +0200 2009</dd>
+			<dd class="modified-date">Tue May 19 13:59:00 +0200 2009</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/lib/caricature/clr/aspnet_mvc.rb

@@ -0,0 +1,51 @@
+load_assembly 'System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
+load_assembly 'System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
+load_assembly 'System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
+
+class String
+
+  def to_url_filename
+    return self.gsub(/\?.*/, '') if self =~ /\?/
+    self
+  end
+
+  def to_qs_parameters
+    if self =~ /\?/
+      parameters = NameValueCollection.new
+      self.split('?')[1].split("&").each do |pair|
+        parts = pair.split('=')
+        parameters.add pair.first, pair.last
+      end
+      return parameters
+    end
+    nil
+  end
+
+end
+
+def http_context_isolation(url="")
+
+  context = Caricature::Isolation.for(HttpContextBase)
+  request = Caricature::Isolation.for(HttpRequestBase)
+  response = Caricature::Isolation.for(HttpResponseBase)
+  session = Caricature::Isolation.for(HttpSessionStateBase)
+  server = Caricature::Isolation.for(HttpServerUtilityBase)
+
+  context.when_receiving(:request).return(request)
+  context.when_receiving(:response).return(response)
+  context.when_receiving(:session).return(session)
+  context.when_receiving(:server).return(server)
+
+  setup_request_url(context.request, url) unless url.nil? or url.empty?
+
+  context
+end
+
+def setup_request_url(request, url)
+  raise ArgumentError.new("url should not be nil") if url.nil? or url.empty?
+  raise ArgumentError.new("we expect a url to start with '~/'.") unless url =~ /^~\//
+
+  request.when_receiving(:query_string).return(url.to_s.to_qs_parameters)
+  request.when_receiving(:app_relative_current_execution_file_path).return(url.to_s.to_url_filename)
+  request.when_receiving(:path_info).return("")
+end

data/lib/caricature/clr/isolator.rb

@@ -18,7 +18,8 @@ module Caricature
         instance = context.subject
       end
       @descriptor = ClrClassDescriptor.new sklass
-      build_isolation sklass, (instance || sklass.new)
+      instance ||= sklass.new unless sklass.to_clr_type.is_abstract
+      build_isolation sklass, instance
     end
 
     # initializes the messaging strategy for the isolator

data/lib/caricature/expectation.rb

@@ -24,7 +24,7 @@ module Caricature
     def find(method_name, mode=:instance, *args)
       expectations = mode == :class ? @class_expectations : @instance_expectations
       candidates = expectations.select { |exp| exp.method_name.to_s.to_sym == method_name.to_s.to_sym }
-      is_single = args.empty? || args.first == :any || (candidates.size == 1 && candidates.first.any_args?)
+      is_single = args.empty? || (args.first.is_a?(Symbol) and args.first == :any) || (candidates.size == 1 && candidates.first.any_args?)
       return candidates.first if is_single
 
       second_pass = candidates.select {|exp| exp.args == args }
@@ -40,7 +40,7 @@ module Caricature
     # there is a magic argument here +any+ which configures
     # the expectation to respond to any arguments
     def with(*args)
-      @any_args = false unless args.first == :any
+      @any_args = args.first.is_a?(Symbol) and args.first == :any
       @args = args
       self
     end
@@ -54,6 +54,7 @@ module Caricature
     end
 
     # tell the expectation it needs to raise an error with the specified arguments
+    alias_method :actual_raise, :raise
     def raise(*args)
       @error_args = args
       self
@@ -127,7 +128,7 @@ module Caricature
     # executes this expectation with its configuration
     def execute(*margs)
       ags = any_args? ? (margs.empty? ? :any : margs) : args
-      raise *@error_args if has_error_args?
+      actual_raise *@error_args if has_error_args?
       return return_value if has_return_value?
       nil
     end

data/lib/caricature/method_call_recorder.rb

@@ -28,7 +28,7 @@ module Caricature
     # Also takes an array as an argument
     def ==(other)
       other = self.class.new(other) if other.respond_to?(:each)
-      return true if other.args.first == :any
+      return true if other.args.first.is_a?(Symbol) and other.args.first == :any 
       other.args == args
     end
   end
@@ -77,7 +77,7 @@ module Caricature
 
     # finds an argument variation that matches the provided +args+
     def find_argument_variations(args)
-      return @variations if args.first == :any
+      return @variations if args.first.is_a?(Symbol) and args.first == :any
       @variations.select { |ar| ar.args == args }
     end
   end

data/lib/caricature/verification.rb

@@ -16,7 +16,7 @@ module Caricature
 
     # constrain this verification to the provided arguments
     def with(*args)
-      @any_args = false unless args.first == :any
+      @any_args = args.first.is_a?(Symbol) and args.first == :any
       @args = args
       self
     end

data/spec/isolator_spec.rb

@@ -6,7 +6,13 @@ class TestIsolation
     @instance, @expectations = instance, expectations
   end
   def send_message(method_name, return_type, *args, &b)
-    exp = expectations.find(method_name, *args)
+    internal_send method_name, :internal, return_type, *args, &b
+  end
+  def send_class_message(method_name, return_type, *args, &b)
+    internal_send method_name, :class, return_type, *args, &b
+  end
+  def internal_send(method_name, mode, return_type, *args, &b)
+    exp = expectations.find(method_name, mode, *args)
     if exp
       res = instance.__send__(method_name, *args, &b) if exp.super_before?
       res = exp.execute(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: caricature
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ivan Porto Carrero
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-19 00:00:00 +02:00
+date: 2009-05-21 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -98,6 +98,7 @@ files:
 - doc/lib/caricature/isolation_rb.html
 - doc/lib/caricature/isolator_rb.html
 - doc/lib/caricature/messaging_rb.html
+- doc/lib/caricature/messenger_rb.html
 - doc/lib/caricature/method_call_recorder_rb.html
 - doc/lib/caricature/verification_rb.html
 - doc/lib/caricature_rb.html
@@ -116,6 +117,7 @@ files:
 - lib/bin/Workarounds.pdb
 - lib/caricature.rb
 - lib/caricature/clr.rb
+- lib/caricature/clr/aspnet_mvc.rb
 - lib/caricature/clr/descriptor.rb
 - lib/caricature/clr/isolation.rb
 - lib/caricature/clr/isolator.rb
@@ -138,6 +140,7 @@ files:
 - lib/core_ext/system/type.rb
 - pkg/.gitignore
 - pkg/caricature-0.1.0.gem
+- pkg/caricature-0.5.0.gem
 - spec/bacon_helper.rb
 - spec/bin/.gitignore
 - spec/core_ext_spec.rb