goliath 0.9.0 → 0.9.1

data/lib/goliath/runner.rb

@@ -102,9 +102,11 @@ module Goliath
         opts.on('-a', '--address HOST', "Bind to HOST address (default: #{@options[:address]})") { |addr| @options[:address] = addr }
         opts.on('-p', '--port PORT', "Use PORT (default: #{@options[:port]})") { |port| @options[:port] = port.to_i }
 
+        opts.on('-u', '--user USER', "Run as specified user") {|v| @options[:user] = v }
         opts.on('-l', '--log FILE', "Log to file (default: off)") { |file| @options[:log_file] = file }
         opts.on('-s', '--stdout', "Log to stdout (default: #{@options[:log_stdout]})") { |v| @options[:log_stdout] = v }
 
+        opts.on('-c', '--config FILE', "Config file (default: ./config/<server>.rb)") { |v| @options[:config] = v }
         opts.on('-P', '--pid FILE', "Pid file (default: off)") { |file| @options[:pid_file] = file }
         opts.on('-d', '--daemonize', "Run daemonized in the background (default: #{@options[:daemonize]})") { |v| @options[:daemonize] = v }
         opts.on('-v', '--verbose', "Enable verbose logging (default: #{@options[:verbose]})") { |v| @options[:verbose] = v }
@@ -134,6 +136,11 @@ module Goliath
     #
     # @return [Nil]
     def run
+      unless Goliath.test?
+        $LOADED_FEATURES.unshift(File.basename($0))
+        Dir.chdir(File.expand_path(File.dirname($0)))
+      end
+
       if @daemonize
         Process.fork do
           Process.setsid
@@ -143,7 +150,6 @@ module Goliath
           @log_file ||= File.expand_path('goliath.log')
           store_pid(Process.pid)
 
-          Dir.chdir(File.dirname(__FILE__))
           File.umask(0000)
 
           stdout_log_file = "#{File.dirname(@log_file)}/#{File.basename(@log_file)}_stdout.log"

data/lib/goliath/server.rb

@@ -58,6 +58,7 @@ module Goliath
       @address = address
       @port = port
 
+      @options = {}
       @status = {}
       @config = {}
       @plugins = []
@@ -74,9 +75,11 @@ module Goliath
 
         EM.epoll
 
-        load_config
+        load_config(options[:config])
         load_plugins
 
+        EM.set_effective_user(options[:user]) if options[:user]
+
         EM.start_server(address, port, Goliath::Connection) do |conn|
           conn.port = port
           conn.app = app
@@ -87,7 +90,6 @@ module Goliath
           conn.options = options
         end
 
-        EM.set_effective_user("nobody") if Goliath.prod?
       end
     end
 
@@ -107,11 +109,8 @@ module Goliath
     #
     # @return [String] THe full path to the config directory
     def config_dir
-      if Goliath.test?
-        "#{File.expand_path(ENV['PWD'])}/config"
-      else
-        "#{File.expand_path(File.dirname($0))}/config"
-      end
+      dir = options[:config] ? File.dirname(options[:config]) : './config'
+      File.expand_path(dir)
     end
 
     # Import callback for configuration files

data/lib/goliath/test_helper.rb

@@ -45,12 +45,17 @@ module Goliath
     #
     # @param api [Class] The API class to launch
     # @param port [Integer] The port to run the server on
-    # @return [Nil]
-    def server(api, port = 9000)
+    # @param options [Hash] The options hash to provide to the server
+    # @return [Goliath::Server] The executed server
+    def server(api, port = 9000, options = {})
+      op = OptionParser.new
+
       s = Goliath::Server.new
       s.logger = mock('log').as_null_object
       s.api = api.new
       s.app = build_app(api)
+      s.api.options_parser(op, options)
+      s.options = options
       s.port = port
       s.start
       s
@@ -67,11 +72,12 @@ module Goliath
     # will start the EventMachine reactor running.
     #
     # @param api [Class] The API class to launch
+    # @param options [Hash] The options to pass to the server
     # @param blk [Proc] The code to execute after the server is launched.
     # @note This will not return until stop is called.
-    def with_api(api, &blk)
+    def with_api(api, options = {}, &blk)
       EM.synchrony do
-        @api_server = server(api)
+        @api_server = server(api, 9000, options)
         blk.call
       end
     end

data/lib/goliath/version.rb

@@ -1,4 +1,4 @@
 module Goliath
   # The current version of Goliath
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/spec/integration/async_request_processing.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 require File.join(File.dirname(__FILE__), '../../', 'examples/async_upload')
 
 describe 'Async Request processing' do
-  include Goliath::TestHelper
-
   it 'asynchronously processes the incoming request' do
     with_api(AsyncUpload) do
       request_data = {

data/spec/integration/echo_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 require File.join(File.dirname(__FILE__), '../../', 'examples/echo')
+require 'multipart_body'
+require 'yajl'
 
 describe Echo do
-  include Goliath::TestHelper
-
   let(:err) { Proc.new { fail "API request failed" } }
 
   it 'returns the echo param' do
@@ -24,4 +24,39 @@ describe Echo do
       end
     end
   end
+
+  it 'echos POST data' do
+    with_api(Echo) do
+      post_request({:body => {'echo' => 'test'}}, err) do |c|
+        b = Yajl::Parser.parse(c.response)
+        b['response'].should == 'test'
+      end
+    end
+  end
+
+  it 'echos POST data that is multipart encoded' do
+    with_api(Echo) do
+      body = MultipartBody.new(:echo => 'test')
+      head = {'content-type' => "multipart/form-data; boundary=#{body.boundary}"}
+
+      post_request({:body => body.to_s,
+                    :head => head}, err) do |c|
+        b = Yajl::Parser.parse(c.response)
+        b['response'].should == 'test'
+      end
+    end
+  end
+
+  it 'echos application/json POST body data' do
+    with_api(Echo) do
+      body = Yajl::Encoder.encode({'echo' => 'My Echo'})
+      head = {'content-type' => 'application/json'}
+
+      post_request({:body => body.to_s,
+                    :head => head}, err) do |c|
+        b = Yajl::Parser.parse(c.response)
+        b['response'].should == 'My Echo'
+      end
+    end
+  end
 end

data/spec/integration/empty_body_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+class Empty < Goliath::API
+  def response(env)
+    [201, {}, []]
+  end
+end
+
+describe 'Empty body API' do
+  let(:err) { Proc.new { fail "API request failed" } }
+
+  it 'serves a 201 with no body' do
+    with_api(Empty) do
+      get_request({}, err) do |c|
+        c.response_header.status.should == 201
+        c.response_header['CONTENT_LENGTH'].should == '0'
+      end
+    end
+  end
+end

data/spec/integration/http_log_spec.rb

@@ -0,0 +1,138 @@
+require 'spec_helper'
+require File.join(File.dirname(__FILE__), '../../', 'examples/http_log')
+
+class Responder < Goliath::API
+  use Goliath::Rack::Params
+
+  def on_headers(env, headers)
+    env['client-headers'] = headers
+  end
+
+  def response(env)
+    query_params = env.params.collect { |param| param.join(": ") }
+    query_headers = env['client-headers'].collect { |param| param.join(": ") }
+
+    headers = {"Special" => "Header",
+               "Params" => query_params.join("|"),
+               "Path" => env[Goliath::Request::REQUEST_PATH],
+               "Headers" => query_headers.join("|"),
+               "Method" => env[Goliath::Request::REQUEST_METHOD]}
+    [200, headers, "Hello from Responder"]
+  end
+end
+
+describe HttpLog do
+  include Goliath::TestHelper
+
+  let(:err) { Proc.new { |c| fail "HTTP Request failed #{c.response}" } }
+
+  def config_file
+    File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'examples', 'config', 'http_log.rb'))
+  end
+
+  let(:api_options) { { :config => config_file } }
+
+  def mock_mongo
+    @api_server.config['mongo'] = mock('mongo').as_null_object
+  end
+
+  it 'responds to requests' do
+    with_api(HttpLog, api_options) do
+      server(Responder, 8080)
+      mock_mongo
+
+      get_request({}, err) do |c|
+        c.response_header.status.should == 200
+      end
+    end
+  end
+
+  it 'forwards to our API server' do
+    with_api(HttpLog, api_options) do
+      server(Responder, 8080)
+      mock_mongo
+
+      get_request({}, err) do |c|
+        c.response_header.status.should == 200
+        c.response_header['SPECIAL'].should == 'Header'
+        c.response.should == 'Hello from Responder'
+      end
+    end
+  end
+
+  context 'HTTP header handling' do
+    it 'transforms back properly' do
+      hl = HttpLog.new
+      hl.to_http_header("SPECIAL").should == 'Special'
+      hl.to_http_header("CONTENT_TYPE").should == 'Content-Type'
+    end
+  end
+
+  context 'query parameters' do
+    it 'forwards the query parameters' do
+      with_api(HttpLog, api_options) do
+        server(Responder, 8080)
+        mock_mongo
+
+        get_request({:query => {:first => :foo, :second => :bar, :third => :baz}}, err) do |c|
+          c.response_header.status.should == 200
+          c.response_header["PARAMS"].should == "first: foo|second: bar|third: baz"
+        end
+      end
+    end
+  end
+
+  context 'request path' do
+    it 'forwards the request path' do
+      with_api(HttpLog, api_options) do
+        server(Responder, 8080)
+        mock_mongo
+
+        get_request({:path => '/my/request/path'}, err) do |c|
+          c.response_header.status.should == 200
+          c.response_header['PATH'].should == '/my/request/path'
+        end
+      end
+    end
+  end
+
+  context 'headers' do
+    it 'forwards the headers' do
+      with_api(HttpLog, api_options) do
+        server(Responder, 8080)
+        mock_mongo
+
+        get_request({:head => {:first => :foo, :second => :bar}}, err) do |c|
+          c.response_header.status.should == 200
+          c.response_header["HEADERS"].should =~ /First: foo\|Second: bar/
+        end
+      end
+    end
+  end
+
+  context 'request method' do
+    it 'forwards GET requests' do
+      with_api(HttpLog, api_options) do
+        server(Responder, 8080)
+        mock_mongo
+
+        get_request({}, err) do |c|
+          c.response_header.status.should == 200
+          c.response_header["METHOD"].should == "GET"
+        end
+      end
+    end
+
+    it 'forwards POST requests' do
+      with_api(HttpLog, api_options) do
+        server(Responder, 8080)
+        mock_mongo
+
+        post_request({}, err) do |c|
+          c.response_header.status.should == 200
+          c.response_header["METHOD"].should == "POST"
+        end
+      end
+    end
+  end
+end

data/spec/integration/keepalive_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 require File.join(File.dirname(__FILE__), '../../', 'examples/echo')
 
 describe 'HTTP Keep-Alive support' do
-  include Goliath::TestHelper
-
   it 'serves multiple requests via single connection' do
     with_api(Echo) do
       conn = EM::HttpRequest.new('http://localhost:9000')

data/spec/integration/pipelining_spec.rb

@@ -12,8 +12,6 @@ class Interleaving < Goliath::API
 end
 
 describe 'HTTP Pipelining support' do
-  include Goliath::TestHelper
-
   it 'serves multiple requests via single connection' do
     with_api(Interleaving) do
       start = Time.now.to_f

data/spec/integration/reloader_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+Goliath.env = 'dev'
+
+class ReloaderDev < Goliath::API
+  use Goliath::Rack::Params
+end
+
+class ReloaderAlreadyLoaded < Goliath::API
+  use ::Rack::Reloader, 0
+  use Goliath::Rack::Params
+end
+
+class ReloaderProd < Goliath::API
+end
+
+describe "Reloader" do
+  let(:err) { Proc.new { fail "API request failed" } }
+
+  before(:each) { Goliath.env = "dev" }
+  after(:each) { Goliath.env = "test" }
+
+  def count(klass)
+    cnt = 0
+    klass.middlewares.each do |mw|
+      cnt += 1 if mw.first == ::Rack::Reloader
+    end
+    cnt
+  end
+
+  it 'adds reloader in dev mode' do
+    count(ReloaderDev).should == 1
+  end
+
+  it "doesn't add if it's already there in dev mode" do
+    count(ReloaderAlreadyLoaded).should == 1
+  end
+
+  it "doesn't add in prod mode" do
+    Goliath.env = "prod"
+    count(ReloaderProd).should == 0
+  end
+end

data/spec/integration/valid_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 require File.join(File.dirname(__FILE__), '../../', 'examples/valid')
 
 describe Valid do
-  include Goliath::TestHelper
-
   let(:err) { Proc.new { fail "API request failed" } }
 
   it 'returns OK with param' do

data/spec/spec_helper.rb

@@ -4,3 +4,9 @@ Bundler.setup
 Bundler.require
 
 require 'goliath/test_helper'
+
+RSpec.configure do |c|
+  c.include Goliath::TestHelper, :example_group => {
+    :file_path => /spec\/integration/
+  }
+end

data/spec/unit/env_spec.rb

@@ -7,12 +7,12 @@ describe Goliath::Env do
   end
 
   it 'responds to []=' do
-    lambda { @env['test'] = 'blah' }.should_not raise_error(Exception)
+    lambda { @env['test'] = 'blah' }.should_not raise_error
   end
 
   it 'responds to []' do
     @env['test'] = 'blah'
-    lambda { @env['test'].should == 'blah' }.should_not raise_error(Exception)
+    lambda { @env['test'].should == 'blah' }.should_not raise_error
   end
 
   context '#method_missing' do

data/spec/unit/rack/formatters/json_spec.rb

@@ -3,7 +3,7 @@ require 'goliath/rack/formatters/json'
 
 describe Goliath::Rack::Formatters::JSON do
   it 'accepts an app' do
-    lambda { Goliath::Rack::Formatters::JSON.new('my app') }.should_not raise_error Exception
+    lambda { Goliath::Rack::Formatters::JSON.new('my app') }.should_not raise_error
   end
 
   describe 'with a formatter' do
@@ -30,7 +30,7 @@ describe Goliath::Rack::Formatters::JSON do
       @app.should_receive(:call).and_return([200, {'Content-Type' => 'application/json'}, {:a => 1, :b => 2}])
 
       status, header, body = @js.call({})
-      lambda { Yajl::Parser.parse(body.first)['a'].should == 1 }.should_not raise_error Exception
+      lambda { Yajl::Parser.parse(body.first)['a'].should == 1 }.should_not raise_error
     end
 
     it "doesn't format to json if the type is not application/json" do