Revert "Remove unnecessary VariableArgsBlockCaller."

This reverts commit e27202d.

Unfortunately, 1.8 and 1.9 blocks have different behavior:

block = Proc.new { |x| puts x.inspect }
block.call(1, 2)

On 1.8, x gets [1, 2]; on 1.9, x gets 1.  So this VariableArgsBlockCaller is more important than I thought to maintain 1.8 compatibility.

Author: myronmarston

lib/vcr.rb

@@ -1,3 +1,4 @@
+require 'vcr/util/variable_args_block_caller'
 require 'vcr/util/yaml'
 
 require 'vcr/cassette'
@@ -11,6 +12,7 @@
 require 'vcr/structs/http_interaction'
 
 module VCR
+  include VariableArgsBlockCaller
   extend self
 
   autoload :BasicObject,        'vcr/util/basic_object'
@@ -56,11 +58,11 @@ def eject_cassette
     cassette
   end
 
-  def use_cassette(*args)
+  def use_cassette(*args, &block)
     cassette = insert_cassette(*args)
 
     begin
-      yield cassette
+      call_block(block, cassette)
     ensure
       eject_cassette
     end

lib/vcr/configuration.rb

@@ -4,6 +4,7 @@
 module VCR
   class Configuration
     include VCR::Hooks
+    include VCR::VariableArgsBlockCaller
 
     define_hook :before_record
     define_hook :before_playback
@@ -65,13 +66,13 @@ def allow_http_connections_when_no_cassette?
       !!@allow_http_connections_when_no_cassette
     end
 
-    def filter_sensitive_data(placeholder, tag = nil)
+    def filter_sensitive_data(placeholder, tag = nil, &block)
       before_record(tag) do |interaction|
-        interaction.filter!((yield interaction), placeholder)
+        interaction.filter!(call_block(block, interaction), placeholder)
       end
 
       before_playback(tag) do |interaction|
-        interaction.filter!(placeholder, (yield interaction))
+        interaction.filter!(placeholder, call_block(block, interaction))
       end
     end
 

lib/vcr/middleware/common.rb

@@ -1,18 +1,20 @@
 module VCR
   module Middleware
     module Common
+      include VCR::VariableArgsBlockCaller
+
       def initialize(app, &block)
         raise ArgumentError.new("You must provide a block to set the cassette options") unless block
         @app, @cassette_arguments_block = app, block
       end
 
-    private
+      private
 
-      def cassette_arguments(env)
-        arguments = CassetteArguments.new
-        @cassette_arguments_block.call(arguments, env)
-        [arguments.name, arguments.options]
-      end
+        def cassette_arguments(env)
+          arguments = CassetteArguments.new
+          call_block(@cassette_arguments_block, arguments, env)
+          [arguments.name, arguments.options]
+        end
     end
   end
 end

lib/vcr/util/hooks.rb

@@ -1,12 +1,14 @@
 module VCR
   module Hooks
+    include VariableArgsBlockCaller
+
     def self.included(klass)
       klass.extend(ClassMethods)
     end
 
     def invoke_hook(hook, tag, *args)
       hooks_for(hook, tag).each do |callback|
-        callback.call(*args)
+        call_block(callback, *args)
       end
     end
 

lib/vcr/util/variable_args_block_caller.rb

@@ -0,0 +1,12 @@
+module VCR
+  module VariableArgsBlockCaller
+    def call_block(block, *args)
+      if block.arity >= 0
+        args = args.first([args.size, block.arity].min)
+      end
+
+      block.call(*args)
+    end
+  end
+end
+

spec/vcr/configuration_spec.rb

@@ -150,13 +150,13 @@ def stub_no_http_stubbing_adapter
     before(:each) { interaction.stub(:filter!) }
 
     it 'adds a before_record hook that replaces the string returned by the block with the given string' do
-      subject.filter_sensitive_data('foo') { 'bar' }
+      subject.filter_sensitive_data('foo', &lambda { 'bar' })
       interaction.should_receive(:filter!).with('bar', 'foo')
       subject.invoke_hook(:before_record, nil, interaction)
     end
 
     it 'adds a before_playback hook that replaces the given string with the string returned by the block' do
-      subject.filter_sensitive_data('foo') { 'bar' }
+      subject.filter_sensitive_data('foo', &lambda { 'bar' })
       interaction.should_receive(:filter!).with('foo', 'bar')
       subject.invoke_hook(:before_playback, nil, interaction)
     end
@@ -173,14 +173,14 @@ def stub_no_http_stubbing_adapter
 
     it 'yields the interaction to the block for the before_record hook' do
       yielded_interaction = nil
-      subject.filter_sensitive_data('foo') { |i| yielded_interaction = i; 'bar' }
+      subject.filter_sensitive_data('foo', &lambda { |i| yielded_interaction = i; 'bar' })
       subject.invoke_hook(:before_record, nil, interaction)
       yielded_interaction.should equal(interaction)
     end
 
     it 'yields the interaction to the block for the before_playback hook' do
       yielded_interaction = nil
-      subject.filter_sensitive_data('foo') { |i| yielded_interaction = i; 'bar' }
+      subject.filter_sensitive_data('foo', &lambda { |i| yielded_interaction = i; 'bar' })
       subject.invoke_hook(:before_playback, nil, interaction)
       yielded_interaction.should equal(interaction)
     end

spec/vcr/middleware/faraday_spec.rb

@@ -32,19 +32,19 @@
 
     it 'sets the cassette options based on the provided block' do
       app = lambda { |env| VCR.current_cassette.erb.should eq({ :foo => :bar }) }
-      instance = described_class.new(app) do |c|
+      instance = described_class.new(app, &lambda do |c|
         c.name    'c'
         c.options :erb => { :foo => :bar }
-      end
+      end)
 
       instance.call(env_hash)
     end
 
     it 'yields the env to the provided block when the block accepts 2 arguments' do
-      instance = described_class.new(lambda { |env| }) do |c, env|
+      instance = described_class.new(lambda { |env| }, &lambda do |c, env|
         env.should eq(env_hash)
         c.name    'c'
-      end
+      end)
 
       instance.call(env_hash)
     end

spec/vcr/middleware/rack_spec.rb

@@ -34,19 +34,19 @@
 
     it 'sets the cassette options based on the provided block' do
       rack_app = lambda { |env| VCR.current_cassette.erb.should eq({ :foo => :bar }) }
-      instance = described_class.new(rack_app) do |c|
+      instance = described_class.new(rack_app, &lambda do |c|
         c.name    'c'
         c.options :erb => { :foo => :bar }
-      end
+      end)
 
       instance.call({})
     end
 
     it 'yields the rack env to the provided block when the block accepts 2 arguments' do
-      instance = described_class.new(lambda { |env| }) do |c, env|
+      instance = described_class.new(lambda { |env| }, &lambda do |c, env|
         env.should eq(env_hash)
         c.name    'c'
-      end
+      end)
 
       instance.call(env_hash)
     end

spec/vcr/util/hooks_spec.rb

@@ -77,13 +77,13 @@
       end
 
       it 'only passes along 1 argument when the block accepts only 1 arguments' do
-        subject.before_foo { |a| invocations << a }
+        subject.before_foo(&lambda { |a| invocations << a })
         subject.invoke_hook(:before_foo, nil, :arg1, :arg2)
         invocations.flatten.should eq([:arg1])
       end
 
       it 'passes along all arguments when the block accepts a variable number of args' do
-        subject.before_foo { |*a| invocations << a }
+        subject.before_foo(&lambda { |*a| invocations << a })
         subject.invoke_hook(:before_foo, nil, :arg1, :arg2)
         invocations.flatten.should eq([:arg1, :arg2])
       end

spec/vcr_spec.rb

@@ -52,14 +52,14 @@ def insert_cassette(name = :cassette_test)
 
     it 'yields' do
       yielded = false
-      VCR.use_cassette(:cassette_test) { yielded = true }
+      VCR.use_cassette(:cassette_test, &lambda { yielded = true })
       yielded.should be_true
     end
 
     it 'yields the cassette instance if the block expects an argument' do
-      VCR.use_cassette('name', :record => :new_episodes) do |cassette|
+      VCR.use_cassette('name', :record => :new_episodes, &lambda do |cassette|
         cassette.should equal(VCR.current_cassette)
-      end
+      end)
     end
 
     it 'yields the cassette instance if the block expects a variable number of args' do