rspec-mocks 2.0.1 → 2.1.0

data/Gemfile

@@ -1,12 +1,13 @@
 source "http://rubygems.org"
 
+%w[rspec-core rspec-expectations rspec-mocks].each do |lib|
+  gem lib, :path => File.expand_path("../../#{lib}", __FILE__)
+end
+
 gem "rake"
-gem "cucumber"
-gem "aruba", ">= 0.2.0"
+gem "cucumber", "0.8.5"
+gem "aruba", "0.2.2"
 gem "autotest"
-gem "rspec-mocks", :path => "."
-gem "rspec-core", :path => "../rspec-core"
-gem "rspec-expectations", :path => "../rspec-expectations"
 gem "relish"
 
 case RUBY_VERSION.to_s

data/History.markdown

@@ -1,11 +1,11 @@
 ## rspec-mocks release history (incomplete)
 
-### 2.0.1 / 2010-10-18
+### 2.1.0 / 2010-11-07
 
-[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.0...v2.0.1)
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.0.1...v2.1.0)
 
-* Enhancements
-  * Make dependencies on other rspec gems consistent across gems
+* Bug fixes
+  * Fix serialization of stubbed object (Josep M Bach)
 
 ### 2.0.0 / 2010-10-10
 

data/README.markdown

@@ -3,11 +3,15 @@
 rspec-mocks provides a test-double framework for rspec including support
 for method stubs, fakes, and message expectations.
 
-## Install
+## Documentation
+
+* [Cucumber features](http://relishapp.com/rspec/rspec-mocks/v/2-0)
+* [RDoc](http://rubydoc.info/gems/rspec-mocks/2.0.1/frames)
 
-    gem install rspec --prerelease
+## Install
 
-This will install rspec, rspec-core, rspec-expectations and rspec-mocks.
+    gem install rspec       # for rspec-core, rspec-expectations, rspec-mocks
+    gem install rspec-mocks # for rspec-mocks only
 
 ## Method Stubs
 

data/lib/rspec/mocks/argument_expectation.rb

@@ -5,7 +5,7 @@ module RSpec
       
       def initialize(*args, &block)
         @args = args
-        @matchers_block = block if args.empty?
+        @matchers_block = args.empty? ? block : nil
         @match_any_args = false
         @matchers = nil
         

data/lib/rspec/mocks/extensions/marshal.rb

@@ -0,0 +1,25 @@
+module Marshal
+
+  class << self
+
+    def dump_with_mocks(*args)
+      object = args.shift
+      return dump_without_mocks(*args.unshift(object)) unless object.instance_variable_defined?(:@mock_proxy)
+
+      mp = object.instance_variable_get(:@mock_proxy)
+      object.send(:remove_instance_variable, :@mock_proxy)
+
+      begin
+        dump_without_mocks(*args.unshift(object.dup))
+      ensure
+        object.instance_variable_set(:@mock_proxy,mp)
+      end
+    end
+
+    alias_method :dump_without_mocks, :dump
+    undef_method :dump
+    alias_method :dump, :dump_with_mocks
+
+  end
+
+end

data/lib/rspec/mocks/serialization.rb

@@ -1,3 +1,5 @@
+require 'rspec/mocks/extensions/marshal'
+
 module RSpec
   module Mocks
     module Serialization

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Mocks # :nodoc:
     module Version # :nodoc:
-      STRING = '2.0.1'
+      STRING = '2.1.0'
     end
   end
 end

data/rspec-mocks.gemspec

@@ -21,8 +21,5 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = [ "README.markdown" ]
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
-
-  s.add_dependency "rspec-core",         "~> 2.0.1"
-  s.add_dependency "rspec-expectations", "~> 2.0.1"
 end
 

data/spec/rspec/mocks/serialization_spec.rb

@@ -60,9 +60,7 @@ module RSpec
       end
 
       it 'marshals the same with and without stubbing' do
-        pending("not sure how to fix this yet") do
-          expect { set_stub }.to_not change { Marshal.dump(subject) }
-        end
+        expect { set_stub }.to_not change { Marshal.dump(subject) }
       end
     end
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: false
   segments: 
   - 2
-  - 0
   - 1
-  version: 2.0.1
+  - 0
+  version: 2.1.0
 platform: ruby
 authors: 
 - David Chelimsky
@@ -16,41 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 -05:00
+date: 2010-11-07 01:00:00 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 0
-        - 1
-        version: 2.0.1
-  requirement: *id001
-  type: :runtime
-  name: rspec-core
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 0
-        - 1
-        version: 2.0.1
-  requirement: *id002
-  type: :runtime
-  name: rspec-expectations
-  prerelease: false
+dependencies: []
+
 description: RSpec's 'test double' framework, with support for stubbing and mocking
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -85,6 +53,7 @@ files:
 - lib/rspec/mocks/error_generator.rb
 - lib/rspec/mocks/errors.rb
 - lib/rspec/mocks/extensions/instance_exec.rb
+- lib/rspec/mocks/extensions/marshal.rb
 - lib/rspec/mocks/extensions/object.rb
 - lib/rspec/mocks/framework.rb
 - lib/rspec/mocks/message_expectation.rb
@@ -157,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -1767543596298256707
       segments: 
       - 0
       version: "0"
@@ -166,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -1767543596298256707
       segments: 
       - 0
       version: "0"
@@ -176,7 +145,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.0.1
+summary: rspec-mocks-2.1.0
 test_files: 
 - features/README.markdown
 - features/message_expectations/block_local_expectations.feature.pending