fakeweb 1.2.8 → 1.3.0

data/.autotest

@@ -0,0 +1,5 @@
+Autotest.add_hook :initialize do |autotest|
+  %w(.git vendor).each do |directory|
+    autotest.add_exception(directory)
+  end
+end

data/CHANGELOG

@@ -1,3 +1,19 @@
+fakeweb (1.3.0)
+
+* improve response header registration so you can pass an array to set a header
+  more than once [Myron Marston]
+
+* fix an exception when the response's :body option was set to nil [Chris Zingel]
+
+* fix that stubbed requests weren't mutating the Net::HTTP request object to set
+  the body and content-length, like real requests do [Chris Kampmeier]
+
+* add FakeWeb.last_request [Chris Kampmeier]
+
+* assigning a String or Regexp to FakeWeb.allow_net_connect= sets a whitelist
+  for outbound requests [Dan Dofter, Tim Carey-Smith, Ben Woosley]
+
+
 fakeweb (1.2.8)
 
 * support Pathname objects where a filename is expected [Chris Kampmeier]

data/LICENSE.txt

@@ -1,281 +1,19 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
+Copyright 2006-2010 Blaine Cook, Chris Kampmeier, and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.rdoc

@@ -131,9 +131,18 @@ behavior, which is to pass those requests through to Net::HTTP as usual).
   Net::HTTP.get(URI.parse("http://example.com/"))
   => FakeWeb is bypassed and the response from a real request is returned
 
-This is handy when you want to make sure your tests are self-contained, or you
-want to catch the scenario when a URI is changed in implementation code
-without a corresponding test change.
+It's recommended that you set <tt>FakeWeb.allow_net_connect = false</tt> in the
+setup for your tests.
+
+==== Allowing requests to a specific server
+
+If you want to prevent your tests from hitting the internet while allowing
+access to a specific server for integration testing, you can assign a URI or
++Regexp+ to be used as a whitelist for outbound requests:
+
+  FakeWeb.allow_net_connect = %r[^https?://localhost]
+  Net::HTTP.get(URI.parse("http://localhost/path"))  # => allowed
+  Net::HTTP.get(URI.parse("http://example.com/"))    # => raises FakeWeb::NetConnectNotAllowedError
 
 === Specifying HTTP response headers
 
@@ -145,6 +154,15 @@ simply add the header as an option to +register_uri+:
 
 This sets the "Content-Type" header in the response.
 
+=== Checking the last request
+
+It's often useful to retrieve the last request made by your code, so you can
+write tests for its content. FakeWeb keeps track of the last request, whether it
+was stubbed or not:
+
+  Net::HTTP.get(URI.parse("http://example.com"))
+  FakeWeb.last_request  # => Net::HTTP::Get request object
+
 == More info
 
 FakeWeb lets you decouple your test environment from live services without
@@ -169,26 +187,3 @@ like OpenURI, as well as a ton of libraries for popular web services.
   change to add support for request bodies in 1.3.0. Your input would be really
   helpful: see http://groups.google.com/group/fakeweb-users/browse_thread/thread/44d190a6b12e4273
   for a discussion of some different options. Thanks!
-
-
-== Copyright
-
-Copyright 2006-2007 Blaine Cook
-
-Copyright 2008-2009 various contributors
-
-  FakeWeb is free software; you can redistribute it and/or modify it under the
-  terms of the GNU General Public License as published by the Free Software
-  Foundation; either version 2 of the License, or (at your option) any later
-  version.
-
-  FakeWeb is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-  details.
-
-  You should have received a copy of the GNU General Public License along
-  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.

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake'
 
-version = '1.2.8'
+version = '1.3.0'
 
 begin
   require 'jeweler'
@@ -52,14 +52,16 @@ end
 
 
 begin
+  require 'sdoc'
   require 'rdoc/task'
   Rake::RDocTask.new do |rdoc|
     rdoc.main = "README.rdoc"
     rdoc.rdoc_files.include("README.rdoc", "CHANGELOG", "LICENSE.txt", "lib/*.rb")
     rdoc.title = "FakeWeb #{version} API Documentation"
-    rdoc.options << '--line-numbers' << '--charset' << 'utf-8'
+    rdoc.rdoc_dir = "doc"
+    rdoc.template = "direct"
+    rdoc.options << "--line-numbers" << "--show-hash" << "--charset=utf-8"
   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 `gem install rdoc`.\n\n"
+  puts "SDoc (or a dependency) not available. Install it with: gem install sdoc"
 end

data/fakeweb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fakeweb}
-  s.version = "1.2.8"
+  s.version = "1.3.0"
 
   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-12-25}
+  s.date = %q{2010-08-22}
   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 = [
@@ -17,7 +17,8 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
+    ".autotest",
+     ".gitignore",
      "CHANGELOG",
      "LICENSE.txt",
      "README.rdoc",
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
      "test/test_fake_web.rb",
      "test/test_fake_web_open_uri.rb",
      "test/test_helper.rb",
+     "test/test_last_request.rb",
      "test/test_missing_open_uri.rb",
      "test/test_missing_pathname.rb",
      "test/test_other_net_http_libraries.rb",
@@ -77,7 +79,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fakeweb}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A tool for faking responses to HTTP requests}
   s.test_files = [
     "test/test_allow_net_connect.rb",
@@ -86,6 +88,7 @@ Gem::Specification.new do |s|
      "test/test_fake_web.rb",
      "test/test_fake_web_open_uri.rb",
      "test/test_helper.rb",
+     "test/test_last_request.rb",
      "test/test_missing_open_uri.rb",
      "test/test_missing_pathname.rb",
      "test/test_other_net_http_libraries.rb",
@@ -111,7 +114,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<mocha>, [">= 0.9.5"])
     else
       s.add_dependency(%q<mocha>, [">= 0.9.5"])

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 = '1.2.8'
+  VERSION = '1.3.0'
 
   # Resets the FakeWeb Registry. This will force all subsequent web requests to
   # behave as real requests.
@@ -33,8 +33,20 @@ module FakeWeb
   #
   # When <tt>FakeWeb.allow_net_connect = true</tt> (the default), requests to
   # URIs not stubbed with FakeWeb are passed through to Net::HTTP.
+  #
+  # If you assign a +String+, +URI+, or +Regexp+ object, unstubbed requests
+  # will be allowed if they match that value. This is useful when you want to
+  # allow access to a local server for integration testing, while still
+  # preventing your tests from using the internet.
   def self.allow_net_connect=(allowed)
-    @allow_net_connect = allowed
+    case allowed
+    when String, URI, Regexp
+      @allow_all_connections = false
+      Registry.instance.register_passthrough_uri(allowed)
+    else
+      @allow_all_connections = allowed
+      Registry.instance.remove_passthrough_uri
+    end
   end
 
   # Enable pass-through to Net::HTTP by default.
@@ -43,8 +55,17 @@ module FakeWeb
   # Returns +true+ if requests to URIs not registered with FakeWeb are passed
   # through to Net::HTTP for normal processing (the default). Returns +false+
   # if an exception is raised for these requests.
-  def self.allow_net_connect?
-    @allow_net_connect
+  #
+  # If you've assigned a +String+, +URI+, or +Regexp+ to
+  # <tt>FakeWeb.allow_net_connect=</tt>, you must supply a URI to check
+  # against that filter. Otherwise, an ArgumentError will be raised.
+  def self.allow_net_connect?(uri = nil)
+    if Registry.instance.passthrough_uri_map.any?
+      raise ArgumentError, "You must supply a URI to test" if uri.nil?
+      Registry.instance.passthrough_uri_matches?(uri)
+    else
+      @allow_all_connections
+    end
   end
 
   # This exception is raised if you set <tt>FakeWeb.allow_net_connect =
@@ -74,7 +95,7 @@ module FakeWeb
   #   as the body of the response instead. (This used to be two options,
   #   <tt>:string</tt> and <tt>:file</tt>, respectively. These are now deprecated.)
   # <tt>:response</tt>:: 
-  #   Either an <tt>Net::HTTPResponse</tt>, an +IO+, or a +String+ which is used
+  #   Either a <tt>Net::HTTPResponse</tt>, an +IO+, or a +String+ which is used
   #   as the full response for the request.
   # 
   #   The easier way by far is to pass the <tt>:response</tt> option to
@@ -85,41 +106,47 @@ module FakeWeb
   # 
   #   To obtain a complete response document, you can use the +curl+ command,
   #   like so:
-  #  
-  #     curl -i http://www.example.com/ > response_for_www.example.com
+  #   
+  #     curl -i http://example.com > response_from_example.com
   #
   #   which can then be used in your test environment like so:
   #
-  #     FakeWeb.register_uri(:get, 'http://www.example.com/', :response => 'response_for_www.example.com')
+  #     FakeWeb.register_uri(:get, "http://example.com", :response => "response_from_example.com")
   #
   #   See the <tt>Net::HTTPResponse</tt>
   #   documentation[http://ruby-doc.org/stdlib/libdoc/net/http/rdoc/classes/Net/HTTPResponse.html]
   #   for more information on creating custom response objects.
   # 
   # +options+ may also be an +Array+ containing a list of the above-described
-  # +Hash+. In this case, FakeWeb will rotate through each provided response,
-  # you may optionally provide:
+  # +Hash+. In this case, FakeWeb will rotate through each response. You can
+  # optionally repeat a response more than once before rotating:
   #
   # <tt>:times</tt>::
-  #   The number of times this response will be used. Decremented by one each time it's called.
-  #   FakeWeb will use the final provided request indefinitely, regardless of its :times parameter.
-  # 
+  #   The number of times this response will be used before moving on to the
+  #   next one. The last response will be repeated indefinitely, regardless of
+  #   its <tt>:times</tt> parameter.
+  #
   # Two optional arguments are also accepted:
   #
   # <tt>:status</tt>::
   #   Passing <tt>:status</tt> as a two-value array will set the response code
   #   and message. The defaults are <tt>200</tt> and <tt>OK</tt>, respectively.
   #   Example:
-  #     FakeWeb.register_uri("http://www.example.com/", :body => "Go away!", :status => [404, "Not Found"])
+  #     FakeWeb.register_uri(:get, "http://example.com", :body => "Go away!", :status => [404, "Not Found"])
   # <tt>:exception</tt>::
   #   The argument passed via <tt>:exception</tt> will be raised when the
   #   specified URL is requested. Any +Exception+ class is valid. Example:
-  #     FakeWeb.register_uri('http://www.example.com/', :exception => Net::HTTPError)
+  #     FakeWeb.register_uri(:get, "http://example.com", :exception => Net::HTTPError)
   #
   # If you're using the <tt>:body</tt> response type, you can pass additional
   # options to specify the HTTP headers to be used in the response. Example:
   #
   #   FakeWeb.register_uri(:get, "http://example.com/index.txt", :body => "Hello", :content_type => "text/plain")
+  #
+  # You can also pass an array of header values to include a header in the
+  # response more than once:
+  #
+  #   FakeWeb.register_uri(:get, "http://example.com", :set_cookie => ["name=value", "example=1"])
   def self.register_uri(*args)
     case args.length
     when 3
@@ -152,7 +179,7 @@ module FakeWeb
   #   FakeWeb.registered_uri?(method, uri)
   #
   # Returns true if a +method+ request for +uri+ is registered with FakeWeb.
-  # Specify a method of <tt>:any</tt> to check for against all HTTP methods.
+  # Specify a method of <tt>:any</tt> to check against all HTTP methods.
   def self.registered_uri?(*args)
     case args.length
     when 2
@@ -165,6 +192,15 @@ module FakeWeb
     end
   end
 
+  # Returns the request object from the last request made via Net::HTTP.
+  def self.last_request
+    @last_request
+  end
+
+  def self.last_request=(request) #:nodoc:
+    @last_request = request
+  end
+
   private
 
   def self.print_missing_http_method_deprecation_warning(*args)

data/lib/fake_web/ext/net_http.rb

@@ -36,25 +36,16 @@ module Net  #:nodoc: all
     end
 
     def request_with_fakeweb(request, body = nil, &block)
-      protocol = use_ssl? ? "https" : "http"
+      FakeWeb.last_request = request
 
-      path = request.path
-      path = URI.parse(request.path).request_uri if request.path =~ /^http/
-
-      if request["authorization"] =~ /^Basic /
-        userinfo = FakeWeb::Utility.decode_userinfo_from_header(request["authorization"])
-        userinfo = FakeWeb::Utility.encode_unsafe_chars_in_userinfo(userinfo) + "@"
-      else
-        userinfo = ""
-      end
-
-      uri = "#{protocol}://#{userinfo}#{self.address}:#{self.port}#{path}"
+      uri = FakeWeb::Utility.request_uri_as_string(self, request)
       method = request.method.downcase.to_sym
 
       if FakeWeb.registered_uri?(method, uri)
         @socket = Net::HTTP.socket_type.new
+        FakeWeb::Utility.produce_side_effects_of_net_http_request(request, body)
         FakeWeb.response_for(method, uri, &block)
-      elsif FakeWeb.allow_net_connect?
+      elsif FakeWeb.allow_net_connect?(uri)
         connect_without_fakeweb
         request_without_fakeweb(request, body, &block)
       else

data/lib/fake_web/registry.rb

@@ -2,7 +2,7 @@ module FakeWeb
   class Registry #:nodoc:
     include Singleton
 
-    attr_accessor :uri_map
+    attr_accessor :uri_map, :passthrough_uri_map
 
     def initialize
       clean_registry
@@ -38,23 +38,36 @@ module FakeWeb
       next_responder.response(&block)
     end
 
+    def register_passthrough_uri(uri)
+      self.passthrough_uri_map = {normalize_uri(uri) => {:any => true}}
+    end
+
+    def remove_passthrough_uri
+      self.passthrough_uri_map = {}
+    end
+
+    def passthrough_uri_matches?(uri)
+      uri = normalize_uri(uri)
+      uri_map_matches(passthrough_uri_map, :any, uri, URI) ||
+      uri_map_matches(passthrough_uri_map, :any, uri, Regexp)
+    end
 
     private
 
     def responders_for(method, uri)
       uri = normalize_uri(uri)
 
-      uri_map_matches(method, uri, URI) ||
-      uri_map_matches(:any,   uri, URI) ||
-      uri_map_matches(method, uri, Regexp) ||
-      uri_map_matches(:any,   uri, Regexp) ||
+      uri_map_matches(uri_map, method, uri, URI) ||
+      uri_map_matches(uri_map, :any,   uri, URI) ||
+      uri_map_matches(uri_map, method, uri, Regexp) ||
+      uri_map_matches(uri_map, :any,   uri, Regexp) ||
       []
     end
 
-    def uri_map_matches(method, uri, type_to_check = URI)
+    def uri_map_matches(map, method, uri, type_to_check = URI)
       uris_to_check = variations_of_uri_as_strings(uri)
 
-      matches = uri_map.select { |registered_uri, method_hash|
+      matches = map.select { |registered_uri, method_hash|
         registered_uri.is_a?(type_to_check) && method_hash.has_key?(method)
       }.select { |registered_uri, method_hash|
         if type_to_check == URI

data/lib/fake_web/responder.rb

@@ -23,7 +23,13 @@ module FakeWeb
         code, msg = meta_information
         response = Net::HTTPResponse.send(:response_class, code.to_s).new("1.0", code.to_s, msg)
         response.instance_variable_set(:@body, body)
-        headers_extracted_from_options.each { |name, value| response[name] = value }
+        headers_extracted_from_options.each do |name, value|
+          if value.respond_to?(:each)
+            value.each { |v| response.add_field(name, v) }
+          else
+            response[name] = value
+          end
+        end
       end
 
       response.instance_variable_set(:@read, true)
@@ -45,7 +51,7 @@ module FakeWeb
     end
 
     def body
-      return '' unless options.has_key?(:body)
+      return '' if options[:body].nil?
 
       options[:body] = options[:body].to_s if defined?(Pathname) && options[:body].is_a?(Pathname)
 

data/lib/fake_web/utility.rb

@@ -18,6 +18,23 @@ module FakeWeb
       end
     end
 
+    # Returns a string with a normalized version of a Net::HTTP request's URI.
+    def self.request_uri_as_string(net_http, request)
+      protocol = net_http.use_ssl? ? "https" : "http"
+
+      path = request.path
+      path = URI.parse(request.path).request_uri if request.path =~ /^http/
+
+      if request["authorization"] =~ /^Basic /
+        userinfo = FakeWeb::Utility.decode_userinfo_from_header(request["authorization"])
+        userinfo = FakeWeb::Utility.encode_unsafe_chars_in_userinfo(userinfo) + "@"
+      else
+        userinfo = ""
+      end
+
+      uri = "#{protocol}://#{userinfo}#{net_http.address}:#{net_http.port}#{path}"
+    end
+
     # Wrapper for URI escaping that switches between URI::Parser#escape and
     # URI.escape for 1.9-compatibility
     def self.uri_escape(*args)
@@ -28,6 +45,11 @@ module FakeWeb
       end
     end
 
+    def self.produce_side_effects_of_net_http_request(request, body)
+      request.set_body_internal(body)
+      request.content_length = request.body.length unless request.body.nil?
+    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,7 +1,6 @@
 require 'test_helper'
 
 class TestFakeWebAllowNetConnect < Test::Unit::TestCase
-
   def test_unregistered_requests_are_passed_through_when_allow_net_connect_is_true
     FakeWeb.allow_net_connect = true
     setup_expectations_for_real_apple_hot_news_request
@@ -10,11 +9,72 @@ class TestFakeWebAllowNetConnect < Test::Unit::TestCase
 
   def test_raises_for_unregistered_requests_when_allow_net_connect_is_false
     FakeWeb.allow_net_connect = false
-    exception = assert_raise FakeWeb::NetConnectNotAllowedError do
+    assert_raise FakeWeb::NetConnectNotAllowedError do
       Net::HTTP.get(URI.parse("http://example.com/"))
     end
   end
 
+  def test_unregistered_requests_are_passed_through_when_allow_net_connect_is_the_same_string
+    FakeWeb.allow_net_connect = "http://images.apple.com/main/rss/hotnews/hotnews.rss"
+    setup_expectations_for_real_apple_hot_news_request
+    Net::HTTP.get(URI.parse("http://images.apple.com/main/rss/hotnews/hotnews.rss"))
+  end
+
+  def test_unregistered_requests_are_passed_through_when_allow_net_connect_is_the_same_string_with_default_port
+    FakeWeb.allow_net_connect = "http://images.apple.com:80/main/rss/hotnews/hotnews.rss"
+    setup_expectations_for_real_apple_hot_news_request
+    Net::HTTP.get(URI.parse("http://images.apple.com/main/rss/hotnews/hotnews.rss"))
+  end
+
+  def test_unregistered_requests_are_passed_through_when_allow_net_connect_is_the_same_uri
+    FakeWeb.allow_net_connect = URI.parse("http://images.apple.com/main/rss/hotnews/hotnews.rss")
+    setup_expectations_for_real_apple_hot_news_request
+    Net::HTTP.get(URI.parse("http://images.apple.com/main/rss/hotnews/hotnews.rss"))
+  end
+
+  def test_unregistered_requests_are_passed_through_when_allow_net_connect_is_a_matching_regexp
+    FakeWeb.allow_net_connect = %r[^http://images\.apple\.com]
+    setup_expectations_for_real_apple_hot_news_request
+    Net::HTTP.get(URI.parse("http://images.apple.com/main/rss/hotnews/hotnews.rss"))
+  end
+
+  def test_raises_for_unregistered_requests_when_allow_net_connect_is_a_different_string
+    FakeWeb.allow_net_connect = "http://example.com"
+    assert_raise FakeWeb::NetConnectNotAllowedError do
+      Net::HTTP.get(URI.parse("http://example.com/path"))
+    end
+  end
+
+  def test_raises_for_unregistered_requests_when_allow_net_connect_is_a_different_uri
+    FakeWeb.allow_net_connect = URI.parse("http://example.com")
+    assert_raise FakeWeb::NetConnectNotAllowedError do
+      Net::HTTP.get(URI.parse("http://example.com/path"))
+    end
+  end
+
+  def test_raises_for_unregistered_requests_when_allow_net_connect_is_a_non_matching_regexp
+    FakeWeb.allow_net_connect = %r[example\.net]
+    assert_raise FakeWeb::NetConnectNotAllowedError do
+      Net::HTTP.get(URI.parse("http://example.com"))
+    end
+  end
+
+  def test_changing_allow_net_connect_from_string_to_false_corretly_removes_whitelist
+    FakeWeb.allow_net_connect = "http://example.com"
+    FakeWeb.allow_net_connect = false
+    assert_raise FakeWeb::NetConnectNotAllowedError do
+      Net::HTTP.get(URI.parse("http://example.com"))
+    end
+  end
+
+  def test_changing_allow_net_connect_from_true_to_string_corretly_limits_connections
+    FakeWeb.allow_net_connect = true
+    FakeWeb.allow_net_connect = "http://example.com"
+    assert_raise FakeWeb::NetConnectNotAllowedError do
+      Net::HTTP.get(URI.parse("http://example.net"))
+    end
+  end
+
   def test_exception_message_includes_unregistered_request_method_and_uri_but_no_default_port
     FakeWeb.allow_net_connect = false
     exception = assert_raise FakeWeb::NetConnectNotAllowedError do
@@ -70,6 +130,29 @@ class TestFakeWebAllowNetConnect < Test::Unit::TestCase
     assert !FakeWeb.allow_net_connect?
   end
 
+  def test_question_mark_method_raises_with_no_argument_when_allow_net_connect_is_a_whitelist
+    FakeWeb.allow_net_connect = "http://example.com"
+    exception = assert_raise ArgumentError do
+      FakeWeb.allow_net_connect?
+    end
+    assert_equal "You must supply a URI to test", exception.message
+  end
+
+  def test_question_mark_method_returns_true_when_argument_is_same_uri_as_allow_net_connect_string
+    FakeWeb.allow_net_connect = "http://example.com"
+    assert FakeWeb.allow_net_connect?("http://example.com/")
+  end
+
+  def test_question_mark_method_returns_true_when_argument_matches_allow_net_connect_regexp
+    FakeWeb.allow_net_connect = %r[^https?://example.com/]
+    assert FakeWeb.allow_net_connect?("http://example.com/path")
+    assert FakeWeb.allow_net_connect?("https://example.com:443/")
+  end
+
+  def test_question_mark_method_returns_false_when_argument_does_not_match_allow_net_connect_regexp
+    FakeWeb.allow_net_connect = %r[^http://example.com/]
+    assert !FakeWeb.allow_net_connect?("http://example.com:8080")
+  end
 end
 
 

data/test/test_fake_web.rb

@@ -276,6 +276,37 @@ class TestFakeWeb < Test::Unit::TestCase
     assert_equal 'foo', response.body
   end
 
+  def test_mock_post_with_body_sets_the_request_body
+    FakeWeb.register_uri(:post, "http://example.com/posts", :status => [201, "Created"])
+    http = Net::HTTP.new("example.com")
+    request = Net::HTTP::Post.new("/posts")
+    http.request(request, "title=Test")
+    assert_equal "title=Test", request.body
+    assert_equal 10, request.content_length
+  end
+
+  def test_mock_post_with_body_using_other_syntax_sets_the_request_body
+    FakeWeb.register_uri(:post, "http://example.com/posts", :status => [201, "Created"])
+    http = Net::HTTP.new("example.com")
+    request = Net::HTTP::Post.new("/posts")
+    request.body = "title=Test"
+    http.request(request)
+    assert_equal "title=Test", request.body
+    assert_equal 10, request.content_length
+  end
+
+  def test_real_post_with_body_sets_the_request_body
+    FakeWeb.allow_net_connect = true
+    setup_expectations_for_real_apple_hot_news_request :method => "POST",
+      :path => "/posts", :request_body => "title=Test"
+    http = Net::HTTP.new("images.apple.com")
+    request = Net::HTTP::Post.new("/posts")
+    request["Content-Type"] = "application/x-www-form-urlencoded"
+    http.request(request, "title=Test")
+    assert_equal "title=Test", request.body
+    assert_equal 10, request.content_length
+  end
+
   def test_mock_get_with_request_as_registered_uri
     fake_response = Net::HTTPOK.new('1.1', '200', 'OK')
     FakeWeb.register_uri(:get, 'http://mock/test_response', :response => fake_response)
@@ -323,6 +354,12 @@ class TestFakeWeb < Test::Unit::TestCase
     end
   end
 
+  def test_specifying_nil_for_body
+    FakeWeb.register_uri(:head, "http://example.com", :body => nil)
+    response = Net::HTTP.start("example.com") { |query| query.head("/") }
+    assert_equal "", response.body
+  end
+
   def test_real_http_request
     FakeWeb.allow_net_connect = true
     setup_expectations_for_real_apple_hot_news_request
@@ -547,7 +584,7 @@ class TestFakeWeb < Test::Unit::TestCase
   end
 
   def test_version
-    assert_equal "1.2.8", FakeWeb::VERSION
+    assert_equal "1.3.0", FakeWeb::VERSION
   end
 
 end

data/test/test_helper.rb

@@ -56,7 +56,7 @@ module FakeWebTestHelper
       socket.expects(:connect).with().at_least_once
     else
       socket = mock("TCPSocket")
-      Socket.expects(:===).with(socket).returns(true)
+      Socket.expects(:===).with(socket).at_least_once.returns(true)
     end
 
     TCPSocket.expects(:open).with(options[:host], options[:port]).returns(socket).at_least_once
@@ -66,6 +66,9 @@ module FakeWebTestHelper
     # Request/response handling
     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)
+    if !options[:request_body].nil?
+      socket.expects(:write).with(options[:request_body]).returns(100)
+    end
 
     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)

data/test/test_last_request.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class TestLastRequest < Test::Unit::TestCase
+
+  def test_last_request_returns_correct_net_http_request_class
+    FakeWeb.register_uri(:get, "http://example.com", :status => [200, "OK"])
+    Net::HTTP.start("example.com") { |http| http.get("/") }
+    assert_instance_of Net::HTTP::Get, FakeWeb.last_request
+  end
+
+  def test_last_request_has_correct_method_path_and_body_for_get
+    FakeWeb.register_uri(:get, "http://example.com", :status => [200, "OK"])
+    Net::HTTP.start("example.com") { |http| http.get("/") }
+    assert_equal "GET", FakeWeb.last_request.method
+    assert_equal "/", FakeWeb.last_request.path
+    assert_nil FakeWeb.last_request.body
+    assert_nil FakeWeb.last_request.content_length
+  end
+
+  def test_last_request_has_correct_method_path_and_body_for_post
+    FakeWeb.register_uri(:post, "http://example.com/posts", :status => [201, "Created"])
+    Net::HTTP.start("example.com") { |http| http.post("/posts", "title=Test") }
+    assert_equal "POST", FakeWeb.last_request.method
+    assert_equal "/posts", FakeWeb.last_request.path
+    assert_equal "title=Test", FakeWeb.last_request.body
+    assert_equal 10, FakeWeb.last_request.content_length
+  end
+
+end

data/test/test_response_headers.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class TestResponseHeaders < Test::Unit::TestCase
-
   def test_content_type_when_registering_with_string_and_content_type_header_as_symbol_option
     FakeWeb.register_uri(:get, "http://example.com/users.json", :body => '[{"username": "chrisk"}]', :content_type => "application/json")
     response = Net::HTTP.start("example.com") { |query| query.get("/users.json") }
@@ -30,6 +29,13 @@ class TestResponseHeaders < Test::Unit::TestCase
     assert_equal "user_id=1; example=yes", response['Set-Cookie']
   end
 
+  def test_multiple_set_cookie_headers
+    FakeWeb.register_uri(:get, "http://example.com", :set_cookie => ["user_id=1", "example=yes"])
+    response = Net::HTTP.start("example.com") { |query| query.get("/") }
+    assert_equal ["user_id=1", "example=yes"], response.get_fields('Set-Cookie')
+    assert_equal "user_id=1, example=yes", response['Set-Cookie']
+  end
+
   def test_registering_with_baked_response_ignores_header_options
     fake_response = Net::HTTPOK.new('1.1', '200', 'OK')
     fake_response["Server"] = "Apache/1.3.27 (Unix)"

data/test/test_utility.rb

@@ -67,6 +67,13 @@ class TestUtility < Test::Unit::TestCase
     assert_equal uri, FakeWeb::Utility.strip_default_port_from_uri(uri)
   end
 
+  def test_request_uri_as_string
+    http = Net::HTTP.new("www.example.com", 80)
+    request = Net::HTTP::Get.new("/index.html")
+    expected = "http://www.example.com:80/index.html"
+    assert_equal expected, FakeWeb::Utility.request_uri_as_string(http, request)
+  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")

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fakeweb
 version: !ruby/object:Gem::Version 
-  version: 1.2.8
+  hash: 27
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Chris Kampmeier
@@ -10,19 +16,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-25 00:00:00 -05:00
+date: 2010-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 9
+        - 5
         version: 0.9.5
-    version: 
+  type: :development
+  version_requirements: *id001
 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
@@ -35,6 +47,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files: 
+- .autotest
 - .gitignore
 - CHANGELOG
 - LICENSE.txt
@@ -60,6 +73,7 @@ files:
 - test/test_fake_web.rb
 - test/test_fake_web_open_uri.rb
 - test/test_helper.rb
+- test/test_last_request.rb
 - test/test_missing_open_uri.rb
 - test/test_missing_pathname.rb
 - test/test_other_net_http_libraries.rb
@@ -100,21 +114,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: fakeweb
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A tool for faking responses to HTTP requests
@@ -125,6 +145,7 @@ test_files:
 - test/test_fake_web.rb
 - test/test_fake_web_open_uri.rb
 - test/test_helper.rb
+- test/test_last_request.rb
 - test/test_missing_open_uri.rb
 - test/test_missing_pathname.rb
 - test/test_other_net_http_libraries.rb