vcr 2.9.0 → 2.9.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzZkYzJkMTc5OTlhMGM0ZDZiMzNkZDcwYzA5YTRlZTJiNDRiYjFjYw==
+    NmYwMzVkMjVkMzU1YzZlZmMwMTJiZGM0ZGNmOTI1Y2QwOGVhYWYwMg==
   data.tar.gz: !binary |-
-    ZmQwMDFiY2JjOWRmYjhjOWM5MTg2MGE4ZTcxMDIwMjk5NzJiMDg1NA==
+    MzcyODU1MmU4OWJmOTFmOGM3NzIxNmZhZDJmY2RmZDA2MmUzNmU2Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzA4NzhmNGE3ODQ1YzcxYTFkNmVmM2E1ZmMxM2JlYjkxNTVmNDk0Yzc4MDZh
-    NjQ3M2Y0ODgwYjA3YjkwM2NkNWU2NGJlYzk3ZWMxMjY1MTRiMGJlNjFmODU3
-    NGZjNWFiNzQ4NzdmYzVhMjdhOGRmMTEyZGQ0NDE2NjE1OGE2ZWM=
+    NzBkOTk1NzIwZTBkOTllZGE2ZGNiMmVhZWE2YzZhMzU0NzZiNTQxNWYxMjE4
+    Mjc2ZTJmZmY1NDkwYTFhYjExNDliZjc3YjllMDZjOGNiZTU4NzAzYjhmYTEx
+    ZWU2MmU0OGRiNTY1M2Q0YzJjNDJmZTc1OGFjNjA3YmRhOGM1Mjc=
   data.tar.gz: !binary |-
-    OTUxNWE4ZDkzNzMwZGRkNDcyOTRiNjU5MDA3NDRkOTQ1MGVlYzA3MGE5OWRm
-    ZGI0OTAzMzNkNjQ2MjNlNDkyNzg3Nzg2NDk1NGRkYzJjNDY2NGY0NzI3NWY3
-    Zjc5ODQ4ZWY0MmY3ZTNmZWVkZjg5NjA2MTA1NGZkMTk3NDhjZTU=
+    OWIyOWM4NGU1ZDlmZmRmNzQyZDJmNzU4ZjU0ODA3NjkwMTI5N2Y0MmU1NWM5
+    YTEyM2U4YTcyOTM4MzQ0MWYzNWQ1NmY3ZjU1YzllNDZiMmUxYjM2NTlmMjk1
+    NDQ5MzViY2EzZTljM2NlOTRlNGI5Y2RmNmQ3MjM4OGIzY2RhNzY=

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.9.1 (May 23, 2014)
+[Full Changelog](http://github.com/vcr/vcr/compare/v2.9.0...v2.9.1)
+
+Bug Fixes:
+
+* Fix RSpec metadata integration to not trigger deprecation warnings
+  with RSpec 3.0.0.rc1+. (Janko Marohnić)
+
 ## 2.9.0 (March 27, 2014)
 
 [Full Changelog](http://github.com/vcr/vcr/compare/v2.8.0...v2.9.0)

data/CONTRIBUTING.md

@@ -24,10 +24,3 @@ If you get an error while running `bundle install`, it may be one of the "extras
 ```console
 bundle install --without extras
 ```
-
-If you are getting an error installing `rb-fsevent` gem, you may want to temporarily change the Gemfile to use the pre-release version of the gem.
-
-```ruby
-gem 'rb-fsevent', '0.9.0.pre4'
-```
-

data/Gemfile

@@ -26,7 +26,7 @@ gem 'rake', '>= 0.9.2'
 gem 'cucumber', '>= 1.1.4'
 gem 'aruba', '>= 0.5'
 
-gem 'rspec', '>= 3.0.0.beta1'
+gem 'rspec', '>= 3.0.0.rc1'
 
 gem 'fakeweb', '>= 1.3.0'
 gem 'webmock', '>= 1.14'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vcr (2.9.0)
+    vcr (2.9.1)
 
 GEM
   remote: https://rubygems.org/
@@ -85,16 +85,18 @@ GEM
       rest-client (>= 1.6.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (3.0.0.beta1)
-      rspec-core (= 3.0.0.beta1)
-      rspec-expectations (= 3.0.0.beta1)
-      rspec-mocks (= 3.0.0.beta1)
-    rspec-core (3.0.0.beta1)
-    rspec-expectations (3.0.0.beta1)
-      diff-lcs (>= 1.1.3, < 2.0)
-      rspec-support (= 3.0.0.beta1)
-    rspec-mocks (3.0.0.beta1)
-    rspec-support (3.0.0.beta1)
+    rspec (3.0.0.rc1)
+      rspec-core (= 3.0.0.rc1)
+      rspec-expectations (= 3.0.0.rc1)
+      rspec-mocks (= 3.0.0.rc1)
+    rspec-core (3.0.0.rc1)
+      rspec-support (= 3.0.0.rc1)
+    rspec-expectations (3.0.0.rc1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (= 3.0.0.rc1)
+    rspec-mocks (3.0.0.rc1)
+      rspec-support (= 3.0.0.rc1)
+    rspec-support (3.0.0.rc1)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -145,7 +147,7 @@ DEPENDENCIES
   redcarpet (~> 1.17.2)
   redis (>= 2.2.2)
   relish (~> 0.6)
-  rspec (>= 3.0.0.beta1)
+  rspec (>= 3.0.0.rc1)
   ruby-debug
   simplecov (>= 0.5.3)
   sinatra (>= 1.3.2)

data/README.md

@@ -38,7 +38,7 @@ maintenance) and accurate (the response will contain the same headers and body y
   following are supported:
   * [WebMock](https://github.com/bblimke/webmock)
   * [Typhoeus](https://github.com/typhoeus/typhoeus)
-  * [Faraday](https://github.com/technoweenie/faraday)
+  * [Faraday](https://github.com/lostisland/faraday)
   * [Excon](https://github.com/geemus/excon)
   * [FakeWeb](https://github.com/chrisk/fakeweb) (deprecated)
 * Supports multiple HTTP libraries:
@@ -49,9 +49,9 @@ maintenance) and accurate (the response will contain the same headers and body y
   * [Net::HTTP](http://www.ruby-doc.org/stdlib/libdoc/net/http/rdoc/index.html) (when using FakeWeb and WebMock)
   * [Typhoeus](https://github.com/typhoeus/typhoeus) (Typhoeus::Hydra, but not Typhoeus::Easy or Typhoeus::Multi)
   * [Excon](https://github.com/geemus/excon)
-  * [Faraday](https://github.com/technoweenie/faraday)
-  * And of course any library built on Net::HTTP, such as [Mechanize](http://github.com/tenderlove/mechanize),
-    [HTTParty](http://github.com/jnunemaker/httparty) or [Rest Client](http://github.com/archiloque/rest-client).
+  * [Faraday](https://github.com/lostisland/faraday)
+  * And of course any library built on Net::HTTP, such as [Mechanize](http://github.com/sparklemotion/mechanize),
+    [HTTParty](http://github.com/jnunemaker/httparty) or [Rest Client](http://github.com/rest-client/rest-client).
 * Request matching is configurable based on HTTP method, URI, host, path, body and headers, or you can easily
   implement a custom request matcher to handle any need.
 * The same request can receive different responses in different tests--just use different cassettes.

data/lib/vcr/deprecations.rb

@@ -91,12 +91,13 @@ module VCR
         # RSpec 1 exposes #description_parts; use that if its available
         return description_parts.join("/") if respond_to?(:description_parts)
 
-        # Otherwise use RSpec 2 metadata...
+        # Otherwise use RSpec 2/3 metadata...
         group_descriptions = []
         klass = self
 
         while klass.respond_to?(:metadata) && klass.metadata
-          group_descriptions << klass.metadata[:example_group][:description]
+          group_descriptions << klass.metadata[:description] ||
+                                klass.metadata[:example_group][:description]
           klass = klass.superclass
         end
 

data/lib/vcr/test_frameworks/rspec.rb

@@ -9,8 +9,9 @@ module VCR
         ::RSpec.configure do |config|
           vcr_cassette_name_for = lambda do |metadata|
             description = metadata[:description]
+            example_group = metadata[:parent_example_group] || metadata[:example_group]
 
-            if example_group = metadata[:example_group]
+            if example_group && example_group.any?
               [vcr_cassette_name_for[example_group], description].join('/')
             else
               description

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.0'
+      string = '2.9.1'
 
       def string.parts
         split('.').map { |p| p.to_i }

data/spec/quality_spec.rb

@@ -27,7 +27,7 @@ describe "The library itself" do
   end
 
   RSpec::Matchers.define :be_well_formed do
-    failure_message_for_should do |actual|
+    failure_message do |actual|
       actual.join("\n")
     end
 

data/spec/spec_helper.rb

@@ -53,7 +53,7 @@ end
 
 RSpec.configure do |config|
   config.order = :rand
-  config.color_enabled = true
+  config.color = true
 
   config.expect_with :rspec do |expectations|
     expectations.syntax = :expect

data/spec/support/shared_example_groups/hook_into_http_library.rb

@@ -56,17 +56,16 @@ shared_examples_for "a hook into an HTTP library" do |library_hook_name, library
     test_record_and_playback "with a complex escaped query param", "q=#{CGI.escape("A&(! 234k !@ kasdj232\#$ kjw35")}"
 
     it 'plays back an empty body response exactly as it was recorded (e.g. nil vs empty string)' do
-      pending "awaiting an external fix", :if => library.gsub('_', '/').include?('net/http') && library_hook_name != :webmock do
-        get_body = lambda do
-          VCR.use_cassette('empty_body', :record => :once) do
-            get_body_object make_http_request(:get, "http://localhost:#{VCR::SinatraApp.port}/204")
-          end
+      pending "awaiting an external fix" if library.gsub('_', '/').include?('net/http') && library_hook_name != :webmock
+      get_body = lambda do
+        VCR.use_cassette('empty_body', :record => :once) do
+          get_body_object make_http_request(:get, "http://localhost:#{VCR::SinatraApp.port}/204")
         end
-
-        recorded = get_body.call
-        played_back = get_body.call
-        expect(played_back).to eq(recorded)
       end
+
+      recorded = get_body.call
+      played_back = get_body.call
+      expect(played_back).to eq(recorded)
     end
 
     describe 'making an HTTP request' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcr
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Myron Marston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-05-23 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