Use #ignore_localhost? rather than #ignore_localhost, since it's more…

… idiomatic ruby.
myronmarston · Jun 22, 2010 · 29925bc · 29925bc
1 parent ef8519a
commit 29925bc
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 18 deletions.
diff --git a/features/step_definitions/vcr_steps.rb b/features/step_definitions/vcr_steps.rb
@@ -2,7 +2,7 @@
 
 module VCRHelpers
   def static_rack_server(response_string)
-    orig_ignore_localhost = VCR.http_stubbing_adapter.ignore_localhost
+    orig_ignore_localhost = VCR.http_stubbing_adapter.ignore_localhost?
     VCR.http_stubbing_adapter.ignore_localhost = true
 
     begin

diff --git a/lib/vcr.rb b/lib/vcr.rb
@@ -41,7 +41,7 @@ def config
     yield VCR::Config
     http_stubbing_adapter.check_version!
     http_stubbing_adapter.http_connections_allowed = false
-    http_stubbing_adapter.ignore_localhost = VCR::Config.ignore_localhost
+    http_stubbing_adapter.ignore_localhost = VCR::Config.ignore_localhost?
   end
 
   def cucumber_tags(&block)
@@ -62,7 +62,7 @@ def http_stubbing_adapter
 
   def record_http_interaction(interaction)
     return unless cassette = current_cassette
-    return if http_stubbing_adapter.ignore_localhost &&
+    return if http_stubbing_adapter.ignore_localhost? &&
       LOCALHOST_ALIASES.include?(URI.parse(interaction.uri).host)
 
     cassette.record_http_interaction(interaction)

diff --git a/lib/vcr/cassette.rb b/lib/vcr/cassette.rb
@@ -81,7 +81,7 @@ def load_recorded_interactions
         @original_recorded_interactions = begin
           interactions = YAML.load(raw_yaml_content)
 
-          if VCR.http_stubbing_adapter.ignore_localhost
+          if VCR.http_stubbing_adapter.ignore_localhost?
             interactions.reject! do |i|
               i.uri.is_a?(String) && VCR::LOCALHOST_ALIASES.include?(URI.parse(i.uri).host)
             end

diff --git a/lib/vcr/config.rb b/lib/vcr/config.rb
@@ -27,8 +27,8 @@ def ignore_localhost=(value)
         @ignore_localhost = value
       end
 
-      def ignore_localhost
-        VCR.http_stubbing_adapter ? VCR.http_stubbing_adapter.ignore_localhost : @ignore_localhost
+      def ignore_localhost?
+        VCR.http_stubbing_adapter ? VCR.http_stubbing_adapter.ignore_localhost? : @ignore_localhost
       end
     end
   end

diff --git a/lib/vcr/deprecations.rb b/lib/vcr/deprecations.rb
@@ -2,15 +2,15 @@ module VCR
   class Cassette
     def allow_real_http_requests_to?(uri)
       warn "WARNING: VCR::Cassette#allow_real_http_requests_to? is deprecated and should no longer be used."
-      VCR.http_stubbing_adapter.ignore_localhost && VCR::LOCALHOST_ALIASES.include?(uri.host)
+      VCR.http_stubbing_adapter.ignore_localhost? && VCR::LOCALHOST_ALIASES.include?(uri.host)
     end
 
     private
 
     def deprecate_old_cassette_options(options)
       message = "VCR's :allow_real_http cassette option is deprecated.  Instead, use the ignore_localhost configuration option."
       if options[:allow_real_http] == :localhost
-        @original_ignore_localhost = VCR.http_stubbing_adapter.ignore_localhost
+        @original_ignore_localhost = VCR.http_stubbing_adapter.ignore_localhost?
         VCR.http_stubbing_adapter.ignore_localhost = true
         Kernel.warn "WARNING: #{message}"
       elsif options[:allow_real_http]

diff --git a/lib/vcr/extensions/net_http.rb b/lib/vcr/extensions/net_http.rb
@@ -5,7 +5,7 @@ class HTTP
     def request_with_vcr(request, body = nil, &block)
       uri = URI.parse(VCR.http_stubbing_adapter.request_uri(self, request))
 
-      if VCR::LOCALHOST_ALIASES.include?(uri.host) && VCR.http_stubbing_adapter.ignore_localhost
+      if VCR::LOCALHOST_ALIASES.include?(uri.host) && VCR.http_stubbing_adapter.ignore_localhost?
         VCR.http_stubbing_adapter.with_http_connections_allowed_set_to(true) do
           return request_without_vcr(request, body, &block)
         end

diff --git a/lib/vcr/http_stubbing_adapters/fakeweb.rb b/lib/vcr/http_stubbing_adapters/fakeweb.rb
@@ -60,7 +60,10 @@ def request_uri(net_http, request)
           "#{protocol}://#{userinfo}#{net_http.address}:#{net_http.port}#{path}"
         end
 
-        attr_accessor :ignore_localhost
+        attr_writer :ignore_localhost
+        def ignore_localhost?
+          @ignore_localhost
+        end
 
         private
 

diff --git a/lib/vcr/http_stubbing_adapters/webmock.rb b/lib/vcr/http_stubbing_adapters/webmock.rb
@@ -55,7 +55,7 @@ def ignore_localhost=(value)
           ::WebMock::Config.instance.allow_localhost = value
         end
 
-        def ignore_localhost
+        def ignore_localhost?
           ::WebMock::Config.instance.allow_localhost
         end
 

diff --git a/spec/cassette_spec.rb b/spec/cassette_spec.rb
@@ -164,7 +164,7 @@ def cassette_body(name, options = {})
           expected_uri_hosts += VCR::LOCALHOST_ALIASES unless ignore_localhost
 
           it "#{ ignore_localhost ? 'does not load' : 'loads' } localhost interactions from the cassette file when http_stubbing_adapter.ignore_localhost is set to #{ignore_localhost}" do
-            VCR.http_stubbing_adapter.stub!(:ignore_localhost).and_return(ignore_localhost)
+            VCR.http_stubbing_adapter.stub!(:ignore_localhost?).and_return(ignore_localhost)
             VCR::Config.cassette_library_dir = File.expand_path(File.dirname(__FILE__) + "/fixtures/#{RUBY_VERSION}/cassette_spec")
             cassette = VCR::Cassette.new('with_localhost_requests', :record => record_mode)
             cassette.recorded_interactions.map { |i| URI.parse(i.uri).host }.should =~ expected_uri_hosts

diff --git a/spec/config_spec.rb b/spec/config_spec.rb
@@ -48,20 +48,20 @@
   end
 
   describe '#ignore_localhost' do
-    it 'sets VCR.http_stubbing_adapter.ignore_localhost' do
+    it 'sets VCR.http_stubbing_adapter.ignore_localhost?' do
       [true, false].each do |val|
         VCR.http_stubbing_adapter.ignore_localhost = !val
         expect {
           VCR::Config.ignore_localhost = val
-        }.to change { VCR.http_stubbing_adapter.ignore_localhost }.from(!val).to(val)
+        }.to change { VCR.http_stubbing_adapter.ignore_localhost? }.from(!val).to(val)
       end
     end
 
     it 'stores the value even when VCR.http_stubbing_adapter is nil' do
       VCR.stub!(:http_stubbing_adapter).and_return(nil)
       [true, false].each do |val|
         VCR::Config.ignore_localhost = val
-        VCR::Config.ignore_localhost.should == val
+        VCR::Config.ignore_localhost?.should == val
       end
     end
   end

diff --git a/spec/deprecations_spec.rb b/spec/deprecations_spec.rb
@@ -23,7 +23,7 @@
 
           it "sets the http_stubbing_adapter's ignore_localhost attribute to true" do
             subject
-            VCR.http_stubbing_adapter.ignore_localhost.should be_true
+            VCR.http_stubbing_adapter.ignore_localhost?.should be_true
           end
 
           it "prints a warning: VCR's :allow_real_http cassette option is deprecated.  Instead, use the ignore_localhost configuration option." do
@@ -33,7 +33,7 @@
 
           it "reverts ignore_localhost when the cassette is ejected" do
             subject.eject
-            VCR.http_stubbing_adapter.ignore_localhost.should == orig_ignore_localhost
+            VCR.http_stubbing_adapter.ignore_localhost?.should == orig_ignore_localhost
           end
 
           {

diff --git a/spec/vcr_spec.rb b/spec/vcr_spec.rb
@@ -133,7 +133,7 @@ def insert_cassette
 
     def self.with_ignore_localhost_set_to(value, &block)
       context "when http_stubbing_adapter.ignore_localhost is #{value}" do
-        before(:each) { VCR.http_stubbing_adapter.stub!(:ignore_localhost).and_return(value) }
+        before(:each) { VCR.http_stubbing_adapter.stub!(:ignore_localhost?).and_return(value) }
 
         instance_eval(&block)
       end