matahari 0.3 → 0.3.1

data/lib/matahari/invocation_matcher.rb

@@ -1,73 +1,75 @@
-class InvocationMatcher
+module Matahari
+  class InvocationMatcher
 
-  #TODO I can't work out how to disentangle the 2 responsibilities of this class:
-  #1. Inspecting and acting on spy invocations
-  #2. Presenting the results of those inspections.
-  #
-  #One to revisit later when my head is less befuddled.
+    #TODO I can't work out how to disentangle the 2 responsibilities of this class:
+    #1. Inspecting and acting on spy invocations
+    #2. Presenting the results of those inspections.
+    #
+    #One to revisit later when my head is less befuddled.
 
-  def initialize(iterator = nil)
-    @expected_call_count = iterator ? iterator.count : nil
-  end
+    def initialize(iterator = nil)
+      @expected_call_count = iterator ? iterator.count : nil
+    end
 
-  def matches?(subject)
-    @subject = subject
-    @invocations_of_method = subject.invocations.select {|i| i[:method] == @call_to_verify}
-    verifying_args = @args_to_verify.size != 0
+    def matches?(subject)
+      @subject = subject
+      @invocations_of_method = subject.invocations.select {|i| i[:method] == @call_to_verify}
+      verifying_args = @args_to_verify.size != 0
 
-    match_passes?(verifying_args)
-  end
+      match_passes?(verifying_args)
+    end
 
-  def failure_message_for_should_not
-    "Spy(:#{@subject.name}) expected not to receive :#{@call_to_verify} but received it #{prettify_times(@matching_calls)}"
-  end
+    def failure_message_for_should_not
+      "Spy(:#{@subject.name}) expected not to receive :#{@call_to_verify} but received it #{prettify_times(@matching_calls)}"
+    end
 
-  def failure_message_for_should
-    if @args_to_verify.size > 0
-      "Spy(:#{@subject.name}) expected to receive :#{@call_to_verify}(#{@args_to_verify.map(&:inspect).join(", ")}) #{prettify_times(@expected_call_count)}, received #{prettify_times(@matching_calls)}"
-    else
-      "Spy(:#{@subject.name}) expected to receive :#{@call_to_verify} #{prettify_times(@expected_call_count)}, received #{prettify_times(@matching_calls)}"
+    def failure_message_for_should
+      if @args_to_verify.size > 0
+        "Spy(:#{@subject.name}) expected to receive :#{@call_to_verify}(#{@args_to_verify.map(&:inspect).join(", ")}) #{prettify_times(@expected_call_count)}, received #{prettify_times(@matching_calls)}"
+      else
+        "Spy(:#{@subject.name}) expected to receive :#{@call_to_verify} #{prettify_times(@expected_call_count)}, received #{prettify_times(@matching_calls)}"
+      end
     end
-  end
 
-  #Allows chaining of method calls following has_received?/should have_received,
-  #e.g. spy.should_have received.some_method, where #some_method is handled by
-  #method_missing, its arguments and name being stored until #matches? is called.
-  def method_missing(sym, *args, &block)
-    @call_to_verify = sym
-    @args_to_verify = args
-    self
-  end
+    #Allows chaining of method calls following has_received?/should have_received,
+    #e.g. spy.should_have received.some_method, where #some_method is handled by
+    #method_missing, its arguments and name being stored until #matches? is called.
+    def method_missing(sym, *args, &block)
+      @call_to_verify = sym
+      @args_to_verify = args
+      self
+    end
 
-  def prettify_times(times)
-    case times
-    when 1
-      "once"
-    when nil
-      "once"
-    when 2
-      "twice"
-    else
-      "#{times} times"
+    def prettify_times(times)
+      case times
+      when 1
+        "once"
+      when nil
+        "once"
+      when 2
+        "twice"
+      else
+        "#{times} times"
+      end
     end
-  end
-  private :prettify_times
+    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
+    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
-  private :match_passes?
 end

data/lib/matahari/spy.rb

@@ -1,45 +1,47 @@
-class Spy
-  attr_reader :name, :invocations
+module Matahari
+  class Spy
+    attr_reader :name, :invocations
 
-  def initialize(name = nil, opts={})
-    @subject = opts[:subject]
-    @name = name
-    @invocations = []
-    @stubbed_calls = {}
-    class << self
-      instance_methods.each do |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)
+    def initialize(name = nil, opts={})
+      @subject = opts[:subject]
+      @name = name
+      @invocations = []
+      @stubbed_calls = {}
+      class << self
+        instance_methods.each do |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
     end
-  end
 
-  #When a given method call, sym, is invoked on self, call block and return its result
-  def stubs(sym, &block)
-    @stubbed_calls[sym] = block
-  end
+    #When a given method call, sym, is invoked on self, call block and return its result
+    def stubs(sym, &block)
+      @stubbed_calls[sym] = block
+    end
 
-  def passes_on(sym)
-    @stubbed_calls[sym] = @subject.method(sym)
-  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)
-    record_invocation(sym, args)
-    @stubbed_calls[sym].call if @stubbed_calls[sym]
-  end
+    #Captures the details of any method call and store for later inspection
+    def method_missing(sym, *args, &block)
+      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
-  #have been called. E.g. spy.has_received?(3.times). While other iterators might work,
-  #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)
-    InvocationMatcher.new(times)
-  end
+    #Pass an iterator to this method to specify the number of times the method should
+    #have been called. E.g. spy.has_received?(3.times). While other iterators might work,
+    #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)
+      InvocationMatcher.new(times)
+    end
 
-  private
-  def record_invocation(sym, *args)
-    @invocations << {:method => sym, :args => args}
+    private
+    def record_invocation(sym, *args)
+      @invocations << {:method => sym, :args => args}
+    end
   end
 end

data/lib/matahari/version.rb

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

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  version: "0.3"
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Tom Stuart
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 +01:00
+date: 2011-06-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency