matahari 0.3.1 → 0.3.2

data/lib/matahari.rb

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

data/lib/matahari/invocation.rb

@@ -0,0 +1,14 @@
+module Matahari
+  class Invocation
+    attr_reader :method, :args
+
+    def initialize(method, args)
+      @method = method
+      @args = args.flatten(1)
+    end
+
+    def ==(other)
+      self.method == other.method && self.args == other.args
+    end
+  end
+end

data/lib/matahari/invocation_matcher.rb

@@ -13,7 +13,7 @@ module Matahari
 
     def matches?(subject)
       @subject = subject
-      @invocations_of_method = subject.invocations.select {|i| i[:method] == @call_to_verify}
+      @invocations_of_method = subject.invocations.select {|i| i.method == @call_to_verify}
       verifying_args = @args_to_verify.size != 0
 
       match_passes?(verifying_args)
@@ -56,7 +56,7 @@ module Matahari
 
     def matching_calls(verifying_args=true)
       @matching_calls ||= if verifying_args
-                            @invocations_of_method.select {|i| i[:args].flatten === @args_to_verify}.size
+                            @invocations_of_method.select {|i| i.args === @args_to_verify}.size
                           else
                             @invocations_of_method.size
                           end

data/lib/matahari/spy.rb

@@ -41,7 +41,7 @@ module Matahari
 
     private
     def record_invocation(sym, *args)
-      @invocations << {:method => sym, :args => args}
+      @invocations << Matahari::Invocation.new(sym, args)
     end
   end
 end

data/lib/matahari/version.rb

@@ -1,3 +1,3 @@
 module Matahari
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,87 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: matahari
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.3.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Tom Stuart
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-29 00:00:00 +01:00
+date: 2011-07-15 00:00:00.000000000 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153269900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153269900
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &2153269480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153269480
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &2153269060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153269060
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2153268640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *2153268640
 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/invocation.rb
 - lib/matahari/invocation_matcher.rb
 - lib/matahari/spy.rb
 - lib/matahari/version.rb
@@ -90,37 +75,28 @@ files:
 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 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Test spy library, inspired by Mockito and RR
 test_files: []
-