mocoso 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7de0f508008ca0672ee0c9b477cd56abcf6426dd
-  data.tar.gz: 095191e5dd87d93e55776ff46694ba6424d9211d
+  metadata.gz: 76a80a460d924893db612381bac7a81d3ffaa1a2
+  data.tar.gz: 289580d3fea0301109093fc70445777dd4712d75
 SHA512:
-  metadata.gz: 592564f4db16626077f2958b8dc52ba7d5289d8d0b7529239a0ddd8e27feb815c40ef623bc7c12e37009fc619b8717235109e88321fef82acedb9c71e1beef2b
-  data.tar.gz: 32f6f94b0cd3cb383aceb4cd30b538ff532b6ed2a21e8cf4dd71d6ba702835c203bdd24abe589b7566013cf08f40212e9e8297d2dc77ebe4132175387d27ef89
+  metadata.gz: a965a66f88678883c46863c3d95f93887c476616e715853f1f903e41c3eff399b6060633bc657da45912b8702f3514946477ef29bc71732e814674f44ec20545
+  data.tar.gz: 1a82908dfd0d84c0119adc7f2eb3ec93b85e7f9cf6d8b05448325e493792beec2ab33f5f59f5f09095e96cfe754f9fc6c1286506fe5fd7cb11d58b4111d2ff2c

data/README.md

@@ -47,7 +47,7 @@ A quick example (uses [Cutest][cutest]):
     test 'stubbing an instance method' do
       user = User.new
 
-      stub user, valid?: true do
+      stub user, :valid?, true do
         assert user.valid?
       end
     end

data/lib/mocoso.rb

@@ -78,35 +78,18 @@ module Mocoso
   #     subject.bar('foo') # => "foo"
   #   end
   #
-  # If you try to stub a method that is not defined by the +object+,
-  # it raises an error.
-  #
-  #   Mocoso.stub Object.new, undefined: nil
-  #   # => NameError: undefined method `undefined' for class `Object'
-  #
-  # The same thing happens if a stubbed method is not invoked:
-  #
-  #   Mocoso.stub subject, :foo, 'value' do
-  #   end
-  #   # => Expected method foo not invoked
-  #
   def stub object, method, result, &block
     metaclass = object.singleton_class
     original  = object.method method
-    invoked   = false
 
     metaclass.send :define_method, method do |*args|
-      invoked = true
       result.respond_to?(:call) ? result.call(*args) : result
     end
 
-    begin
-      yield
-    ensure
-      metaclass.send :undef_method, method
-      metaclass.send :define_method, method, original
-      raise "Expected method #{method} not invoked" if !invoked
-    end
+    yield
+  ensure
+    metaclass.send :undef_method, method
+    metaclass.send :define_method, method, original
   end
 
   # Expect that method +method+ is called with the arguments specified in the
@@ -129,22 +112,12 @@ module Mocoso
   #   end
   #
   def expect object, method, options, &block
-    stub object, method, Expectation.new(options), &block
-  end
-
-  # Intended for private use, but you can overwrite the +call+ method
-  # if you want to support more expectation options.
-  class Expectation # :nodoc:
-    attr :options
-
-    def initialize options
-      @options = options
-    end
-
-    def call *params
+    expectation = -> *params {
       with = options.fetch(:with) { [] }
       raise ExpectationError, "Expected #{with}, got #{params}" if params != with
-      options.fetch :returns
-    end
+      options.fetch(:returns)
+    }
+
+    stub object, method, expectation, &block
   end
 end

data/mocoso.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'mocoso'
-  s.version     = '1.0.1'
+  s.version     = '1.1.0'
   s.summary     = 'A simple stub & mock library'
   s.description = s.summary
   s.authors     = ['Francesco Rodríguez']

data/test/scary_mocks_and_nice_stubs.rb

@@ -18,7 +18,7 @@ setup do
 end
 
 test 'raises error if block is not given' do |subject|
-  assert_raise { stub(subject, foo: 'foo') }
+  assert_raise { stub(subject, :foo, 'foo') }
 end
 
 test 'raises error if object not respond to the given method' do |subject|
@@ -80,19 +80,3 @@ test 'expectation with multiple arguments' do |subject|
     assert_equal 'new foo', subject.foo('new foo', optional: true)
   end
 end
-
-test 'raises error if stubbed method is never invoked' do |subject|
-  assert_raise {
-    stub subject, :foo, 'value' do
-    end
-  }
-end
-
-test 'stub within a stub' do |subject|
-  stub subject, :foo, 'outer' do
-    stub subject, :foo, 'inner' do
-      assert_equal 'inner', subject.foo
-    end
-    assert_equal 'outer', subject.foo
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocoso
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Francesco Rodríguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest