fakeweb 1.2.2 → 1.2.3

data/CHANGELOG

@@ -1,3 +1,18 @@
+fakeweb (1.2.3)
+
+* fix the #http_version of :file and :string responses, which was returning the
+  request URI instead of something sensible like "1.0" [Chris Kampmeier]
+
+* add method aliases in the Net::HTTP patch to eliminate warnings when running
+  with -w [Joshua Clingenpeel]
+
+* fix that removing the redefinition of OpenURI::HTTPError in 1.2.0 caused
+  :exception responses to raise when OpenURI isn't available [Chris Kampmeier]
+
+* fix registering an :exception response with classes that require arguments for
+  instantiation, like Interrupt's subclasses [Chris Kampmeier]
+
+
 fakeweb (1.2.2)
 
 * fix that HTTP Digest and OAuth requests could raise URI::InvalidURIErrors

data/Rakefile

@@ -38,7 +38,7 @@ task :manifest do
 
   if spec_file
     spec = File.read spec_file
-    spec.gsub! /^(\s* s.(test_)?files \s* = \s* )( \[ [^\]]* \] | %w\( [^)]* \) )/mx do
+    spec.gsub!(/^(\s* s.(test_)?files \s* = \s* )( \[ [^\]]* \] | %w\( [^)]* \) )/mx) do
       assignment = $1
       bunch = $2 ? list.grep(/^test\//) : list
       '%s%%w(%s)' % [assignment, bunch.join(' ')]

data/lib/fake_web/ext/net_http.rb

@@ -5,6 +5,7 @@ require 'stringio'
 module Net  #:nodoc: all
 
   class BufferedIO
+    alias initialize_without_fakeweb initialize
     def initialize(io, debug_output = nil)
       @read_timeout = 60
       @rbuf = ''
@@ -25,13 +26,14 @@ module Net  #:nodoc: all
   end
 
   class HTTP
-    def self.socket_type
-      FakeWeb::StubSocket
+    class << self
+      alias socket_type_without_fakeweb socket_type
+      def socket_type
+        FakeWeb::StubSocket
+      end
     end
 
-    alias :original_net_http_request :request
-    alias :original_net_http_connect :connect
-
+    alias request_without_fakeweb request
     def request(request, body = nil, &block)
       protocol = use_ssl? ? "https" : "http"
 
@@ -51,14 +53,15 @@ module Net  #:nodoc: all
         @socket = Net::HTTP.socket_type.new
         FakeWeb.response_for(method, uri, &block)
       elsif FakeWeb.allow_net_connect?
-        original_net_http_connect
-        original_net_http_request(request, body, &block)
+        connect_without_fakeweb
+        request_without_fakeweb(request, body, &block)
       else
         raise FakeWeb::NetConnectNotAllowedError,
               "Real HTTP connections are disabled. Unregistered request: #{request.method} #{uri}"
       end
     end
 
+    alias connect_without_fakeweb connect
     def connect
     end
   end

data/lib/fake_web/responder.rb

@@ -15,7 +15,7 @@ module FakeWeb
         response = baked_response
       else
         code, msg = meta_information
-        response = Net::HTTPResponse.send(:response_class, code.to_s).new(uri, code.to_s, msg)
+        response = Net::HTTPResponse.send(:response_class, code.to_s).new("1.0", code.to_s, msg)
         response.instance_variable_set(:@body, content)
       end
 
@@ -82,13 +82,13 @@ module FakeWeb
 
     def optionally_raise(response)
       return unless options.has_key?(:exception)
-      ex_alloc = options[:exception].allocate
-      ex_instance = case ex_alloc
-      when Net::HTTPError, OpenURI::HTTPError
-        options[:exception].new('Exception from FakeWeb', response)
-      else options[:exception].new
+
+      case options[:exception].to_s
+      when "Net::HTTPError", "OpenURI::HTTPError"
+        raise options[:exception].new('Exception from FakeWeb', response)
+      else
+        raise options[:exception].new('Exception from FakeWeb')
       end
-      raise ex_instance
     end
 
     def meta_information

data/test/test_fake_web.rb

@@ -389,6 +389,13 @@ class TestFakeWeb < Test::Unit::TestCase
     end
   end
 
+  def test_raising_an_exception_that_requires_an_argument_to_instantiate
+    FakeWeb.register_uri(:get, "http://example.com/timeout.txt", :exception => Timeout::Error)
+    assert_raises(Timeout::Error) do
+      Net::HTTP.get(URI.parse("http://example.com/timeout.txt"))
+    end
+  end
+
   def test_mock_instance_syntax
     FakeWeb.register_uri('http://mock/test_example.txt', :file => File.dirname(__FILE__) + '/fixtures/test_example.txt')
     response = nil
@@ -497,4 +504,16 @@ class TestFakeWeb < Test::Unit::TestCase
       Net::HTTP.get(URI.parse("http://example.com"))
     end
   end
+
+  def test_http_version_from_string_response
+    FakeWeb.register_uri(:get, "http://example.com", :string => "example")
+    response = Net::HTTP.start("example.com") { |http| http.get("/") }
+    assert_equal "1.0", response.http_version
+  end
+
+  def test_http_version_from_file_response
+    FakeWeb.register_uri(:get, "http://example.com", :file => File.dirname(__FILE__) + '/fixtures/test_example.txt')
+    response = Net::HTTP.start("example.com") { |http| http.get("/") }
+    assert_equal "1.0", response.http_version
+  end
 end

data/test/test_missing_open_uri.rb

@@ -0,0 +1,24 @@
+require File.join(File.dirname(__FILE__), "test_helper")
+
+class TestMissingOpenURI < Test::Unit::TestCase
+
+  def setup
+    FakeWeb.clean_registry
+    @saved_open_uri = OpenURI
+    Object.send(:remove_const, :OpenURI)
+  end
+
+  def teardown
+    Object.const_set(:OpenURI, @saved_open_uri)
+  end
+
+
+  def test_register_using_exception_without_open_uri
+    # regression test for Responder needing OpenURI::HTTPError to be defined
+    FakeWeb.register_uri(:get, "http://example.com/", :exception => StandardError)
+    assert_raises(StandardError) do
+      Net::HTTP.start("example.com") { |http| http.get("/") }
+    end
+  end
+
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: fakeweb
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
-- Blaine Cook
 - Chris Kampmeier
+- Blaine Cook
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-05-04 00:00:00 -07:00
+date: 2009-05-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,8 +23,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.5
     version: 
-description: 
-email: chris@kampers.net
+description: FakeWeb is a helper for faking web requests in Ruby. It works at a global level, without modifying code or writing extensive stubs.
+email: 
+- chris@kampers.net
+- romeda@gmail.com
 executables: []
 
 extensions: []
@@ -55,6 +57,7 @@ files:
 - test/test_fake_web.rb
 - test/test_fake_web_open_uri.rb
 - test/test_helper.rb
+- test/test_missing_open_uri.rb
 - test/test_query_string.rb
 - test/test_trailing_slashes.rb
 has_rdoc: true
@@ -103,5 +106,6 @@ test_files:
 - test/test_fake_web.rb
 - test/test_fake_web_open_uri.rb
 - test/test_helper.rb
+- test/test_missing_open_uri.rb
 - test/test_query_string.rb
 - test/test_trailing_slashes.rb