goliath 0.9.0 → 0.9.1

data/.gitignore

@@ -1,15 +1,18 @@
-Makefile
-mkmf.log
-*.o
-*.bundle
+Gemfile.lock
+
+.bundle/
 doc/
 pkg/
-examples/log
-*.swp
-Gemfile.lock
+_site
+
 .yardoc
 .livereload
+.rvmrc
+
+*.swp
 *.watchr
 *.rbc
-.rvmrc
-_site
+
+examples/log
+examples/goliath.log*
+examples/goliath.pid

data/README.md

@@ -23,9 +23,6 @@ Each HTTP request within Goliath is executed in its own Ruby fiber and all async
     require 'goliath'
 
     class Hello < Goliath::API
-      # reload code on every request in dev environment
-      use ::Rack::Reloader, 0 if Goliath.dev?
-
       def response(env)
         [200, {}, "Hello World"]
       end
@@ -55,7 +52,7 @@ Goliath has been in production at PostRank for over a year, serving a sustained
     * Mongrel is a threaded web-server, and both Passenger and Unicorn fork an entire VM to isolate each request from each other. By contrast, Goliath builds a single instance of the Rack app and runs all requests in parallel through a single VM, which leads to a much smaller memory footprint and less overhead.
 
 * How do I deploy Goliath in production?
-    * We recommend deploying Goliath behind a reverse proxy such as HAProxy, Nginx or equivalent. Using one of the above, you can easily run multiple instances of the same application and load balance between then within the reverse proxy.
+    * We recommend deploying Goliath behind a reverse proxy such as HAProxy, Nginx or equivalent. Using one of the above, you can easily run multiple instances of the same application and load balance between them within the reverse proxy.
 
 ## Guides
 
@@ -74,6 +71,8 @@ Goliath has been in production at PostRank for over a year, serving a sustained
 
 * [Goliath: Non-blocking, Ruby 1.9 Web Server](http://www.igvita.com/2011/03/08/goliath-non-blocking-ruby-19-web-server)
 * [Stage left: Enter Goliath - HTTP Proxy + MongoDB](http://everburning.com/news/stage-left-enter-goliath/)
+* [InfoQ: Meet the Goliath of Ruby Application Servers](http://www.infoq.com/articles/meet-goliath)
+* [Node.jsはコールバック・スパゲティを招くか](http://el.jibun.atmarkit.co.jp/rails/2011/03/nodejs-d123.html)
 
 ## Discussion and Support
 
@@ -83,4 +82,4 @@ Goliath has been in production at PostRank for over a year, serving a sustained
 
 ## License & Acknowledgments
 
-Goliath is distributed under the MIT license, for full details please see the LICENSE file.
+Goliath is distributed under the MIT license, for full details please see the LICENSE file.

data/Rakefile

@@ -5,6 +5,7 @@ require 'yard'
 require 'rspec/core/rake_task'
 
 task :default => [:spec]
+task :test => [:spec]
 
 desc "run spec tests"
 RSpec::Core::RakeTask.new('spec') do |t|

data/examples/activerecord/srv.rb

@@ -19,8 +19,6 @@ class User < ActiveRecord::Base
 end
 
 class Srv < Goliath::API
-  use ::Rack::Reloader, 0 if Goliath.dev?
-
   use Goliath::Rack::Params
   use Goliath::Rack::DefaultMimeType
   use Goliath::Rack::Formatters::JSON

data/examples/async_upload.rb

@@ -5,10 +5,6 @@ require 'goliath'
 require 'yajl'
 
 class AsyncUpload < Goliath::API
-
-  # reload code on every request in dev environment
-  use ::Rack::Reloader, 0 if Goliath.dev?
-
   use Goliath::Rack::Params             # parse & merge query and body parameters
   use Goliath::Rack::DefaultMimeType    # cleanup accepted media types
   use Goliath::Rack::Formatters::JSON   # JSON output formatter

data/examples/conf_test.rb

@@ -10,7 +10,6 @@ $:<< '../lib' << 'lib'
 require 'goliath'
 
 class ConfTest < Goliath::API
-
   use Goliath::Rack::Params
   use Goliath::Rack::DefaultMimeType
   use Goliath::Rack::Formatters::JSON

data/examples/config/content_stream.rb

@@ -0,0 +1,33 @@
+require 'amqp'
+
+config['channel'] = EM::Channel.new
+
+amqp_config = {
+  :host => 'localhost',
+  :user => 'test',
+  :pass => 'test',
+  :vhost => '/test'
+}
+
+conn = AMQP.connect(amqp_config)
+
+xchange = AMQP::Channel.new(conn).fanout('stream')
+q = AMQP::Channel.new(conn).queue('stream/StreamAPI')
+q.bind(xchange)
+
+# pull data off the exchange and push to streams
+q.pop do |data|
+  if data.nil?
+    EM.add_timer(1) { q.pop }
+  else
+    config['channel'].push(data)
+    q.pop
+  end
+end
+
+# push data into the stream. (Just so we have stuff going in)
+count = 0
+EM.add_periodic_timer(2) do
+  xchange.publish("Iteration #{count}\n")
+  count += 1
+end

data/examples/config/http_log.rb

@@ -1,7 +1,9 @@
 config['forwarder'] = 'http://localhost:8080'
 
-config['mongo'] = EventMachine::Synchrony::ConnectionPool.new(size: 20) do
-  # Need to deal with this just never connecting ... ?
-  conn = EM::Mongo::Connection.new('localhost', 27017, 1, {:reconnect_in => 1})
-  conn.db('http_log').collection('aggregators')
-end
+environment(:development) do
+  config['mongo'] = EventMachine::Synchrony::ConnectionPool.new(size: 20) do
+    # Need to deal with this just never connecting ... ?
+    conn = EM::Mongo::Connection.new('localhost', 27017, 1, {:reconnect_in => 1})
+    conn.db('http_log').collection('aggregators')
+  end
+end

data/examples/content_stream.rb

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+$:<< '../lib' << 'lib'
+
+require 'goliath'
+
+# This example assumes you have an AMQP server up and running with the
+# following config (using rabbit-mq as an example)
+#
+# rabbitmq-server start
+# rabbitmqctl add_vhost /test
+# rabbitmqctl add_user test test
+# rabbitmqctl set_permissions -p /test test ".*" ".*" ".*"
+
+class ContentStream < Goliath::API
+  use Goliath::Rack::Formatters::JSON
+  use Goliath::Rack::Params
+
+  use Goliath::Rack::Render
+  use Goliath::Rack::Heartbeat
+  use Goliath::Rack::ValidationError
+  use Goliath::Rack::Validation::RequestMethod, %w(GET)
+
+  def on_close(env)
+    # This is just to make sure if the Heartbeat fires we don't try
+    # to close a connection.
+    return unless env['subscription']
+
+    env.channel.unsubscribe(env['subscription'])
+    env.logger.info "Stream connection closed."
+  end
+
+  def response(env)
+    env.logger.info "Stream connection opened"
+
+    env['subscription'] = env.channel.subscribe do |msg|
+      env.stream_send(msg)
+    end
+
+    [200, {}, Goliath::Response::STREAMING]
+  end
+end

data/examples/echo.rb

@@ -9,10 +9,6 @@ require 'goliath/plugins/latency'
 require 'yajl'
 
 class Echo < Goliath::API
-
-  # reload code on every request in dev environment
-  use ::Rack::Reloader, 0 if Goliath.dev?
-
   use Goliath::Rack::Params             # parse & merge query and body parameters
   use Goliath::Rack::DefaultMimeType    # cleanup accepted media types
   use Goliath::Rack::Formatters::JSON   # JSON output formatter
@@ -20,7 +16,7 @@ class Echo < Goliath::API
   use Goliath::Rack::Heartbeat          # respond to /status with 200, OK (monitoring, etc)
   use Goliath::Rack::ValidationError    # catch and render validation errors
 
-  use Goliath::Rack::Validation::RequestMethod, %w(GET)           # allow GET requests only
+  use Goliath::Rack::Validation::RequestMethod, %w(GET POST)           # allow GET and POST requests only
   use Goliath::Rack::Validation::RequiredParam, {:key => 'echo'}  # must provide ?echo= query or body param
 
   plugin Goliath::Plugin::Latency       # output reactor latency every second

data/examples/http_log.rb

@@ -15,7 +15,6 @@ require 'em-synchrony/em-http'
 require 'pp'
 
 class HttpLog < Goliath::API
-  use ::Rack::Reloader, 0 if Goliath.dev?
   use Goliath::Rack::Params
 
   def on_headers(env, headers)

data/examples/valid.rb

@@ -4,10 +4,6 @@ $:<< '../lib' << 'lib'
 require 'goliath'
 
 class Valid < Goliath::API
-
-  # reload code on every request in dev environment
-  use ::Rack::Reloader, 0 if Goliath.dev?
-
   use Goliath::Rack::Params
   use Goliath::Rack::ValidationError
 

data/goliath.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'http_parser.rb'
   s.add_dependency 'log4r'
 
-  s.add_dependency 'rack'
+  s.add_dependency 'rack', '>=1.2.2'
   s.add_dependency 'rack-contrib'
   s.add_dependency 'rack-respond_to'
   s.add_dependency 'async-rack'
@@ -31,6 +31,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'em-mongo'
   s.add_development_dependency 'yajl-ruby'
   s.add_development_dependency 'rack-rewrite'
+  s.add_development_dependency 'multipart_body'
+  s.add_development_dependency 'amqp', '>=0.7.1'
 
   s.add_development_dependency 'yard'
   s.add_development_dependency 'bluecloth'

data/lib/goliath/api.rb

@@ -20,8 +20,16 @@ module Goliath
       #
       # @return [Array] array contains [middleware class, args, block]
       def middlewares
-        @middlewares ||= [[::Rack::ContentLength, nil, nil],
-                          [Goliath::Rack::DefaultResponseFormat, nil, nil]]
+        @middlewares ||= []
+        @middlewares.unshift([::Goliath::Rack::DefaultResponseFormat, nil, nil])
+        @middlewares.unshift([::Rack::ContentLength, nil, nil])
+
+        if Goliath.dev?
+           reloader = @middlewares.detect {|mw| mw.first == ::Rack::Reloader}
+           @middlewares.unshift([::Rack::Reloader, 0, nil]) if !reloader
+         end
+
+        @middlewares
       end
 
       # Specify a middleware to be used by the API
@@ -37,7 +45,8 @@ module Goliath
       # @param args Any arguments to pass to the middeware
       # @param block A block to pass to the middleware
       def use(name, args = nil, &block)
-        middlewares.push([name, args, block])
+        @middlewares ||= []
+        @middlewares << [name, args, block]
       end
 
       # Returns the plugins configured for this API

data/lib/goliath/application.rb

@@ -45,7 +45,11 @@ module Goliath
     # @return [Nil]
     def self.run!
       file = File.basename(app_file, '.rb')
-      klass = Kernel.const_get(camel_case(file))
+      klass = begin
+        Kernel.const_get(camel_case(file))
+      rescue NameError
+        raise NameError, "Class #{camel_case(file)} not found."
+      end
       api = klass.new
 
       runner = Goliath::Runner.new(ARGV, api)

data/lib/goliath/connection.rb

@@ -23,9 +23,8 @@ module Goliath
       @parser.on_headers_complete = proc do |h|
 
         env = Goliath::Env.new
-        env[OPTIONS]     = options
         env[SERVER_PORT] = port.to_s
-        env[LOGGER]      = logger
+        env[RACK_LOGGER] = logger
         env[OPTIONS]     = options
         env[STATUS]      = status
         env[CONFIG]      = config

data/lib/goliath/constants.rb

@@ -10,7 +10,6 @@ module Goliath
 
     HTTP_PREFIX     = 'HTTP_'
     LOCALHOST       = 'localhost'
-    LOGGER          = 'logger'
     STATUS          = 'status'
     CONFIG          = 'config'
     OPTIONS         = 'options'
@@ -22,6 +21,7 @@ module Goliath
     RACK_MULTIPROCESS = 'rack.multiprocess'
     RACK_RUN_ONCE   = 'rack.run_once'
     RACK_VERSION_NUM = [1, 0]
+    RACK_LOGGER     = 'rack.logger'
 
     ASYNC_CALLBACK  = 'async.callback'
     ASYNC_HEADERS   = 'async.headers'
@@ -37,6 +37,7 @@ module Goliath
     SCRIPT_NAME     = 'SCRIPT_NAME'
     REMOTE_ADDR     = 'REMOTE_ADDR'
     CONTENT_LENGTH  = 'CONTENT_LENGTH'
+    CONTENT_TYPE    = 'CONTENT_TYPE'
     REQUEST_METHOD  = 'REQUEST_METHOD'
     REQUEST_URI     = 'REQUEST_URI'
     QUERY_STRING    = 'QUERY_STRING'

data/lib/goliath/env.rb

@@ -67,6 +67,13 @@ module Goliath
       self[STREAM_CLOSE].call
     end
 
+    # Convenience method for accessing the rack.logger item in the environment.
+    #
+    # @return [Logger] The logger object
+    def logger
+      self[RACK_LOGGER]
+    end
+
     # @param name [Symbol] The method to check if we respond to it.
     # @return [Boolean] True if the Env responds to the method, false otherwise
     def respond_to?(name)

data/lib/goliath/goliath.rb

@@ -6,7 +6,7 @@ require 'async_rack'
 module Goliath
   module_function
 
-  @env = 'development'
+  @env = :development
 
   # Retrieves the current goliath environment
   #
@@ -19,10 +19,10 @@ module Goliath
   #
   # @param [String] env the environment string of [dev|prod|test]
   def env=(env)
-    case(env)
-    when 'dev' then @env = 'development'
-    when 'prod' then @env = 'production'
-    when 'test' then @env = 'test'
+    case(env.to_s)
+    when 'dev'  then @env = :development
+    when 'prod' then @env = :production
+    when 'test' then @env = :test
     end
   end
 
@@ -30,20 +30,20 @@ module Goliath
   #
   # @return [Boolean] true if current environemnt is production, false otherwise
   def prod?
-    @env == 'production'
+    @env == :production
   end
 
   # Determines if we are in the development environment
   #
   # @return [Boolean] true if current environemnt is development, false otherwise
   def dev?
-    @env == 'development'
+    @env == :development
   end
 
   # Determines if we are in the test environment
   #
   # @return [Boolean] true if current environemnt is test, false otherwise
   def test?
-    @env == 'test'
+    @env == :test
   end
 end

data/lib/goliath/rack/params.rb

@@ -1,7 +1,11 @@
+require 'multi_json'
 require 'rack/utils'
 
 module Goliath
   module Rack
+    URL_ENCODED = %r{^application/x-www-form-urlencoded}
+    JSON_ENCODED = %r{^application/json}
+
     # A middle ware to parse params. This will parse both the
     # query string parameters and the body and place them into
     # the _params_ hash of the Goliath::Env for the request.
@@ -21,8 +25,27 @@ module Goliath
 
       def retrieve_params(env)
         params = {}
-        params.merge!(::Rack::Utils.parse_query(env['QUERY_STRING']))
-        params.merge!(::Rack::Utils.parse_query(env['rack.input'].read)) unless env['rack.input'].nil?
+        params.merge!(::Rack::Utils.parse_nested_query(env['QUERY_STRING']))
+
+        if env['rack.input']
+          post_params = ::Rack::Utils::Multipart.parse_multipart(env)
+          unless post_params
+            body = env['rack.input'].read
+            env['rack.input'].rewind
+
+            post_params = case(env['CONTENT_TYPE'])
+            when URL_ENCODED then
+              ::Rack::Utils.parse_nested_query(body)
+            when JSON_ENCODED then
+              MultiJson.decode(body)
+            else
+              {}
+            end
+          end
+
+          params.merge!(post_params)
+        end
+
         params
       end
     end

data/lib/goliath/request.rb

@@ -47,7 +47,16 @@ module Goliath
         @env[HTTP_PREFIX + k.gsub('-','_').upcase] = v
       end
 
-      @env[STATUS]          = parser.status_code
+      %w(CONTENT_TYPE CONTENT_LENGTH).each do |name|
+        @env[name] = @env.delete("HTTP_#{name}") if @env["HTTP_#{name}"]
+      end
+
+      if @env['HTTP_HOST']
+        name, port = @env['HTTP_HOST'].split(':')
+        @env[SERVER_NAME] = name if name
+        @env[SERVER_PORT] = port if port
+      end
+
       @env[REQUEST_METHOD]  = parser.http_method
       @env[REQUEST_URI]     = parser.request_url
       @env[QUERY_STRING]    = parser.query_string
@@ -118,6 +127,7 @@ module Goliath
     def process
       begin
         @state = :finished
+        @env['rack.input'].rewind if @env['rack.input']
         post_process(@app.call(@env))
 
       rescue Exception => e
@@ -153,7 +163,7 @@ module Goliath
           begin
             @response.status, @response.headers, @response.body = status, headers, body
             @response.each { |chunk| @conn.send_data(chunk) }
-            @env[LOGGER].info("Status: #{@response.status}, " +
+            @env[RACK_LOGGER].info("Status: #{@response.status}, " +
                               "Content-Length: #{@response.headers['Content-Length']}, " +
                               "Response Time: #{"%.2f" % ((Time.now.to_f - @env[:start_time]) * 1000)}ms")
 
@@ -175,7 +185,7 @@ module Goliath
     # @param e [Exception] The exception to log
     # @return [Nil]
     def server_exception(e)
-      @env[LOGGER].error("#{e.message}\n#{e.backtrace.join("\n")}")
+      @env[RACK_LOGGER].error("#{e.message}\n#{e.backtrace.join("\n")}")
       post_process([500, {}, 'An error happened'])
     end