fakeweb 1.2.0 → 1.2.1

data/CHANGELOG

@@ -1,3 +1,17 @@
+fakeweb (1.2.1)
+
+* fix that query parameters are handled correctly when registering with a URI
+  object [Anselmo Alves, Chris Kampmeier]
+
+* fix an exception when registering with the :response option and a string
+  containing "\0" [Jonathan Baudanza, Chris Kampmeier]
+
+* fix that trailing slashes were considered significant for requests to the root
+  of a domain [Chris Kampmeier]
+
+* add support for HTTP basic authentication via userinfo strings in URIs
+  [Michael Bleigh]
+
 fakeweb (1.2.0)
 
 * add lib/fakeweb.rb so you can require "fakeweb" as well [Chris Kampmeier]

data/README.rdoc

@@ -11,6 +11,10 @@ RubyForge mirror. Just install the gem:
 
   sudo 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>
+
 
 == Help and discussion
 
@@ -19,6 +23,7 @@ RDocs for the current release are available at http://fakeweb.rubyforge.org.
 There's a mailing list for questions and discussion at
 http://groups.google.com/group/fakeweb-users.
 
+The main source repository is http://github.com/chrisk/fakeweb.
 
 == Examples
 
@@ -86,6 +91,21 @@ option for that response.)
     req.delete("/posts/1").body  # => "Post not found"
   end
 
+=== Using HTTP basic authentication
+
+You can stub requests that use basic authentication with +userinfo+ strings in
+the URIs:
+
+  FakeWeb.register_uri("http://example.com/secret", :string => "Unauthorized", :status => ["401", "Unauthorized"])
+  FakeWeb.register_uri("http://user:pass@example.com/secret", :string => "Authorized")
+
+  Net::HTTP.start("example.com") do |http|
+    req = Net::HTTP::Get.new("/secret")
+    http.request(req)  # => "Unauthorized"
+    req.basic_auth("user", "pass")
+    http.request(req)  # => "Authorized"
+  end
+
 === Clearing registered URIs
 
 The FakeWeb registry is a singleton that lasts for the duration of your
@@ -159,4 +179,4 @@ Copyright 2008-2009 various contributors
   with FakeWeb; if not, write to the Free Software Foundation, Inc., 51
   Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-See <tt>LICENSE.txt</tt> for the full terms.
+See <tt>LICENSE.txt</tt> for the full terms.

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'rake/gempackagetask'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
@@ -7,7 +8,7 @@ task :default => :test
 desc "Run All Tests"
 Rake::TestTask.new :test do |test|
   test.test_files = ["test/**/*.rb"]
-  test.verbose = true
+  test.verbose = false
 end
 
 desc "Generate Documentation"
@@ -60,4 +61,10 @@ else
     t.rcov_opts << "--exclude gems"
     t.rcov_opts << "--no-validator-links"
   end
-end
+end
+
+spec = eval(File.read(File.join(File.dirname(__FILE__), "fakeweb.gemspec")))
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.need_tar_gz = true
+  pkg.need_zip    = true
+end

data/lib/fake_web/ext/net_http.rb

@@ -14,7 +14,11 @@ module Net  #:nodoc: all
       when Socket, OpenSSL::SSL::SSLSocket, IO
         io
       when String
-        File.exists?(io) ? File.open(io, "r") : StringIO.new(io)
+        if !io.include?("\0") && File.exists?(io)
+          File.open(io, "r")
+        else
+          StringIO.new(io)
+        end
       end
       raise "Unable to create local socket" unless @io
     end
@@ -34,7 +38,13 @@ module Net  #:nodoc: all
       path = request.path
       path = URI.parse(request.path).request_uri if request.path =~ /^http/
 
-      uri = "#{protocol}://#{self.address}:#{self.port}#{path}"
+      if request['authorization'].nil?
+        userinfo = ""
+      else
+        userinfo = request['authorization'].sub(/^Basic /, "").unpack("m").first + "@"
+      end
+
+      uri = "#{protocol}://#{userinfo}#{self.address}:#{self.port}#{path}"
       method = request.method.downcase.to_sym
 
       if FakeWeb.registered_uri?(method, uri)
@@ -53,4 +63,4 @@ module Net  #:nodoc: all
     end
   end
 
-end
+end

data/lib/fake_web/registry.rb

@@ -56,14 +56,15 @@ module FakeWeb
     private
 
     def normalize_uri(uri)
-      case uri
-      when URI then uri
-      else
-        uri = 'http://' + uri unless uri.match('^https?://')
-        parsed_uri = URI.parse(uri)
-        parsed_uri.query = sort_query_params(parsed_uri.query)
-        parsed_uri
-      end
+      normalized_uri =
+        case uri
+        when URI then uri
+        else
+          uri = 'http://' + uri unless uri.match('^https?://')
+          URI.parse(uri)
+        end
+      normalized_uri.query = sort_query_params(normalized_uri.query)
+      normalized_uri.normalize
     end
 
     def sort_query_params(query)

data/test/test_fake_authentication.rb

@@ -0,0 +1,44 @@
+require File.join(File.dirname(__FILE__), "test_helper")
+
+class TestFakeAuthentication < Test::Unit::TestCase
+  def setup
+    FakeWeb.register_uri('http://user:pass@mock/auth.txt', :string => 'authorized')
+    FakeWeb.register_uri('http://user2:pass@mock/auth.txt', :string => 'wrong user')
+    FakeWeb.register_uri('http://mock/auth.txt', :string => 'unauthorized')
+  end
+
+  def test_register_uri_with_authentication
+    FakeWeb.register_uri('http://user:pass@mock/test_example.txt', :string => "example")
+    assert FakeWeb.registered_uri?('http://user:pass@mock/test_example.txt')
+  end
+
+  def test_register_uri_with_authentication_doesnt_trigger_without
+    FakeWeb.register_uri('http://user:pass@mock/test_example.txt', :string => "example")
+    assert !FakeWeb.registered_uri?('http://mock/test_example.txt')
+  end
+
+  def test_register_uri_with_authentication_doesnt_trigger_with_incorrect_credentials
+    FakeWeb.register_uri('http://user:pass@mock/test_example.txt', :string => "example")
+    assert !FakeWeb.registered_uri?('http://user:wrong@mock/test_example.txt')
+  end
+
+  def test_unauthenticated_request
+    http = Net::HTTP.new('mock', 80)
+    req = Net::HTTP::Get.new('/auth.txt')
+    assert_equal http.request(req).body, 'unauthorized'
+  end
+
+  def test_authenticated_request
+    http = Net::HTTP.new('mock',80)
+    req = Net::HTTP::Get.new('/auth.txt')
+    req.basic_auth 'user', 'pass'
+    assert_equal http.request(req).body, 'authorized'
+  end
+
+  def test_incorrectly_authenticated_request
+    http = Net::HTTP.new('mock',80)
+    req = Net::HTTP::Get.new('/auth.txt')
+    req.basic_auth 'user2', 'pass'
+    assert_equal http.request(req).body, 'wrong user'
+  end
+end

data/test/test_fake_web.rb

@@ -486,4 +486,15 @@ class TestFakeWeb < Test::Unit::TestCase
   def test_requiring_fakeweb_instead_of_fake_web
     require "fakeweb"
   end
+
+  def test_registering_using_response_with_string_containing_null_byte
+    # Regression test for File.exists? raising an ArgumentError ("string
+    # contains null byte") since :response first tries to find by filename.
+    # The string should be treated as a response body, instead, and an
+    # EOFError is raised when the byte is encountered.
+    FakeWeb.register_uri("http://example.com", :response => "test\0test")
+    assert_raise EOFError do
+      Net::HTTP.get(URI.parse("http://example.com"))
+    end
+  end
 end

data/test/test_query_string.rb

@@ -6,24 +6,36 @@ class TestFakeWebQueryString < Test::Unit::TestCase
     FakeWeb.clean_registry
   end
 
-  def test_register_uri_with_query_params
+  def test_register_uri_string_with_query_params
     FakeWeb.register_uri('http://example.com/?a=1&b=1', :string => 'foo')
     assert FakeWeb.registered_uri?('http://example.com/?a=1&b=1')
+
+    FakeWeb.register_uri(URI.parse("http://example.org/?a=1&b=1"), :string => "foo")
+    assert FakeWeb.registered_uri?("http://example.org/?a=1&b=1")
   end
 
   def test_register_uri_with_query_params_and_check_in_different_order
     FakeWeb.register_uri('http://example.com/?a=1&b=1', :string => 'foo')
     assert FakeWeb.registered_uri?('http://example.com/?b=1&a=1')
+
+    FakeWeb.register_uri(URI.parse('http://example.org/?a=1&b=1'), :string => 'foo')
+    assert FakeWeb.registered_uri?('http://example.org/?b=1&a=1')
   end
 
   def test_registered_uri_gets_recognized_with_empty_query_params
     FakeWeb.register_uri('http://example.com/', :string => 'foo')
     assert FakeWeb.registered_uri?('http://example.com/?')
+
+    FakeWeb.register_uri(URI.parse('http://example.org/'), :string => 'foo')
+    assert FakeWeb.registered_uri?('http://example.org/?')
   end
 
   def test_register_uri_with_empty_query_params_and_check_with_none
     FakeWeb.register_uri('http://example.com/?', :string => 'foo')
     assert FakeWeb.registered_uri?('http://example.com/')
+
+    FakeWeb.register_uri(URI.parse('http://example.org/?'), :string => 'foo')
+    assert FakeWeb.registered_uri?('http://example.org/')
   end
 
   def test_registry_sort_query_params

data/test/test_trailing_slashes.rb

@@ -0,0 +1,62 @@
+require File.join(File.dirname(__FILE__), "test_helper")
+
+class TestFakeWebTrailingSlashes < Test::Unit::TestCase
+
+  def setup
+    FakeWeb.clean_registry
+    @original_allow_net_connect = FakeWeb.allow_net_connect?
+  end
+
+  def teardown
+    FakeWeb.allow_net_connect = @old_allow_net_conncet
+  end
+
+  def test_registering_root_without_slash_and_ask_predicate_method_with_slash
+    FakeWeb.register_uri(:get, "http://www.example.com", :string => "root")
+    assert FakeWeb.registered_uri?(:get, "http://www.example.com/")
+  end
+
+  def test_registering_root_without_slash_and_request
+    FakeWeb.register_uri(:get, "http://www.example.com", :string => "root")
+    response = Net::HTTP.start("www.example.com") { |query| query.get('/') }
+    assert_equal "root", response.body
+  end
+
+  def test_registering_root_with_slash_and_ask_predicate_method_without_slash
+    FakeWeb.register_uri(:get, "http://www.example.com/", :string => "root")
+    assert FakeWeb.registered_uri?(:get, "http://www.example.com")
+  end
+
+  def test_registering_root_with_slash_and_request
+    FakeWeb.register_uri(:get, "http://www.example.com/", :string => "root")
+    response = Net::HTTP.start("www.example.com") { |query| query.get('/') }
+    assert_equal "root", response.body
+  end
+
+  def test_registering_path_without_slash_and_ask_predicate_method_with_slash
+    FakeWeb.register_uri(:get, "http://www.example.com/users", :string => "User list")
+    assert !FakeWeb.registered_uri?(:get, "http://www.example.com/users/")
+  end
+
+  def test_registering_path_without_slash_and_request_with_slash
+    FakeWeb.allow_net_connect = false
+    FakeWeb.register_uri(:get, "http://www.example.com/users", :string => "User list")
+    assert_raise FakeWeb::NetConnectNotAllowedError do
+      response = Net::HTTP.start("www.example.com") { |query| query.get('/users/') }
+    end
+  end
+
+  def test_registering_path_with_slash_and_ask_predicate_method_without_slash
+    FakeWeb.register_uri(:get, "http://www.example.com/users/", :string => "User list")
+    assert !FakeWeb.registered_uri?(:get, "http://www.example.com/users")
+  end
+
+  def test_registering_path_with_slash_and_request_without_slash
+    FakeWeb.allow_net_connect = false
+    FakeWeb.register_uri(:get, "http://www.example.com/users/", :string => "User list")
+    assert_raise FakeWeb::NetConnectNotAllowedError do
+      response = Net::HTTP.start("www.example.com") { |query| query.get('/users') }
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fakeweb
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Blaine Cook
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-07 00:00:00 -08:00
+date: 2009-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,10 +56,12 @@ files:
 - test/fixtures/test_example.txt
 - test/fixtures/test_txt_file
 - test/test_allow_net_connect.rb
+- test/test_fake_authentication.rb
 - test/test_fake_web.rb
 - test/test_fake_web_open_uri.rb
 - test/test_helper.rb
 - test/test_query_string.rb
+- test/test_trailing_slashes.rb
 has_rdoc: true
 homepage: http://github.com/chrisk/fakeweb
 post_install_message: 
@@ -89,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fakeweb
-rubygems_version: 1.3.1
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: A tool for faking responses to HTTP requests
@@ -101,7 +103,9 @@ test_files:
 - test/fixtures/test_example.txt
 - test/fixtures/test_txt_file
 - test/test_allow_net_connect.rb
+- test/test_fake_authentication.rb
 - test/test_fake_web.rb
 - test/test_fake_web_open_uri.rb
 - test/test_helper.rb
 - test/test_query_string.rb
+- test/test_trailing_slashes.rb