surrogate 0.4.2 → 0.4.3

data/Readme.md

@@ -358,6 +358,8 @@ TODO
 
 * Add a better explanation for motivations
 * Figure out whether I'm supposed to be using clone or dup for the object -.^ (looks like there may also be an `initialize_copy` method I can take advantage of instead of crazy stupid shit I'm doing now)
+* don't blow up when delegating to the Object#initialize with args
+* queues should not reset when done, they should raise
 
 
 Future Features

data/lib/surrogate/endower.rb

@@ -76,7 +76,7 @@ class Surrogate
 
     def enable_defining_methods(klass)
       def klass.define(method_name, options={}, &block)
-        @hatchery.define method_name, options, block
+        @hatchery.define method_name, options, &block
       end
 
       def klass.api_method_names

data/lib/surrogate/hatchery.rb

@@ -11,7 +11,7 @@ class Surrogate
       klass_can_define_api_methods
     end
 
-    def define(method_name, options={}, block)
+    def define(method_name, options={}, &block)
       add_api_method_for method_name
       add_verb_helpers_for method_name
       add_noun_helpers_for method_name

data/lib/surrogate/hatchling.rb

@@ -17,7 +17,7 @@ class Surrogate
 
     def invoke_method(method_name, args, &block)
       invoked_methods[method_name] << args
-      return get_default method_name, args unless has_ivar? method_name
+      return get_default method_name, args, &block unless has_ivar? method_name
       Value.factory(get_ivar method_name).value(self, method_name)
     end
 
@@ -64,8 +64,8 @@ class Surrogate
       end
     end
 
-    def get_default(method_name, args)
-      api_methods[method_name].default instance, args do
+    def get_default(method_name, args, &block)
+      api_methods[method_name].default instance, args, block do
         raise UnpreparedMethodError, "#{method_name} has been invoked without being told how to behave"
       end
     end

data/lib/surrogate/options.rb

@@ -1,3 +1,5 @@
+require 'bindable_block'
+
 class Surrogate
   class Options
     attr_accessor :options, :default_proc
@@ -18,10 +20,21 @@ class Surrogate
       options
     end
 
-    def default(instance, args, &no_default)
-      return options[:default] if options.has_key? :default
-      return instance.instance_exec(*args, &default_proc) if default_proc
-      no_default.call
+    def default(instance, args, block, &no_default)
+      if options.has_key? :default
+        options[:default]
+      elsif default_proc
+        # This works for now, but it's a kind of crappy solution because
+        # BindableBlock adds and removes methods for each time it is invoked.
+        #
+        # A better solution would be to instantiate it before passing it to
+        # the options, then we only have to bind it to an instance and invoke
+        BindableBlock.new(instance.class, &default_proc)
+                     .bind(instance)
+                     .call(*args, &block)
+      else
+        no_default.call
+      end
     end
   end
 end

data/lib/surrogate/version.rb

@@ -1,3 +1,3 @@
 class Surrogate
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/defining_api_methods_spec.rb

@@ -6,31 +6,48 @@ describe 'define' do
 
   describe 'in the block' do
     it 'is an api method for the class' do
-      pristine_klass = Class.new do
-        Surrogate.endow self do
-          define(:find) { 123 }
-        end
-      end
-
-      klass1 = pristine_klass.clone
-      klass1.should_not have_been_told_to :find
-      klass1.find(1).should == 123
-      klass1.should have_been_told_to(:find).with(1)
+      pristine_klass = Class.new { Surrogate.endow(self) { define :find } }
+      pristine_klass.singleton_class.api_method_names.should == [:find]
     end
   end
 
 
   describe 'out of the block' do
     it 'is an api method for the instance' do
-      mocked_class.define(:book) { 'book' }
-      instance.book.should == 'book'
+      mocked_class.define :book
+      mocked_class.api_method_names.should == [:book]
+    end
+  end
+
+  describe 'definition default block invocation' do
+    xit "something about raising an error if arity is wrong" do
+      mocked_class.define(:a) { |arg| 1 }
+      mocked_class.new.a.should == 1
+      mocked_class.new.a(2).should == 1
+      mocked_class.new.a(3).should == 1
+    end
+
+    it "is passed the arguments" do
+      arg = nil
+      mocked_class.define(:meth) { |inner_arg| arg = inner_arg }.new.meth(1212)
+      arg.should == 1212
+    end
+
+    it "is passed the block" do
+      block = nil
+      mocked_class.define(:meth) { |&inner_block| block = inner_block }.new.meth { 12 }
+      block.call.should == 12
+    end
+
+    it "returns the value that the method returns" do
+      mocked_class.define(:meth) { 1234 }.new.meth.should == 1234
     end
   end
 
   describe 'declaring the behaviour' do
 
     describe 'for verbs' do
-      before     { mocked_class.define :wink }
+      before { mocked_class.define :wink }
 
       describe 'will_<api_method>' do
         it 'overrides the default value for the api method' do

data/surrogate.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
+  s.add_runtime_dependency 'bindable_block', '= 0.0.4'
+
   s.add_development_dependency "rspec", '~> 2.8.0' # TODO: Figure out how far back we can work with
-  # s.add_runtime_dependency "rest-client"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: surrogate
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-06-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bindable_block
+  requirement: &70325486799660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *70325486799660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70344532950860 !ruby/object:Gem::Requirement
+  requirement: &70325486799160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +32,7 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70344532950860
+  version_requirements: *70325486799160
 description: Framework to aid in handrolling mock/spy objects.
 email:
 - josh.cheek@gmail.com