rspec-mocks 2.2.0 → 2.3.0

data/Gemfile

@@ -1,21 +1,39 @@
 source "http://rubygems.org"
 
+### rspec libs
 %w[rspec-core rspec-expectations rspec-mocks].each do |lib|
-  gem lib, :path => File.expand_path("../../#{lib}", __FILE__)
+  library_path = File.expand_path("../../#{lib}", __FILE__)
+  if File.exist?(library_path)
+    gem lib, :path => library_path
+  else
+    gem lib
+  end
 end
 
-gem "rake"
+### dev dependencies
+gem "rake", "0.8.7"
 gem "cucumber", "0.9.4"
 gem "aruba", "0.2.2"
-gem "autotest"
-gem "relish"
-gem "guard-rspec"
-gem "growl"
+gem "rcov", "0.9.9"
+gem "relish", "0.2.0"
+gem "guard-rspec", "0.1.9"
+gem "growl", "1.0.3"
+gem "ZenTest", "~> 4.4.2"
+
+if RUBY_PLATFORM =~ /darwin/
+  gem "autotest-fsevent", "~> 0.2.4"
+  gem "autotest-growl", "~> 0.2.9"
+end
 
 gem "ruby-debug", :platforms => :ruby_18
-gem "ruby-debug19", :platforms => :ruby_19
+gem "ruby-debug19", "~> 0.11.6", :platforms => :ruby_19
 
 platforms :ruby_18, :ruby_19 do
-  gem "rb-fsevent"
-  gem "ruby-prof"
+  gem "rb-fsevent", "~> 0.3.9"
+  gem "ruby-prof", "~> 0.9.2"
 end
+
+platforms :jruby do
+  gem "jruby-openssl"
+end
+

data/History.markdown

@@ -1,5 +1,13 @@
 ## rspec-mocks release history (incomplete)
 
+### 2.3.0 / 2010-12-12
+
+[full changelog](http://github.com/rspec/rspec-mocks/compare/v2.2.1...v2.3.0)
+
+* Bug fixes 
+  * Fix our Marshal extension so that it does not interfere with objects that
+    have their own @mock_proxy instance variable. (Myron Marston)
+
 ### 2.2.0 / 2010-11-28
 
 [full changelog](http://github.com/rspec/rspec-mocks/compare/v2.1.0...v2.2.0)

data/README.md

@@ -5,10 +5,10 @@ for method stubs, fakes, and message expectations.
 
 ## Documentation
 
-The [Cucumber features](http://relishapp.com/rspec/rspec-mocks/v/2-1) are the
+The [Cucumber features](http://relishapp.com/rspec/rspec-mocks) are the
 most comprehensive and up-to-date docs for end-users.
 
-The [RDoc](http://rubydoc.info/gems/rspec-mocks/2.1/frames) provides additional
+The [RDoc](http://rubydoc.info/gems/rspec-mocks/2.3.0/frames) provides additional
 information for contributors and/or extenders.
 
 All of the documentation is open source and a work in progress. If you find it

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

@@ -7,6 +7,8 @@ module Marshal
       return dump_without_mocks(*args.unshift(object)) unless object.instance_variable_defined?(:@mock_proxy)
 
       mp = object.instance_variable_get(:@mock_proxy)
+      return dump_without_mocks(*args.unshift(object)) unless mp.is_a?(::RSpec::Mocks::Proxy)
+
       object.send(:remove_instance_variable, :@mock_proxy)
 
       begin

data/lib/rspec/mocks/version.rb

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

data/spec/rspec/mocks/null_object_mock_spec.rb

@@ -26,6 +26,11 @@ module RSpec
         @double.should respond_to(:any_message_it_gets)
       end
 
+      it "allows explicit stubs" do
+        @double.stub(:foo) { "bar" }
+        @double.foo.should eq("bar")
+      end
+
       it "allows explicit expectation" do
         @double.should_receive(:something)
         @double.something

data/spec/rspec/mocks/serialization_spec.rb

@@ -5,6 +5,18 @@ module RSpec
   module Mocks
     class SerializableStruct < Struct.new(:foo, :bar); end
 
+    class SerializableMockProxy
+      attr_reader :mock_proxy
+
+      def initialize(mock_proxy)
+        @mock_proxy = mock_proxy
+      end
+
+      def ==(other)
+        other.class == self.class && other.mock_proxy == mock_proxy
+      end
+    end
+
     describe Serialization do
       def self.with_yaml_loaded(&block)
         context 'with YAML loaded' do
@@ -62,6 +74,15 @@ module RSpec
       it 'marshals the same with and without stubbing' do
         expect { set_stub }.to_not change { Marshal.dump(subject) }
       end
+
+      describe "an object that has its own mock_proxy instance variable" do
+        subject { SerializableMockProxy.new(:my_mock_proxy) }
+
+        it 'does not interfere with its marshalling' do
+          marshalled_copy = Marshal.load(Marshal.dump(subject))
+          marshalled_copy.should == subject
+        end
+      end
     end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 2
-  - 2
+  - 3
   - 0
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors: 
 - David Chelimsky
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-28 00:00:00 -06:00
+date: 2010-12-12 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -129,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3345678086829726871
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -138,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3345678086829726871
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -148,7 +149,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.2.0
+summary: rspec-mocks-2.3.0
 test_files: 
 - features/README.markdown
 - features/message_expectations/block_local_expectations.feature.pending