rest-assured 1.0.0 → 1.1.0

data/.gitignore

@@ -4,3 +4,6 @@ pkg/*
 bundle_bin
 *.db
 .sass-cache
+test.log
+Gemfile.lock
+coverage

data/Gemfile

@@ -32,4 +32,6 @@ group :local do
     gem 'rb-readline'
   end
   gem 'sinatra-activerecord'
+  gem 'simplecov', :platforms => :ruby_19
 end
+

data/README.markdown

@@ -27,8 +27,8 @@ It is also recommended to have thin installed. This improves startup time (over
 
 Then install gem and run:
 
-    bash$ gem install rest-assured --pre
-    bash$ rest-assured -a mysql &
+    bash$ gem install rest-assured
+    bash$ rest-assured &
 
 Or clone from github and run:
 
@@ -40,8 +40,6 @@ This starts up an instance of rest-assured on port 4578. It is accessible via RE
 
 Various options (such as ssl, port, db credentials, etc.) are available through command line options. Check out `rest-assured -h` to see what they are.
 
-NOTE that although sqlite is an extremely handy option (especially with `-d :memory:`), I found it sometimes locking tables under non-trivial load. Hence there is a Plan B - mysql. But may be that is just me sqliting it wrong.
-
 ## Doubles
 
 Double is a stub/spy of HTTP request. Create a double that has the same request fullpath and method as the one your app is sending to a dependant service and then convience your app that rest-assured is that dependency (hint: by making endpoints configurable).
@@ -171,7 +169,7 @@ For those using rest-assured from non-ruby environments.
 
 It is sometimes desirable to only double certain calls while letting others through to the "real" services. Meet Redirects. Kind of "rewrite rules" for requests that didn't match any double. 
 
-Another potential use for redirects is setting up a "default" double that matches multiple fullpaths. This is of course given your app does not mind an extra redirect. Also note that such "default" double still only covers single http verb so requests with different methods won't match (hint: need an extra double).
+Another use for redirects is setting up a "default" double that matches multiple fullpaths. If a redirect pattern matches a defined double then it will act like a double and respond directly.  If it does not match a double then it will return HTTP 303 redirect instead.  Note that HTTP redirects are usually converted to GET requests by HTTP clients.
 
 Here is the rest API for managing redirects:
 
@@ -200,7 +198,11 @@ Here is the rest API for managing redirects:
 
 ## Changelog
 
-#### 1.0.0.rc1 (13 Feb 2012)
+#### 1.1.0 (17 Feb 2012)
+
+* Redirects supports 'real' (without http redirect) rewrite to local double
+
+#### 1.0.0 (14 Feb 2012)
 
 * start/stop rest-assured via api
 * redirects support pattern/replacement
@@ -211,8 +213,7 @@ Here is the rest API for managing redirects:
 
 #### 0.3.1 (09 Jan 2012)
 
-* lock rack version to <= 1.3.6 until they release fix for
-https://github.com/rack/rack/issues/299
+* lock rack version to <= 1.3.6 until they release fix for https://github.com/rack/rack/issues/299
 
 #### 0.3 (12 Dec 2011)
 

data/features/rest_api/doubles.feature

@@ -15,6 +15,7 @@ Feature: use doubles via api
       | /api/some          | text content | GET    | GET         | 303    | 303           |
       | /api/some?a=3&b=dd | more content |        | GET         |        | 200           |
       | /api/empty         |              | POST   | POST        |        | 200           |
+      | /api/file          |              | HEAD   | HEAD        |        | 200           |
 
   Scenario: view created double details
     When I create a double

data/features/step_definitions/ruby_api_steps.rb

@@ -55,7 +55,7 @@ Then /^it should wait for (#{CAPTURE_A_NUMBER}) seconds(?: \(default timeout\))?
   wait_time = Time.now - @wait_start
   #(timeout..(timeout+1)).should cover(wait_time) # cover() only avilable in 1.9
   wait_time.should >= timeout
-  wait_time.should < timeout + 1
+  wait_time.should < timeout + 1.5
 end
 
 Then /^it should raise MoreRequestsExpected error after with the following message:$/ do |string|

data/lib/rest-assured/models/double.rb

@@ -7,7 +7,7 @@ module RestAssured
 
       serialize :response_headers, Hash
 
-      VERBS = %w{GET POST PUT DELETE}
+      VERBS = %w{GET POST PUT DELETE HEAD}
       STATUSES = Net::HTTPResponse::CODE_TO_OBJ.keys.map(&:to_i)
 
       validates_presence_of :fullpath

data/lib/rest-assured/routes/response.rb

@@ -1,23 +1,33 @@
 module RestAssured
   class Response
+
     def self.perform(app)
       request = app.request
-
       if d = Models::Double.where(:fullpath => request.fullpath, :active => true, :verb => request.request_method).first
-        request.body.rewind
-        body = request.body.read #without temp variable ':body = > body' is always nil. mistery
-        env  = request.env.except('rack.input', 'rack.errors', 'rack.logger')
-
-        d.requests.create!(:rack_env => env.to_json, :body => body, :params => request.params.to_json)
-
-        app.headers d.response_headers
-        app.body d.content
-        app.status d.status
+        return_double app, d
       elsif redirect_url = Models::Redirect.find_redirect_url_for(request.fullpath)
-        app.redirect redirect_url
+        if d = Models::Double.where(:fullpath => redirect_url, :active => true, :verb => request.request_method).first
+          return_double app, d
+        else
+          app.redirect redirect_url
+        end
       else
         app.status 404
       end
     end
+
+    def self.return_double(app, d)
+      request = app.request
+      request.body.rewind
+      body = request.body.read #without temp variable ':body = > body' is always nil. mistery
+      env  = request.env.except('rack.input', 'rack.errors', 'rack.logger')
+
+      d.requests.create!(:rack_env => env.to_json, :body => body, :params => request.params.to_json)
+
+      app.headers d.response_headers
+      app.body d.content
+      app.status d.status
+    end
+
   end
 end

data/lib/rest-assured/utils/subprocess.rb

@@ -6,19 +6,10 @@ module RestAssured
       def initialize
         @pid = Kernel.fork do
           trap('USR1') do
-            $stopped = true
             Process.kill('TERM', Process.pid) # unlike 'exit' this one is NOT being intercepted by Webrick
           end
 
-          at_exit do
-            if $stopped
-              puts "Being stopped from parent..."
-            #else
-              #puts "Shutting down parent..."
-              #Process.kill('TERM', Process.ppid)
-            end
-            exit!
-          end
+          at_exit { exit! }
 
           begin
             yield

data/lib/rest-assured/version.rb

@@ -1,3 +1,3 @@
 module RestAssured
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/rest-assured.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors               = ['Artem Avetisyan']
   s.email                 = ['artem.avetisyan@bbc.co.uk']
   s.homepage              = "https://github.com/BBC/rest-assured"
-  s.summary               = %q{A tool for high level mocking/stubbing HTTP based REST services}
+  s.summary               = %q{Real stubs and spies for HTTP(S) services}
   #s.description          = %q{TODO: Write a gem description}
 
   s.rubyforge_project     = "rest-assured"
@@ -20,9 +20,8 @@ Gem::Specification.new do |s|
   s.executables           = ['rest-assured']
   s.require_paths         = ['lib']
 
-  s.add_dependency 'sinatra', '>= 1.3.1'
-  s.add_dependency 'rack', '<= 1.3.6'
-  s.add_dependency 'childprocess', '~> 0.2.8'
+  s.add_dependency 'sinatra', '>= 1.3.2'
+  s.add_dependency 'childprocess', '~> 0.3.0'
   s.add_dependency 'sinatra-flash'
   s.add_dependency 'haml', '>= 3.1.3'
   s.add_dependency 'activerecord', '~> 3.1.0'

data/spec/functional/response_spec.rb

@@ -60,6 +60,19 @@ module RestAssured
 
         Response.perform(rest_assured_app)
       end
+    
+      it "returns double when redirect matches double" do
+        fullpath = '/some/other/path'
+        request.stub(:fullpath).and_return(fullpath)
+        Models::Redirect.stub(:find_redirect_url_for).with(fullpath).and_return('/some/path')
+
+        rest_assured_app.should_receive(:body).with(@double.content)
+        rest_assured_app.should_receive(:status).with(@double.status)
+        rest_assured_app.should_receive(:headers).with(@double.response_headers)
+
+        Response.perform(rest_assured_app)
+      end
+
     end
 
     it "redirects if double not hit but there is redirect that matches request" do

data/spec/spec_helper.rb

@@ -1,4 +1,17 @@
 require 'rubygems'
+
+if RUBY_VERSION =~ /^1.9/
+  begin
+    require 'simplecov'
+    SimpleCov.start do
+      at_exit {} # reset built in at_exit or else it gets triggered when RestAssured::Server.stop is called from tests
+      add_filter "/spec/"
+      add_filter "/sinatra/"
+    end
+  rescue LoadError
+  end
+end
+
 require 'spork'
 
 $:.unshift(File.expand_path('../../lib'), __FILE__)
@@ -44,6 +57,12 @@ Spork.prefork do
     c.before(:each, :ui => false) do
       header 'User-Agent', nil
     end
+
+    if defined?(SimpleCov)
+      c.after(:suite) do
+        SimpleCov.result.format!
+      end
+    end
   end
   require 'rest-assured/config'
   db_opts = { :dbuser => ENV['TRAVIS'] ? "''" : "root", :adapter => 'mysql' }

data/spec/subprocess_spec.rb

@@ -43,35 +43,6 @@ module RestAssured::Utils
       res_file.read.should == 'true'
     end
 
-    # I am not sure this is actually useful
-    #describe 'commits seppuku' do
-    #it 'if child raises exception' do
-    #res_file = Tempfile.new('res')
-    #fork do
-    #at_exit { exit! }
-    #Subprocess.new { raise "!!NO PANIC!! This exception is part of test"; sleep 1 }
-    #sleep 0.5
-    #res_file.write('should not exist because this process should be killed by now')
-    #res_file.rewind
-    #end
-    #Process.wait
-    #res_file.read.should == ''
-    #end
-
-    #it 'if child just quits' do
-    #res_file = Tempfile.new('res')
-    #fork do
-    #at_exit { exit! }
-    #Subprocess.new { 1 }
-    #sleep 0.5
-    #res_file.write('should not exist because this process should be killed by now')
-    #res_file.rewind
-    #end
-    #Process.wait
-    #res_file.read.should == ''
-    #end
-    #end
-
     context 'shuts down child process' do
       let(:child_pid) do
         Tempfile.new('child_pid')
@@ -97,6 +68,7 @@ module RestAssured::Utils
           res_file.rewind
         end
         Process.wait
+        sleep 0.5
         res_file.read.should == 'false'
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-assured
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,44 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2154191820 !ruby/object:Gem::Requirement
+  requirement: &2168491020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2154191820
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &2154191300 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: *2154191300
+  version_requirements: *2168491020
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &2154207160 !ruby/object:Gem::Requirement
+  requirement: &2168528060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154207160
+  version_requirements: *2168528060
 - !ruby/object:Gem::Dependency
   name: sinatra-flash
-  requirement: &2154206740 !ruby/object:Gem::Requirement
+  requirement: &2168523560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154206740
+  version_requirements: *2168523560
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2154206160 !ruby/object:Gem::Requirement
+  requirement: &2168565440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2154206160
+  version_requirements: *2168565440
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2154205600 !ruby/object:Gem::Requirement
+  requirement: &2168564340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +65,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154205600
+  version_requirements: *2168564340
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &2154205100 !ruby/object:Gem::Requirement
+  requirement: &2168563340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +76,7 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154205100
+  version_requirements: *2168563340
 description: 
 email:
 - artem.avetisyan@bbc.co.uk
@@ -137,7 +126,6 @@ files:
 - features/support/world_helpers.rb
 - features/web_ui/doubles.feature
 - features/web_ui/redirects.feature
-- lib/active_record/leaky_connections_patch.rb
 - lib/rest-assured.rb
 - lib/rest-assured/api.rb
 - lib/rest-assured/api/app_runner.rb
@@ -223,13 +211,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1385633666069364310
+      hash: 1944321672567783063
 requirements: []
 rubyforge_project: rest-assured
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A tool for high level mocking/stubbing HTTP based REST services
+summary: Real stubs and spies for HTTP(S) services
 test_files:
 - features/command_line_options.feature
 - features/rest_api/doubles.feature

data/lib/active_record/leaky_connections_patch.rb

@@ -1,55 +0,0 @@
-# fix leaking db connections https://github.com/rails/rails/commit/ea341b8e043160a7ddaba9e6b2bb6044f73c31a8
-# TODO remove with the next ActiveRecord update as this patch will be there
-module ActiveRecord
-  class ConnectionAdapters::ConnectionPool
-    def current_connection_id #:nodoc:
-      ActiveRecord::Base.connection_id ||= Thread.current.object_id
-    end
-  end
-
-  class Base::ConnectionSpecification
-    class << self
-      def connection_id
-        Thread.current['ActiveRecord::Base.connection_id']
-      end
-
-      def connection_id=(connection_id)
-        Thread.current['ActiveRecord::Base.connection_id'] = connection_id
-      end
-    end
-  end
-
-  class QueryCache
-    class BodyProxy
-      def initialize(original_cache_value, target, connection_id)
-        @original_cache_value = original_cache_value
-        @target               = target
-        @connection_id        = connection_id
-      end
-
-      def close
-        @target.close if @target.respond_to?(:close)
-      ensure
-        ActiveRecord::Base.connection_id = @connection_id
-        ActiveRecord::Base.connection.clear_query_cache
-        unless @original_cache_value
-          ActiveRecord::Base.connection.disable_query_cache!
-        end
-      end
-    end
-
-    def call(env)
-      old = ActiveRecord::Base.connection.query_cache_enabled
-      ActiveRecord::Base.connection.enable_query_cache!
-
-      status, headers, body = @app.call(env)
-      [status, headers, BodyProxy.new(old, body, ActiveRecord::Base.connection_id)]
-    rescue Exception => e
-      ActiveRecord::Base.connection.clear_query_cache
-      unless old
-        ActiveRecord::Base.connection.disable_query_cache!
-      end
-      raise e
-    end
-  end
-end