vcr 2.9.2 → 2.9.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWYxNGYxYjZkYmEyZDVmZjA1YmI5NjFhNzNlOWIwNDllMTI2ODNkZg==
-  data.tar.gz: !binary |-
-    ODFjNWVlMmIzYzIyMzkzODYyMjkyYTcwZWU0MGY1MWE4YjYxMmI0Mw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MGQyZDM0NDFlYTQyNjA2NzhjMmU1Mjc4MGFiMTM2NzlmODM4MjBiOGI0ZjMz
-    OWI0MmYxMTE2N2RjMWMwYTQ4MTFlZjUzYmMyODA0YzJkMmRlYmM3MTgwYTUw
-    YjhkYWI4NDhkZDRkOWZhM2E1ZGRmZDllMjY5N2JkZDRkMzgyMWM=
-  data.tar.gz: !binary |-
-    ZGZkOWJkMWM1ZjQwZDZlZWU1ZGQ5ZDQzMDc1NGVlM2M5M2M4NTMzNTgwNmU1
-    NjhiYzNhNzI4MzY0ODZiNjNhMzdjZjk3NGIxMTI1M2FlNWNmODBmODQ3ODdi
-    YWM0MzUzMDgwMjBkMmExZGI4Y2EyYzQ1YTE3ZThjYzZkMzVjOWQ=
+SHA1:
+  metadata.gz: 1e6983e0b541695c90b220f62fe9a67357d061c7
+  data.tar.gz: dae97ef043b1c5fcc7589dd0f591ce7bb751e3db
+SHA512:
+  metadata.gz: 16981e6236478ed88aa82d859e1cfeed50d9d16a44d536a0606c0408c4f17d74147e1ed855a2273a1f0c7aa8521713fdc741333382e181641edf8a30fbbd5d07
+  data.tar.gz: de2dd8e386e31e46d500e2faa5daa993df951a2adec43163f325f6bc9d530bce519fe16739c71a8f989daa2015b62cfde4d2369260f2bc50a92630990e509b84

data/.travis.yml

@@ -9,6 +9,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ree
   - jruby-18mode
   - jruby-19mode

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.9.3 (September 7, 2014)
+[Full Changelog](http://github.com/vcr/vcr/compare/v2.9.2...v2.9.3)
+
+Bug Fixes:
+
+* Fix `VCR::Cassette#serializable_hash` so that it does not allow
+  `before_record` hooks to apply mutations to existing HTTPInteraction
+  instances. (Myron Marston)
+
 ## 2.9.2 (May 27, 2014)
 [Full Changelog](http://github.com/vcr/vcr/compare/v2.9.1...v2.9.2)
 

data/Gemfile

@@ -25,10 +25,7 @@ gem 'rake', '>= 0.9.2'
 
 gem 'cucumber', '>= 1.1.4'
 gem 'aruba', '>= 0.5'
-
-%w[ core mocks expectations support ].each do |name|
-  gem "rspec-#{name}", :github => "rspec/rspec-#{name}"
-end
+gem 'rspec', '~> 3.1'
 
 gem 'fakeweb', '>= 1.3.0'
 gem 'webmock', '>= 1.14'

data/Gemfile.lock

@@ -1,35 +1,7 @@
-GIT
-  remote: git://github.com/rspec/rspec-core.git
-  revision: 5dad09158a9e5d94830dffcacc19f34e3bbc574f
-  specs:
-    rspec-core (3.0.0.rc1)
-      rspec-support (= 3.0.0.rc1)
-
-GIT
-  remote: git://github.com/rspec/rspec-expectations.git
-  revision: 1dce0c78b1a19f0d328d9574d7b3e4201e269b3f
-  specs:
-    rspec-expectations (3.0.0.rc1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (= 3.0.0.rc1)
-
-GIT
-  remote: git://github.com/rspec/rspec-mocks.git
-  revision: 6176d177121cdb4b83a31fac3b647ff89148a9b5
-  specs:
-    rspec-mocks (3.0.0.rc1)
-      rspec-support (= 3.0.0.rc1)
-
-GIT
-  remote: git://github.com/rspec/rspec-support.git
-  revision: b5f29f2f03ee57f3bbcca092e09fe5a7199b3580
-  specs:
-    rspec-support (3.0.0.rc1)
-
 PATH
   remote: .
   specs:
-    vcr (2.9.2)
+    vcr (2.9.3)
 
 GEM
   remote: https://rubygems.org/
@@ -113,6 +85,18 @@ GEM
       rest-client (>= 1.6.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.1)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -163,10 +147,7 @@ DEPENDENCIES
   redcarpet (~> 1.17.2)
   redis (>= 2.2.2)
   relish (~> 0.6)
-  rspec-core!
-  rspec-expectations!
-  rspec-mocks!
-  rspec-support!
+  rspec (~> 3.1)
   ruby-debug
   simplecov (>= 0.5.3)
   sinatra (>= 1.3.2)

data/README.md

@@ -2,7 +2,7 @@
 
 Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.
 
-[![Build Status](https://secure.travis-ci.org/vcr/vcr.png?branch=master)](http://travis-ci.org/vcr/vcr) [![Code Climate](https://codeclimate.com/github/vcr/vcr.png)](https://codeclimate.com/github/vcr/vcr)
+[![Gem Version](https://img.shields.io/gem/v/vcr.svg)](http://rubygems.org/gems/vcr) [![Build Status](https://img.shields.io/travis/vcr/vcr/master.svg)](https://travis-ci.org/vcr/vcr) [![Code Climate](https://img.shields.io/codeclimate/github/vcr/vcr.svg)](https://codeclimate.com/github/vcr/vcr)
 
 ## Synopsis
 
@@ -161,6 +161,7 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Herman Verschooten](https://github.com/Hermanverschooten)
 * [Ian Cordasco](https://github.com/sigmavirus24)
 * [Ingemar](https://github.com/ingemar)
+* [Ilya Scharrenbroich](https://github.com/quidproquo)
 * [Jacob Green](https://github.com/Jacobkg)
 * [James Bence](https://github.com/jbence)
 * [Jay Shepherd](https://github.com/jayshepherd)
@@ -221,6 +222,11 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [vcr-clj](https://github.com/ifesdjeen/vcr-clj) (Clojure)
 * [VHS](https://github.com/diegoeche/vhs) (Erlang)
 
+## Related Projects
+
+* [Mr. Video](https://github.com/quidproquo/mr_video) (Rails engine for managing VCR cassettes and episodes)
+
+
 ## Similar Libraries in Ruby
 
 * [Ephemeral Response](https://github.com/sandro/ephemeral_response)

data/features/step_definitions/cli_steps.rb

@@ -176,10 +176,11 @@ Then /^the file "([^"]*)" should contain a YAML fragment like:$/ do |file_name,
     # Normalize by removing leading and trailing whitespace...
     file_content = file_content.split("\n").map do |line|
       # Different versions of psych use single vs. double quotes
-      line.strip.gsub('"', "'")
+      # And then 2.1 sometimes adds quotes...
+      line.strip.gsub('"', "'").gsub("'", '')
     end.join("\n")
 
-    file_content.should include(fragment)
+    file_content.should include(fragment.gsub("'", ''))
   end
 end
 

data/lib/vcr/cassette.rb

@@ -244,7 +244,9 @@ module VCR
     end
 
     def interactions_to_record
-      merged_interactions.tap do |interactions|
+      # We deep-dup the interactions by roundtripping them to/from a hash.
+      # This is necessary because `before_record` can mutate the interactions.
+      merged_interactions.map { |i| HTTPInteraction.from_hash(i.to_hash) }.tap do |interactions|
         invoke_hook(:before_record, interactions)
       end
     end

data/lib/vcr/version.rb

@@ -10,7 +10,7 @@ module VCR
   #   * `parts` [Array<Integer>] List of the version parts.
   def version
     @version ||= begin
-      string = '2.9.2'
+      string = '2.9.3'
 
       def string.parts
         split('.').map { |p| p.to_i }

data/spec/vcr/cassette_spec.rb

@@ -73,14 +73,24 @@ describe VCR::Cassette do
     let(:metadata) { subject.serializable_hash.reject { |k,v| k == "http_interactions" } }
 
     it 'includes the hash form of all recorded interactions' do
-      allow(interaction_1).to receive(:to_hash).and_return({ "i" => 1, 'body' => '' })
-      allow(interaction_2).to receive(:to_hash).and_return({ "i" => 2, 'body' => '' })
-      expect(subject.serializable_hash).to include('http_interactions' => [{ "i" => 1, 'body' => '' }, { "i" => 2, 'body' => '' }])
+      hash_1 = interaction_1.to_hash
+      hash_2 = interaction_2.to_hash
+      expect(subject.serializable_hash).to include('http_interactions' => [hash_1, hash_2])
     end
 
     it 'includes additional metadata about the cassette' do
       expect(metadata).to eq("recorded_with" => "VCR #{VCR.version}")
     end
+
+    it 'does not allow the interactions to be mutated by configured hooks' do
+      VCR.configure do |c|
+        c.define_cassette_placeholder('<BODY>') { 'body' }
+      end
+
+      expect {
+        subject.serializable_hash
+      }.not_to change { interaction_1.response.body }
+    end
   end
 
   describe "#recording?" do
@@ -103,21 +113,21 @@ describe VCR::Cassette do
 
       it 'returns false when there is an existing cassette file with content' do
         cassette = VCR::Cassette.new("example", :record => :once)
-        expect(File).to exist(cassette.file)
-        expect(File.size?(cassette.file)).to be_truthy
+        expect(::File).to exist(cassette.file)
+        expect(::File.size?(cassette.file)).to be_truthy
         expect(cassette).not_to be_recording
       end
 
       it 'returns true when there is an empty existing cassette file' do
         cassette = VCR::Cassette.new("empty", :record => :once)
-        expect(File).to exist(cassette.file)
-        expect(File.size?(cassette.file)).to be_falsey
+        expect(::File).to exist(cassette.file)
+        expect(::File.size?(cassette.file)).to be_falsey
         expect(cassette).to be_recording
       end
 
       it 'returns true when there is no existing cassette file' do
         cassette = VCR::Cassette.new("non_existant_file", :record => :once)
-        expect(File).not_to exist(cassette.file)
+        expect(::File).not_to exist(cassette.file)
         expect(cassette).to be_recording
       end
     end
@@ -243,11 +253,11 @@ describe VCR::Cassette do
           end
 
           context "and re_record_interval is 7.days" do
-            let(:file_name) { File.join(VCR.configuration.cassette_library_dir, "cassette_name.yml") }
-            subject { VCR::Cassette.new(File.basename(file_name).gsub('.yml', ''), :record => record_mode, :re_record_interval => 7.days) }
+            let(:file_name) { ::File.join(VCR.configuration.cassette_library_dir, "cassette_name.yml") }
+            subject { VCR::Cassette.new(::File.basename(file_name).gsub('.yml', ''), :record => record_mode, :re_record_interval => 7.days) }
 
             context 'when the cassette file does not exist' do
-              before(:each) { allow(File).to receive(:exist?).with(file_name).and_return(false) }
+              before(:each) { allow(::File).to receive(:exist?).with(file_name).and_return(false) }
 
               it "has :#{record_mode} for the record mode" do
                 expect(subject.record_mode).to eq(record_mode)
@@ -261,9 +271,9 @@ describe VCR::Cassette do
                 end
                 yaml = YAML.dump("http_interactions" => interactions)
 
-                allow(File).to receive(:exist?).with(file_name).and_return(true)
-                allow(File).to receive(:size?).with(file_name).and_return(true)
-                allow(File).to receive(:read).with(file_name).and_return(yaml)
+                allow(::File).to receive(:exist?).with(file_name).and_return(true)
+                allow(::File).to receive(:size?).with(file_name).and_return(true)
+                allow(::File).to receive(:read).with(file_name).and_return(yaml)
               end
 
               context 'and the earliest recorded interaction was recorded less than 7 days ago' do
@@ -480,7 +490,7 @@ describe VCR::Cassette do
       expect(cassette).to respond_to(:serializable_hash)
       allow(cassette).to receive(:serializable_hash).and_return({ "http_interactions" => [1, 3, 5] })
 
-      expect { cassette.eject }.to change { File.exist?(cassette.file) }.from(false).to(true)
+      expect { cassette.eject }.to change { ::File.exist?(cassette.file) }.from(false).to(true)
       saved_stuff = YAML.load_file(cassette.file)
       expect(saved_stuff).to eq("http_interactions" => [1, 3, 5])
     end
@@ -508,13 +518,13 @@ describe VCR::Cassette do
     end
 
     it 'does not record interactions that have been ignored' do
+      VCR.configure do |c|
+        c.before_record { |i| i.ignore! if i.request.uri =~ /foo/ }
+      end
+
       interaction_1 = http_interaction { |i| i.request.uri = 'http://foo.com/'; i.response.body = 'res 1' }
       interaction_2 = http_interaction { |i| i.request.uri = 'http://bar.com/'; i.response.body = 'res 2' }
 
-      hook_aware_interaction_1 = interaction_1.hook_aware
-      allow(interaction_1).to receive(:hook_aware).and_return(hook_aware_interaction_1)
-      hook_aware_interaction_1.ignore!
-
       cassette = VCR::Cassette.new('test_cassette')
       allow(cassette).to receive(:new_recorded_interactions).and_return([interaction_1, interaction_2])
       cassette.eject
@@ -524,17 +534,17 @@ describe VCR::Cassette do
     end
 
     it 'does not write the cassette to disk if all interactions have been ignored' do
-      interaction_1 = http_interaction { |i| i.request.uri = 'http://foo.com/'; i.response.body = 'res 1' }
+      VCR.configure do |c|
+        c.before_record { |i| i.ignore! }
+      end
 
-      hook_aware_interaction_1 = interaction_1.hook_aware
-      allow(interaction_1).to receive(:hook_aware).and_return(hook_aware_interaction_1)
-      hook_aware_interaction_1.ignore!
+      interaction_1 = http_interaction { |i| i.request.uri = 'http://foo.com/'; i.response.body = 'res 1' }
 
       cassette = VCR::Cassette.new('test_cassette')
       allow(cassette).to receive(:new_recorded_interactions).and_return([interaction_1])
       cassette.eject
 
-      expect(File).not_to exist(cassette.file)
+      expect(::File).not_to exist(cassette.file)
     end
 
     it "writes the recorded interactions to a subdirectory if the cassette name includes a directory" do
@@ -542,7 +552,7 @@ describe VCR::Cassette do
       cassette = VCR::Cassette.new('subdirectory/test_cassette')
       allow(cassette).to receive(:new_recorded_interactions).and_return(recorded_interactions)
 
-      expect { cassette.eject }.to change { File.exist?(cassette.file) }.from(false).to(true)
+      expect { cassette.eject }.to change { ::File.exist?(cassette.file) }.from(false).to(true)
       saved_recorded_interactions = YAML.load_file(cassette.file)
       expect(saved_recorded_interactions["http_interactions"]).to eq(recorded_interactions.map(&:to_hash))
     end
@@ -558,8 +568,8 @@ describe VCR::Cassette do
 
         it "does not re-write to disk the previously recorded interactions if there are no new ones" do
           yaml_file = subject.file
-          expect(File).not_to receive(:open).with(subject.file, 'w')
-          expect { subject.eject }.to_not change { File.mtime(yaml_file) }
+          expect(::File).not_to receive(:open).with(subject.file, 'w')
+          expect { subject.eject }.to_not change { ::File.mtime(yaml_file) }
         end
 
         context 'when some new interactions have been recorded' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcr
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.3
 platform: ruby
 authors:
 - Myron Marston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies: []
 description: VCR provides a simple API to record and replay your test suite's HTTP
   interactions.  It works with a variety of HTTP client libraries, HTTP stubbing libraries
@@ -18,12 +18,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
-- .gitignore
-- .gitmodules
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gemtest"
+- ".gitignore"
+- ".gitmodules"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -200,17 +200,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Record your test suite's HTTP interactions and replay them during future