netnoop 0.1.0 → 0.2.0

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.authors = ["Michael Klett"]
     gem.add_dependency "fakeweb"
     gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "jeweler"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/netnoop.rb

@@ -8,6 +8,7 @@ end
 require 'uri'
 require 'netnoop/hooks'
 require 'netnoop/request'
+require 'netnoop/response'
 require 'netnoop/bucket'
 
 module NetNoop

data/lib/netnoop/bucket.rb

@@ -11,9 +11,8 @@ module NetNoop
       empty_bucket
     end
     
-    def add_request(uri, method, body = nil)
-      req = NetNoop::Request.new(uri, method, body)
-      self.request_map[uri] = self.request_map[uri] + [req]
+    def add_request(req)
+      self.request_map[req.uri] = self.request_map[req.uri] + [req]
       self.requests << req
     end
     

data/lib/netnoop/hooks.rb

@@ -1,10 +1,17 @@
 module Net
   class HTTP
     def request_with_netnoop(request, body = nil, &block)
-      uri, method = netnoop_parse_request_details(request)
-      
-      NetNoop::Bucket.instance.add_request(uri, method, body)
-      request_without_netnoop(request, body, &block)
+      response = request_without_netnoop(request, body, &block)
+
+      begin
+        uri, method = netnoop_parse_request_details(request)
+        NetNoop::Bucket.instance.add_request(
+          NetNoop::Request.new(uri, method, body, response)
+        )
+      rescue
+      end
+
+      response
     end
     alias_method :request_without_netnoop, :request
     alias_method :request, :request_with_netnoop

data/lib/netnoop/request.rb

@@ -3,11 +3,13 @@ module NetNoop
     attr_reader :uri
     attr_reader :method
     attr_reader :body
+    attr_reader :response
     
-    def initialize(uri, method, body)
+    def initialize(uri, method, body, http_response = nil)
       @uri = uri
       @method = method
       @body = body
+      @response = Response.new(http_response)
     end
   end
 end

data/lib/netnoop/response.rb

@@ -0,0 +1,20 @@
+module NetNoop
+  class Response
+    attr_reader :status
+    attr_reader :body
+    attr_reader :headers
+    
+    def initialize(http_response)
+      @status   = http_response.code
+      @body     = http_response.body
+      @headers  = http_response.header.to_hash
+    end
+    
+    def content_type
+      if ct = headers['content-type']
+        return ct.first if ct.is_a?(Array)
+        return ct
+      end
+    end
+  end
+end

data/netnoop.gemspec

@@ -0,0 +1,69 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{netnoop}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Michael Klett"]
+  s.date = %q{2010-08-11}
+  s.description = %q{Collects and stores your outgoing HTTP requests in NetNoop.requests for later inspection, usually in your test assertions or matchers.
+
+Can be used in conjunction with FakeWeb to disable outbound HTTP requests while also making the contents of those requests visible.}
+  s.email = %q{michael@webadvocate.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "examples/basic.rb",
+     "lib/netnoop.rb",
+     "lib/netnoop/bucket.rb",
+     "lib/netnoop/hooks.rb",
+     "lib/netnoop/request.rb",
+     "lib/netnoop/response.rb",
+     "netnoop.gemspec",
+     "spec/netnoop_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/moklett/netnoop}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Collects and stores your outgoing HTTP requests for later inspection}
+  s.test_files = [
+    "spec/netnoop_spec.rb",
+     "spec/spec_helper.rb",
+     "examples/basic.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<fakeweb>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+    else
+      s.add_dependency(%q<fakeweb>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<fakeweb>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+  end
+end
+

data/spec/netnoop_spec.rb

@@ -6,20 +6,69 @@ describe "NetNoop" do
   end
   
   context "upon a GET request" do
-    it "stores the request in the +requests+ array" do
+    attr_reader :the_stored_request
+    
+    before(:each) do
       perform_net_http_get(example_uri)
+      @the_stored_request = NetNoop.requests.last
+    end
+    
+    it "stores 1 request in the +NetNoop.requests+ array" do
+      NetNoop.requests.size.should == 1
+    end
+    
+    it "is stores 1 request in the +NetNoop.request_map+ hash at the correct key" do
+      NetNoop.request_map[example_uri].size.should == 1
+    end
+    
+    describe "the stored request" do
+      it "holds the URI" do
+        the_stored_request.uri.should == example_uri
+      end
       
-      req = NetNoop.requests.first
-      req.uri.should == example_uri
-      req.method.should == :get
+      it "holds the method" do
+        the_stored_request.method.should == :get
+      end
+      
+      it "has a nil body" do
+        the_stored_request.body.should be_nil
+      end
     end
-
-    it "stores the request in the +request_map+ hash" do
-      perform_net_http_get(example_uri)
+    
+    describe "the stored response" do
+      attr_reader :uri, :response_body, :response_status, :response_content_type, :the_stored_response
       
-      req = NetNoop.request_map[example_uri].first
-      req.uri.should == example_uri
-      req.method.should == :get
+      before(:each) do
+        @uri = "http://www.example.com/storeresponse"
+        response_hash = {
+          :body => @response_body = "I am the response",
+          :status => @response_status = '200',
+        }.merge({:content_type => @response_content_type = "text/plain"})
+        
+        FakeWeb.register_uri(:any, uri, response_hash)
+        perform_net_http_get(uri)
+        @the_stored_response = NetNoop.requests.last.response
+      end
+      
+      it "is present" do
+        the_stored_response.should_not be_nil
+      end
+      
+      it "holds the response status" do
+        the_stored_response.status.should == response_status
+      end
+      
+      it "holds the response body" do
+        the_stored_response.body.should == response_body
+      end
+      
+      it "holds the response headers" do
+        the_stored_response.headers.should be_a(Hash)
+      end
+      
+      it "parses the content-type" do
+        the_stored_response.content_type.should == response_content_type
+      end
     end
   end
   
@@ -31,6 +80,11 @@ describe "NetNoop" do
     end
   end
   
+  it "does not interfere with the original request" do
+    lambda {
+      perform_net_http_get("http://www.example.com/foobar.html")
+    }.should raise_error(FakeWeb::NetConnectNotAllowedError)
+  end
   
   def perform_net_http_get(uri)
     url = URI.parse(uri)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: netnoop
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Klett
@@ -48,6 +48,20 @@ dependencies:
         version: 1.2.9
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: |-
   Collects and stores your outgoing HTTP requests in NetNoop.requests for later inspection, usually in your test assertions or matchers.
   
@@ -72,6 +86,8 @@ files:
 - lib/netnoop/bucket.rb
 - lib/netnoop/hooks.rb
 - lib/netnoop/request.rb
+- lib/netnoop/response.rb
+- netnoop.gemspec
 - spec/netnoop_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb