webmock 1.2.0 → 1.2.1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 #Changelog
 
+## 1.2.1
+
+* Changed license from GPL to MIT
+
+* Fixed gemspec file. Thanks to Razic
+
 ## 1.2.0 
 
 * RSpec 2 compatibility. Thanks to Sam Phillips!

data/LICENSE

@@ -1,281 +1,20 @@
-		    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 (c) 2009-2010 Bartosz Blimke
+
+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.md

@@ -11,7 +11,8 @@ Features
 * Matching requests based on method, URI, headers and body
 * Smart matching of the same URIs in different representations (also encoded and non encoded forms)
 * Smart matching of the same headers in different representations.
-* Support for Test::Unit and RSpec (and can be easily extended to other frameworks)
+* Support for Test::Unit
+* Support for RSpec 1.x and RSpec 2.x
 * Support for Net::HTTP and other http libraries based on Net::HTTP (i.e RightHttpConnection, rest-client, HTTParty)
 * Support for HTTPClient library (both sync and async requests)
 * Support for Patron library
@@ -26,13 +27,17 @@ In your `test/test_helper.rb` add these two lines:
 
     require 'webmock/test_unit'
 	
-	include WebMock
+	class Test::Unit::TestCase
+	  include WebMock
+	end
 
 or if you use RSpec add these lines to `spec/spec_helper`:
 
 	require 'webmock/rspec'
 
-	include WebMock
+	Spec::Runner.configure do |config|
+	  config.include WebMock
+	end
 
 You can also use WebMock without RSpec or Test::Unit support:
 
@@ -430,6 +435,9 @@ People who submitted patches and new features or suggested improvements. Many th
 * Tom Ward
 * Nadim Bitar
 * Myron Marston
+* Sam Phillips
+* Jose Angel Cortinas
+* Razic
 
 ## Background
 
@@ -440,4 +448,4 @@ I also preferred some things to work differently i.e request stub precedence.
 
 ## Copyright
 
-Copyright 2009-2010 Bartosz Blimke. See LICENSE for details.
+Copyright (c) 2009-2010 Bartosz Blimke. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -73,9 +73,9 @@ module Net  #:nodoc: all
 
 
     def connect_with_webmock
-      unless @@alredy_checked_for_net_http_replacement_libs ||= false
-        WebMock::NetHTTPUtility.puts_warning_for_net_http_replacement_libs_if_needed
-        @@alredy_checked_for_net_http_replacement_libs = true
+      unless @@alredy_checked_for_right_http_connection ||= false
+        WebMock::NetHTTPUtility.puts_warning_for_right_http_if_needed
+        @@alredy_checked_for_right_http_connection = true
       end
       nil
     end
@@ -124,7 +124,7 @@ module WebMock
       method = request.method.downcase.to_sym
 
       headers = Hash[*request.to_hash.map {|k,v| [k, v]}.inject([]) {|r,x| r + x}]
-       
+
       headers.reject! {|k,v| k =~ /[Aa]uthorization/ && v.first =~ /^Basic / } #we added it to url userinfo
 
 
@@ -143,26 +143,17 @@ module WebMock
     end
 
 
-    def self.record_loaded_net_http_replacement_libs
-      libs = {"RightHttpConnection" => defined?(RightHttpConnection)}
-      @loaded_net_http_replacement_libs = libs.map { |name, loaded| name if loaded }.compact
+    def self.check_right_http_connection
+      @was_right_http_connection_loaded = defined?(RightHttpConnection)
     end
 
-    def self.puts_warning_for_net_http_replacement_libs_if_needed
-      libs = {"RightHttpConnection" => defined?(RightHttpConnection)}
-      warnings = libs.select { |_, loaded| loaded }.
-        reject { |name, _| @loaded_net_http_replacement_libs.include?(name) }.
-        map do |name, _|
-        <<-TEXT.gsub(/ {10}/, '')
-        \e[1mWarning: #{name} was loaded after WebMock\e[0m
-          * WebMock's code is being ignored, because #{name} replaces parts of
-          Net::HTTP without deferring to other libraries. This will break Net::HTTP requests.
-          * To fix this, just reorder your requires so that #{name} is before WebMock.
-          TEXT
-        end
-        $stderr.puts "\n" + warnings.join("\n") + "\n" if warnings.any?
+    def self.puts_warning_for_right_http_if_needed
+      if !@was_right_http_connection_loaded && defined?(RightHttpConnection)
+        $stderr.puts "\nWarning: RightHttpConnection has to be required before WebMock is required !!!\n"
       end
     end
+
   end
+end
 
-  WebMock::NetHTTPUtility.record_loaded_net_http_replacement_libs
+WebMock::NetHTTPUtility.check_right_http_connection

data/spec/other_net_http_libs_spec.rb

@@ -23,7 +23,7 @@ describe "loading other Net::HTTP based libraries" do
   it "should requiring right http connection after webmock and then connecting prints warning" do
     additional_code = "Net::HTTP.start('example.com')"
     output = capture_output_from_requiring %w(webmock right_http_connection), additional_code
-    output.should match(%r(Warning: RightHttpConnection was loaded after WebMock))
+    output.should match(%r(Warning: RightHttpConnection has to be required before WebMock is required !!!))
   end
 
 end

data/spec/spec_helper.rb

@@ -13,6 +13,10 @@ require 'json'
 
 include WebMock
 
+Spec::Runner.configure do |config|
+   config.include WebMock
+end
+
 def fail()
   raise_error(Spec::Expectations::ExpectationNotMetError)
 end

data/test/test_helper.rb

@@ -5,9 +5,12 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'webmock/test_unit'
 require 'test/unit'
-include WebMock
 
-def assert_fail(message, &block)
-  e = assert_raise(AssertionFailedError, &block)
-  assert_equal(message, e.message)
-end
+class Test::Unit::TestCase
+  include WebMock
+
+  def assert_fail(message, &block)
+    e = assert_raise(AssertionFailedError, &block)
+    assert_equal(message, e.message)
+  end
+end

data/webmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmock}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bartosz Blimke"]
-  s.date = %q{2010-05-14}
+  s.date = %q{2010-05-24}
   s.description = %q{WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.}
   s.email = %q{bartosz.blimke@gmail.com}
   s.extra_rdoc_files = [
@@ -86,8 +86,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Library for stubbing HTTP requests in Ruby.}
   s.test_files = [
-    "spec/benchmark.rb",
-     "spec/httpclient_spec.rb",
+    "spec/httpclient_spec.rb",
      "spec/httpclient_spec_helper.rb",
      "spec/net_http_spec.rb",
      "spec/net_http_spec_helper.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 +01:00
+date: 2010-05-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -177,7 +177,6 @@ signing_key:
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.
 test_files: 
-- spec/benchmark.rb
 - spec/httpclient_spec.rb
 - spec/httpclient_spec_helper.rb
 - spec/net_http_spec.rb

data/spec/benchmark.rb

@@ -1,63 +0,0 @@
-require 'rubygems'
-require 'benchmark'
-require 'net/http'
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-def http_request
-  res = Net::HTTP.get_response(URI.parse('http://example.com'))
-  raise "Body should be 'Hello'" unless res.body == 'Hello'
-end
-
-# def fakeweb
-#   FakeWeb.register_uri(:get, 'http://example.com', :body => 'Hello')
-#   yield
-# ensure
-#   FakeWeb.clean_registry
-# end
-
-def webmock
-  WebMock.stub_request(:get, %r{http://example.com}).to_return(:body => 'Hello')
-  yield
-ensure
-  WebMock.reset_webmock
-end
-
-def perform_benchmark(name)
-  puts "\n\nBenchmarking #{name}:"
-  Benchmark.benchmark do |b|
-    %w(webmock).each do |type|
-      b.report(type) do
-        # this is a bit convoluted, but we want to ensure that each benchmark runs without the other library loaded,
-        # so we fork off a sub-process before requiring the libraries.
-        Process.fork do
-          require type
-          yield type
-        end
-        Process.wait
-      end
-    end
-  end
-end
-
-n = 5000 #*2*2
-# uri = Addressable::URI.heuristic_parse("http://www.example.com")
-perform_benchmark("Single setup/teardown") do |type|
-  send(type) { n.times { http_request } }
-  # (2*n).times { WebMock::Util::URI.normalize_uri("http://www.example.com") }
-end
-
-perform_benchmark("Setup/teardown for each http request") do |type|
-  n.times { send(type) { http_request } }
-   # WebMock::Util::URI.normalize_uri("http://www.example.com")
-end
-
-# Output on my machine:
-#
-# Benchmarking Single setup/teardown:
-# webmock  0.000000   0.000000  18.830000 ( 19.350281)
-# fakeweb  0.000000   0.000000   1.930000 (  2.049569)
-# 
-# 
-# Benchmarking Setup/teardown for each http request:
-# webmock  0.000000   0.000000  21.350000 ( 21.795557)
-# fakeweb  0.000000   0.000000   2.490000 (  2.707574)