Remove lots of old deprecations.

myronmarston · Sep 11, 2011 · 004dfa9 · 004dfa9
1 parent 145918e
commit 004dfa9
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 185 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 [Full Changelog](http://github.com/myronmarston/vcr/compare/v1.11.3...master)
 
 * Removed support for Ruby 1.8.6 and 1.9.1.
+* Removed lots of old deprecated APIs.
 
 ## 1.11.3 (August 31, 2011)
 

diff --git a/lib/vcr.rb b/lib/vcr.rb
@@ -9,10 +9,6 @@
 
 require 'vcr/http_stubbing_adapters/common'
 
-require 'vcr/deprecations/cassette'
-require 'vcr/deprecations/config'
-require 'vcr/deprecations/http_stubbing_adapters/common'
-
 require 'vcr/structs/normalizers/body'
 require 'vcr/structs/normalizers/header'
 require 'vcr/structs/normalizers/status_message'

diff --git a/lib/vcr/cassette.rb b/lib/vcr/cassette.rb
@@ -15,7 +15,6 @@ def initialize(name, options = {})
       invalid_options = options.keys - [
         :record,
         :erb,
-        :allow_real_http,
         :match_requests_on,
         :re_record_interval,
         :tag,
@@ -35,7 +34,6 @@ def initialize(name, options = {})
       @record_mode        = :all if should_re_record?
       @update_content_length_header = options[:update_content_length_header]
 
-      deprecate_old_cassette_options(options)
       raise_error_unless_valid_record_mode
 
       set_http_connections_allowed
@@ -46,7 +44,6 @@ def eject
       write_recorded_interactions_to_disk
       VCR.http_stubbing_adapter.restore_stubs_checkpoint(self)
       restore_http_connections_allowed
-      restore_ignore_localhost_for_deprecation
     end
 
     def recorded_interactions

diff --git a/lib/vcr/deprecations/cassette.rb b/lib/vcr/deprecations/cassette.rb
diff --git a/lib/vcr/deprecations/config.rb b/lib/vcr/deprecations/config.rb
diff --git a/lib/vcr/deprecations/http_stubbing_adapters/common.rb b/lib/vcr/deprecations/http_stubbing_adapters/common.rb
diff --git a/lib/vcr/deprecations/http_stubbing_adapters/fakeweb.rb b/lib/vcr/deprecations/http_stubbing_adapters/fakeweb.rb
diff --git a/lib/vcr/http_stubbing_adapters/fakeweb.rb b/lib/vcr/http_stubbing_adapters/fakeweb.rb
@@ -1,5 +1,4 @@
 require 'fakeweb'
-require 'vcr/deprecations/http_stubbing_adapters/fakeweb'
 require 'vcr/extensions/net_http'
 
 module VCR

diff --git a/spec/vcr/deprecations/cassette_spec.rb b/spec/vcr/deprecations/cassette_spec.rb
diff --git a/spec/vcr/deprecations/config_spec.rb b/spec/vcr/deprecations/config_spec.rb
diff --git a/spec/vcr/deprecations/http_stubbing_adapters/common_spec.rb b/spec/vcr/deprecations/http_stubbing_adapters/common_spec.rb
diff --git a/spec/vcr/deprecations/http_stubbing_adapters/fakeweb_spec.rb b/spec/vcr/deprecations/http_stubbing_adapters/fakeweb_spec.rb