rest-assured 0.3.2 → 1.0.0.rc1

data/features/support/env.rb

@@ -3,14 +3,18 @@ require 'rubygems'
 require 'spork'
 
 Spork.prefork do
+  require 'timeout'
   require 'rspec'
   require 'rack/test'
   require 'capybara'
   require 'capybara/firebug'
   require 'capybara/cucumber'
   require 'database_cleaner'
+  require 'awesome_print'
+  require 'rest-assured/utils/port_explorer'
   require File.dirname(__FILE__) + '/world_helpers'
 
+
   ENV['RACK_ENV'] = 'test'
 
   module RackHeaderHack
@@ -41,21 +45,8 @@ end
 Spork.each_run do
   require 'rest-assured/config'
   RestAssured::Config.build(:adapter => 'mysql')
-
   require 'rest-assured'
-  require 'rest-assured/client'
-  require File.expand_path('../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
+  require 'rest-assured/application'
 
   def app
     RestAssured::Application
@@ -68,6 +59,10 @@ 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/features/support/world_helpers.rb

@@ -7,7 +7,7 @@ module WorldHelpers
     code = File.read rest_assured_exec
 
     code.sub!(/(.*)/, "\\1\nENV['RACK_ENV'] = 'production'")
-    code.sub!(/require 'rest-assured'/, '')
+    code.sub!(/require 'rest-assured\/application'/, '')
     code.sub!(/RestAssured::Application.run!/, 'puts AppConfig.to_yaml')
 
     new_exec = "#{rest_assured_exec}_temp"

data/lib/rest-assured.rb

@@ -1,45 +1 @@
-require 'sinatra/base'
-require 'sinatra/handler_options_patch'
-require 'haml'
-require 'rack-flash'
-require 'sinatra/partials'
-require 'rest-assured/config'
-require 'rest-assured/models/double'
-require 'rest-assured/models/redirect'
-require 'rest-assured/models/request'
-require 'rest-assured/routes/double'
-require 'rest-assured/routes/redirect'
-require 'rest-assured/routes/response'
-
-module RestAssured
-  class Application < Sinatra::Base
-
-    include Config
-
-    enable :method_override
-
-    enable :sessions
-    use Rack::Flash, :sweep => true
-
-    set :public_folder, File.expand_path('../../public', __FILE__)
-    set :views, File.expand_path('../../views', __FILE__)
-    set :haml, :format => :html5
-
-    helpers Sinatra::Partials
-
-    helpers do
-      def browser?
-        request.user_agent =~ /Safari|Firefox|Opera|MSIE|Chrome/
-      end
-    end
-
-    include DoubleRoutes
-    include RedirectRoutes
-
-    %w{get post put delete}.each do |verb|
-      send verb, /.*/ do
-        Response.perform(self)
-      end
-    end
-  end
-end
+require 'rest-assured/api'

data/lib/rest-assured/api.rb

@@ -0,0 +1,3 @@
+require 'rest-assured/api/server'
+require 'rest-assured/api/resources'
+

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

@@ -0,0 +1,18 @@
+require 'singleton'
+
+module RestAssured
+  class AppRunner
+    include Singleton
+
+    def run!
+      unless Kernel.require 'rest-assured/application'
+        RestAssured::Application.send(:include, Config)
+      end
+      RestAssured::Application.run!
+    end
+
+    def self.method_missing(*args)
+      instance.send(*args)
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+require 'rest-assured/utils/subprocess'
+require 'rest-assured/utils/drb_sniffer'
+require 'rest-assured/api/app_runner'
+require 'childprocess'
+
+module RestAssured
+  class AppSession
+    include Utils::DrbSniffer
+
+    def initialize
+      @child = if not running_in_drb? and Process.respond_to?(:fork)
+                 Utils::Subprocess.new do
+                   AppRunner.run!
+                 end
+               else
+                 child = ChildProcess.build('rest-assured', *Config.to_cmdargs)
+                 child.io.inherit!
+                 child.start
+                 child
+               end
+    end
+
+    def alive?
+      @child.alive?
+    rescue Errno::ECHILD
+      false
+    end
+
+    def method_missing(*args)
+      @child.send(*args)
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+require 'singleton'
+require 'rest-assured/config'
+require 'rest-assured/api/resources'
+require 'rest-assured/api/app_session'
+require 'rest-assured/utils/port_explorer'
+
+module RestAssured
+  class Server
+    attr_reader :address
+
+    include Singleton
+
+    def start!(opts = {})
+      at_exit { stop }
+
+      stop if up?
+
+      Config.build(opts)
+
+      self.address = "http#{AppConfig.ssl ? 's' : ''}://127.0.0.1:#{AppConfig.port}"
+
+      @session = AppSession.new
+    end
+
+    def start(*args)
+      start!(*args)
+
+      while not up?
+        sleep 0.5
+      end
+    end
+
+    def address=(address)
+      Double.site = @address = address
+    end
+
+    def stop
+      @session.try(:stop)
+
+      10.times do
+        if up?
+          sleep 0.5
+          next
+        else
+          return
+        end
+      end
+      raise "Failed to stop RestAssured server"
+    end
+
+    def up?
+      !!@session && @session.alive? && !Utils::PortExplorer.port_free?(AppConfig.port) 
+    end
+
+    def self.method_missing(*args)
+      instance.send(*args)
+    end
+  end
+end

data/lib/rest-assured/application.rb

@@ -0,0 +1,46 @@
+require 'sinatra/base'
+require 'sinatra/handler_options_patch'
+require 'haml'
+require 'sinatra/flash'
+require 'sinatra/partials'
+require 'rest-assured/config'
+require 'rest-assured/models/double'
+require 'rest-assured/models/redirect'
+require 'rest-assured/models/request'
+require 'rest-assured/routes/double'
+require 'rest-assured/routes/redirect'
+require 'rest-assured/routes/response'
+
+module RestAssured
+  class Application < Sinatra::Base
+
+    include Config
+
+    enable :method_override
+
+    enable :sessions
+    register Sinatra::Flash
+
+    set :public_folder, File.expand_path('../../../public', __FILE__)
+    set :views, File.expand_path('../../../views', __FILE__)
+    set :haml, :format => :html5
+
+    helpers Sinatra::Partials
+
+    helpers do
+      def browser?
+        request.user_agent =~ /Safari|Firefox|Opera|MSIE|Chrome/
+      end
+    end
+
+    include DoubleRoutes
+    include RedirectRoutes
+
+    %w{get post put delete}.each do |verb|
+      send verb, /.*/ do
+        Response.perform(self)
+      end
+    end
+  end
+end
+

data/lib/rest-assured/config.rb

@@ -31,7 +31,8 @@ module RestAssured
 
     # this is meant to be called prior to include
     def self.build(opts = {})
-      AppConfig.merge!(opts)
+      @user_conf = opts
+      AppConfig.merge!(@user_conf)
 
       AppConfig.logfile ||= if AppConfig.environment == 'production'
                               './rest-assured.log'
@@ -45,7 +46,7 @@ module RestAssured
     def self.included(klass)
       init_logger
       setup_db
-      setup_ssl(klass) if AppConfig.use_ssl
+      setup_ssl(klass) if AppConfig.ssl
 
       klass.set :port, AppConfig.port
       klass.set :environment, AppConfig.environment
@@ -54,6 +55,18 @@ module RestAssured
       klass.use Rack::CommonLogger, AppConfig.logger
     end
 
+    def self.to_cmdargs
+      @user_conf.inject([]) do |acc, (k,v)|
+        if v == true
+          acc << "--#{k}"
+        elsif v.is_a?(String) || v.is_a?(Integer)
+          acc << "--#{k}" << v.to_s
+        else
+          acc
+        end
+      end
+    end
+
     private
 
       def self.setup_ssl(klass)
@@ -152,7 +165,7 @@ module RestAssured
       end
 
       def self.build_ssl_config
-        AppConfig.use_ssl ||= false
+        AppConfig.ssl ||= false
         AppConfig.ssl_cert ||= File.expand_path('../../../ssl/localhost.crt', __FILE__)
         AppConfig.ssl_key ||= File.expand_path('../../../ssl/localhost.key', __FILE__)
       end

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

@@ -9,6 +9,12 @@ module RestAssured
 
       before_create :assign_position
 
+      def self.find_redirect_url_for(fullpath)
+        if redirect = ordered.find { |r| fullpath =~ /#{r.pattern}/ }
+          fullpath.sub /#{redirect.pattern}/, redirect.to
+        end
+      end
+
       def self.update_order(ordered_redirect_ids)
         success = true
 

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

@@ -48,7 +48,7 @@ module RestAssured
             flash[:notice] = "Double created"
             redirect '/doubles'
           else
-            flash[:error] = "Crumps! " + @double.errors.full_messages.join("; ")
+            flash.now[:error] = "Crumps! " + @double.errors.full_messages.join("; ")
             haml :'doubles/new'
           end
         else

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

@@ -19,7 +19,7 @@ module RestAssured
             flash[:notice] = "Redirect created"
             redirect '/redirects'
           else
-            flash[:error] = "Crumps! " + @redirect.errors.full_messages.join("; ")
+            flash.now[:error] = "Crumps! " + @redirect.errors.full_messages.join("; ")
             haml :'redirects/new'
           end
         else

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

@@ -5,16 +5,16 @@ module RestAssured
 
       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')
+        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
-      elsif r = Models::Redirect.ordered.find { |r| request.fullpath =~ /#{r.pattern}/ }
-        app.redirect( "#{r.to}#{request.fullpath}" )
+      elsif redirect_url = Models::Redirect.find_redirect_url_for(request.fullpath)
+        app.redirect redirect_url
       else
         app.status 404
       end

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

@@ -0,0 +1,11 @@
+require 'drb'
+
+module RestAssured
+  module Utils
+    module DrbSniffer
+      def running_in_drb?
+        defined?(Spork) and Spork.using_spork?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require 'socket'
+
+module RestAssured
+  module Utils
+    class PortExplorer
+      def self.free_port
+        server = TCPServer.new('127.0.0.1', 0)
+        free_port = server.addr[1]
+        server.close
+        free_port
+      end
+
+      def self.port_free?(port)
+        Net::HTTP.get('127.0.0.1', '/', port)
+      rescue => e
+        e.is_a?(Errno::ECONNREFUSED)
+      else
+        false
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+module RestAssured
+  module Utils
+    class Subprocess
+      attr_reader :pid
+
+      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
+
+          begin
+            yield
+          rescue => e
+            if defined?(EventMachine) && e.is_a?(EventMachine::ConnectionNotBound)
+              retry
+            end
+            puts "#{self} has raised #{e.inspect}:"
+            puts e.backtrace.join("\n")
+          end
+        end
+
+        Process.detach(@pid)
+        at_exit { stop }
+      end
+
+      def alive?
+        Process.kill(0, @pid)
+        true
+      rescue Errno::ESRCH
+        false
+      end
+
+      def stop
+        Process.kill('USR1', @pid) rescue Errno::ESRCH # no such process
+      end
+    end
+  end
+end