synthesis 0.0.14 → 0.0.15

data/README

@@ -42,7 +42,7 @@ To use with Test::Unit and Mocha, ignoring Array and Hash:
 	
   Synthesis::Task.new do |t|
     t.pattern = 'test/unit/**/*_test.rb'
-    t.ignored = %w[Array, Hash]
+    t.ignored = [Array, Hash]
   end
 
 To use with RSpec, running all specs in the <tt>spec</tt> directory:
@@ -63,6 +63,25 @@ To use with Expectations, redirecting output to a file
     t.out = File.new "synthesis.test.txt", "a"
   end
 
+== Utilities
+
+=== mock_instance
+
+  require "synthesis/util/mock_instance"
+  foo_mock = Foo.mock_instance(arg_one, arg_2)
+
+This is equivalent, but without calling the real <tt>initialize</tt>, to:
+
+  foo_mock = Foo.new
+  Foo.expects(:new).with(arg_one, arg_two).returns(foo_mock)
+
+Or, in the case of RSpec, it is equivalent to:
+
+  foo_mock = Foo.new
+  Foo.should_receive(:new).with(arg_one, arg_two).and_return(foo_mock)
+
+Either <tt>"mocha_standalone"</tt> or <tt>"spec/mocks"</tt> need to be required before using <tt>mock_instance</tt>.
+
 == Known Issues
 
 Reporting the location (filename and line number) of tested/untested expectations doesn't work as intended with the Expectations adapter.

data/Rakefile

@@ -37,7 +37,7 @@ end
 
 Synthesis::Task.new do |t|
   t.pattern = 'test_project/mocha/test/*_test.rb'
-  t.ignored = %w[Array Hash]
+  t.ignored = [Array, Hash]
   # t.out = File.new('synthesis.test.txt', 'a')
 end
 
@@ -56,42 +56,9 @@ task :publish_rdoc do
   Rake::SshDirPublisher.new("gmalamid@rubyforge.org", "/var/www/gforge-projects/synthesis", "doc").upload
 end
 
-namespace :svn do
-  task :st do
-    puts %x[svn st]
-  end
-
-  task :up do
-    puts %x[svn up]
-  end
-
-  task :add do
-    %x[svn st].split(/\n/).each do |line|
-      trimmed_line = line.delete('?').lstrip
-      if line[0,1] =~ /\?/
-        %x[svn add #{trimmed_line}]
-        puts %[added #{trimmed_line}]
-      end
-    end
-  end
-  
-  task :delete do
-    %x[svn st].split(/\n/).each do |line|
-      trimmed_line = line.delete('!').lstrip
-      if line[0,1] =~ /\!/
-        %x[svn rm #{trimmed_line}]
-        puts %[removed #{trimmed_line}]
-      end
-    end
-  end
-
-  desc "Run before checking in"
-  task :pc => %w[svn:add svn:delete svn:up default svn:st]
-end
-
 gem_spec = Gem::Specification.new do |s|
   s.name = 'synthesis'
-  s.version = '0.0.14'
+  s.version = '0.0.15'
   s.platform = Gem::Platform::RUBY
   s.rubyforge_project = "synthesis"
   s.summary, s.description = 'A tool for Synthesized Testing'

data/lib/synthesis/expectation_interceptor.rb

@@ -8,14 +8,19 @@ module Synthesis
     def record_expected_argument_types_on(method_name)
       @original_with = method_name
       
-      class_eval <<-end_eval
-        alias intercepted_#{@original_with} #{@original_with}
+      class_eval do
+        alias_method "intercepted_#{method_name}", method_name
         
-        def #{@original_with}(*expected_parameters, &matching_block)
+        define_method(:get_method_name) {method_name}
+        
+        def temp_method(*expected_parameters, &matching_block)
           synthesis_expectation.args = expected_parameters if synthesis_expectation
-          intercepted_#{@original_with}(*expected_parameters, &matching_block)
+          send("intercepted_#{get_method_name}", *expected_parameters, &matching_block)
         end
-      end_eval
+        
+        alias_method method_name, :temp_method
+        undef temp_method
+      end
     end
     
     # Intercept the mock object framework's expectation method for declaring a mocked
@@ -23,29 +28,30 @@ module Synthesis
     def record_expected_return_values_on(method_name)
       @original_returns = method_name
       
-      class_eval <<-end_eval
-        alias intercepted_#{@original_returns} #{@original_returns}
-
-        def #{@original_returns}(*values)
-          mock_expectation = intercepted_#{@original_returns}(*values)
+      class_eval do
+        alias_method "intercepted_#{method_name}", method_name
+        
+        define_method(method_name) do |*values|
+          mock_expectation = send("intercepted_#{method_name}", *values)
           synthesis_expectation.add_return_values(*values) if synthesis_expectation
           mock_expectation
         end
-      end_eval
+      end
     end
     
     # Restore the original methods ExpectationInterceptor has rewritten and
     # undefine their intercepted counterparts. Undefine the synthesis_expectation
     # accessors.
     def stop_intercepting!
-      class_eval <<-end_eval
-        alias #{@original_with} intercepted_#{@original_with}
-        alias #{@original_returns} intercepted_#{@original_returns}
-        undef intercepted_#{@original_with}
-        undef intercepted_#{@original_returns}
-        undef synthesis_expectation
-        undef synthesis_expectation=
-      end_eval
+      with_method, returns_method = @original_with, @original_returns
+      class_eval do
+        alias_method with_method, "intercepted_#{with_method}"
+        alias_method returns_method, "intercepted_#{returns_method}"
+        remove_method "intercepted_#{with_method}"
+        remove_method "intercepted_#{returns_method}"
+        remove_method :synthesis_expectation
+        remove_method :synthesis_expectation=
+      end
     end
     
     # Classes extending ExpectationInterceptor will have a synthesis_expectation

data/lib/synthesis/expectation_record_enabled.rb

@@ -8,25 +8,26 @@ module Synthesis
     def record_expectations_on(method_name)
       @original_expects = method_name
       
-      class_eval <<-end_eval
-        alias intercepted_#{@original_expects} #{@original_expects}
+      class_eval do
+        alias_method "intercepted_#{method_name}", method_name
 
-        def #{@original_expects}(meth)
+        define_method(method_name) do |meth|
           s_expectation = ExpectationRecord.add_expectation(self, meth, caller[0])
-          m_expectation = intercepted_#{@original_expects}(meth)
+          m_expectation = send("intercepted_#{method_name}", meth)
           m_expectation.synthesis_expectation = s_expectation
           m_expectation
         end
-      end_eval
+      end
     end
     
     # Restore the original methods ExpectationRecordEnabled has rewritten and
     # undefine their intercepted counterparts.
     def stop_recording!
-      class_eval <<-end_eval
-        alias #{@original_expects} intercepted_#{@original_expects}
-        undef intercepted_#{@original_expects}
-      end_eval
+      method_name = @original_expects
+      class_eval do
+        alias_method method_name, "intercepted_#{method_name}"
+        remove_method "intercepted_#{method_name}"
+      end
     end
   end
 end

data/lib/synthesis/util/mock_instance.rb

@@ -0,0 +1,7 @@
+if defined? Mocha
+  require File.dirname(__FILE__) + "/mock_instance/mocha"
+elsif defined? Spec
+  require File.dirname(__FILE__) + "/mock_instance/rspec"
+else
+  raise "Either mocha_standalone or spec/mocks must be required before you can use mock_instance"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: synthesis
 version: !ruby/object:Gem::Version 
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors: 
 - Stuart Caborn, George Malamidis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-21 00:00:00 +01:00
+date: 2008-05-25 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -43,6 +43,7 @@ files:
 - lib/synthesis/task.rb
 - lib/synthesis/util/mock_instance/mocha.rb
 - lib/synthesis/util/mock_instance/rspec.rb
+- lib/synthesis/util/mock_instance.rb
 - lib/synthesis.rb
 - test/synthesis/adapter/mocha/expectation_record_test.rb
 - test/synthesis/adapter/mocha/helper.rb