surrogate 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: e5519647b998e324731c5f4077ab0902717266ff
-  data.tar.gz: 28ddc396ed4f356a85ebf882466eab96cbb4b34f
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDNiZGViOTMzZmVjMTkzMDIzNmU5NDVjMGU2NDAzNjc4MzE5ZjAxYw==
+  data.tar.gz: !binary |-
+    ZjlkYzRhNTJmODcyODU0OGI0ZDQ4YjMzYTFhZDZjMWZmYTJmYmRkMg==
 SHA512:
-  metadata.gz: fcec1624106b21f4a9bfcc3966d311c8d53d7318f3eac6b1dfdc9268816a4a396d102f951f12c9f3086d2d684c941a69a4fc3dbcaf122b07c41887d3bcf3fb2f
-  data.tar.gz: e5e1e7233a828144ae186a0b057c4c4dd25296bad08bc6662be59c752ee653d653001a1beedc97681481a47a2e0a6daf59dc9bc3f81a7a8f4013782768288af7
+  metadata.gz: !binary |-
+    ZmI0NjdlZGE4NDA3Yjk5Mjc2YjE4NzU2ZDcyNTQ2MTVkMDQxZTFiYjcyYzA5
+    OWJmMmQ0MzYwYjM0ODE3YzI2NDBkZGQ4ODJmNmQ3M2EwZGFhM2FjYTc2YmY4
+    NDkyNTk4MDQ0MTg1OTkyOWViN2IzYTAxM2Q5M2RmMWM0MTlhZGU=
+  data.tar.gz: !binary |-
+    NDA1NWY0ZThhYmFmMGY1ZjY4ZDkzYWVhYWM4MGY3ZDdlY2ZmZjhkMzlmZjUx
+    NGM3Njg4Y2EyMmVlNmM1ZGQyZDBmYzhiNWQ5Y2Q4Y2VlNjMxNjY3YjFjZjQ0
+    NTI0MWIyMjVmYmNiYWRmYTRmODRiYWRkOGEzYWIzM2FjOThkOTM=

data/Gemfile

@@ -1,2 +1,5 @@
 source "https://rubygems.org"
 gemspec
+gem "mountain_berry_fields",                git: 'https://github.com/JoshCheek/mountain_berry_fields.git'
+gem "mountain_berry_fields-rspec",          git: 'https://github.com/JoshCheek/mountain_berry_fields-rspec.git'
+gem "mountain_berry_fields-magic_comments", git: 'https://github.com/JoshCheek/mountain_berry_fields-magic_comments.git'

data/Rakefile

@@ -1,16 +1,15 @@
-require "bundler/gem_tasks"
+require 'bundler/setup'
 
-require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new :rspec do |t|
-  t.rspec_opts = [
-    '--fail-fast',
-    '--colour',
-    '--format', 'documentation',
-  ]
+desc 'Run specs'
+task :spec do
+  sh 'rspec --fail-fast --colour --format documentation'
 end
 
-# require 'mountain_berry_fields/rake_task'
-# MountainBerryFields::RakeTask.new :readme, 'Readme.md.mountain_berry_fields'
-# task default: [:rspec, :readme]
-task default: :rspec
+desc 'Test/generate readme'
+task :readme do
+  sh 'bundle exec mountain_berry_fields Readme.md.mountain_berry_fields'
+end
+
+
+task default: [:spec, :readme]

data/Readme.md

@@ -190,7 +190,7 @@ user_class.was told_to :find
 MockUser.was_not told_to :find
 
 # initializing the clone
-MockUser.clone(find: nil).find.should be_nil
+expect(MockUser.clone(find: nil).find).to be_nil
 ```
 
 **Mass initialize** with `.factory(key: value)`, this can be turned off by passing
@@ -337,7 +337,7 @@ class MockUser
   define :id
 end
 user = MockUser.new 12
-user.id.should == 12
+expect(user.id).to eq 12
 user.was initialized_with 12
 ```
 
@@ -354,9 +354,9 @@ class MockUser
 end
 
 user = MockUser.new
-user.should_not be_admin
+expect(user).to_not be_admin
 user.will_have_admin? true
-user.should be_admin
+expect(user).to be_admin
 user.was asked_if(:admin?).times(2)
 ```
 
@@ -390,25 +390,25 @@ class MockUser
 end
 
 # they are the same
-User.should substitute_for MockUser
+expect(User).to substitute_for MockUser
 
 # they differ
 MockUser.define :name
-User.should_not substitute_for MockUser
+expect(User).to_not substitute_for MockUser
 
 # signatures don't match (you can turn this off by passing `types: false` to substitute_for)
 class UserWithWrongSignature
   def initialize()end # no id
   def id()end
 end
-UserWithWrongSignature.should_not substitute_for MockUser
+expect(UserWithWrongSignature).to_not substitute_for MockUser
 
 # parameter names don't match
 class UserWithWrongParamNames
   def initialize(name)end # real one takes an id
   def id()end
 end
-UserWithWrongParamNames.should_not substitute_for MockUser, names: true
+expect(UserWithWrongParamNames).to_not substitute_for MockUser, names: true
 ```
 
 Sometimes you don't want to have to implement the entire interface.
@@ -429,11 +429,11 @@ class MockUser
 end
 
 # doesn't matter that real user has a name as long as it has initialize and id
-User.should substitute_for MockUser, subset: true
+expect(User).to substitute_for MockUser, subset: true
 
 # but now it fails b/c it has no address
 MockUser.define :address
-User.should_not substitute_for MockUser, subset: true
+expect(User).to_not substitute_for MockUser, subset: true
 ```
 
 
@@ -467,10 +467,10 @@ describe 'something that creates a user through the service' do
     end
 
     service.was told_to(:create).with { |block|
-      block.call_with({id: new_id})              # this will be given to the block
-      block.returns old_id                       # provide a return value, or a block that receives the return value (where you can make assertions)
-      block.before { user_id.should == old_id }  # assertions about state of the world before the block is called
-      block.after  { user_id.should == new_id }  # assertions about the state of the world after the block is called
+      block.call_with({id: new_id})                  # this will be given to the block
+      block.returns old_id                           # provide a return value, or a block that receives the return value (where you can make assertions)
+      block.before { expect(user_id).to eq old_id }  # assertions about state of the world before the block is called
+      block.after  { expect(user_id).to eq new_id }  # assertions about the state of the world after the block is called
     }
   end
 end

data/Readme.md.mountain_berry_fields

@@ -223,7 +223,7 @@ user_class.was told_to :find
 MockUser.was_not told_to :find
 
 # initializing the clone
-MockUser.clone(find: nil).find.should be_nil
+expect(MockUser.clone(find: nil).find).to be_nil
 <% end %>
 ```
 
@@ -422,7 +422,7 @@ class MockUser
   define :id
 end
 user = MockUser.new 12
-user.id.should == 12
+expect(user.id).to eq 12
 user.was initialized_with 12
 <% end %>
 ```
@@ -441,9 +441,9 @@ class MockUser
 end
 
 user = MockUser.new
-user.should_not be_admin
+expect(user).to_not be_admin
 user.will_have_admin? true
-user.should be_admin
+expect(user).to be_admin
 user.was asked_if(:admin?).times(2)
 <% end %>
 ```
@@ -479,25 +479,25 @@ class MockUser
 end
 
 # they are the same
-User.should substitute_for MockUser
+expect(User).to substitute_for MockUser
 
 # they differ
 MockUser.define :name
-User.should_not substitute_for MockUser
+expect(User).to_not substitute_for MockUser
 
 # signatures don't match (you can turn this off by passing `types: false` to substitute_for)
 class UserWithWrongSignature
   def initialize()end # no id
   def id()end
 end
-UserWithWrongSignature.should_not substitute_for MockUser
+expect(UserWithWrongSignature).to_not substitute_for MockUser
 
 # parameter names don't match
 class UserWithWrongParamNames
   def initialize(name)end # real one takes an id
   def id()end
 end
-UserWithWrongParamNames.should_not substitute_for MockUser, names: true
+expect(UserWithWrongParamNames).to_not substitute_for MockUser, names: true
 <% end %>
 ```
 
@@ -520,11 +520,11 @@ class MockUser
 end
 
 # doesn't matter that real user has a name as long as it has initialize and id
-User.should substitute_for MockUser, subset: true
+expect(User).to substitute_for MockUser, subset: true
 
 # but now it fails b/c it has no address
 MockUser.define :address
-User.should_not substitute_for MockUser, subset: true
+expect(User).to_not substitute_for MockUser, subset: true
 <% end %>
 ```
 
@@ -560,10 +560,10 @@ describe 'something that creates a user through the service' do
     end
 
     service.was told_to(:create).with { |block|
-      block.call_with({id: new_id})              # this will be given to the block
-      block.returns old_id                       # provide a return value, or a block that receives the return value (where you can make assertions)
-      block.before { user_id.should == old_id }  # assertions about state of the world before the block is called
-      block.after  { user_id.should == new_id }  # assertions about the state of the world after the block is called
+      block.call_with({id: new_id})                  # this will be given to the block
+      block.returns old_id                           # provide a return value, or a block that receives the return value (where you can make assertions)
+      block.before { expect(user_id).to eq old_id }  # assertions about state of the world before the block is called
+      block.after  { expect(user_id).to eq new_id }  # assertions about the state of the world after the block is called
     }
   end
 end

data/lib/surrogate/rspec/with_filter.rb

@@ -17,8 +17,7 @@ class Surrogate
         end
 
         def matcher_class
-          return ::RSpec::Mocks::ArgumentListMatcher if approximate_2_11? || approximate_3_0_0_rc?
-          ::RSpec::Mocks::ArgumentExpectation
+          ::RSpec::Mocks::ArgumentListMatcher
         end
 
         def approximate_2_11?

data/lib/surrogate/values.rb

@@ -6,7 +6,9 @@ class Surrogate
     # convert raw arguments into a value
     def self.factory(*args, &block)
       arg = args.first
-      if args.size > 1
+      if block
+        BlockValue.new &block
+      elsif args.size > 1
         ValueQueue.new args
       elsif arg.kind_of? Exception
         Raisable.new arg
@@ -34,6 +36,16 @@ class Surrogate
     end
 
 
+    class BlockValue < BaseValue
+      def initialize(&block)
+        @block = block
+      end
+
+      def value(method_name)
+        @block.call
+      end
+    end
+
     class Raisable < BaseValue
       def value(*)
         raise @value

data/lib/surrogate/version.rb

@@ -1,3 +1,3 @@
 class Surrogate
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/spec/defining_api_methods_spec.rb

@@ -60,6 +60,9 @@ describe 'define' do
       before { mocked_class.define :wink }
 
       describe 'will_<api_method>' do
+        it 'returns the object' do
+          instance.will_wink(:quickly).should equal instance
+        end
         it 'overrides the default value for the api method' do
           mock1 = mocked_class.new
           mock2 = mocked_class.new
@@ -69,9 +72,23 @@ describe 'define' do
           mock2.wink.should == :slowly
           mock1.wink.should == :quickly
         end
+      end
 
+      describe 'will_<api_method> { ... }' do
         it 'returns the object' do
-          instance.will_wink(:quickly).should equal instance
+          instance.will_wink(:quickly) { }.should equal instance
+        end
+        it 'overrides the default behaviour for the api method' do
+          mock1 = mocked_class.new
+          mock2 = mocked_class.new
+          winks = []
+          mock1.will_wink { winks << 1 }
+          mock2.will_wink { winks << 2 }
+
+          winks.should == []
+          expect(mock1.wink).to eq [1]
+          expect(mock2.wink).to eq [1, 2]
+          expect(mock1.wink).to eq [1, 2, 1]
         end
       end
 

data/todo

@@ -1,3 +1,15 @@
+Surrogate
+  get a reflector
+  block matcher: if it *was* told to write beforehand, then tell me fucking where
+  record callers
+  when capturing a block, can opt to invoke immediately, if later make assertions against that block, and they fail, also notify user that it was previously invoked (e.g. before conditions may be false)
+  all arguments must be explicit
+  rspec: expect(surrogate).was told_to...
+  get rid of initialized_with matcher
+
+
+
+
 Urgent (things I want to do immediately, formatted as the git commits I will use)
 ---------------------------------------------------------------------------------
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: surrogate
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Framework to aid in handrolling mock/spy objects.
@@ -45,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Changelog.md
 - Gemfile
 - Rakefile
@@ -102,17 +102,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: surrogate
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Framework to aid in handrolling mock/spy objects.