webmock 0.9.1 → 1.0.0

data/webmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmock}
-  s.version = "0.9.1"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bartosz Blimke"]
-  s.date = %q{2010-02-02}
+  s.date = %q{2010-04-12}
   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 = [
@@ -26,16 +26,16 @@ Gem::Specification.new do |s|
      "lib/webmock.rb",
      "lib/webmock/adapters/rspec.rb",
      "lib/webmock/adapters/rspec/matchers.rb",
-     "lib/webmock/adapters/rspec/request_profile_matcher.rb",
+     "lib/webmock/adapters/rspec/request_pattern_matcher.rb",
      "lib/webmock/adapters/rspec/webmock_matcher.rb",
      "lib/webmock/adapters/test_unit.rb",
      "lib/webmock/config.rb",
      "lib/webmock/errors.rb",
      "lib/webmock/http_lib_adapters/httpclient.rb",
      "lib/webmock/http_lib_adapters/net_http.rb",
-     "lib/webmock/request.rb",
+     "lib/webmock/http_lib_adapters/patron.rb",
      "lib/webmock/request_execution_verifier.rb",
-     "lib/webmock/request_profile.rb",
+     "lib/webmock/request_pattern.rb",
      "lib/webmock/request_registry.rb",
      "lib/webmock/request_signature.rb",
      "lib/webmock/request_stub.rb",
@@ -53,8 +53,10 @@ Gem::Specification.new do |s|
      "spec/net_http_spec.rb",
      "spec/net_http_spec_helper.rb",
      "spec/other_net_http_libs_spec.rb",
+     "spec/patron_spec.rb",
+     "spec/patron_spec_helper.rb",
      "spec/request_execution_verifier_spec.rb",
-     "spec/request_profile_spec.rb",
+     "spec/request_pattern_spec.rb",
      "spec/request_registry_spec.rb",
      "spec/request_signature_spec.rb",
      "spec/request_stub_spec.rb",
@@ -103,8 +105,10 @@ Gem::Specification.new do |s|
      "spec/net_http_spec.rb",
      "spec/net_http_spec_helper.rb",
      "spec/other_net_http_libs_spec.rb",
+     "spec/patron_spec.rb",
+     "spec/patron_spec_helper.rb",
      "spec/request_execution_verifier_spec.rb",
-     "spec/request_profile_spec.rb",
+     "spec/request_pattern_spec.rb",
      "spec/request_registry_spec.rb",
      "spec/request_signature_spec.rb",
      "spec/request_stub_spec.rb",
@@ -138,15 +142,18 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<addressable>, [">= 2.1.1"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<httpclient>, [">= 2.1.5.2"])
+      s.add_development_dependency(%q<patron>, [">= 0.4.5"])
     else
       s.add_dependency(%q<addressable>, [">= 2.1.1"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<httpclient>, [">= 2.1.5.2"])
+      s.add_dependency(%q<patron>, [">= 0.4.5"])
     end
   else
     s.add_dependency(%q<addressable>, [">= 2.1.1"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<httpclient>, [">= 2.1.5.2"])
+    s.add_dependency(%q<patron>, [">= 0.4.5"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 1.0.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 +00:00
+date: 2010-04-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.1.5.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: patron
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.4.5
+    version: 
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: bartosz.blimke@gmail.com
 executables: []
@@ -61,16 +71,16 @@ files:
 - lib/webmock.rb
 - lib/webmock/adapters/rspec.rb
 - lib/webmock/adapters/rspec/matchers.rb
-- lib/webmock/adapters/rspec/request_profile_matcher.rb
+- lib/webmock/adapters/rspec/request_pattern_matcher.rb
 - lib/webmock/adapters/rspec/webmock_matcher.rb
 - lib/webmock/adapters/test_unit.rb
 - lib/webmock/config.rb
 - lib/webmock/errors.rb
 - lib/webmock/http_lib_adapters/httpclient.rb
 - lib/webmock/http_lib_adapters/net_http.rb
-- lib/webmock/request.rb
+- lib/webmock/http_lib_adapters/patron.rb
 - lib/webmock/request_execution_verifier.rb
-- lib/webmock/request_profile.rb
+- lib/webmock/request_pattern.rb
 - lib/webmock/request_registry.rb
 - lib/webmock/request_signature.rb
 - lib/webmock/request_stub.rb
@@ -88,8 +98,10 @@ files:
 - spec/net_http_spec.rb
 - spec/net_http_spec_helper.rb
 - spec/other_net_http_libs_spec.rb
+- spec/patron_spec.rb
+- spec/patron_spec_helper.rb
 - spec/request_execution_verifier_spec.rb
-- spec/request_profile_spec.rb
+- spec/request_pattern_spec.rb
 - spec/request_registry_spec.rb
 - spec/request_signature_spec.rb
 - spec/request_stub_spec.rb
@@ -160,8 +172,10 @@ test_files:
 - spec/net_http_spec.rb
 - spec/net_http_spec_helper.rb
 - spec/other_net_http_libs_spec.rb
+- spec/patron_spec.rb
+- spec/patron_spec_helper.rb
 - spec/request_execution_verifier_spec.rb
-- spec/request_profile_spec.rb
+- spec/request_pattern_spec.rb
 - spec/request_registry_spec.rb
 - spec/request_signature_spec.rb
 - spec/request_stub_spec.rb

data/lib/webmock/request.rb

@@ -1,29 +0,0 @@
-module WebMock
-
-  class Request
-    attr_accessor :method, :uri, :body, :headers
-
-    def initialize(method, uri, options = {})
-      self.method = method
-      self.uri = uri.is_a?(Addressable::URI) ? uri : WebMock::Util::URI.normalize_uri(uri)
-      assign_options(options)
-    end
-
-    def to_s
-      string = "#{self.method.to_s.upcase} #{WebMock::Util::URI.strip_default_port_from_uri_string(self.uri.to_s)}"
-      string << " with body '#{body.to_s}'" if body && body.to_s != ''
-      if headers && !headers.empty?
-        string << " with headers #{WebMock::Util::Headers.normalize_headers(headers).inspect.gsub("\"","'")}"
-      end      
-      string
-    end
-
-    private
-
-    def assign_options(options)
-      self.body = options[:body] if options.has_key?(:body)
-      self.headers = WebMock::Util::Headers.normalize_headers(options[:headers]) if options.has_key?(:headers)
-    end
-
-  end
-end

data/lib/webmock/request_profile.rb

@@ -1,50 +0,0 @@
-module WebMock
-
-  class RequestProfile < Request
-    
-    attr_reader :with_block
-
-    def with(options = {}, &block)
-      assign_options(options)
-      @with_block = block
-      self
-    end
-    
-    def body=(body)
-      @body = Body.new(body)
-    end
-    
-    def to_s
-      string = super
-      string << " with given block" if @with_block
-      string
-    end
-
-    class Body
-
-      attr_reader :data
-
-      def initialize(data)
-        @data = data
-      end
-
-      def ==(other)
-        other = Body.new(other) unless other.is_a?(Body)
-        other.is_a?(Body) &&
-          (other.is_empty? && self.is_empty? || other.data == self.data || self.data === other.data )        
-      end
-
-      def is_empty?
-        @data.nil? || @data == ""
-      end
-
-      def to_s
-        @data
-      end
-
-    end
-
-  end
-
-
-end

data/spec/request_profile_spec.rb

@@ -1,68 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe RequestProfile do
-
-  describe "initialization" do
-
-    it "should have assigned normalized uri" do
-      WebMock::Util::URI.should_receive(:normalize_uri).and_return("www.example.kom")
-      profile = RequestProfile.new(:get, "www.example.com")
-      profile.uri.should == "www.example.kom"
-    end
-
-    it "should have assigned uri without normalization if uri is URI" do
-      WebMock::Util::URI.should_not_receive(:normalize_uri)
-      uri = Addressable::URI.parse("www.example.com")
-      profile = RequestProfile.new(:get, uri)
-      profile.uri.should == uri
-    end
-
-    it "should have assigned normalized headers" do
-      WebMock::Util::Headers.should_receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
-      RequestProfile.new(:get, "www.example.com", :headers => {'A' => 'a'}).headers.should == {'B' => 'b'}
-    end
-
-    it "should have assigned body" do
-      RequestProfile.new(:get, "www.example.com", :body => "abc").
-        body.should == RequestProfile::Body.new("abc")
-    end
-
-  end
-
-  it "should report string describing itself" do
-    RequestProfile.new(:get, "www.example.com",
-      :body => "abc", :headers => {'A' => 'a', 'B' => 'b'}).to_s.should ==
-    "GET http://www.example.com/ with body 'abc' with headers {'A'=>'a', 'B'=>'b'}"
-  end
-
-  it "should report string describing itself with block" do
-    RequestProfile.new(:get, "www.example.com",
-      :body => "abc", :headers => {'A' => 'a', 'B' => 'b'}).with {|req| true}.to_s.should ==
-    "GET http://www.example.com/ with body 'abc' with headers {'A'=>'a', 'B'=>'b'} with given block"
-  end
-
-  describe "with" do
-    before(:each) do
-      @request_profile = RequestProfile.new(:get, "www.example.com")
-    end
-
-    it "should assign body to request profile" do
-      @request_profile.with(:body => "abc")
-      @request_profile.body.should == RequestProfile::Body.new("abc")
-    end
-
-    it "should have the same body" do
-      @request_profile.with(:body => "abc")
-      @request_profile.body.should == RequestProfile::Body.new("abc")
-    end
-
-    it "should assign normalized headers to request profile" do
-      WebMock::Util::Headers.should_receive(:normalize_headers).with('A' => 'a').and_return('B' => 'b')
-      @request_profile.with(:headers => {'A' => 'a'})
-      @request_profile.headers.should == {'B' => 'b'}
-    end
-
-  end
-
-
-end