matahari 0.2.1 → 0.3

data/README.rdoc

@@ -75,7 +75,7 @@ influenced the creation of Matahari
 == KNOWN ISSUES/TODO:
 
 * Stubbing implementation is incredibly basic
-* Not very usable at all for test/unit users (but this is easily fixed with an assert_received method)
+* Not very usable or test/unit users (it works, but you don't get a fancy DSL.)
 * No support for argument matchers - arguments must match exactly via == or not at all
 * We need to be able to remote-control BMWs.
 

data/lib/matahari.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'matahari/spy'
-require 'matahari/debriefing'
+require 'matahari/invocation_matcher'
 require 'matahari/adapters/matahari_methods'
 require 'matahari/adapters/rspec'
 require 'matahari/adapters/test_unit'

data/lib/matahari/adapters/matahari_methods.rb

@@ -1,8 +1,8 @@
 module Matahari
   module Adapters
     module MatahariMethods
-      def spy(name = nil)
-        Spy.new(name)
+      def spy(name = nil, opts={})
+        Spy.new(name, opts)
       end
     end
   end

data/lib/matahari/adapters/rspec.rb

@@ -4,14 +4,7 @@ module Matahari
       include Matahari::Adapters::MatahariMethods
 
       def have_received(times = nil)
-        if times 
-          @calls_expected = 0
-          times.each { @calls_expected+= 1 }
-
-          Debriefing.new(@calls_expected)
-        else
-          Debriefing.new
-        end
+        InvocationMatcher.new(times)
       end
     end
   end

data/lib/matahari/adapters/test_unit.rb

@@ -8,10 +8,10 @@ module Matahari
         assert result.matches?(subject), result.failure_message_for_should
       end
 
-			def assert_not_received(subject, &block)
-				result = block.call
-				assert !result.matches?(subject), result.failure_message_for_should_not
-			end
+      def assert_not_received(subject, &block)
+        result = block.call
+        assert !result.matches?(subject), result.failure_message_for_should_not
+      end
     end
   end
 end

data/lib/matahari/{debriefing.rb → invocation_matcher.rb}

@@ -1,4 +1,4 @@
-class Debriefing
+class InvocationMatcher
 
   #TODO I can't work out how to disentangle the 2 responsibilities of this class:
   #1. Inspecting and acting on spy invocations
@@ -6,8 +6,8 @@ class Debriefing
   #
   #One to revisit later when my head is less befuddled.
 
-  def initialize(expected_call_count = nil)
-    @expected_call_count = expected_call_count
+  def initialize(iterator = nil)
+    @expected_call_count = iterator ? iterator.count : nil
   end
 
   def matches?(subject)
@@ -53,21 +53,21 @@ class Debriefing
   end
   private :prettify_times
 
-	def matching_calls(verifying_args=true)
-		@matching_calls ||= if verifying_args
-			@invocations_of_method.select {|i| i[:args].flatten === @args_to_verify}.size
-		else
-			@invocations_of_method.size
-		end
-	end
-	private :matching_calls
+  def matching_calls(verifying_args=true)
+    @matching_calls ||= if verifying_args
+                          @invocations_of_method.select {|i| i[:args].flatten === @args_to_verify}.size
+                        else
+                          @invocations_of_method.size
+                        end
+  end
+  private :matching_calls
 
-	def match_passes?(verifying_args)
-		if @expected_call_count
-			matching_calls(verifying_args) == @expected_call_count
-		else
-			matching_calls(verifying_args) > 0
-		end
-	end
-	private :match_passes?
+  def match_passes?(verifying_args)
+    if @expected_call_count
+      matching_calls(verifying_args) == @expected_call_count
+    else
+      matching_calls(verifying_args) > 0
+    end
+  end
+  private :match_passes?
 end

data/lib/matahari/spy.rb

@@ -1,13 +1,15 @@
 class Spy
   attr_reader :name, :invocations
 
-  def initialize(name = nil)
-    @name = name if name
+  def initialize(name = nil, opts={})
+    @subject = opts[:subject]
+    @name = name
     @invocations = []
     @stubbed_calls = {}
     class << self
       instance_methods.each do |meth|
-        next if [:name, :define_method, :stubs, :method_missing, :record_invocation, :invocations, :has_received?, :object_id, :respond_to?, :respond_to_missing?, :instance_eval, :instance_exec, :class_eval, :__send__, :send, :should, :should_not].include?(meth)
+        whitelist = [:name, :define_method, :stubs, :passes_on, :method_missing, :record_invocation, :invocations, :has_received?, :object_id, :respond_to?, :respond_to_missing?, :instance_eval, :instance_exec, :class_eval, :__send__, :send, :should, :should_not, :__id__, :__send__]
+        next if whitelist.include?(meth) || whitelist.include?(meth.to_sym)
         undef_method(meth)
       end
     end
@@ -18,14 +20,14 @@ class Spy
     @stubbed_calls[sym] = block
   end
 
+  def passes_on(sym)
+    @stubbed_calls[sym] = @subject.method(sym)
+  end
+
   #Captures the details of any method call and store for later inspection
   def method_missing(sym, *args, &block)
-    if @verifying
-      raise
-    else
-      record_invocation(sym, args)
-      @stubbed_calls[sym].call if @stubbed_calls[sym]
-    end
+    record_invocation(sym, args)
+    @stubbed_calls[sym].call if @stubbed_calls[sym]
   end
 
   #Pass an iterator to this method to specify the number of times the method should
@@ -33,14 +35,7 @@ class Spy
   #the idea is to allow this nice DSL-ish way of asserting on the number of calls, hence
   #the odd method signature.
   def has_received?(times=nil)
-    if times 
-      calls_expected = 0
-      times.each { calls_expected += 1 }
-
-      Debriefing.new(calls_expected)
-    else
-      Debriefing.new
-    end
+    InvocationMatcher.new(times)
   end
 
   private

data/lib/matahari/version.rb

@@ -1,3 +1,3 @@
 module Matahari
-  VERSION = "0.2.1"
+  VERSION = "0.3"
 end

metadata

@@ -1,88 +1,125 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: matahari
-version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  version: "0.3"
 platform: ruby
-authors:
+authors: 
 - Tom Stuart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-06-28 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2156576720 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2156576720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &2156576300 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2156576300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: aruba
-  requirement: &2156575780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: *2156575780
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Matahari provides test spies for Ruby
-email:
+email: 
 - tom@therye.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/matahari/adapters/matahari_methods.rb
 - lib/matahari/adapters/rspec.rb
 - lib/matahari/adapters/test_unit.rb
-- lib/matahari/debriefing.rb
+- lib/matahari/invocation_matcher.rb
 - lib/matahari/spy.rb
 - lib/matahari/version.rb
 - lib/matahari.rb
 - README.rdoc
+has_rdoc: true
 homepage: https://github.com/mortice/matahari
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Test spy library, inspired by Mockito and RR
 test_files: []
+