mocoso 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28d0d3a0e008702420b77c694201274bee0f074f
-  data.tar.gz: 7fc938881701274f8170549426e908623283a3c2
+  metadata.gz: f9f6f53b3e3a29820c1944832ff3de637d468e4e
+  data.tar.gz: 3fbc9ff9e2c65770153c6936ef7824acf9e89575
 SHA512:
-  metadata.gz: 75c5b235d40842390adbf5f00ffbb7c0606a92352a5a0f8dcb1ba47a2ca00de81f55f64a8319e27f2e4b9a1f742a9e1f966e08d9cb14318066d3809e3154120d
-  data.tar.gz: ba1dfe75fc54f4ff04715a246d377a52009322234c83d42ebafb43fe5c2f890af5802d54f738734b422161340a67b3d63a56c0f87c06b41808a86efd04735b1c
+  metadata.gz: 91c1c78830ff902b84e0f5c27e6f431e9d0dcac1b21634f3b2ab1dfc1156426dd7f84d5109d2c1656a8eb977cf65dd4a5ad3782a4c77da185a647a18540220ae
+  data.tar.gz: bd5ec6b9bec963f5f73e8bbec7a88f6d8f182cd9e5abaf9dad1a83118246878cfb3a3758929be195002eb9697f6a8e14bc0a469ae18358adb28efe19129bc9fc

data/README.md

@@ -37,7 +37,7 @@ A quick example (uses [Cutest][cutest]):
     test 'mocking a class method' do
       user = User.new
 
-      expect User, :find, with: [1], returns: user do
+      expect User, :find, with: [1], return: user do
         assert_equal user, User.find(1)
       end
 

data/lib/mocoso.rb

@@ -23,7 +23,7 @@
 #     test 'mocking a class method' do
 #       user = User.new
 #
-#       expect User, :find, with: [1], returns: user do
+#       expect User, :find, with: [1], return: user do
 #         assert_equal user, User.find(1)
 #       end
 #
@@ -65,7 +65,7 @@ module Mocoso
   #
   # You can pass a callable object (responds to +call+) as a value:
   #
-  #   Mocoso.stub subject, :foo, -> { "foo" } do
+  #   Mocoso.stub subject, :foo, -> { 'foo' } do
   #     subject.foo # => "foo"
   #   end
   #
@@ -73,7 +73,7 @@ module Mocoso
   #     subject.bar('foo') # => "foo"
   #   end
   #
-  def stub object, method, result, &block
+  def stub object, method, result
     metaclass = object.singleton_class
     original  = object.method method
 
@@ -88,8 +88,8 @@ module Mocoso
   end
 
   # Expects that method +method+ is called with the arguments specified in the
-  # +:with+ option (defaults to +[]+ if it's not given) and returns the value
-  # specified in the +:returns+ option. If expectations are not met, it raises
+  # +:with+ option (defaults to +[]+ if it's not given) and return the value
+  # specified in the +:return+ option. If expectations are not met, it raises
   # Mocoso::ExpectationError error. It uses #stub internally, so it will restore
   # the methods to their original implementation after the +block+ is executed.
   #
@@ -98,7 +98,7 @@ module Mocoso
   #
   #   user = User[1]
   #
-  #   Mocoso.expect user, :update, with: [{ name: 'new name' }], returns: true do
+  #   Mocoso.expect user, :update, with: [{ name: 'new name' }], return: true do
   #     subject.update unexpected: nil
   #     # => Mocoso::ExpectationError: Expected [{:name=>"new name"}], got [{:unexpected=>nil}]
   #
@@ -106,19 +106,19 @@ module Mocoso
   #     # => true
   #   end
   #
-  def expect object, method, options, &block
+  def expect object, method, options
     expectation = -> *params {
       with = options.fetch :with, []
       raise ExpectationError, "Expected #{with}, got #{params}" if params != with
-      options.fetch :returns
+      options.fetch :return
     }
 
-    stub object, method, expectation, &block
+    stub object, method, expectation, &proc
   end
 
   # Raised by #expect when a expectation is not fulfilled.
   #
-  #   Mocoso.expect object, :method, with: 'argument', returns: nil do
+  #   Mocoso.expect object, :method, with: 'argument', return: nil do
   #     object.method 'unexpected argument'
   #     # => Mocoso::ExpectationError: Expected ["argument"], got ["unexpected argument"]
   #   end

data/mocoso.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'mocoso'
-  s.version     = '1.1.1'
+  s.version     = '1.2.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

@@ -56,7 +56,7 @@ test 'stubs method with a callable object that requires arguments' do |subject|
 end
 
 test 'succeeds if expectations are met' do |subject|
-  expect subject, :baz, with: ['value'], returns: 'result' do
+  expect subject, :baz, with: ['value'], return: 'result' do
     assert_equal 'result', subject.baz('value')
   end
 
@@ -64,19 +64,19 @@ test 'succeeds if expectations are met' do |subject|
 end
 
 test 'raises an error if expectation are not met' do |subject|
-  expect subject, :baz, with: ['value'], returns: 'result' do
+  expect subject, :baz, with: ['value'], return: 'result' do
     assert_raise(Mocoso::ExpectationError) { subject.baz('another') }
   end
 end
 
 test 'expectation without with option defaults to empty array' do |subject|
-  expect subject, :foo, returns: 'new foo' do
+  expect subject, :foo, return: 'new foo' do
     assert_equal 'new foo', subject.foo
   end
 end
 
 test 'expectation with multiple arguments' do |subject|
-  expect subject, :foo, with: ['new foo', { optional: true }], returns: 'new foo' do
+  expect subject, :foo, with: ['new foo', { optional: true }], return: 'new foo' do
     assert_equal 'new foo', subject.foo('new foo', optional: true)
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: mocoso
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Francesco Rodríguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple stub & mock library
@@ -46,17 +46,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.preview.1
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A simple stub & mock library