webmock 0.7.1 → 0.7.2

data/test/test_webmock.rb

@@ -4,13 +4,18 @@ require 'ostruct'
  
 class TestWebMock < Test::Unit::TestCase
     
-  def http_request(method, url, options = {})
-    url = URI.parse(url)
+  def http_request(method, uri, options = {})
+    begin
+      uri = URI.parse(uri)
+    rescue
+      uri = Addressable::URI.heuristic_parse(uri)
+    end
     response = nil
     clazz = Net::HTTP.const_get("#{method.to_s.capitalize}")
-    req = clazz.new(url.path, options[:headers])
-    http = Net::HTTP.new(url.host, url.port)
-    http.use_ssl = true if url.scheme == "https"
+    req = clazz.new("#{uri.path}#{uri.query ? '?' : ''}#{uri.query}", options[:headers])
+    req.basic_auth uri.user, uri.password if uri.user
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true if uri.scheme == "https"
     response = http.start {|http|
       http.request(req, options[:body])
     }
@@ -18,7 +23,7 @@ class TestWebMock < Test::Unit::TestCase
       :body => response.body,
       :headers => response,
       :status => response.code })
-  end  
+  end
 
   
   def setup

data/webmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmock}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bartosz Blimke"]
-  s.date = %q{2009-11-20}
+  s.date = %q{2009-11-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 = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "CHANGELOG",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -34,23 +35,30 @@ Gem::Specification.new do |s|
      "lib/webmock/request_execution_verifier.rb",
      "lib/webmock/request_profile.rb",
      "lib/webmock/request_registry.rb",
+     "lib/webmock/request_signature.rb",
      "lib/webmock/request_stub.rb",
      "lib/webmock/response.rb",
-     "lib/webmock/url.rb",
+     "lib/webmock/rspec.rb",
+     "lib/webmock/test_unit.rb",
      "lib/webmock/util/hash_counter.rb",
-     "lib/webmock/utility.rb",
+     "lib/webmock/util/headers.rb",
+     "lib/webmock/util/uri.rb",
      "lib/webmock/webmock.rb",
      "spec/net_http_spec.rb",
      "spec/other_net_http_libs_spec.rb",
      "spec/request_execution_verifier_spec.rb",
      "spec/request_profile_spec.rb",
      "spec/request_registry_spec.rb",
+     "spec/request_signature_spec.rb",
      "spec/request_stub_spec.rb",
      "spec/response_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/util/hash_counter_spec.rb",
-     "spec/utility_spec.rb",
+     "spec/util/headers_spec.rb",
+     "spec/util/uri_spec.rb",
+     "spec/vendor/addressable/lib/addressable/uri.rb",
+     "spec/vendor/addressable/lib/uri.rb",
      "spec/vendor/right_http_connection-1.2.4/History.txt",
      "spec/vendor/right_http_connection-1.2.4/Manifest.txt",
      "spec/vendor/right_http_connection-1.2.4/README.txt",
@@ -88,11 +96,15 @@ Gem::Specification.new do |s|
      "spec/request_execution_verifier_spec.rb",
      "spec/request_profile_spec.rb",
      "spec/request_registry_spec.rb",
+     "spec/request_signature_spec.rb",
      "spec/request_stub_spec.rb",
      "spec/response_spec.rb",
      "spec/spec_helper.rb",
      "spec/util/hash_counter_spec.rb",
-     "spec/utility_spec.rb",
+     "spec/util/headers_spec.rb",
+     "spec/util/uri_spec.rb",
+     "spec/vendor/addressable/lib/addressable/uri.rb",
+     "spec/vendor/addressable/lib/uri.rb",
      "spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb",
      "spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb",
      "spec/vendor/right_http_connection-1.2.4/setup.rb",
@@ -113,11 +125,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<addressable>, [">= 2.1.1"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
+      s.add_dependency(%q<addressable>, [">= 2.1.1"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
+    s.add_dependency(%q<addressable>, [">= 2.1.1"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 +00:00
+date: 2009-11-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: addressable
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development
@@ -33,6 +43,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- CHANGELOG
 - LICENSE
 - README.md
 - Rakefile
@@ -49,23 +60,30 @@ files:
 - lib/webmock/request_execution_verifier.rb
 - lib/webmock/request_profile.rb
 - lib/webmock/request_registry.rb
+- lib/webmock/request_signature.rb
 - lib/webmock/request_stub.rb
 - lib/webmock/response.rb
-- lib/webmock/url.rb
+- lib/webmock/rspec.rb
+- lib/webmock/test_unit.rb
 - lib/webmock/util/hash_counter.rb
-- lib/webmock/utility.rb
+- lib/webmock/util/headers.rb
+- lib/webmock/util/uri.rb
 - lib/webmock/webmock.rb
 - spec/net_http_spec.rb
 - spec/other_net_http_libs_spec.rb
 - spec/request_execution_verifier_spec.rb
 - spec/request_profile_spec.rb
 - spec/request_registry_spec.rb
+- spec/request_signature_spec.rb
 - spec/request_stub_spec.rb
 - spec/response_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/util/hash_counter_spec.rb
-- spec/utility_spec.rb
+- spec/util/headers_spec.rb
+- spec/util/uri_spec.rb
+- spec/vendor/addressable/lib/addressable/uri.rb
+- spec/vendor/addressable/lib/uri.rb
 - spec/vendor/right_http_connection-1.2.4/History.txt
 - spec/vendor/right_http_connection-1.2.4/Manifest.txt
 - spec/vendor/right_http_connection-1.2.4/README.txt
@@ -125,11 +143,15 @@ test_files:
 - spec/request_execution_verifier_spec.rb
 - spec/request_profile_spec.rb
 - spec/request_registry_spec.rb
+- spec/request_signature_spec.rb
 - spec/request_stub_spec.rb
 - spec/response_spec.rb
 - spec/spec_helper.rb
 - spec/util/hash_counter_spec.rb
-- spec/utility_spec.rb
+- spec/util/headers_spec.rb
+- spec/util/uri_spec.rb
+- spec/vendor/addressable/lib/addressable/uri.rb
+- spec/vendor/addressable/lib/uri.rb
 - spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb
 - spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb
 - spec/vendor/right_http_connection-1.2.4/setup.rb

data/lib/webmock/url.rb

@@ -1,46 +0,0 @@
-module WebMock
-
-  class URL
-
-    def self.normalize_uri(uri)
-      return uri if uri.is_a?(Regexp)
-      normalized_uri =
-      case uri
-      when URI then uri
-      when String
-        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 self.variations_of_uri_as_strings(uri_object)
-      normalized_uri = normalize_uri(uri_object.dup)
-      normalized_uri_string = normalized_uri.to_s
-
-      variations = [normalized_uri_string]
-
-      # if the port is implied in the original, add a copy with an explicit port
-      if normalized_uri.default_port == normalized_uri.port
-        variations << normalized_uri_string.sub(
-          /#{Regexp.escape(normalized_uri.request_uri)}$/,
-          ":#{normalized_uri.port}#{normalized_uri.request_uri}")
-      end
-
-      variations
-    end
-
-    private
-
-    def self.sort_query_params(query)
-      if query.nil? || query.empty?
-        nil
-      else
-        query.split('&').sort.join('&')
-      end
-    end
-
-  end
-
-end

data/lib/webmock/utility.rb

@@ -1,65 +0,0 @@
-#This file is taken from FakeWeb (fakeweb.rubyforge.org/) and adopted
-
-module WebMock
-  module Utility #:nodoc:
-
-    def self.decode_userinfo_from_header(header)
-      header.sub(/^Basic /, "").unpack("m").first
-    end
-
-    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(":")
-    end
-
-    def self.strip_default_port_from_uri(uri)
-      case uri
-      when %r{^http://}  then uri.sub(%r{:80(/|$)}, '\1')
-      when %r{^https://} then uri.sub(%r{:443(/|$)}, '\1')
-      else uri
-      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, _|
-        <<-TEXT.gsub(/ {10}/, '')
-          \e[1mWarning: WebMock was loaded after #{name}\e[0m
-          * #{name}'s code is being ignored when a request is handled by WebMock,
-            because both libraries work by patching Net::HTTP.
-          * To fix this, just reorder your requires so that WebMock is before #{name}.
-        TEXT
-      end
-      $stderr.puts "\n" + warnings.join("\n") + "\n" if warnings.any?
-    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
-    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?
-    end
-
-    def self.normalize_headers(headers)
-      return nil unless headers
-      array = headers.map { |name, value|
-        [name.to_s.split(/_|-/).map { |segment| segment.capitalize }.join("-"), value.to_s]
-      }
-      Hash[*array.flatten]
-    end
-
-  end
-end

data/spec/utility_spec.rb

@@ -1,70 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe Utility do
-
-  it "should decode_userinfo_from_header handles basic auth" do
-    authorization_header = "Basic dXNlcm5hbWU6c2VjcmV0"
-    userinfo = Utility.decode_userinfo_from_header(authorization_header)
-    userinfo.should == "username:secret"
-  end
-
-  it "should encode unsafe chars in userinfo does not encode userinfo safe punctuation" do
-    userinfo = "user;&=+$,:secret"
-    userinfo.should == Utility.encode_unsafe_chars_in_userinfo(userinfo)
-  end
-
-  it "should encode unsafe chars in userinfo does not encode rfc 3986 unreserved characters" do
-    userinfo = "-.!~*'()abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:secret"
-    userinfo.should == Utility.encode_unsafe_chars_in_userinfo(userinfo)
-  end
-
-  it "should encode unsafe chars in userinfo does encode other characters" do
-    userinfo, safe_userinfo = 'us#rn@me:sec//ret?"', 'us%23rn%40me:sec%2F%2Fret%3F%22'
-    safe_userinfo.should == Utility.encode_unsafe_chars_in_userinfo(userinfo)
-  end
-
-  it "should strip_default_port_from_uri strips 80 from http with path" do
-    uri = "http://example.com:80/foo/bar"
-    stripped_uri = Utility.strip_default_port_from_uri(uri)
-    stripped_uri.should ==  "http://example.com/foo/bar"
-  end
-
-  it "should strip_default_port_from_uri strips 80 from http without path" do
-    uri = "http://example.com:80"
-    stripped_uri = Utility.strip_default_port_from_uri(uri)
-    stripped_uri.should ==  "http://example.com"
-  end
-
-  it "should strip_default_port_from_uri strips 443 from https without path" do
-    uri = "https://example.com:443"
-    stripped_uri = Utility.strip_default_port_from_uri(uri)
-    stripped_uri.should ==  "https://example.com"
-  end
-
-  it "should strip_default_port_from_uri strips 443 from https" do
-    uri = "https://example.com:443/foo/bar"
-    stripped_uri = Utility.strip_default_port_from_uri(uri)
-    stripped_uri.should == "https://example.com/foo/bar"
-  end
-
-  it "should strip_default_port_from_uri does not strip 8080 from http" do
-    uri = "http://example.com:8080/foo/bar"
-    uri.should == Utility.strip_default_port_from_uri(uri)
-  end
-
-  it "should strip_default_port_from_uri does not strip 443 from http" do
-    uri = "http://example.com:443/foo/bar"
-    uri.should == Utility.strip_default_port_from_uri(uri)
-  end
-
-  it "should strip_default_port_from_uri does not strip 80 from query string" do
-    uri = "http://example.com/?a=:80&b=c"
-    uri.should == Utility.strip_default_port_from_uri(uri)
-  end
-
-  it "should strip_default_port_from_uri does not modify strings that do not start with http or https" do
-    uri = "httpz://example.com:80/"
-    uri.should == Utility.strip_default_port_from_uri(uri)
-  end
-
-end