Merge pull request bblimke#132 from stephencelis/warnings

Fix various warnings.
libc · Sep 8, 2011 · 76eefec · 76eefec
2 parents b1e9953 + 87926d1
commit 76eefec
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/lib/webmock/http_lib_adapters/httpclient_adapter.rb b/lib/webmock/http_lib_adapters/httpclient_adapter.rb
@@ -150,7 +150,7 @@ def build_request_signature(req)
       uri.userinfo = userinfo
     end
 
-    request_signature = WebMock::RequestSignature.new(
+    WebMock::RequestSignature.new(
       req.header.request_method.downcase.to_sym,
       uri.to_s,
       :body => req.content,

diff --git a/lib/webmock/http_lib_adapters/net_http_response.rb b/lib/webmock/http_lib_adapters/net_http_response.rb
@@ -15,7 +15,9 @@
 module Net
   module WebMockHTTPResponse
     def read_body(dest = nil, &block)
-      return super if @__read_body_previously_called
+      if defined? @__read_body_previously_called && @__read_body_previously_called
+        return super 
+      end
       return @body if dest.nil? && block.nil?
       raise ArgumentError.new("both arg and block given for HTTP method") if dest && block
       return nil if @body.nil?

diff --git a/lib/webmock/request_pattern.rb b/lib/webmock/request_pattern.rb
@@ -5,8 +5,11 @@ class RequestPattern
     attr_reader :method_pattern, :uri_pattern, :body_pattern, :headers_pattern
 
     def initialize(method, uri, options = {})
-      @method_pattern = MethodPattern.new(method)
-      @uri_pattern = create_uri_pattern(uri)
+      @method_pattern  = MethodPattern.new(method)
+      @uri_pattern     = create_uri_pattern(uri)
+      @body_pattern    = nil
+      @headers_pattern = nil
+      @with_block      = nil
       assign_options(options)
     end
 

diff --git a/lib/webmock/util/headers.rb b/lib/webmock/util/headers.rb
@@ -24,7 +24,7 @@ def self.sorted_headers_string(headers)
         str << headers.map do |k,v|
           v = case v
             when Regexp then v.inspect
-            when Array then "["+v.map{|v| "'#{v.to_s}'"}.join(", ")+"]"
+            when Array then "["+v.map{|w| "'#{w.to_s}'"}.join(", ")+"]"
             else "'#{v.to_s}'"
           end
           "'#{k}'=>#{v}"

diff --git a/lib/webmock/util/json.rb b/lib/webmock/util/json.rb
@@ -5,7 +5,7 @@ module Util
     class JSON
       def self.parse(json)
         YAML.load(unescape(convert_json_to_yaml(json)))
-      rescue ArgumentError => e
+      rescue ArgumentError
         raise ParseError, "Invalid JSON string"
       end