vcr 1.11.3 → 2.0.0.beta1

data/lib/vcr/structs/http_interaction.rb

@@ -1,4 +1,10 @@
 require 'forwardable'
+require 'vcr/structs/normalizers/body'
+require 'vcr/structs/normalizers/header'
+require 'vcr/structs/normalizers/status_message'
+require 'vcr/structs/normalizers/uri'
+require 'vcr/structs/request'
+require 'vcr/structs/response'
 
 module VCR
   class HTTPInteraction < Struct.new(:request, :response)
@@ -25,28 +31,28 @@ module VCR
       filter_object!(self, text, replacement_text)
     end
 
-    private
+  private
 
-      def filter_object!(object, text, replacement_text)
-        if object.respond_to?(:gsub)
-          object.gsub!(text, replacement_text) if object.include?(text)
-        elsif Hash === object
-          filter_hash!(object, text, replacement_text)
-        elsif object.respond_to?(:each)
-          # This handles nested arrays and structs
-          object.each { |o| filter_object!(o, text, replacement_text) }
-        end
-
-        object
+    def filter_object!(object, text, replacement_text)
+      if object.respond_to?(:gsub)
+        object.gsub!(text, replacement_text) if object.include?(text)
+      elsif Hash === object
+        filter_hash!(object, text, replacement_text)
+      elsif object.respond_to?(:each)
+        # This handles nested arrays and structs
+        object.each { |o| filter_object!(o, text, replacement_text) }
       end
 
-      def filter_hash!(hash, text, replacement_text)
-        filter_object!(hash.values, text, replacement_text)
+      object
+    end
+
+    def filter_hash!(hash, text, replacement_text)
+      filter_object!(hash.values, text, replacement_text)
 
-        hash.keys.each do |k|
-          new_key = filter_object!(k.dup, text, replacement_text)
-          hash[new_key] = hash.delete(k) unless k == new_key
-        end
+      hash.keys.each do |k|
+        new_key = filter_object!(k.dup, text, replacement_text)
+        hash[new_key] = hash.delete(k) unless k == new_key
       end
+    end
   end
 end

data/lib/vcr/structs/normalizers/body.rb

@@ -6,7 +6,7 @@ module VCR
         normalize_body
       end
 
-      private
+    private
 
       def normalize_body
         # Ensure that the body is a raw string, in case the string instance

data/lib/vcr/structs/normalizers/header.rb

@@ -17,7 +17,7 @@ module VCR
         normalize_headers
       end
 
-      private
+    private
 
       def important_header_values(k, values)
         skip_values = HEADERS_TO_SKIP[k] || []

data/lib/vcr/structs/normalizers/status_message.rb

@@ -6,7 +6,7 @@ module VCR
         normalize_status_message
       end
 
-      private
+    private
 
       def normalize_status_message
         self.message = message.strip if message

data/lib/vcr/structs/normalizers/uri.rb

@@ -11,7 +11,7 @@ module VCR
         normalize_uri
       end
 
-      private
+    private
 
       def normalize_uri
         u = begin

data/lib/vcr/structs/request.rb

@@ -4,23 +4,10 @@ module VCR
     include Normalizers::URI
     include Normalizers::Body
 
-    def self.from_net_http_request(net_http, request)
-      new(
-        request.method.downcase.to_sym,
-        VCR.http_stubbing_adapter.request_uri(net_http, request),
-        request.body,
-        request.to_hash
-      )
-    end
-
     @@object_method = Object.instance_method(:method)
     def method(*args)
       return super if args.empty?
       @@object_method.bind(self).call(*args)
     end
-
-    def matcher(match_attributes)
-      RequestMatcher.new(self, match_attributes)
-    end
   end
 end

data/lib/vcr/structs/response.rb

@@ -1,17 +1,10 @@
+require 'vcr/structs/response_status'
+
 module VCR
   class Response < Struct.new(:status, :headers, :body, :http_version)
     include Normalizers::Header
     include Normalizers::Body
 
-    def self.from_net_http_response(response)
-      new(
-        ResponseStatus.from_net_http_response(response),
-        response.to_hash,
-        response.body,
-        response.http_version
-      )
-    end
-
     def update_content_length_header
       headers['content-length'] &&= [body ? body.length.to_s : '0']
     end

data/lib/vcr/structs/response_status.rb

@@ -1,9 +1,5 @@
 module VCR
   class ResponseStatus < Struct.new(:code, :message)
     include Normalizers::StatusMessage
-
-    def self.from_net_http_response(response)
-      new(response.code.to_i, response.message)
-    end
   end
 end

data/lib/vcr/test_frameworks/cucumber.rb

@@ -18,7 +18,7 @@ module VCR
     def tags(*tag_names)
       options = tag_names.last.is_a?(::Hash) ? tag_names.pop : {}
       tag_names.each do |tag_name|
-        tag_name = "@#{tag_name}" unless tag_name =~ /^@/
+        tag_name = "@#{tag_name}" unless tag_name =~ /\A@/
         cassette_name = "cucumber_tags/#{tag_name.gsub(/\A@/, '')}"
 
         # It would be nice to use an Around hook here, but

data/lib/vcr/test_frameworks/rspec.rb

@@ -14,7 +14,7 @@ module VCR
         end
       end
 
-      private
+    private
 
       def infer_cassette_name
         # RSpec 1 exposes #description_parts; use that if its available

data/lib/vcr/util/hooks.rb

@@ -2,7 +2,11 @@ module VCR
   module Hooks
     include VariableArgsBlockCaller
 
-    def invoke_hook(hook, tag, *args)
+    def self.included(klass)
+      klass.extend(ClassMethods)
+    end
+
+    def invoke_hook(hook, tag=nil, *args)
       hooks_for(hook, tag).each do |callback|
         call_block(callback, *args)
       end
@@ -12,31 +16,36 @@ module VCR
       hooks.clear
     end
 
-    private
+  private
 
-      def hooks
-        @hooks ||= Hash.new do |hook_type_hash, hook_type|
-          hook_type_hash[hook_type] = Hash.new do |tag_hash, tag|
-            tag_hash[tag] = []
-          end
+    def hooks
+      @hooks ||= Hash.new do |hook_type_hash, hook_type|
+        hook_type_hash[hook_type] = Hash.new do |tag_hash, tag|
+          tag_hash[tag] = []
         end
       end
+    end
 
+    def hooks_for(hook, tag)
+      for_hook = hooks[hook]
+      hooks = for_hook[tag] # matching tagged hooks
+      hooks += for_hook[nil] unless tag.nil? # untagged hooks
+      hooks
+    end
+
+    module ClassMethods
       def define_hook(hook)
-        # We must use string eval so that the dynamically
-        # defined method can accept a block.
-        instance_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{hook}(tag = nil, &block)
-            hooks[#{hook.inspect}][tag] << block
+        # We use splat args here because 1.8.7 doesn't allow default
+        # values for block arguments, so we have to fake it.
+        define_method hook do |*args, &block|
+          if args.size > 1
+            raise ArgumentError.new("wrong number of arguments (#{args.size} for 1)")
           end
-        RUBY
-      end
 
-      def hooks_for(hook, tag)
-        for_hook = hooks[hook]
-        hooks = for_hook[tag] # matching tagged hooks
-        hooks += for_hook[nil] unless tag.nil? # untagged hooks
-        hooks
+          tag = args.first
+          hooks[hook][tag] << block
+        end
       end
+    end
   end
 end

data/lib/vcr/util/internet_connection.rb

@@ -1,6 +1,32 @@
-require 'vcr/util/ping'
-
 module VCR
+  # Ruby 1.8 provides Ping.pingecho, but it was removed in 1.9.
+  # So we try requiring it, and if that fails, define it ourselves.
+  begin
+    require 'ping'
+    Ping = ::Ping
+  rescue LoadError
+    # This is copied, verbatim, from Ruby 1.8.7's ping.rb.
+    require 'timeout'
+    require "socket"
+
+    module Ping
+      def pingecho(host, timeout=5, service="echo")
+        begin
+          timeout(timeout) do
+            s = TCPSocket.new(host, service)
+            s.close
+          end
+        rescue Errno::ECONNREFUSED
+          return true
+        rescue Timeout::Error, StandardError
+          return false
+        end
+        return true
+      end
+      module_function :pingecho
+    end
+  end
+
   module InternetConnection
     extend self
 
@@ -12,3 +38,4 @@ module VCR
     end
   end
 end
+

data/lib/vcr/util/version_checker.rb

@@ -0,0 +1,60 @@
+module VCR
+  class VersionChecker
+    def initialize(library_name, library_version, min_patch_level, max_minor_version)
+      @library_name, @library_version = library_name, library_version
+      @min_patch_level, @max_minor_version = min_patch_level, max_minor_version
+
+      @major,     @minor,     @patch     = parse_version(library_version)
+      @min_major, @min_minor, @min_patch = parse_version(min_patch_level)
+      @max_major, @max_minor             = parse_version(max_minor_version)
+
+      @comparison_result = compare_version
+    end
+
+    def check_version!
+      raise_too_low_error if too_low?
+      warn_about_too_high if too_high?
+    end
+
+  private
+
+    def too_low?
+      @comparison_result == :too_low
+    end
+
+    def too_high?
+      @comparison_result == :too_high
+    end
+
+    def raise_too_low_error
+      raise Errors::LibraryVersionTooLowError,
+        "You are using #{@library_name} #{@library_version}. " +
+        "VCR requires version #{version_requirement}."
+    end
+
+    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."
+    end
+
+    def compare_version
+      case
+        when @major < @min_major then :too_low
+        when @major > @max_major then :too_high
+        when @minor < @min_minor then :too_low
+        when @minor > @max_minor then :too_high
+        when @patch < @min_patch then :too_low
+      end
+    end
+
+    def version_requirement
+      ">= #{@min_patch_level}, < #{@max_major}.#{@max_minor + 1}"
+    end
+
+    def parse_version(version)
+      version.split('.').map { |v| v.to_i }
+    end
+  end
+end
+

data/lib/vcr/version.rb

@@ -3,7 +3,7 @@ module VCR
 
   def version
     @version ||= begin
-      string = '1.11.3'
+      string = '2.0.0.beta1'
 
       def string.parts
         split('.').map { |p| p.to_i }

data/script/FullBuildRakeFile

@@ -37,13 +37,6 @@ task :print_ruby_description do
 end
 
 task :bundle_install => :ensure_bundler_installed do
-  # Unfortunately, there is no version of ruby-debug that installs cleanly on 1.9.1 and 1.9.2.
-  # Our Gemfile specifies different versions using conditionals, but we still need to bundle update
-  # to get bundler to use the different versions.
-  if RUBY_VERSION =~ /^1\.9/
-    sh "bundle update ruby-debug-base19"
-  end
-
   sh "bundle install"
 end
 

data/script/full_build

@@ -1 +1 @@
-rvm 1.8.6,1.8.7,1.9.1,1.9.2,ree,rbx rake -f script/FullBuildRakeFile build | tee tmp/full_build.out
+rvm 1.8.7,1.9.2,ree,rbx rake -f script/FullBuildRakeFile build | tee tmp/full_build.out

data/spec/capture_warnings.rb

@@ -3,40 +3,45 @@ stderr_file = Tempfile.new("vcr.stderr")
 $stderr.reopen(stderr_file.path)
 current_dir = Dir.pwd
 
-at_exit do
-  stderr_file.rewind
-  lines = stderr_file.read.split("\n").uniq
-  stderr_file.close!
-
-  vcr_warnings, other_warnings = lines.partition { |line| line.include?(current_dir) }
-
-  # For some weird reason, JRuby is giving me some warnings about
-  # `@proxy` not being initialized, and putting a vcr file/line number
-  # in the warning, but it's really happening in excon.
-  if RUBY_PLATFORM == 'java'
-    vcr_warnings.reject! do |line|
-      line.include?('@proxy not initialized') && line.include?('excon')
+require 'rubygems' if RUBY_VERSION =~ /^1\.8/
+require 'rspec/core'
+
+RSpec.configure do |config|
+  config.after(:suite) do
+    stderr_file.rewind
+    lines = stderr_file.read.split("\n").uniq
+    stderr_file.close!
+
+    vcr_warnings, other_warnings = lines.partition { |line| line.include?(current_dir) }
+
+    # For some weird reason, JRuby is giving me some warnings about
+    # `@proxy` not being initialized, and putting a vcr file/line number
+    # in the warning, but it's really happening in excon.
+    if RUBY_PLATFORM == 'java'
+      vcr_warnings.reject! do |line|
+        line.include?('@proxy not initialized') && line.include?('excon')
+      end
     end
-  end
 
-  if vcr_warnings.any?
-    puts
-    puts "-" * 30 + " VCR Warnings: " + "-" * 30
-    puts
-    puts vcr_warnings.join("\n")
-    puts
-    puts "-" * 75
-    puts
-  end
+    if vcr_warnings.any?
+      puts
+      puts "-" * 30 + " VCR Warnings: " + "-" * 30
+      puts
+      puts vcr_warnings.join("\n")
+      puts
+      puts "-" * 75
+      puts
+    end
 
-  if other_warnings.any?
-    File.open('tmp/warnings.txt', 'w') { |f| f.write(other_warnings.join("\n")) }
-    puts
-    puts "Non-VCR warnings written to tmp/warnings.txt"
-    puts
-  end
+    if other_warnings.any?
+      File.open('tmp/warnings.txt', 'w') { |f| f.write(other_warnings.join("\n")) }
+      puts
+      puts "Non-VCR warnings written to tmp/warnings.txt"
+      puts
+    end
 
-  # fail the build...
-  exit(1) if vcr_warnings.any?
+    # fail the build...
+    raise "Failing build due to VCR warnings" if vcr_warnings.any?
+  end
 end