vcr 2.6.0 → 2.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWJkMzRlZWY1OTM1ZDQ3NGJiODIyZTJjMjE3YjljNGMwMDIzODdlOA==
+    MWRhMTJmODMwZTRlMWQ4YzFiMGRlZmY4ZTE5NmM4OWQyZDNlYzM0ZQ==
   data.tar.gz: !binary |-
-    ZDE3NDU2NTFjYTJkNjY0ZDg4MGI3ZmQzZWE1OGIzN2QxOWI3NDc2ZQ==
+    MjU3OGExMjk0NWI2MjVhYTM2NGEzNTRhOGJlMWJlMzFiNzBkMjRkYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjIyYjhmNDNjN2ZlMjBhZTY3YWM5YWFkNjZkZWFhN2NmYWQyZTM1Y2M0NDNk
-    MGY3NTFlMjkzYzEyZDY5ODcwOTNjNzgzMDFlYzE3YjA4OWVjYzc5YTliODk2
-    ZmVkMTdhZmQ3YTcwNDYyOGU4YzJjNWNkZWQ0MTc0MzRlNzk2OGE=
+    ZTI5ZDI3NDdmNmI4ZTY1NTFmNTBkN2Q1NGViYTc5MTkzNzhmNDY3MDJkMmQ1
+    ZTVjNTk0YzVkOTM0MjVkN2U0ZTVmNTIzZGViYTFiYzVlYmM0MjM2NWFiNThl
+    MGI1YTg3ZDc3MTcwMjJiMmY1MzA1YWMzNzBhMWJmMThhZGE5YmU=
   data.tar.gz: !binary |-
-    OTJmNjYyMDczMWJkOWFkODRjNmEwOTRjNmMyNzNiZDZmZDIyODBmYmNmZTdi
-    Y2JjMTkzMDMwZDg2NWVjNjkyMzIyZGVjMmI2MmNmMDlhMWJjN2I2YTAzYzEz
-    MjM1OTc0OWYyMmY3ODExZDQ0MDFiNWE4ZWQwM2RkZWM0MjM0OGY=
+    MTIwY2QzNmRkOTczOGNmYmQxNzg2N2E0NjI4YjgyMTRiYzMzMTFmODA3ZGZm
+    ZDdlNGFmNjg5NmY4YWQ4YzM0ZjA4YzIwZGIwYjdlZjViZmFkMDM1NTZmOTJi
+    ZWFiNDhmMzllZjI5OTgwOTM0OWI2ZjgxNmM3ZmYxMzFlMGQwZmM=

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 2.7.0 (October 31, 2013)
+
+[Full Changelog](http://github.com/vcr/vcr/compare/v2.6.0...v2.7.0)
+
+Enhancements:
+
+* Explicitly support the latest WebMock releases (1.14 and 1.15).
+  (Eduardo Maia, Johannes Würbach)
+* Explicitly support the latest Excon releases (0.27 and 0.28).
+  (Myron Marston)
+* Add support for Excon unix sockets by leveraging its
+  new `::Excon::Utils.request_uri` method. (Todd Lunter)
+* Reword the "it may not work with this version" warning
+  message so the intent is more clear (Myron Marston).
+* Support post/put bodies being specified as a hash when
+  using Typhoeus by leveraging it's new `encoded_body` API.
+  (Myron Marston, Hans Hasselberg)
+
+Bug Fixes:
+
+* Fix detection of encoding errors for MultiJson 1.8.1+.
+  (Myron Marston).
+* Fix file name sanitization to better handle paths that have
+  a dot in them (Rob Hanlon, Myron Marston).
+* Fix Faraday middleware so that it works properly when another
+  adapter is exclusively enabled (Myron Marston).
+
 ## 2.6.0 (September 25, 2013)
 
 [Full Changelog](http://github.com/vcr/vcr/compare/v2.5.0...v2.6.0)

data/Gemfile

@@ -31,7 +31,7 @@ gem 'aruba', '>= 0.5'
 gem 'rspec', '>= 2.11'
 
 gem 'fakeweb', '>= 1.3.0'
-gem 'webmock', '>= 1.13'
+gem 'webmock', '>= 1.14'
 
 gem 'faraday', '>= 0.8'
 gem 'httpclient', '>= 2.2'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vcr (2.6.0)
+    vcr (2.7.0)
 
 GEM
   remote: https://rubygems.org/
@@ -29,15 +29,15 @@ GEM
       gherkin (~> 2.12.1)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.0.2)
-    curb (0.8.4)
-    debugger (1.6.1)
+    curb (0.8.5)
+    debugger (1.6.2)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
       debugger-ruby_core_source (~> 1.2.3)
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.2.3)
     diff-lcs (1.2.4)
-    em-http-request (1.1.0)
+    em-http-request (1.1.1)
       addressable (>= 2.3.4)
       cookiejar
       em-socksify (>= 0.3)
@@ -49,11 +49,11 @@ GEM
       ffi (>= 1.3.0)
       mime-types (~> 1.18)
     eventmachine (1.0.3)
-    excon (0.26.0)
+    excon (0.28.0)
     fakeweb (1.3.0)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
-    ffi (1.9.0)
+    ffi (1.9.3)
     fuubar (1.2.1)
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
@@ -61,17 +61,17 @@ GEM
     fuubar-cucumber (0.0.20)
       cucumber (~> 1.3.0)
       ruby-progressbar (~> 1.0.0)
-    gherkin (2.12.1)
+    gherkin (2.12.2)
       multi_json (~> 1.3)
     github-markup (0.7.5)
     http_parser.rb (0.6.0.beta.2)
     httpclient (2.3.4.1)
-    json (1.8.0)
+    json (1.8.1)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     method_source (0.8.2)
     mime-types (1.25)
-    multi_json (1.8.0)
+    multi_json (1.8.2)
     multi_test (0.0.2)
     multipart-post (1.2.0)
     patron (0.4.18)
@@ -85,7 +85,7 @@ GEM
     rake (10.1.0)
     rbx-require-relative (0.0.9)
     redcarpet (1.17.2)
-    redis (3.0.4)
+    redis (3.0.5)
     relish (0.7)
       archive-tar-minitar (>= 0.5.2)
       json (>= 1.4.6)
@@ -96,11 +96,11 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
+    rspec-core (2.14.6)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-instafail (0.2.4)
-    rspec-mocks (2.14.3)
+    rspec-mocks (2.14.4)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -119,9 +119,9 @@ GEM
     slop (3.4.6)
     tilt (1.4.1)
     timecop (0.6.1)
-    typhoeus (0.6.5)
+    typhoeus (0.6.6)
       ethon (~> 0.6.1)
-    webmock (1.13.0)
+    webmock (1.15.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
     yajl-ruby (1.1.0)
@@ -161,6 +161,6 @@ DEPENDENCIES
   timecop (= 0.6.1)
   typhoeus (>= 0.6)
   vcr!
-  webmock (>= 1.13)
+  webmock (>= 1.14)
   yajl-ruby (>= 1.1.0)
   yard

data/README.md

@@ -148,6 +148,7 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Carlos Kirkconnell](https://github.com/kirkconnell)
 * [Chad Jolly](https://github.com/cjolly)
 * [Chris Le](https://github.com/chrisle)
+* [Eduardo Maia](https://github.com/emaiax)
 * [Eric Allam](http://github.com/rubymaverick)
 * [Ezekiel Templin](https://github.com/ezkl)
 * [Flaviu Simihaian](https://github.com/closedbracket)
@@ -184,6 +185,7 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Shay Frendt](https://github.com/shayfrendt)
 * [Steve Faulkner](https://github.com/southpolesteve)
 * [Stephen Anderson](https://github.com/bendycode)
+* [Todd Lunter](https://github.com/tlunter)
 * [Tyler Hunt](https://github.com/tylerhunt)
 * [Uģis Ozols](https://github.com/ugisozols)
 * [vzvu3k6k](https://github.com/vzvu3k6k)
@@ -193,6 +195,7 @@ Thanks also to the following people who have contributed patches or helpful sugg
 
 * [Betamax](https://github.com/robfletcher/betamax) (Groovy/JVM)
 * [Betamax](https://github.com/sigmavirus24/betamax) (Python)
+* [ExVCR](https://github.com/parroty/exvcr) (Elixir)
 * [HAVCR](https://github.com/cordawyn/havcr) (Haskell)
 * [Mimic](https://github.com/acoulton/mimic) (PHP/Kohana)
 * [Nock-VCR](https://github.com/carbonfive/nock-vcr) (JavaScript/Node)

data/lib/vcr/cassette/persisters/file_system.rb

@@ -51,7 +51,11 @@ module VCR
 
         def sanitized_file_name_from(file_name)
           parts = file_name.to_s.split('.')
-          file_extension = '.' + parts.pop if parts.size > 1
+
+          if parts.size > 1 && !parts.last.include?(File::SEPARATOR)
+            file_extension = '.' + parts.pop
+          end
+
           parts.join('.').gsub(/[^\w\-\/]+/, '_') + file_extension.to_s
         end
       end

data/lib/vcr/library_hooks/typhoeus.rb

@@ -23,7 +23,7 @@ else
             @vcr_request ||= VCR::Request.new \
               request.options.fetch(:method, :get),
               request.url,
-              request.options.fetch(:body, ""),
+              request_body,
               request.options.fetch(:headers, {})
           end
 
@@ -61,6 +61,16 @@ else
               end if stubbed_response.headers
             end
           end
+
+          if ::Typhoeus::Request.method_defined?(:encoded_body)
+            def request_body
+              request.encoded_body
+            end
+          else
+            def request_body
+              request.options.fetch(:body, "")
+            end
+          end
         end
 
         # @private

data/lib/vcr/library_hooks/webmock.rb

@@ -2,7 +2,7 @@ require 'vcr/util/version_checker'
 require 'vcr/request_handler'
 require 'webmock'
 
-VCR::VersionChecker.new('WebMock', WebMock.version, '1.8.0', '1.13').check_version!
+VCR::VersionChecker.new('WebMock', WebMock.version, '1.8.0', '1.15').check_version!
 
 module VCR
   class LibraryHooks

data/lib/vcr/middleware/excon.rb

@@ -2,7 +2,7 @@ require 'excon'
 require 'vcr/request_handler'
 require 'vcr/util/version_checker'
 
-VCR::VersionChecker.new('Excon', Excon::VERSION, '0.22.0', '0.26').check_version!
+VCR::VersionChecker.new('Excon', Excon::VERSION, '0.22.0', '0.28').check_version!
 
 module VCR
   # Contains middlewares for use with different libraries.
@@ -164,30 +164,16 @@ module VCR
           normalized
         end
 
-        def uri
-          @uri ||= "#{request_params[:scheme]}://#{request_params[:host]}:#{request_params[:port]}#{request_params[:path]}#{query}"
-        end
-
-        # based on:
-        # https://github.com/geemus/excon/blob/v0.7.8/lib/excon/connection.rb#L117-132
-        def query
-          @query ||= case request_params[:query]
-            when String
-              "?#{request_params[:query]}"
-            when Hash
-              qry = '?'
-              for key, values in request_params[:query]
-                if values.nil?
-                  qry << key.to_s << '&'
-                else
-                  for value in [*values]
-                    qry << key.to_s << '=' << CGI.escape(value.to_s) << '&'
-                  end
-                end
-              end
-              qry.chop! # remove trailing '&'
-            else
-              ''
+        if defined?(::Excon::Utils) && ::Excon::Utils.respond_to?(:request_uri)
+          def uri
+            @uri ||= "#{::Excon::Utils.request_uri(request_params)}"
+          end
+        else
+          require 'vcr/middleware/excon/legacy_methods'
+          include LegacyMethods
+
+          def uri
+            @uri ||= "#{request_params[:scheme]}://#{request_params[:host]}:#{request_params[:port]}#{request_params[:path]}#{query}"
           end
         end
       end

data/lib/vcr/middleware/excon/legacy_methods.rb

@@ -0,0 +1,33 @@
+module VCR
+  module Middleware
+    class Excon
+      # Contains legacy methods only needed when integrating with older versions
+      # of Excon.
+      # @api private
+      module LegacyMethods
+        # based on:
+        # https://github.com/geemus/excon/blob/v0.7.8/lib/excon/connection.rb#L117-132
+        def query
+          @query ||= case request_params[:query]
+            when String
+              "?#{request_params[:query]}"
+            when Hash
+              qry = '?'
+              for key, values in request_params[:query]
+                if values.nil?
+                  qry << key.to_s << '&'
+                else
+                  for value in [*values]
+                    qry << key.to_s << '=' << CGI.escape(value.to_s) << '&'
+                  end
+                end
+              end
+              qry.chop! # remove trailing '&'
+            else
+              ''
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vcr/middleware/faraday.rb

@@ -27,7 +27,7 @@ module VCR
       #
       # @param [Hash] env the Faraday request env hash
       def call(env)
-        return if VCR.library_hooks.disabled?(:faraday)
+        return @app.call(env) if VCR.library_hooks.disabled?(:faraday)
         RequestHandler.new(@app, env).handle
       end
 

data/lib/vcr/util/version_checker.rb

@@ -35,8 +35,9 @@ module VCR
 
     def warn_about_too_high
       Kernel.warn "You are using #{@library_name} #{@library_version}. " +
-                  "VCR is known to work with #{@library_name} #{version_requirement}. " +
-                  "It may not work with this version."
+                  "VCR #{VCR.version} has been tested against #{@library_name} #{version_requirement}, " +
+                  "and you are using a newer version. If you experience VCR issues, " +
+                  "consider downgrading #{@library_name} as it may fix it."
     end
 
     def compare_version

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

data/spec/support/sinatra_app.rb

@@ -28,6 +28,10 @@ module VCR
       "FOO!"
     end
 
+    post '/return-request-body' do
+      request.body
+    end
+
     get '/set-cookie-headers/1' do
       headers 'Set-Cookie' => 'foo'
       'header set'

data/spec/vcr/cassette/persisters/file_system_spec.rb

@@ -56,6 +56,11 @@ module VCR
             expected = File.join(FileSystem.storage_location, "a_1/b")
             expect(FileSystem.absolute_path_to_file("a 1/b")).to eq(expected)
           end
+
+          it 'handles files with no extensions (even when there is a dot in the path)' do
+            expected = File.join(FileSystem.storage_location, "/foo_bar/baz_qux")
+            expect(FileSystem.absolute_path_to_file("/foo.bar/baz qux")).to eq(expected)
+          end
         end
       end
     end

data/spec/vcr/cassette/serializers_spec.rb

@@ -71,10 +71,8 @@ module VCR
 
         if RUBY_INTERPRETER == :jruby
           # don't test yajl on jruby
-        elsif RUBY_VERSION.to_f < 1.9
-          engines[:yajl] = MultiJson::LoadError
         else
-          engines[:yajl] = ArgumentError
+          engines[:yajl] = MultiJson::LoadError
         end
 
         if RUBY_VERSION =~ /1.9/

data/spec/vcr/library_hooks/typhoeus_spec.rb

@@ -84,13 +84,30 @@ describe "Typhoeus hook", :with_monkey_patches => :typhoeus do
     end
 
     it 'records and replays headers correctly' do
-      pending "waiting on typhoeus/typhoeus#324" do
-        recorded = get_response
-        played_back = get_response
+      recorded = get_response
+      played_back = get_response
 
-        expect(played_back.headers).to eq(recorded.headers)
+      expect(played_back.headers).to eq(recorded.headers)
+    end
+  end
+
+  context 'when a request is made with a hash for the POST body' do
+    def make_request
+      VCR.use_cassette("hash_body") do
+        Typhoeus::Request.post(
+          "http://localhost:#{VCR::SinatraApp.port}/return-request-body",
+          :body => { :foo => "17" }
+        )
       end
     end
+
+    it 'records and replays correctly' do
+      recorded = make_request
+      played_back = make_request
+
+      expect(recorded.body).to eq("foo=17")
+      expect(played_back.body).to eq(recorded.body)
+    end
   end
 
   context '#effective_url' do

data/spec/vcr/middleware/faraday_spec.rb

@@ -128,6 +128,16 @@ describe VCR::Middleware::Faraday do
       end
     end
 
+    context "when another adapter is exclusive" do
+      it 'still makes requests properly' do
+        response = VCR.library_hooks.exclusively_enabled(:typhoeus) do
+          Faraday.get("http://localhost:#{VCR::SinatraApp.port}/")
+        end
+
+        expect(response.body).to eq("GET to root")
+      end
+    end
+
     context 'for a recorded request' do
       let!(:inserted_cassette) { VCR.insert_cassette('new_cassette') }
       before(:each) { expect(VCR).to receive(:record_http_interaction) }

data/spec/vcr/util/version_checker_spec.rb

@@ -19,13 +19,13 @@ module VCR
 
     it 'prints a warning if the major version is too high' do
       checker = VersionChecker.new('foo', '2.0.0', '1.0.0', '1.1')
-      expect(Kernel).to receive(:warn).with(/may not work with this version/)
+      expect(Kernel).to receive(:warn).with(/you are using a newer version/)
       checker.check_version!
     end
 
     it 'prints a warning if the minor version is too high' do
       checker = VersionChecker.new('foo', '1.2.0', '1.0.0', '1.1')
-      expect(Kernel).to receive(:warn).with(/may not work with this version/)
+      expect(Kernel).to receive(:warn).with(/you are using a newer version/)
       checker.check_version!
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcr
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Myron Marston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-10-31 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
@@ -120,6 +120,7 @@ files:
 - lib/vcr/library_hooks/typhoeus_0.4.rb
 - lib/vcr/library_hooks/webmock.rb
 - lib/vcr/middleware/excon.rb
+- lib/vcr/middleware/excon/legacy_methods.rb
 - lib/vcr/middleware/faraday.rb
 - lib/vcr/middleware/rack.rb
 - lib/vcr/request_handler.rb