surrogate 0.6.5 → 0.7.0

data/Changelog.md

@@ -1,3 +1,7 @@
+### 0.7.0
+
+* BREAKING CHANGE: Bodyless methods behave as if they were defined with an empty block (arity of 0, return nil)
+
 ### 0.6.4
 
 * Remove explicit reference to RSpec::Matchers so that surrogate/rspec doesn't depend on rspec-expectations

data/lib/surrogate.rb

@@ -8,8 +8,6 @@ require 'surrogate/api_comparer'
 require 'surrogate/invocation'
 
 class Surrogate
-  UnpreparedMethodError = Class.new StandardError
-
   def self.endow(klass, options={},  &block)
     Endower.endow klass, options, &block
     klass

data/lib/surrogate/endower.rb

@@ -78,11 +78,11 @@ class Surrogate
 
     def enable_defining_methods(klass)
       def klass.define(method_name, options={}, &block)
+        block ||= lambda {}
         @hatchery.define method_name.to_sym, options, &block
       end
 
       def klass.define_reader(*method_names, &block)
-        block ||= lambda {}
         method_names.each { |method_name| define method_name, &block }
         self
       end

data/lib/surrogate/hatchling.rb

@@ -53,9 +53,7 @@ class Surrogate
     end
 
     def get_default(method_name, invocation)
-      api_methods[method_name].default instance, invocation do
-        raise UnpreparedMethodError, "#{method_name} has been invoked without being told how to behave"
-      end
+      api_methods[method_name].default instance, invocation
     end
 
     def must_know(method_name)

data/lib/surrogate/method_definition.rb

@@ -26,13 +26,13 @@ class Surrogate
       default_proc && errorizer.match!(*args)
     end
 
-    def default(instance, invocation, &no_default)
+    def default(instance, invocation)
       if options.has_key? :default
         options[:default]
       elsif default_proc
         default_proc_as_method_on(instance).call(*invocation.args, &invocation.block)
       else
-        no_default.call
+        raise "You should never get here. Please open a issue at http://github.com/JoshCheek/surrogate"
       end
     end
 

data/lib/surrogate/version.rb

@@ -1,3 +1,3 @@
 class Surrogate
-  VERSION = "0.6.5"
+  VERSION = "0.7.0"
 end

data/spec/acceptance_spec.rb

@@ -91,10 +91,6 @@ describe Surrogate do
     # defaults are used if provided
     Mock::User.new(1).name.should == 'Josh'
 
-    # error is raised if you try to access an attribute that hasn't been set and has no default
-    expect { Mock::User.new(1).address }.to raise_error Surrogate::UnpreparedMethodError
-    Mock::User.new(1).will_have_address('123 Fake St.').address.should == '123 Fake St.'
-
     # methods with multiple args
     user.phone_numbers.should be_empty
     user.add_phone_number '123', '456-7890'

data/spec/defining_api_methods_spec.rb

@@ -183,9 +183,9 @@ describe 'define' do
       mocked_class.new.other_meth(1).should == 2
     end
 
-    it 'raises an UnpreparedMethodError when it has no default block' do
+    it 'returns nil when there is no default block' do
       mocked_class.define :meth
-      expect { instance.meth }.to raise_error Surrogate::UnpreparedMethodError, /meth/
+      instance.meth.should equal nil
     end
 
     it 'considers ivars of the same name to be its default when it has no suffix' do
@@ -222,11 +222,12 @@ describe 'define' do
       expect { instance.meth "extra", "args" }.to raise_error ArgumentError, /wrong number of arguments \(2 for 0\)/
     end
 
-    it 'does not raise arity errors, when there is no default block and the value is overridden' do
+    it 'treats bastard methods as having no arity' do
       mocked_class.define :meth
       mocked = mocked_class.new
       mocked.instance_variable_set :@meth, "abc"
-      mocked.meth 1, 2, 3
+      expect { mocked.meth 1, 2, 3 }.to raise_error ArgumentError
+      expect { mocked.meth }.to_not raise_error
     end
 
     it 'can make #initialize an api method' do

data/spec/rspec/substitute_for_spec.rb

@@ -188,10 +188,14 @@ describe 'substutability matchers' do
       klass.should substitute_for surrogate, names: false, types: true
     end
 
-    it 'disregards when surrogate has no body for an api method' do
-      klass = Class.new { def instance_meth(a) end }
+    it 'treats a bastard method as a no arity method' do
       surrogate = Surrogate.endow(Class.new).define :instance_meth
+
+      klass = Class.new { def instance_meth() end }
       klass.should substitute_for surrogate, types: true
+
+      klass = Class.new { def instance_meth(a) end }
+      klass.should_not substitute_for surrogate, types: true
     end
 
     it 'disregards when real object has natively implemented methods that cannot be reflected on' do
@@ -286,15 +290,23 @@ describe 'substutability matchers' do
       klass.should substitute_for surrogate, types: false, names: true
     end
 
-    it 'disregards when surrogate has no body for an api method' do
+    it 'treats bastard methods as no arity methods' do
       # instance
-      klass = Class.new { def instance_meth(a) end }
       surrogate = Surrogate.endow(Class.new).define(:instance_meth)
+
+      klass = Class.new { def instance_meth(a) end }
+      klass.should_not substitute_for surrogate, names: true
+
+      klass = Class.new { def instance_meth() end }
       klass.should substitute_for surrogate, names: true
 
       # class
-      klass = Class.new { def self.class_meth(a) end }
       surrogate = Surrogate.endow(Class.new) { define :class_meth }
+
+      klass = Class.new { def self.class_meth(a) end }
+      klass.should_not substitute_for surrogate, names: true
+
+      klass = Class.new { def self.class_meth() end }
       klass.should substitute_for surrogate, names: true
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: surrogate
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70276370003140 !ruby/object:Gem::Requirement
+  requirement: &70341864482800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276370003140
+  version_requirements: *70341864482800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70276370002580 !ruby/object:Gem::Requirement
+  requirement: &70341864481800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70276370002580
+  version_requirements: *70341864481800
 - !ruby/object:Gem::Dependency
   name: mountain_berry_fields
-  requirement: &70276370002000 !ruby/object:Gem::Requirement
+  requirement: &70341864496820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.3
   type: :development
   prerelease: false
-  version_requirements: *70276370002000
+  version_requirements: *70341864496820
 - !ruby/object:Gem::Dependency
   name: mountain_berry_fields-rspec
-  requirement: &70276370001440 !ruby/object:Gem::Requirement
+  requirement: &70341864496280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.3
   type: :development
   prerelease: false
-  version_requirements: *70276370001440
+  version_requirements: *70341864496280
 - !ruby/object:Gem::Dependency
   name: mountain_berry_fields-magic_comments
-  requirement: &70276370000820 !ruby/object:Gem::Requirement
+  requirement: &70341864495600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *70276370000820
+  version_requirements: *70341864495600
 description: Framework to aid in handrolling mock/spy objects.
 email:
 - josh.cheek@gmail.com