rest-assured 0.3.2 → 1.0.0.rc1

data/spec/functional/response_spec.rb

@@ -63,11 +63,13 @@ module RestAssured
     end
 
     it "redirects if double not hit but there is redirect that matches request" do
-      r = Models::Redirect.create :to => 'http://exmple.com/api', :pattern => '.*'
+      #r = Models::Redirect.create :to => 'http://exmple.com/api', :pattern => '.*'
+      #
       fullpath = '/some/other/path'
       request.stub(:fullpath).and_return(fullpath)
+      Models::Redirect.stub(:find_redirect_url_for).with(fullpath).and_return('new_url')
 
-      rest_assured_app.should_receive(:redirect).with(r.to + fullpath)
+      rest_assured_app.should_receive(:redirect).with('new_url')
 
       Response.perform(rest_assured_app)
     end
@@ -78,6 +80,7 @@ module RestAssured
       Response.perform(rest_assured_app)
     end
 
+    # TODO change to instead exclude anything that does not respond_to?(:to_s)
     it 'excludes "rack.input" and "rack.errors" as they break with "IOError - not opened for reading:" on consequent #to_json (as they are IO and StringIO)' do
       requests = double.as_null_object
       Models::Double.stub_chain('where.first').and_return(double(:requests => requests).as_null_object)

data/spec/models/redirect_spec.rb

@@ -37,5 +37,27 @@ module RestAssured::Models
 
       Redirect.update_order([nil, 34]).should == false
     end
+
+    context 'redirect url' do
+      it 'constructs url to redirect to' do
+        path = rand(1000)
+        r = Redirect.create :pattern => '/api/(.*)\?.*', :to => 'http://external.com/some/url/\1?p=5'
+        Redirect.find_redirect_url_for("/api/#{path}?param=1").should == "http://external.com/some/url/#{path}?p=5"
+      end
+
+      it 'returns the one that matches the substring' do
+        r1 = Redirect.create :pattern => '/ai/path', :to => 'someurl'
+        r2 = Redirect.create :pattern => '/api/path', :to => 'someurl'
+
+        Redirect.find_redirect_url_for('/api/path').should == 'someurl'
+      end
+
+      it 'returns the oldest one that match' do
+        r1 = Redirect.create :pattern => '/api', :to => 'someurl'
+        r2 = Redirect.create :pattern => '/api/path', :to => 'otherurl'
+
+        Redirect.find_redirect_url_for('/api/path').should == 'someurl/path'
+      end
+    end
   end
 end

data/spec/port_explorer_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('../../lib/rest-assured/utils/port_explorer', __FILE__)
+
+module RestAssured::Utils
+  describe PortExplorer do
+    it 'finds free tcp port' do
+      free_port = PortExplorer.free_port
+      lambda { Net::HTTP.get('127.0.0.1', '/', free_port) }.should raise_error(Errno::ECONNREFUSED)
+    end
+
+    it 'knows if port is in use' do
+      port = PortExplorer.free_port
+
+      Thread.new do
+        TCPServer.open('127.0.0.1', port) do |serv|
+          s = serv.accept
+          s.puts 'Hello from test'
+          s.close
+        end
+      end
+      sleep 0.5
+
+      PortExplorer.port_free?(port).should == false
+    end
+
+    it 'knows that port is free' do
+      port = PortExplorer.free_port
+
+      PortExplorer.port_free?(port).should == true
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -4,10 +4,14 @@ require 'spork'
 $:.unshift(File.expand_path('../../lib'), __FILE__)
 
 Spork.prefork do
+  require 'rspec'
   require 'capybara/rspec'
   require 'rack/test'
   require 'database_cleaner'
-  require File.expand_path('../custom_matchers', __FILE__)
+  require 'awesome_print'
+  require File.expand_path('../support/custom_matchers', __FILE__)
+  require File.expand_path('../support/reset-singleton', __FILE__)
+  require 'rest-assured/utils/drb_sniffer'
 
   ENV['RACK_ENV'] = 'test'
 
@@ -23,6 +27,7 @@ Spork.prefork do
     c.include Capybara::DSL
     c.include Rack::Test::Methods
     c.include XhrHelpers
+    c.include RestAssured::Utils::DrbSniffer
 
     c.before(:each) do
       DatabaseCleaner.start
@@ -40,29 +45,31 @@ Spork.prefork do
       header 'User-Agent', nil
     end
   end
-end
-
-Spork.each_run do
   require 'rest-assured/config'
-  RestAssured::Config.build(:adapter => 'mysql')
+  db_opts = { :dbuser => ENV['TRAVIS'] ? "''" : "root", :adapter => 'mysql' }
+  RestAssured::Config.build(db_opts)
 
   require 'rest-assured'
-  require 'rest-assured/client'
+  require 'rest-assured/application'
   require 'shoulda-matchers'
-  require File.expand_path('../../features/support/test-server', __FILE__)
-
-  at_exit do
-    TestServer.stop
-  end
 
-  TestServer.start(:port => 9876, :db_user => ENV['TRAVIS'] ? "''" : "root")
-
-  while not TestServer.up?
-    puts 'Waiting for TestServer to come up...'
-    sleep 1
-  end
+  RestAssured::Server.start(db_opts.merge(:port => 9876))
+end
 
-  RestAssured::Client.config.server_address = 'http://localhost:9876'
+Spork.each_run do
+  #require 'rest-assured/config'
+  #db_opts = { :dbuser => ENV['TRAVIS'] ? "''" : "root", :adapter => 'mysql' }
+  #RestAssured::Config.build(db_opts)
+
+  #require 'rest-assured'
+  #require 'rest-assured/application'
+  #require 'shoulda-matchers'
+
+  #RSpec.configure do |c|
+    #c.before(:each, "ruby-api" => true) do
+      #RestAssured::Server.start(db_opts.merge(:port => 9876))
+    #end
+  #end
 
   Capybara.app = RestAssured::Application
 

data/spec/subprocess_spec.rb

@@ -0,0 +1,138 @@
+require 'tempfile'
+require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('../../lib/rest-assured/utils/subprocess', __FILE__)
+
+module RestAssured::Utils
+  describe Subprocess do
+
+    it 'forks passed block' do
+      ppid_file = Tempfile.new('ppidfile')
+      pid_file = Tempfile.new('pidfile')
+
+      fork do
+        pid_file.write(Process.pid)
+        pid_file.rewind
+        at_exit { exit! }
+        Subprocess.new do
+          ppid_file.write(Process.ppid)
+          ppid_file.rewind
+          sleep 2
+        end
+        sleep 0.5
+      end
+      Process.wait
+      ppid_file.read.should == pid_file.read
+    end
+
+    it 'ensures no zombies' do
+      Kernel.stub(:fork).and_return(pid = 1)
+      Process.should_receive(:detach).with(pid)
+
+      Subprocess.new {1}
+    end
+
+    it 'knows when it is running' do
+      res_file = Tempfile.new('res')
+      fork do
+        at_exit { exit! }
+        child = Subprocess.new { sleep 0.5 }
+        res_file.write(child.alive?)
+        res_file.rewind
+      end
+      Process.wait
+      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')
+      end
+
+      let(:child_alive?) do
+        begin
+          Process.kill(0, child_pid.read.to_i)
+          true
+        rescue Errno::ESRCH
+          false
+        end
+      end
+
+      it 'when stopped' do
+        res_file = Tempfile.new('res')
+        fork do
+          at_exit { exit! }
+          child = Subprocess.new { sleep 2 }
+          child.stop
+          sleep 1
+          res_file.write(child.alive?)
+          res_file.rewind
+        end
+        Process.wait
+        res_file.read.should == 'false'
+      end
+
+      it 'when exits normally' do
+        if not running_in_drb? # drb breaks fork sandbox: at_exits a collected and fired all together on master process exit
+          child_pid # Magic touch. Literally. Else Tempfile gets created in fork and that messes things up
+
+          fork do
+            at_exit { exit! }
+            child = Subprocess.new { sleep 2 }
+            child_pid.write(child.pid)
+            child_pid.rewind
+          end
+
+          sleep 0.5
+          child_alive?.should == false
+        end
+      end
+
+      it 'when killed violently' do
+        if not running_in_drb?
+          child_pid
+
+          fork do
+            at_exit { exit! }
+            child = Subprocess.new { sleep 2 }
+            child_pid.write(child.pid)
+            child_pid.rewind
+
+            Process.kill('TERM', Process.pid)
+          end
+
+          sleep 0.5
+          child_alive?.should == false
+        end
+      end
+    end
+  end
+end

data/spec/support/reset-singleton.rb

@@ -0,0 +1,15 @@
+require 'singleton'
+
+class <<Singleton
+  def included_with_reset(klass)
+    included_without_reset(klass)
+    class <<klass
+      def reset_instance
+        Singleton.send :__init__, self
+        self
+      end
+    end
+  end
+  alias_method :included_without_reset, :included
+  alias_method :included, :included_with_reset
+end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rest-assured
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 1.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Artem Avetisyan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000 Z
+date: 2012-02-10 00:00:00.000000000 +00:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2156381020 !ruby/object:Gem::Requirement
+  requirement: &2157171280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,32 +22,43 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156381020
+  version_requirements: *2157171280
 - !ruby/object:Gem::Dependency
-  name: rack-flash
-  requirement: &2156380560 !ruby/object:Gem::Requirement
+  name: rack
+  requirement: &2157166140 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <=
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156380560
+  version_requirements: *2157166140
 - !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &2156380100 !ruby/object:Gem::Requirement
+  name: childprocess
+  requirement: &2157165680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 0.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *2156380100
+  version_requirements: *2157165680
+- !ruby/object:Gem::Dependency
+  name: sinatra-flash
+  requirement: &2157165300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157165300
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2156379640 !ruby/object:Gem::Requirement
+  requirement: &2157164700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +66,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156379640
+  version_requirements: *2157164700
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156379180 !ruby/object:Gem::Requirement
+  requirement: &2157164060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +77,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156379180
+  version_requirements: *2157164060
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &2156356520 !ruby/object:Gem::Requirement
+  requirement: &2157163540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +88,7 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156356520
+  version_requirements: *2157163540
 description: 
 email:
 - artem.avetisyan@bbc.co.uk
@@ -86,6 +98,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - Guardfile
@@ -111,6 +124,7 @@ files:
 - features/rest_api/doubles.feature
 - features/rest_api/redirects.feature
 - features/ruby_api/create_double.feature
+- features/ruby_api/test_server.feature
 - features/ruby_api/verify_requests.feature
 - features/ruby_api/wait_for_requests.feature
 - features/step_definitions/command_line_options_steps.rb
@@ -126,8 +140,12 @@ files:
 - features/web_ui/redirects.feature
 - lib/active_record/leaky_connections_patch.rb
 - lib/rest-assured.rb
-- lib/rest-assured/client.rb
-- lib/rest-assured/client/resources.rb
+- lib/rest-assured/api.rb
+- lib/rest-assured/api/app_runner.rb
+- lib/rest-assured/api/app_session.rb
+- lib/rest-assured/api/resources.rb
+- lib/rest-assured/api/server.rb
+- lib/rest-assured/application.rb
 - lib/rest-assured/config.rb
 - lib/rest-assured/models/double.rb
 - lib/rest-assured/models/redirect.rb
@@ -135,9 +153,13 @@ files:
 - lib/rest-assured/routes/double.rb
 - lib/rest-assured/routes/redirect.rb
 - lib/rest-assured/routes/response.rb
+- lib/rest-assured/utils/drb_sniffer.rb
+- lib/rest-assured/utils/port_explorer.rb
+- lib/rest-assured/utils/subprocess.rb
 - lib/rest-assured/version.rb
 - lib/sinatra/handler_options_patch.rb
 - lib/sinatra/partials.rb
+- prof-result.html
 - public/css/base.css
 - public/css/grid.inuit.css
 - public/css/inuit.css
@@ -155,16 +177,22 @@ files:
 - public/javascript/application.js
 - public/javascript/jquery.jgrowl_minimized.js
 - rest-assured.gemspec
-- spec/client/resource_double_spec.rb
+- spec/api/app_runner_spec.rb
+- spec/api/app_session_spec.rb
+- spec/api/resource_double_spec.rb
+- spec/api/server_spec.rb
 - spec/config_spec.rb
-- spec/custom_matchers.rb
 - spec/functional/double_routes_spec.rb
 - spec/functional/redirect_routes_spec.rb
 - spec/functional/response_spec.rb
 - spec/models/double_spec.rb
 - spec/models/redirect_spec.rb
 - spec/models/request_spec.rb
+- spec/port_explorer_spec.rb
 - spec/spec_helper.rb
+- spec/subprocess_spec.rb
+- spec/support/custom_matchers.rb
+- spec/support/reset-singleton.rb
 - ssl/localhost.crt
 - ssl/localhost.key
 - views/doubles/_form.haml
@@ -176,6 +204,7 @@ files:
 - views/redirects/edit.haml
 - views/redirects/index.haml
 - views/redirects/new.haml
+has_rdoc: true
 homepage: https://github.com/BBC/rest-assured
 licenses: []
 post_install_message: 
@@ -191,12 +220,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rest-assured
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A tool for high level mocking/stubbing HTTP based REST services
@@ -205,6 +234,7 @@ test_files:
 - features/rest_api/doubles.feature
 - features/rest_api/redirects.feature
 - features/ruby_api/create_double.feature
+- features/ruby_api/test_server.feature
 - features/ruby_api/verify_requests.feature
 - features/ruby_api/wait_for_requests.feature
 - features/step_definitions/command_line_options_steps.rb
@@ -218,13 +248,19 @@ test_files:
 - features/support/world_helpers.rb
 - features/web_ui/doubles.feature
 - features/web_ui/redirects.feature
-- spec/client/resource_double_spec.rb
+- spec/api/app_runner_spec.rb
+- spec/api/app_session_spec.rb
+- spec/api/resource_double_spec.rb
+- spec/api/server_spec.rb
 - spec/config_spec.rb
-- spec/custom_matchers.rb
 - spec/functional/double_routes_spec.rb
 - spec/functional/redirect_routes_spec.rb
 - spec/functional/response_spec.rb
 - spec/models/double_spec.rb
 - spec/models/redirect_spec.rb
 - spec/models/request_spec.rb
+- spec/port_explorer_spec.rb
 - spec/spec_helper.rb
+- spec/subprocess_spec.rb
+- spec/support/custom_matchers.rb
+- spec/support/reset-singleton.rb