vcr 2.0.0.rc2 → 2.0.0

data/lib/vcr/library_hooks/excon.rb

@@ -2,7 +2,7 @@ require 'vcr/util/version_checker'
 require 'vcr/request_handler'
 require 'excon'
 
-VCR::VersionChecker.new('Excon', Excon::VERSION, '0.9.6', '0.9').check_version!
+VCR::VersionChecker.new('Excon', Excon::VERSION, '0.9.6', '0.10').check_version!
 
 module VCR
   class LibraryHooks

data/lib/vcr/library_hooks/faraday.rb

@@ -1,4 +1,4 @@
-require 'faraday'
+require 'vcr/middleware/faraday'
 
 module VCR
   class LibraryHooks

data/lib/vcr/middleware/faraday.rb

@@ -2,7 +2,7 @@ require 'faraday'
 require 'vcr/util/version_checker'
 require 'vcr/request_handler'
 
-VCR::VersionChecker.new('Faraday', Faraday::VERSION, '0.7.0', '0.7').check_version!
+VCR::VersionChecker.new('Faraday', Faraday::VERSION, '0.7.0', '0.8').check_version!
 
 module VCR
   # Contains middlewares for use with different libraries.

data/lib/vcr/structs.rb

@@ -155,9 +155,15 @@ module VCR
     include Normalizers::Body
 
     def initialize(*args)
-      super
+      skip_port_stripping = false
+      if args.last == :skip_port_stripping
+        skip_port_stripping = true
+        args.pop
+      end
+
+      super(*args)
       self.method = self.method.to_s.downcase.to_sym if self.method
-      self.uri = without_standard_port(self.uri)
+      self.uri = without_standard_port(self.uri) unless skip_port_stripping
     end
 
     # Builds a serializable hash from the request data.
@@ -184,7 +190,8 @@ module VCR
       new method,
           hash['uri'],
           body_from(hash['body']),
-          hash['headers']
+          hash['headers'],
+          :skip_port_stripping
     end
 
     @@object_method = Object.instance_method(:method)
@@ -275,6 +282,75 @@ module VCR
     end
   end
 
+  # The response of an {HTTPInteraction}.
+  #
+  # @attr [ResponseStatus] status the status of the response
+  # @attr [Hash{String => Array<String>}] headers the response headers
+  # @attr [String] body the response body
+  # @attr [nil, String] http_version the HTTP version
+  class Response < Struct.new(:status, :headers, :body, :http_version)
+    include Normalizers::Header
+    include Normalizers::Body
+
+    # Builds a serializable hash from the response data.
+    #
+    # @return [Hash] hash that represents this response
+    #  and can be easily serialized.
+    # @see Response.from_hash
+    def to_hash
+      {
+        'status'       => status.to_hash,
+        'headers'      => headers,
+        'body'         => serializable_body,
+        'http_version' => http_version
+      }.tap { |h| OrderedHashSerializer.apply_to(h, members) }
+    end
+
+    # Constructs a new instance from a hash.
+    #
+    # @param [Hash] hash the hash to use to construct the instance.
+    # @return [Response] the response
+    def self.from_hash(hash)
+      new ResponseStatus.from_hash(hash.fetch('status', {})),
+          hash['headers'],
+          body_from(hash['body']),
+          hash['http_version']
+    end
+
+    # Updates the Content-Length response header so that it is
+    # accurate for the response body.
+    def update_content_length_header
+      value = body ? body.bytesize.to_s : '0'
+      key = %w[ Content-Length content-length ].find { |k| headers.has_key?(k) }
+      headers[key] = [value] if key
+    end
+  end
+
+  # The response status of an {HTTPInteraction}.
+  #
+  # @attr [Integer] code the HTTP status code
+  # @attr [String] message the HTTP status message (e.g. "OK" for a status of 200)
+  class ResponseStatus < Struct.new(:code, :message)
+    # Builds a serializable hash from the response status data.
+    #
+    # @return [Hash] hash that represents this response status
+    #  and can be easily serialized.
+    # @see ResponseStatus.from_hash
+    def to_hash
+      {
+        'code' => code, 'message' => message
+      }.tap { |h| OrderedHashSerializer.apply_to(h, members) }
+    end
+
+    # Constructs a new instance from a hash.
+    #
+    # @param [Hash] hash the hash to use to construct the instance.
+    # @return [ResponseStatus] the response status
+    def self.from_hash(hash)
+      new hash['code'], hash['message']
+    end
+  end
+
   # Represents a single interaction over HTTP, containing a request and a response.
   #
   # @attr [Request] request the request
@@ -374,73 +450,4 @@ module VCR
       end
     end
   end
-
-  # The response of an {HTTPInteraction}.
-  #
-  # @attr [ResponseStatus] status the status of the response
-  # @attr [Hash{String => Array<String>}] headers the response headers
-  # @attr [String] body the response body
-  # @attr [nil, String] http_version the HTTP version
-  class Response < Struct.new(:status, :headers, :body, :http_version)
-    include Normalizers::Header
-    include Normalizers::Body
-
-    # Builds a serializable hash from the response data.
-    #
-    # @return [Hash] hash that represents this response
-    #  and can be easily serialized.
-    # @see Response.from_hash
-    def to_hash
-      {
-        'status'       => status.to_hash,
-        'headers'      => headers,
-        'body'         => serializable_body,
-        'http_version' => http_version
-      }.tap { |h| OrderedHashSerializer.apply_to(h, members) }
-    end
-
-    # Constructs a new instance from a hash.
-    #
-    # @param [Hash] hash the hash to use to construct the instance.
-    # @return [Response] the response
-    def self.from_hash(hash)
-      new ResponseStatus.from_hash(hash.fetch('status', {})),
-          hash['headers'],
-          body_from(hash['body']),
-          hash['http_version']
-    end
-
-    # Updates the Content-Length response header so that it is
-    # accurate for the response body.
-    def update_content_length_header
-      value = body ? body.bytesize.to_s : '0'
-      key = %w[ Content-Length content-length ].find { |k| headers.has_key?(k) }
-      headers[key] = [value] if key
-    end
-  end
-
-  # The response status of an {HTTPInteraction}.
-  #
-  # @attr [Integer] code the HTTP status code
-  # @attr [String] message the HTTP status message (e.g. "OK" for a status of 200)
-  class ResponseStatus < Struct.new(:code, :message)
-    # Builds a serializable hash from the response status data.
-    #
-    # @return [Hash] hash that represents this response status
-    #  and can be easily serialized.
-    # @see ResponseStatus.from_hash
-    def to_hash
-      {
-        'code' => code, 'message' => message
-      }.tap { |h| OrderedHashSerializer.apply_to(h, members) }
-    end
-
-    # Constructs a new instance from a hash.
-    #
-    # @param [Hash] hash the hash to use to construct the instance.
-    # @return [ResponseStatus] the response status
-    def self.from_hash(hash)
-      new hash['code'], hash['message']
-    end
-  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.0.0.rc2'
+      string = '2.0.0'
 
       def string.parts
         split('.').map { |p| p.to_i }

data/spec/quality_spec.rb

@@ -0,0 +1,51 @@
+# Borrowed from:
+# https://github.com/carlhuda/bundler/blob/v1.1.rc.7/spec/quality_spec.rb
+require "spec_helper"
+
+describe "The library itself" do
+  def check_for_tab_characters(filename)
+    failing_lines = []
+    File.readlines(filename).each_with_index do |line,number|
+      failing_lines << number + 1 if line =~ /\t/
+    end
+
+    unless failing_lines.empty?
+      "#{filename} has tab characters on lines #{failing_lines.join(', ')}"
+    end
+  end
+
+  def check_for_extra_spaces(filename)
+    failing_lines = []
+    File.readlines(filename).each_with_index do |line,number|
+      next if line =~ /^\s+#.*\s+\n$/
+      failing_lines << number + 1 if line =~ /\s+\n$/
+    end
+
+    unless failing_lines.empty?
+      "#{filename} has spaces on the EOL on lines #{failing_lines.join(', ')}"
+    end
+  end
+
+  RSpec::Matchers.define :be_well_formed do
+    failure_message_for_should do |actual|
+      actual.join("\n")
+    end
+
+    match do |actual|
+      actual.empty?
+    end
+  end
+
+  it "has no malformed whitespace" do
+    error_messages = []
+    Dir.chdir(File.expand_path("../..", __FILE__)) do
+      `git ls-files`.split("\n").each do |filename|
+        next if filename =~ /vendor|.feature|.yml|.gitmodules/
+        error_messages << check_for_tab_characters(filename)
+        error_messages << check_for_extra_spaces(filename)
+      end
+    end
+    error_messages.compact.should be_well_formed
+  end
+end
+

data/spec/vcr/cassette/migrator_spec.rb

@@ -3,38 +3,38 @@ require 'vcr/cassette/migrator'
 
 describe VCR::Cassette::Migrator do
   let(:original_contents) { <<-EOF
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
     method: :get
     uri: http://example.com:80/foo
-    body: 
-    headers: 
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+    body:
+    headers:
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
       code: 200
       message: OK
-    headers: 
-      content-type: 
+    headers:
+      content-type:
       - text/html;charset=utf-8
-      content-length: 
+      content-length:
       - "9"
     body: Hello foo
     http_version: "1.1"
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
     method: :get
     uri: http://localhost:7777/bar
-    body: 
-    headers: 
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+    body:
+    headers:
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
       code: 200
       message: OK
-    headers: 
-      content-type: 
+    headers:
+      content-type:
       - text/html;charset=utf-8
-      content-length: 
+      content-length:
       - "9"
     body: Hello bar
     http_version: "1.1"
@@ -42,9 +42,9 @@ EOF
   }
 
   let(:updated_contents) { <<-EOF
---- 
-http_interactions: 
-- request: 
+---
+http_interactions:
+- request:
     method: get
     uri: http://example.com/foo
     body:
@@ -52,21 +52,21 @@ http_interactions:
       string: ""
     headers: {}
 
-  response: 
-    status: 
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      Content-Type: 
+    headers:
+      Content-Type:
       - text/html;charset=utf-8
-      Content-Length: 
+      Content-Length:
       - "9"
     body:
       encoding: UTF-8
       string: Hello foo
     http_version: "1.1"
   recorded_at: Wed, 04 May 2011 12:30:00 GMT
-- request: 
+- request:
     method: get
     uri: http://localhost:7777/bar
     body:
@@ -74,14 +74,14 @@ http_interactions:
       string: ""
     headers: {}
 
-  response: 
-    status: 
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      Content-Type: 
+    headers:
+      Content-Type:
       - text/html;charset=utf-8
-      Content-Length: 
+      Content-Length:
       - "9"
     body:
       encoding: UTF-8

data/spec/vcr/configuration_spec.rb

@@ -117,7 +117,7 @@ describe VCR::Configuration do
     end
   end
 
-  describe "#before_record hook", :with_monkey_patches => :fakeweb do
+  describe "request/configuration interactions", :with_monkey_patches => :fakeweb do
     specify 'the request on the yielded interaction is not typed even though the request given to before_http_request is' do
       before_record_req = before_request_req = nil
       VCR.configure do |c|
@@ -132,6 +132,18 @@ describe VCR::Configuration do
       before_record_req.should_not respond_to(:type)
       before_request_req.should respond_to(:type)
     end unless RUBY_VERSION =~ /^1\.8/
+
+    specify 'the filter_sensitive_data option works even when it modifies the URL in a way that makes it an invalid URI' do
+      VCR.configure do |c|
+        c.filter_sensitive_data('<HOST>') { 'localhost' }
+      end
+
+      2.times do
+        VCR.use_cassette("example") do
+          ::Net::HTTP.get_response(URI("http://localhost:#{VCR::SinatraApp.port}/foo"))
+        end
+      end
+    end
   end
 
   [:before_record, :before_playback].each do |hook_type|

data/spec/vcr/library_hooks/faraday_spec.rb

@@ -5,7 +5,6 @@ describe "Faraday hook" do
   it 'inserts the VCR middleware just before the adapter' do
     conn = Faraday.new(:url => 'http://sushi.com') do |builder|
       builder.request  :url_encoded
-      builder.request  :json
       builder.response :logger
       builder.adapter  :net_http
     end

data/vcr.gemspec

@@ -29,23 +29,23 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakeweb', '~> 1.3.0'
   s.add_development_dependency 'webmock', '~> 1.8.0'
 
-  s.add_development_dependency 'faraday', '~> 0.7.2'
+  s.add_development_dependency 'faraday', '~> 0.8.0.rc2'
   s.add_development_dependency 'httpclient', '~> 2.1.5.2'
-  s.add_development_dependency 'excon', '~> 0.9.6'
+  s.add_development_dependency 'excon', '>= 0.9.6', '< 1.0'
 
   s.add_development_dependency 'timecop', '~> 0.3.5'
   s.add_development_dependency 'rack', '~> 1.3.6'
   s.add_development_dependency 'sinatra', '~> 1.3.2'
   s.add_development_dependency 'multi_json', '~> 1.0.3'
-  s.add_development_dependency 'yajl-ruby', '~> 1.1.0'
   s.add_development_dependency 'json', '~> 1.6.5'
   s.add_development_dependency 'limited_red', '~> 0.3.7'
   s.add_development_dependency 'simplecov', '~> 0.5.3'
 
   unless RUBY_PLATFORM == 'java'
     s.add_development_dependency 'patron', '~> 0.4.15'
-    s.add_development_dependency 'em-http-request', '~> 0.3.0'
+    s.add_development_dependency 'em-http-request', '~> 1.0.1'
     s.add_development_dependency 'curb', '~> 0.8.0'
     s.add_development_dependency 'typhoeus', '~> 0.3.3'
+    s.add_development_dependency 'yajl-ruby', '~> 1.1.0'
   end
 end