fakeweb 1.2.7 → 1.2.8

data/.gitignore

@@ -4,3 +4,4 @@
 /coverage
 /pkg
 /.idea
+*.rbc

data/CHANGELOG

@@ -1,3 +1,12 @@
+fakeweb (1.2.8)
+
+* support Pathname objects where a filename is expected [Chris Kampmeier]
+
+* fix compatibility with Ruby 1.9.2 [Chris Kampmeier]
+
+* simplify storage of FakeWeb::VERSION [Josh Peek, Woody Peterson, Ben Woosley]
+
+
 fakeweb (1.2.7)
 
 * revert to sorting query params before matching requests against regexps,

data/README.rdoc

@@ -6,14 +6,11 @@ level, without modifying code or writing extensive stubs.
 
 == Installation
 
-The latest release of FakeWeb is once again available from your friendly
-RubyForge mirror. Just install the gem:
-
-  sudo gem install fakeweb
+  gem install fakeweb
 
 Note: the gem was previously available as +FakeWeb+ (capital letters), but now
 all versions are simply registered as +fakeweb+. If you have any old +FakeWeb+
-gems lying around, remove them: <tt>sudo gem uninstall FakeWeb</tt>
+gems lying around, remove them: <tt>gem uninstall FakeWeb</tt>
 
 
 == Help and discussion
@@ -29,7 +26,6 @@ The main source repository is http://github.com/chrisk/fakeweb.
 
 Start by requiring FakeWeb:
 
-  require 'rubygems'
   require 'fakeweb'
 
 === Registering basic string responses
@@ -45,6 +41,11 @@ Start by requiring FakeWeb:
 You can also call <tt>register_uri</tt> with a regular expression, to match
 more than one URI.
 
+  FakeWeb.register_uri(:get, %r|http://example\.com/|, :body => "Hello World!")
+
+  Net::HTTP.get(URI.parse("http://example.com/test3"))
+  => "Hello World!"
+
 === Replaying a recorded response
 
   page = `curl -is http://www.google.com/`
@@ -71,17 +72,17 @@ more than one URI.
 
 If you use the <tt>:any</tt> symbol, the URI you specify will be completely
 stubbed out (regardless of the HTTP method of the request). This can be useful
-for RPC-like services, where the HTTP method isn't significant. (Older
+for RPC-style services, where the HTTP method isn't significant. (Older
 versions of FakeWeb always behaved like this, and didn't accept the first
 +method+ argument above; this syntax is now deprecated.)
 
 === Rotating responses
 
-You can optionally call FakeWeb.register_uri with an array of options hashes;
-these are used, in order, to respond to repeated requests. Once you run out of
-responses, further requests always receive the last response. (You can also send
-a response more than once before rotating, by specifying a <tt>:times</tt>
-option for that response.)
+You can optionally call <tt>FakeWeb.register_uri</tt> with an array of options
+hashes; these are used, in order, to respond to repeated requests. Once you run
+out of responses, further requests always receive the last response. (You can
+also send a response more than once before rotating, by specifying a
+<tt>:times</tt> option for that response.)
 
   FakeWeb.register_uri(:delete, "http://example.com/posts/1",
                        [{:body => "Post 1 deleted.", :status => ["200", "OK"]},
@@ -95,8 +96,8 @@ option for that response.)
 
 === Using HTTP basic authentication
 
-You can stub requests that use basic authentication with +userinfo+ strings in
-the URIs:
+You can fake requests that use basic authentication by adding +userinfo+ strings
+to your URIs:
 
   FakeWeb.register_uri(:get, "http://example.com/secret", :body => "Unauthorized", :status => ["401", "Unauthorized"])
   FakeWeb.register_uri(:get, "http://user:pass@example.com/secret", :body => "Authorized")
@@ -110,9 +111,9 @@ the URIs:
 
 === Clearing registered URIs
 
-The FakeWeb registry is a singleton that lasts for the duration of your
-program, maintaining every fake response you register. If needed, you
-can clean out the registry and remove all registered URIs:
+The FakeWeb registry is a singleton that lasts for the duration of your program,
+maintaining every fake response you register. If needed, you can clean out the
+registry and remove all registered URIs:
 
   FakeWeb.clean_registry
 

data/Rakefile

@@ -1,9 +1,7 @@
-puts "Using ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
-
 require 'rubygems'
 require 'rake'
 
-version = File.read(File.join(File.dirname(__FILE__), "lib", "fake_web", "VERSION")).strip
+version = '1.2.8'
 
 begin
   require 'jeweler'
@@ -18,19 +16,15 @@ begin
     gem.homepage = "http://github.com/chrisk/fakeweb"
     gem.add_development_dependency "mocha", ">= 0.9.5"
   end
-  Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-    rubyforge.remote_doc_path = ""
-  end
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.test_files = FileList["test/**/*.rb"].exclude("test/test_helper.rb", "test/vendor")
+  test.libs << "test"
   test.verbose = false
   test.warning = true
 end
@@ -42,6 +36,7 @@ begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |t|
     t.test_files = FileList["test/**/*.rb"].exclude("test/test_helper.rb", "test/vendor")
+    t.libs << "test"
     t.rcov_opts << "--sort coverage"
     t.rcov_opts << "--exclude gems"
     t.warning = true
@@ -66,5 +61,5 @@ begin
   end
 rescue LoadError
   puts "\nIt looks like you're using an old version of RDoc, but FakeWeb requires a newer one."
-  puts "You can try upgrading with `sudo gem install rdoc`.\n\n"
+  puts "You can try upgrading with `gem install rdoc`.\n\n"
 end

data/fakeweb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fakeweb}
-  s.version = "1.2.7"
+  s.version = "1.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Kampmeier", "Blaine Cook"]
-  s.date = %q{2009-11-02}
+  s.date = %q{2009-12-25}
   s.description = %q{FakeWeb is a helper for faking web requests in Ruby. It works at a global level, without modifying code or writing extensive stubs.}
   s.email = ["chris@kampers.net", "romeda@gmail.com"]
   s.extra_rdoc_files = [
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "fakeweb.gemspec",
      "lib/fake_web.rb",
-     "lib/fake_web/VERSION",
      "lib/fake_web/ext/net_http.rb",
      "lib/fake_web/registry.rb",
      "lib/fake_web/responder.rb",
@@ -44,6 +43,7 @@ Gem::Specification.new do |s|
      "test/test_fake_web_open_uri.rb",
      "test/test_helper.rb",
      "test/test_missing_open_uri.rb",
+     "test/test_missing_pathname.rb",
      "test/test_other_net_http_libraries.rb",
      "test/test_precedence.rb",
      "test/test_query_string.rb",
@@ -87,6 +87,7 @@ Gem::Specification.new do |s|
      "test/test_fake_web_open_uri.rb",
      "test/test_helper.rb",
      "test/test_missing_open_uri.rb",
+     "test/test_missing_pathname.rb",
      "test/test_other_net_http_libraries.rb",
      "test/test_precedence.rb",
      "test/test_query_string.rb",

data/lib/fake_web.rb

@@ -13,7 +13,7 @@ FakeWeb::Utility.puts_warning_for_net_http_around_advice_libs_if_needed
 module FakeWeb
 
   # Returns the version string for the copy of FakeWeb you have loaded.
-  VERSION = File.read(File.join(File.dirname(__FILE__), "fake_web", "VERSION")).strip
+  VERSION = '1.2.8'
 
   # Resets the FakeWeb Registry. This will force all subsequent web requests to
   # behave as real requests.

data/lib/fake_web/registry.rb

@@ -19,29 +19,29 @@ module FakeWeb
     end
 
     def registered_uri?(method, uri)
-      !responses_for(method, uri).empty?
+      !responders_for(method, uri).empty?
     end
 
     def response_for(method, uri, &block)
-      responses = responses_for(method, uri)
-      return nil if responses.empty?
-
-      next_response = responses.last
-      responses.each do |response|
-        if response.times and response.times > 0
-          response.times -= 1
-          next_response = response
+      responders = responders_for(method, uri)
+      return nil if responders.empty?
+
+      next_responder = responders.last
+      responders.each do |responder|
+        if responder.times and responder.times > 0
+          responder.times -= 1
+          next_responder = responder
           break
         end
       end
 
-      next_response.response(&block)
+      next_responder.response(&block)
     end
 
 
     private
 
-    def responses_for(method, uri)
+    def responders_for(method, uri)
       uri = normalize_uri(uri)
 
       uri_map_matches(method, uri, URI) ||

data/lib/fake_web/responder.rb

@@ -47,6 +47,8 @@ module FakeWeb
     def body
       return '' unless options.has_key?(:body)
 
+      options[:body] = options[:body].to_s if defined?(Pathname) && options[:body].is_a?(Pathname)
+
       if !options[:body].include?("\0") && File.exists?(options[:body]) && !File.directory?(options[:body])
         File.read(options[:body])
       else
@@ -55,30 +57,31 @@ module FakeWeb
     end
 
     def baked_response
-      resp = case options[:response]
-      when Net::HTTPResponse then options[:response]
-      when String
-        socket = Net::BufferedIO.new(options[:response])
+      return options[:response] if options[:response].is_a?(Net::HTTPResponse)
+
+      if options[:response].is_a?(String) || (defined?(Pathname) && options[:response].is_a?(Pathname))
+        socket = Net::BufferedIO.new(options[:response].to_s)
         r = Net::HTTPResponse.read_new(socket)
 
-        # Store the oiriginal transfer-encoding
+        # Store the original transfer-encoding
         saved_transfer_encoding = r.instance_eval {
           @header['transfer-encoding'] if @header.key?('transfer-encoding')
         }
 
-        # read the body of response.
+        # Read the body of response
         r.instance_eval { @header['transfer-encoding'] = nil }
         r.reading_body(socket, true) {}
 
-        # Delete the transfer-encoding key from r.@header if there wasn't one,
-        # else restore the saved_transfer_encoding.
+        # Delete the transfer-encoding key from r.@header if there wasn't one;
+        # otherwise, restore the saved_transfer_encoding
         if saved_transfer_encoding.nil?
           r.instance_eval { @header.delete('transfer-encoding') }
         else
           r.instance_eval { @header['transfer-encoding'] = saved_transfer_encoding }
         end
         r
-      else raise StandardError, "Handler unimplemented for response #{options[:response]}"
+      else
+        raise StandardError, "Handler unimplemented for response #{options[:response]}"
       end
     end
 

data/lib/fake_web/utility.rb

@@ -7,7 +7,7 @@ module FakeWeb
 
     def self.encode_unsafe_chars_in_userinfo(userinfo)
       unsafe_in_userinfo = /[^#{URI::REGEXP::PATTERN::UNRESERVED};&=+$,]|^(#{URI::REGEXP::PATTERN::ESCAPED})/
-      userinfo.split(":").map { |part| URI.escape(part, unsafe_in_userinfo) }.join(":")
+      userinfo.split(":").map { |part| uri_escape(part, unsafe_in_userinfo) }.join(":")
     end
 
     def self.strip_default_port_from_uri(uri)
@@ -18,6 +18,16 @@ module FakeWeb
       end
     end
 
+    # Wrapper for URI escaping that switches between URI::Parser#escape and
+    # URI.escape for 1.9-compatibility
+    def self.uri_escape(*args)
+      if URI.const_defined?(:Parser)
+        URI::Parser.new.escape(*args)
+      else
+        URI.escape(*args)
+      end
+    end
+
     def self.puts_warning_for_net_http_around_advice_libs_if_needed
       libs = {"Samuel" => defined?(Samuel)}
       warnings = libs.select { |_, loaded| loaded }.map do |name, _|

data/test/test_allow_net_connect.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 class TestFakeWebAllowNetConnect < Test::Unit::TestCase
 

data/test/test_deprecations.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 class TestDeprecations < Test::Unit::TestCase
 
@@ -39,7 +39,7 @@ class TestDeprecations < Test::Unit::TestCase
 
   def test_register_uri_with_file_option_prints_deprecation_warning
     warning = capture_stderr do
-      FakeWeb.register_uri(:get, "http://example.com", :file => File.dirname(__FILE__) + '/fixtures/test_example.txt')
+      FakeWeb.register_uri(:get, "http://example.com", :file => fixture_path("test_example.txt"))
     end
     assert_match %r(deprecation warning: fakeweb's :file option)i, warning
   end

data/test/test_fake_authentication.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 class TestFakeAuthentication < Test::Unit::TestCase
 

data/test/test_fake_web.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 class TestFakeWeb < Test::Unit::TestCase
 
@@ -36,7 +36,7 @@ class TestFakeWeb < Test::Unit::TestCase
 
   def test_register_uri_without_domain_name
     assert_raises URI::InvalidURIError do
-      FakeWeb.register_uri(:get, 'test_example2.txt', File.dirname(__FILE__) + '/fixtures/test_example.txt')
+      FakeWeb.register_uri(:get, 'test_example2.txt', fixture_path("test_example.txt"))
     end
   end
 
@@ -122,7 +122,7 @@ class TestFakeWeb < Test::Unit::TestCase
   end
 
   def test_response_for_with_registered_uri
-    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => File.dirname(__FILE__) + '/fixtures/test_example.txt')
+    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => fixture_path("test_example.txt"))
     assert_equal 'test example content', FakeWeb.response_for(:get, 'http://mock/test_example.txt').body
   end
 
@@ -223,7 +223,7 @@ class TestFakeWeb < Test::Unit::TestCase
   end
 
   def test_mock_request_with_block
-    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => File.dirname(__FILE__) + '/fixtures/test_example.txt')
+    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => fixture_path("test_example.txt"))
     response = Net::HTTP.start('mock') { |http| http.get('/test_example.txt') }
     assert_equal 'test example content', response.body
   end
@@ -253,7 +253,7 @@ class TestFakeWeb < Test::Unit::TestCase
   end
 
   def test_mock_request_with_undocumented_full_uri_argument_style
-    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => File.dirname(__FILE__) + '/fixtures/test_example.txt')
+    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => fixture_path("test_example.txt"))
     response = Net::HTTP.start('mock') { |query| query.get('http://mock/test_example.txt') }
     assert_equal 'test example content', response.body
   end
@@ -265,7 +265,7 @@ class TestFakeWeb < Test::Unit::TestCase
   end
 
   def test_mock_post
-    FakeWeb.register_uri(:post, 'http://mock/test_example.txt', :body => File.dirname(__FILE__) + '/fixtures/test_example.txt')
+    FakeWeb.register_uri(:post, 'http://mock/test_example.txt', :body => fixture_path("test_example.txt"))
     response = Net::HTTP.start('mock') { |query| query.post('/test_example.txt', '') }
     assert_equal 'test example content', response.body
   end
@@ -284,14 +284,14 @@ class TestFakeWeb < Test::Unit::TestCase
   end
 
   def test_mock_get_with_request_from_file_as_registered_uri
-    FakeWeb.register_uri(:get, 'http://www.google.com/', :response => File.dirname(__FILE__) + '/fixtures/google_response_without_transfer_encoding')
+    FakeWeb.register_uri(:get, 'http://www.google.com/', :response => fixture_path("google_response_without_transfer_encoding"))
     response = Net::HTTP.start('www.google.com') { |query| query.get('/') }
     assert_equal '200', response.code
     assert response.body.include?('<title>Google</title>')
   end
 
   def test_mock_post_with_request_from_file_as_registered_uri
-    FakeWeb.register_uri(:post, 'http://www.google.com/', :response => File.dirname(__FILE__) + '/fixtures/google_response_without_transfer_encoding')
+    FakeWeb.register_uri(:post, 'http://www.google.com/', :response => fixture_path("google_response_without_transfer_encoding"))
     response = Net::HTTP.start('www.google.com') { |query| query.post('/', '') }
     assert_equal "200", response.code
     assert response.body.include?('<title>Google</title>')
@@ -408,7 +408,7 @@ class TestFakeWeb < Test::Unit::TestCase
   end
 
   def test_mock_instance_syntax
-    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => File.dirname(__FILE__) + '/fixtures/test_example.txt')
+    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => fixture_path("test_example.txt"))
     response = nil
     uri = URI.parse('http://mock/test_example.txt')
     http = Net::HTTP.new(uri.host, uri.port)
@@ -423,7 +423,7 @@ class TestFakeWeb < Test::Unit::TestCase
     response = nil
     proxy_address = nil
     proxy_port = nil
-    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => File.dirname(__FILE__) + '/fixtures/test_example.txt')
+    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => fixture_path("test_example.txt"))
     uri = URI.parse('http://mock/test_example.txt')
     http = Net::HTTP::Proxy(proxy_address, proxy_port).new(
               uri.host, (uri.port or 80))
@@ -451,7 +451,7 @@ class TestFakeWeb < Test::Unit::TestCase
 
   def test_mock_rotate_responses
     FakeWeb.register_uri(:get, 'http://mock/multiple_test_example.txt',
-                         [ {:body => File.dirname(__FILE__) + '/fixtures/test_example.txt', :times => 2},
+                         [ {:body => fixture_path("test_example.txt"), :times => 2},
                            {:body => "thrice", :times => 3},
                            {:body => "ever_more"} ])
 
@@ -462,28 +462,28 @@ class TestFakeWeb < Test::Unit::TestCase
   end
 
   def test_mock_request_using_response_with_transfer_encoding_header_has_valid_transfer_encoding_header
-    FakeWeb.register_uri(:get, 'http://www.google.com/', :response => File.dirname(__FILE__) + '/fixtures/google_response_with_transfer_encoding')
+    FakeWeb.register_uri(:get, 'http://www.google.com/', :response => fixture_path("google_response_with_transfer_encoding"))
     response = Net::HTTP.start('www.google.com') { |query| query.get('/') }
     assert_not_nil response['transfer-encoding']
     assert response['transfer-encoding'] == 'chunked'
   end
 
   def test_mock_request_using_response_without_transfer_encoding_header_does_not_have_a_transfer_encoding_header
-    FakeWeb.register_uri(:get, 'http://www.google.com/', :response => File.dirname(__FILE__) + '/fixtures/google_response_without_transfer_encoding')
+    FakeWeb.register_uri(:get, 'http://www.google.com/', :response => fixture_path("google_response_without_transfer_encoding"))
     response = nil
     response = Net::HTTP.start('www.google.com') { |query| query.get('/') }
     assert !response.key?('transfer-encoding')
   end
 
   def test_mock_request_using_response_from_curl_has_original_transfer_encoding_header
-    FakeWeb.register_uri(:get, 'http://www.google.com/', :response => File.dirname(__FILE__) + '/fixtures/google_response_from_curl')
+    FakeWeb.register_uri(:get, 'http://www.google.com/', :response => fixture_path("google_response_from_curl"))
     response = Net::HTTP.start('www.google.com') { |query| query.get('/') }
     assert_not_nil response['transfer-encoding']
     assert response['transfer-encoding'] == 'chunked'
   end
 
   def test_txt_file_should_have_three_lines
-    FakeWeb.register_uri(:get, 'http://www.google.com/', :body => File.dirname(__FILE__) + '/fixtures/test_txt_file')
+    FakeWeb.register_uri(:get, 'http://www.google.com/', :body => fixture_path("test_txt_file"))
     response = Net::HTTP.start('www.google.com') { |query| query.get('/') }
     assert response.body.split(/\n/).size == 3, "response has #{response.body.split(/\n/).size} lines should have 3"
   end
@@ -520,6 +520,20 @@ class TestFakeWeb < Test::Unit::TestCase
     assert_equal File.dirname(__FILE__), body
   end
 
+  def test_registering_with_a_body_pointing_to_a_pathname
+    path = Pathname.new(fixture_path("test_example.txt"))
+    FakeWeb.register_uri(:get, "http://example.com", :body => path)
+    response = Net::HTTP.start("example.com") { |http| http.get("/") }
+    assert_equal "test example content", response.body
+  end
+
+  def test_registering_with_a_response_pointing_to_a_pathname
+    path = Pathname.new(fixture_path("google_response_without_transfer_encoding"))
+    FakeWeb.register_uri(:get, "http://google.com", :response => path)
+    response = Net::HTTP.start("google.com") { |http| http.get("/") }
+    assert response.body.include?("<title>Google</title>")
+  end
+
   def test_http_version_from_string_response
     FakeWeb.register_uri(:get, "http://example.com", :body => "example")
     response = Net::HTTP.start("example.com") { |http| http.get("/") }
@@ -527,13 +541,13 @@ class TestFakeWeb < Test::Unit::TestCase
   end
 
   def test_http_version_from_file_response
-    FakeWeb.register_uri(:get, "http://example.com", :body => File.dirname(__FILE__) + '/fixtures/test_example.txt')
+    FakeWeb.register_uri(:get, "http://example.com", :body => fixture_path("test_example.txt"))
     response = Net::HTTP.start("example.com") { |http| http.get("/") }
     assert_equal "1.0", response.http_version
   end
 
   def test_version
-    assert_equal "1.2.7", FakeWeb::VERSION
+    assert_equal "1.2.8", FakeWeb::VERSION
   end
 
 end

data/test/test_fake_web_open_uri.rb

@@ -1,14 +1,14 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 class TestFakeWebOpenURI < Test::Unit::TestCase
 
   def test_content_for_registered_uri
-    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => File.dirname(__FILE__) + '/fixtures/test_example.txt')
+    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => fixture_path("test_example.txt"))
     assert_equal 'test example content', FakeWeb.response_for(:get, 'http://mock/test_example.txt').body
   end
   
   def test_mock_open
-    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => File.dirname(__FILE__) + '/fixtures/test_example.txt')
+    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => fixture_path("test_example.txt"))
     assert_equal 'test example content', open('http://mock/test_example.txt').read
   end
   
@@ -51,7 +51,7 @@ class TestFakeWebOpenURI < Test::Unit::TestCase
   end
 
   def test_mock_open_with_block
-    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => File.dirname(__FILE__) + '/fixtures/test_example.txt')
+    FakeWeb.register_uri(:get, 'http://mock/test_example.txt', :body => fixture_path("test_example.txt"))
     body = open('http://mock/test_example.txt') { |f| f.readlines }
     assert_equal 'test example content', body.first
   end

data/test/test_helper.rb

@@ -1,8 +1,8 @@
-$:.unshift "#{File.dirname(__FILE__)}/../lib"
-
 require 'test/unit'
 require 'open-uri'
+require 'pathname'
 require 'fake_web'
+require 'rbconfig'
 require 'rubygems'
 require 'mocha'
 
@@ -25,6 +25,10 @@ end
 
 module FakeWebTestHelper
 
+  def fixture_path(basename)
+    "test/fixtures/#{basename}"
+  end
+
   def capture_stderr
     $stderr = StringIO.new
     yield
@@ -33,6 +37,12 @@ module FakeWebTestHelper
     $stderr = STDERR
   end
 
+  # The path to the current ruby interpreter. Adapted from Rake's FileUtils.
+  def ruby_path
+    ext = ((RbConfig::CONFIG['ruby_install_name'] =~ /\.(com|cmd|exe|bat|rb|sh)$/) ? "" : RbConfig::CONFIG['EXEEXT'])
+    File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'] + ext).sub(/.*\s.*/m, '"\&"')
+  end
+
   # Sets several expectations (using Mocha) that a real HTTP request makes it
   # past FakeWeb to the socket layer. You can use this when you need to check
   # that a request isn't handled by FakeWeb.
@@ -57,7 +67,8 @@ module FakeWebTestHelper
     request_parts = ["#{options[:method]} #{options[:path]} HTTP/1.1", "Host: #{options[:host]}"]
     socket.expects(:write).with(all_of(includes(request_parts[0]), includes(request_parts[1]))).returns(100)
 
-    socket.expects(:sysread).at_least_once.returns("HTTP/1.1 #{options[:response_code]} #{options[:response_message]}\nContent-Length: #{options[:response_body].length}\n\n#{options[:response_body]}").then.raises(EOFError)
+    read_method = RUBY_VERSION >= "1.9.2" ? :read_nonblock : :sysread
+    socket.expects(read_method).at_least_once.returns("HTTP/1.1 #{options[:response_code]} #{options[:response_message]}\nContent-Length: #{options[:response_body].length}\n\n#{options[:response_body]}").then.raises(EOFError)
   end
 
 

data/test/test_missing_open_uri.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 class TestMissingOpenURI < Test::Unit::TestCase
 

data/test/test_missing_pathname.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class TestMissingPathname < Test::Unit::TestCase
+
+  def setup
+    super
+    @saved_pathname = Pathname
+    Object.send(:remove_const, :Pathname)
+  end
+
+  def teardown
+    super
+    Object.const_set(:Pathname, @saved_pathname)
+  end
+
+  # FakeWeb supports using Pathname objects where filenames are expected, but
+  # Pathname isn't required to use FakeWeb. Make sure everything still works
+  # when Pathname isn't in use.
+
+  def test_register_using_body_without_pathname
+    FakeWeb.register_uri(:get, "http://example.com/", :body => fixture_path("test_example.txt"))
+    Net::HTTP.start("example.com") { |http| http.get("/") }
+  end
+
+  def test_register_using_response_without_pathname
+    FakeWeb.register_uri(:get, "http://example.com/", :response => fixture_path("google_response_without_transfer_encoding"))
+    Net::HTTP.start("example.com") { |http| http.get("/") }
+  end
+
+  def test_register_using_unsupported_response_without_pathname
+    FakeWeb.register_uri(:get, "http://example.com/", :response => 1)
+    assert_raise StandardError do
+      Net::HTTP.start("example.com") { |http| http.get("/") }
+    end
+  end
+
+end

data/test/test_other_net_http_libraries.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 class TestOtherNetHttpLibraries < Test::Unit::TestCase
 
@@ -8,8 +8,7 @@ class TestOtherNetHttpLibraries < Test::Unit::TestCase
     vendor_dirs = Dir["#{File.dirname(__FILE__)}/vendor/*/lib"]
     load_path_opts = vendor_dirs.unshift(fakeweb_dir).map { |dir| "-I#{dir}" }.join(" ")
 
-    # TODO: use the same Ruby executable that this test was invoked with
-    `ruby #{load_path_opts} -e "#{requires}; #{additional_code}" 2>&1`
+    `#{ruby_path} #{load_path_opts} -e "#{requires}; #{additional_code}" 2>&1`
   end
 
   def test_requiring_samuel_before_fakeweb_prints_warning

data/test/test_precedence.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 class TestPrecedence < Test::Unit::TestCase
 

data/test/test_query_string.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 class TestFakeWebQueryString < Test::Unit::TestCase
 

data/test/test_regexes.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 class TestRegexes < Test::Unit::TestCase
 

data/test/test_response_headers.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 class TestResponseHeaders < Test::Unit::TestCase
 
@@ -23,7 +23,7 @@ class TestResponseHeaders < Test::Unit::TestCase
   end
 
   def test_cookies_when_registering_with_file_and_set_cookie_header
-    FakeWeb.register_uri(:get, "http://example.com/", :body => File.dirname(__FILE__) + '/fixtures/test_example.txt',
+    FakeWeb.register_uri(:get, "http://example.com/", :body => fixture_path("test_example.txt"),
                                                       :set_cookie => "user_id=1; example=yes")
     response = Net::HTTP.start("example.com") { |query| query.get("/") }
     assert_equal "test example content", response.body

data/test/test_trailing_slashes.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 class TestFakeWebTrailingSlashes < Test::Unit::TestCase
 

data/test/test_utility.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 class TestUtility < Test::Unit::TestCase
 
@@ -67,4 +67,10 @@ class TestUtility < Test::Unit::TestCase
     assert_equal uri, FakeWeb::Utility.strip_default_port_from_uri(uri)
   end
 
+  def test_uri_escape_delegates_to_uri_parser_when_available
+    parsing_object = URI.const_defined?(:Parser) ? URI::Parser.any_instance : URI
+    parsing_object.expects(:escape).with("string", /unsafe/).returns("escaped")
+    assert_equal "escaped", FakeWeb::Utility.uri_escape("string", /unsafe/)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fakeweb
 version: !ruby/object:Gem::Version 
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors: 
 - Chris Kampmeier
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -08:00
+date: 2009-12-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,6 @@ files:
 - Rakefile
 - fakeweb.gemspec
 - lib/fake_web.rb
-- lib/fake_web/VERSION
 - lib/fake_web/ext/net_http.rb
 - lib/fake_web/registry.rb
 - lib/fake_web/responder.rb
@@ -62,6 +61,7 @@ files:
 - test/test_fake_web_open_uri.rb
 - test/test_helper.rb
 - test/test_missing_open_uri.rb
+- test/test_missing_pathname.rb
 - test/test_other_net_http_libraries.rb
 - test/test_precedence.rb
 - test/test_query_string.rb
@@ -126,6 +126,7 @@ test_files:
 - test/test_fake_web_open_uri.rb
 - test/test_helper.rb
 - test/test_missing_open_uri.rb
+- test/test_missing_pathname.rb
 - test/test_other_net_http_libraries.rb
 - test/test_precedence.rb
 - test/test_query_string.rb

data/lib/fake_web/VERSION

@@ -1 +0,0 @@
-1.2.7