From 19fc2ccb89f6a13259658b14bb48eb83d106c4c1 Mon Sep 17 00:00:00 2001
From: Damian Janowski <damian.janowski@gmail.com>
Date: Mon, 12 Apr 2010 22:21:59 -0300
Subject: [PATCH] Remove warnings [#372 state:resolved].

On why this is important:
http://eigenclass.org/hiki/ruby-warnings-SEX-and-stds
---
 lib/webrat/core/mime.rb           |  4 ++--
 lib/webrat/core/scope.rb          |  1 +
 lib/webrat/core/session.rb        |  3 ++-
 spec/fakes/test_adapter.rb        |  2 +-
 spec/private/core/session_spec.rb | 18 ------------------
 5 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/lib/webrat/core/mime.rb b/lib/webrat/core/mime.rb
index 873f729..732c9bf 100644
--- a/lib/webrat/core/mime.rb
+++ b/lib/webrat/core/mime.rb
@@ -8,8 +8,8 @@ module Webrat #:nodoc:
     def mime_type(type)
       return type if type.nil? || type.to_s.include?("/")
       type = ".#{type}" unless type.to_s[0] == ?.
-      MIME_TYPES.fetch(type) { |type|
-        raise ArgumentError.new("Invalid Mime type: #{type}")
+      MIME_TYPES.fetch(type) { |invalid_type|
+        raise ArgumentError.new("Invalid Mime type: #{invalid_type}")
       }
     end
 
diff --git a/lib/webrat/core/scope.rb b/lib/webrat/core/scope.rb
index 41cb869..1b1431d 100644
--- a/lib/webrat/core/scope.rb
+++ b/lib/webrat/core/scope.rb
@@ -28,6 +28,7 @@ module Webrat
     attr_reader :session
 
     def initialize(session, &block) #:nodoc:
+      @selector, @dom = nil
       @session = session
       instance_eval(&block) if block_given?
 
diff --git a/lib/webrat/core/session.rb b/lib/webrat/core/session.rb
index 41855e1..ba95f79 100644
--- a/lib/webrat/core/session.rb
+++ b/lib/webrat/core/session.rb
@@ -75,6 +75,7 @@ For example:
       @data            = {}
       @default_headers = {}
       @custom_headers  = {}
+      @current_url     = nil
       reset
     end
 
@@ -155,7 +156,7 @@ For example:
     end
 
     def redirect? #:nodoc:
-      response_code != 304 && (response_code / 100).to_i == 3
+      [301, 302, 303, 307].include?(response_code)
     end
 
     def internal_redirect?
diff --git a/spec/fakes/test_adapter.rb b/spec/fakes/test_adapter.rb
index c3d2d22..c49fe9d 100644
--- a/spec/fakes/test_adapter.rb
+++ b/spec/fakes/test_adapter.rb
@@ -15,7 +15,7 @@ module Webrat #:nodoc:
     end
 
     def response_code
-      @response_code || 200
+      @response_code ||= 200
     end
 
     def get(url, data, headers = nil)
diff --git a/spec/private/core/session_spec.rb b/spec/private/core/session_spec.rb
index 4e735fb..1b34b44 100644
--- a/spec/private/core/session_spec.rb
+++ b/spec/private/core/session_spec.rb
@@ -106,24 +106,6 @@ describe Webrat::Session do
       webrat_session = Webrat::Session.new
     end
 
-    it "should return true if the last response was a redirect and Fixnum#/ returns a Rational" do
-      # This happens if the ruby-units gem has been required
-      Fixnum.class_eval do
-        alias_method :original_divide, "/".to_sym
-
-        def /(other)
-          Rational(self, other)
-        end
-      end
-
-      webrat_session.stub!(:response_code => 301)
-      webrat_session.redirect?.should be_true
-
-      Fixnum.class_eval do
-        alias_method "/".to_sym, :original_divide
-      end
-    end
-
     it "should return true if the last response was a redirect" do
       webrat_session.stub!(:response_code => 301)
       webrat_session.redirect?.should be_true