netrecorder 0.2.2 → 0.2.3

data/Manifest

@@ -2,7 +2,9 @@ Manifest
 README.rdoc
 Rakefile
 features/manage_cache.feature
+features/manage_scoping.feature
 features/step_definitions/manage_cache_steps.rb
+features/step_definitions/manage_scoping_steps.rb
 features/support/env.rb
 lib/config.rb
 lib/fake.rb

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('netrecorder', '0.2.2') do |p|
+Echoe.new('netrecorder', '0.2.3') do |p|
   p.description    = "Record network responses for easy stubbing of external calls"
   p.url            = "http://github.com/chrisyoung/netrecorder"
   p.author         = "Chris Young"

data/features/manage_cache.feature

@@ -13,7 +13,7 @@ Scenario: Cache a page
 Scenario: Cache a page with a Net::HTTP request with a block
   Given caching is turned on
   And a clear cache
-  When I visit "http://www.example.com" using a  Net::HTTP request with a block
+  When I visit "http://www.example.com" using a Net::HTTP request with a block
   And I save the cache
   Then the cache should contain the example body
   And the Net::HTTP request should return the response

data/features/manage_scoping.feature

@@ -0,0 +1,20 @@
+Feature: Manage scoping
+  In order to allow users to register scopes that are not dependent on order (limit of fakeweb)
+  As a user
+  I want to be able to manage scopes
+
+Scenario: Store responses in reverse order
+  # Seems to be an error with fakeweb that keeps it from re-registering a url after clearing the registry - so I'm using google.com here instead of example.com
+  Given caching is turned on
+  And a clear cache
+  And I scope the request to "first scope"
+  And I visit "http://www.google.com"
+  And I scope the request to "second scope"
+  And I wait 3 seconds
+  And I visit "http://www.google.com"
+  And I save the cache
+  And I have registered "second scope"
+  And I visit "http://www.google.com"
+  Given I have registered "first scope"
+  And I visit "http://www.google.com"
+  Then the first response should be later than the second

data/features/step_definitions/manage_cache_steps.rb

@@ -24,10 +24,12 @@ And /^I save the cache$/ do
 end
 
 And /^I visit "([^\"]*)"$/ do |url|
-  Net::HTTP.get URI.parse(url)
+  uri = URI.parse(url)
+  @last_response = @response
+  @response = Net::HTTP.start(uri.host, uri.port) {|http| http.get('/')}
 end
 
-When /^I visit "([^\"]*)" using a  Net::HTTP request with a block$/ do |url|
+When /^I visit "([^\"]*)" using a Net::HTTP request with a block$/ do |url|
   uri = URI.parse(url)
   @last_response = Net::HTTP.new(uri.host, uri.port).start do |http|
     http.get(uri.path.empty? ? '/' : uri.path)
@@ -71,4 +73,5 @@ end
 Then /^I should not hit the web if i visit the example page$/ do
   FakeWeb.allow_net_connect = false
   Proc.new{Net::HTTP.get URI.parse('http://www.example.com/')}.should_not raise_error
+  FakeWeb.allow_net_connect = true
 end

data/features/step_definitions/manage_scoping_steps.rb

@@ -0,0 +1,18 @@
+Given /^I have registered "([^\"]*)"$/ do |scope|
+  NetRecorder.register_scope(scope)
+  FakeWeb.allow_net_connect = false
+end
+
+Then /^the first response should be later than the second$/ do
+  first_date  = DateTime.parse(@last_response['date'])
+  second_date = DateTime.parse(@response['date'])
+  raise 'the first response is not more recent' if first_date < second_date
+end
+
+Given /^I scope the request to "([^\"]*)"$/ do |scope|
+  NetRecorder.scope = scope
+end
+
+Given /^I wait (.+) seconds$/ do |count|
+  sleep count.to_i
+end

data/lib/fake.rb

@@ -1,3 +1,4 @@
+# Helper module to tuck away some ugly file operations
 module Fake
   Fake::REQUEST = 0
   Fake::RESPONSE = 1

data/lib/http.rb

@@ -9,8 +9,11 @@ module NetRecorder
         # request is overridden and the request and response are stored as a hash that can be written to a cache file
         def request(req, body = nil, &block)
           response = alias_for_request(req, body)
-          
-          return response unless NetRecorder.recording?
+
+          unless NetRecorder.recording?
+            yield response and return if block
+            return response
+          end
           
           scope = NetRecorder.scope || 'global'
           path = "http://#{req.bauth if req.bauth}#{req['host']}#{req.path}"
@@ -22,10 +25,11 @@ module NetRecorder
           end
           
           if existing_fake
-            existing_fake[Fake::RESPONSE][scope][:response] << {:response => response} and return response 
+            existing_fake[Fake::RESPONSE][scope][:response] << {:response => response}
+          else
+            @@fakes << [path, {scope => {:method => req.method, :response => [{:response => response}]}}]
           end
-          
-          @@fakes << [path, {scope => {:method => req.method, :response => [{:response => response}]}}]
+
           yield response if block
           response
         end

data/lib/netrecorder.rb

@@ -9,7 +9,6 @@ require "#{File.dirname(__FILE__)}/fake"
 
 # NetRecorder - the global namespace
 module NetRecorder
-  
   # the path to the cache file
   def self.cache_file
     @@config.cache_file
@@ -64,11 +63,12 @@ private
     
   # load the cache and register all of the urls with fakeweb
   def self.fakeweb(scope='global')
+    FakeWeb.clean_registry
     fakes.each do |fake|
+      next unless fake[Fake::RESPONSE][scope]
       method   = fake[Fake::RESPONSE][scope][:method].downcase.to_sym
       response = fake[Fake::RESPONSE][scope][:response]
       request  = fake[Fake::REQUEST]
-
       FakeWeb.register_uri(method, request, response)
     end
   end

data/netrecorder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{netrecorder}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Young"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{Record network responses for easy stubbing of external calls}
   s.email = %q{beesucker@gmail.com}
   s.extra_rdoc_files = ["README.rdoc", "lib/config.rb", "lib/fake.rb", "lib/http.rb", "lib/http_header.rb", "lib/netrecorder.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "features/manage_cache.feature", "features/step_definitions/manage_cache_steps.rb", "features/support/env.rb", "lib/config.rb", "lib/fake.rb", "lib/http.rb", "lib/http_header.rb", "lib/netrecorder.rb", "netrecorder.gemspec"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "features/manage_cache.feature", "features/manage_scoping.feature", "features/step_definitions/manage_cache_steps.rb", "features/step_definitions/manage_scoping_steps.rb", "features/support/env.rb", "lib/config.rb", "lib/fake.rb", "lib/http.rb", "lib/http_header.rb", "lib/netrecorder.rb", "netrecorder.gemspec"]
   s.homepage = %q{http://github.com/chrisyoung/netrecorder}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Netrecorder", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netrecorder
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Chris Young
@@ -70,7 +70,9 @@ files:
 - README.rdoc
 - Rakefile
 - features/manage_cache.feature
+- features/manage_scoping.feature
 - features/step_definitions/manage_cache_steps.rb
+- features/step_definitions/manage_scoping_steps.rb
 - features/support/env.rb
 - lib/config.rb
 - lib/fake.rb