rest-assured 1.0.0.rc1 → 1.0.0.rc2

data/README.markdown

@@ -9,7 +9,7 @@ There are three main use cases:
 
 * stubbing out external data sources with predefined data
 * verify requests to external services (aka spying)
-* quickly simulate different behavior of external services using web UI; useful in development
+* simulate different behavior of external services using web UI; useful in development
 
 ## Usage
 
@@ -27,7 +27,7 @@ It is also recommended to have thin installed. This improves startup time (over
 
 Then install gem and run:
 
-    bash$ gem install rest-assured
+    bash$ gem install rest-assured --pre
     bash$ rest-assured -a mysql &
 
 Or clone from github and run:
@@ -74,7 +74,7 @@ RestAssured::Double.create(fullpath: '/products', content: 'this is content')
 
 Now GET `http://localhost:4578/products` will be returning `this is content`.
 
-You can also verify what requests happen on a double, or, in other words, spy on a double. Say this is a Given part of a test:
+You can also verify what requests happen on a double, or, if you like, spy on a it. Say this is a Given part of a test:
 
 ```ruby
 @double = RestAssured::Double.create(fullpath: '/products', verb: 'POST')
@@ -87,12 +87,12 @@ Then let us assume that `http://localhost:4578/products` got POSTed as a result
 
 req = @double.requests.first
 
-req.body.should == expected_payload
+req.body.should == some_expected_payload
 JSON.parse(req.params).should == expected_params_hash
-JSON.parse(req.rack_env)['ACCEPT'].should == 'text/html'
+JSON.parse(req.rack_env)['HTTP_ACCEPT'].should == 'text/html'
 ```
 
-Use plain rest api to clear doubles/redirects between tests:
+Use plain REST api to clear doubles/redirects between tests:
 
 ```ruby
 RestClient.delete "#{RestAssured::Server.address}/redirects/all"

data/features/rest_api/doubles.feature

@@ -16,7 +16,6 @@ Feature: use doubles via api
       | /api/some?a=3&b=dd | more content |        | GET         |        | 200           |
       | /api/empty         |              | POST   | POST        |        | 200           |
 
-  @now
   Scenario: view created double details
     When I create a double
     Then I should be able to get json representation of that double from response

data/features/rest_api/redirects.feature

@@ -1,4 +1,3 @@
-@now
 Feature: manage redirect rules
   In order to be able to mock only part of api
   As a developer

data/features/ruby_api/test_server.feature

@@ -1,7 +1,8 @@
+@api_server
 Feature: test server
   In order to have easy integration with my test code
   As a ruby developer
-  I want to have a client library take care of starting/stopping an instance of rest-assured appropriately
+  I want to have a client library take care of starting/stopping an instance of rest-assured
 
   Scenario: start rest-assured server
     Given there is free tcp port

data/features/support/env.rb

@@ -39,13 +39,24 @@ Spork.prefork do
 
   World(Capybara, Rack::Test::Methods, RackHeaderHack, WorldHelpers)
 
-end
+  require 'rest-assured/config'
+  db_opts = { :dbuser => ENV['TRAVIS'] ? "''" : "root", :adapter => 'mysql' }
+  RestAssured::Config.build(db_opts)
+
+  require 'rest-assured'
+  require 'shoulda-matchers'
+
+  RestAssured::Server.start(db_opts.merge(:port => 9876))
 
+  Before "@api_server" do
+    RestAssured::Server.stop
+  end
+  After "@api_server" do
+    RestAssured::Server.start(db_opts.merge(:port => 9876))
+  end
+end
 
 Spork.each_run do
-  require 'rest-assured/config'
-  RestAssured::Config.build(:adapter => 'mysql')
-  require 'rest-assured'
   require 'rest-assured/application'
 
   def app
@@ -59,10 +70,6 @@ Spork.each_run do
     DatabaseCleaner.start
   end
 
-  Before "@ruby_api" do
-    RestAssured::Server.start(:port => 9876, :dbuser => ENV['TRAVIS'] ? "''" : "root")
-  end
-
   Before "@ui" do
     set_headers "HTTP_USER_AGENT" => 'Firefox'
   end

data/lib/rest-assured/api/app_session.rb

@@ -8,7 +8,7 @@ module RestAssured
     include Utils::DrbSniffer
 
     def initialize
-      @child = if not running_in_drb? and Process.respond_to?(:fork)
+      @child = if not running_in_spork? and Process.respond_to?(:fork)
                  Utils::Subprocess.new do
                    AppRunner.run!
                  end

data/lib/rest-assured/api/server.rb

@@ -10,9 +10,11 @@ module RestAssured
 
     include Singleton
 
-    def start!(opts = {})
-      at_exit { stop }
+    at_exit do
+      instance.stop if instance
+    end
 
+    def start!(opts = {})
       stop if up?
 
       Config.build(opts)

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

@@ -3,8 +3,8 @@ require 'drb'
 module RestAssured
   module Utils
     module DrbSniffer
-      def running_in_drb?
-        defined?(Spork) and Spork.using_spork?
+      def running_in_spork?
+        defined?(Spork) && Spork.using_spork?
       end
     end
   end

data/lib/rest-assured/version.rb

@@ -1,3 +1,3 @@
 module RestAssured
-  VERSION = '1.0.0.rc1'
+  VERSION = '1.0.0.rc2'
 end

data/spec/api/app_session_spec.rb

@@ -6,7 +6,7 @@ module RestAssured
   describe AppSession do
     context 'either without spork or outside prefork block' do
       before do
-        AppSession.any_instance.stub(:running_in_drb? => false)
+        AppSession.any_instance.stub(:running_in_spork? => false)
       end
 
       it 'start application in subprocess' do
@@ -26,7 +26,7 @@ module RestAssured
 
     context 'within spork prefork block' do
       before do
-        AppSession.any_instance.stub(:running_in_drb? => true)
+        AppSession.any_instance.stub(:running_in_spork? => true)
       end
 
       it 'starts application in childprocess' do

data/spec/api/server_spec.rb

@@ -120,7 +120,7 @@ module RestAssured
     end
 
     it 'stops application subprocess when current process exits' do
-      if not running_in_drb? # drb breaks fork sandbox: at_exits a collected and fired all together on master process exit
+      if not running_in_spork?
         res_file = Tempfile.new('res')
         AppSession.stub(:new).and_return(session = mock.as_null_object)
         session.stub(:stop) do
@@ -132,6 +132,8 @@ module RestAssured
         end
         Process.wait
         res_file.read.should == 'stopped'
+      else
+        pending "Skipped: drb/spork breaks fork sandbox (at_exits are collected and fired all together on master process exit)"
       end
     end
   end

data/spec/spec_helper.rb

@@ -53,24 +53,10 @@ Spork.prefork do
   require 'rest-assured/application'
   require 'shoulda-matchers'
 
-  RestAssured::Server.start(db_opts.merge(:port => 9876))
+  RestAssured::Server.start(db_opts.merge(:port => 9877))
 end
 
 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
 
   def app

data/spec/subprocess_spec.rb

@@ -101,7 +101,7 @@ module RestAssured::Utils
       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
+        if not running_in_spork?
           child_pid # Magic touch. Literally. Else Tempfile gets created in fork and that messes things up
 
           fork do
@@ -113,11 +113,13 @@ module RestAssured::Utils
 
           sleep 0.5
           child_alive?.should == false
+        else
+          pending "Skipped: drb/spork breaks fork sandbox (at_exits are collected and fired all together on master process exit)"
         end
       end
 
       it 'when killed violently' do
-        if not running_in_drb?
+        if not running_in_spork?
           child_pid
 
           fork do
@@ -131,6 +133,8 @@ module RestAssured::Utils
 
           sleep 0.5
           child_alive?.should == false
+        else
+          pending "Skipped: drb/spork breaks fork sandbox (at_exits are collected and fired all together on master process exit)"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-assured
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000 +00:00
-default_executable: 
+date: 2012-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2157171280 !ruby/object:Gem::Requirement
+  requirement: &2160189400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157171280
+  version_requirements: *2160189400
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2157166140 !ruby/object:Gem::Requirement
+  requirement: &2160188700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -33,10 +32,10 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *2157166140
+  version_requirements: *2160188700
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &2157165680 !ruby/object:Gem::Requirement
+  requirement: &2160188000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 0.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *2157165680
+  version_requirements: *2160188000
 - !ruby/object:Gem::Dependency
   name: sinatra-flash
-  requirement: &2157165300 !ruby/object:Gem::Requirement
+  requirement: &2160187420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157165300
+  version_requirements: *2160187420
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2157164700 !ruby/object:Gem::Requirement
+  requirement: &2160186660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157164700
+  version_requirements: *2160186660
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2157164060 !ruby/object:Gem::Requirement
+  requirement: &2160185800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +76,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157164060
+  version_requirements: *2160185800
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &2157163540 !ruby/object:Gem::Requirement
+  requirement: &2160185300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +87,7 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157163540
+  version_requirements: *2160185300
 description: 
 email:
 - artem.avetisyan@bbc.co.uk
@@ -204,7 +203,6 @@ 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: 
@@ -225,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: rest-assured
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A tool for high level mocking/stubbing HTTP based REST services