goliath 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c49ef49ca7b81daf949084e54013fe33751d9461
+  data.tar.gz: c9bd1ae49086f0fa8ff01dd8617994156ff1b448
+SHA512:
+  metadata.gz: 4d9e9698db573be7495f89394bae42ad613397489a5e979994b29ee1518238c73884444f8be2bdef7b7bea936a1bced59b07e7d85eb5cec5dc1e2fb75758de8a
+  data.tar.gz: 4a800250911ccb181214f88c43442539b18cb96676b960ffa8e7a3acddc1aa3413d83c58bab1b389280d09f4822ac97f815be9db80cd8dde52483a006e991062

data/examples/api_proxy.rb

@@ -2,6 +2,8 @@
 
 # Rewrites and proxies requests to a third-party API, with HTTP basic authentication.
 
+$:<< '../lib' << 'lib'
+
 require 'goliath'
 require 'em-synchrony/em-http'
 

data/examples/around.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+$:<< '../lib' << 'lib'
+
+require 'goliath'
+
+class ApiValidationAroundware
+  include Goliath::Rack::SimpleAroundware
+  class InvalidApiKeyError < Goliath::Validation::BadRequestError; end
+  
+  def pre_process
+    validate_api_key!
+    env.logger.info "past api_key validation" #<-- this is output, then an empty response header & body as if it is just hanging...
+    Goliath::Connection::AsyncResponse
+  end 
+  
+  def post_process
+    [status, headers, body]
+  end
+  
+  def validate_api_key!
+    server_api_key = env['config']['server_api_key'].to_s
+    if api_key != server_api_key
+      raise InvalidApiKeyError
+    end
+  end
+
+  # retreive the client's api_key  
+  def api_key
+    env['HTTP_API_KEY'].to_s
+  end
+end
+
+class AwesomeApiWithLogging < Goliath::API
+  use Goliath::Rack::SimpleAroundwareFactory, ApiValidationAroundware
+  def response(env)
+    [200, {}, "Hello"]
+  end
+end

data/examples/clone.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+$:<< '../lib' << 'lib'
+
+require 'goliath'
+
+class RandomAPI2 < Goliath::API
+  use Goliath::Rack::Params
+  use Goliath::Rack::Validation::Param, :key => 'user'
+
+  def response(env)
+    [200, {}, "Hello 2!"]
+  end
+end
+
+class Router < Goliath::API
+  map '/', RandomAPI2
+end
+
+# class PlainApi < Goliath::API
+#   use Goliath::Rack::Params
+#   use Goliath::Rack::Validation::Param, :key => 'user'
+
+#   def response(env)
+#     [200, {}, "Hello 2!"]
+#   end
+# end

data/examples/router.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+$:<< '../lib' << 'lib'
+
+require 'goliath'
+require 'test'
+
+
+class Router < Goliath::API
+  get '/v1/app/:appid/binary/:key', RawFileApp
+  put '/v1/app/:appid/binary/:key', RawFileApp
+
+  not_found do
+    run Proc.new { |env| [404, {"Content-Type" => "text/html"}, "not found"] }
+  end
+end

data/examples/test.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+$:<< '../lib' << 'lib'
+
+require 'goliath'
+
+class RawFileApp < Goliath::API
+  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
+  use Goliath::Rack::Render                 # auto-negotiate response format
+
+  def response(env)
+    p params
+    p params['key2']
+    p params[:key2]
+    obj = {
+      somekey: 'val',
+      otherkey: 42
+    }
+    [200, { 'Content-Type' => 'application/json' }, obj]
+  end
+end
+
+class Router < Goliath::API
+  get '/v1/app/:appid/binary/:key', RawFileApp
+  put '/v1/app/:appid/binary/:key', RawFileApp
+
+  not_found do
+    run Proc.new { |env| [404, {"Content-Type" => "text/html"}, "not found"] }
+  end
+end

data/examples/upload.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+$:<< '../lib' << 'lib'
+
+require 'goliath'
+
+class Upload < Goliath::API
+  
+  def on_headers(env, h)
+    if h['Expect'] == '100-continue'
+      env.stream_send "HTTP/1.1 100 Continue\r\n"
+    end
+  end
+
+  def response(env)
+    [200, {}, "oh hai"]
+  end
+end

data/goliath.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eventmachine', '>= 1.0.0.beta.4'
   s.add_dependency 'em-synchrony', '>= 1.0.0'
   s.add_dependency 'em-websocket', "0.3.8"
-  s.add_dependency 'http_parser.rb', '0.6.0.beta.2'
+  s.add_dependency 'http_parser.rb', '0.6.0'
   s.add_dependency 'log4r'
 
   s.add_dependency 'rack', '>=1.2.2'
@@ -40,8 +40,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'haml', '>=3.0.25'
   s.add_development_dependency 'yard'
 
-  s.add_development_dependency 'guard'
-  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'guard', '~> 1.8.3'
+  s.add_development_dependency 'guard-rspec', '~> 3.1.0'
+  s.add_development_dependency 'listen', '~> 1.3.1'
 
   if RUBY_PLATFORM != 'java'
     s.add_development_dependency 'yajl-ruby'

data/lib/goliath/api.rb

@@ -175,8 +175,11 @@ module Goliath
         env[ASYNC_CALLBACK].call(validation_error(e.status_code, e.message))
 
       rescue Exception => e
-        env.logger.error(e.message)
-        env.logger.error(e.backtrace.join("\n"))
+        logthis = "#{e.backtrace[0]}: #{e.message} (#{e.class})\n"
+        e.backtrace[1..-1].each do |bt|
+          logthis += "    from #{bt}\n"
+        end
+        env.logger.error(logthis)
         env[RACK_EXCEPTION] = e
 
         message = Goliath.env?(:production) ? 'An error happened' : e.message

data/lib/goliath/connection.rb

@@ -22,7 +22,7 @@ module Goliath
 
       @parser = Http::Parser.new
       @parser.on_headers_complete = proc do |h|
-        env = Thread.current[GOLIATH_ENV] = Goliath::Env.new
+        env = Goliath::Env.new
         env[SERVER_PORT] = port.to_s
         env[RACK_LOGGER] = logger
         env[OPTIONS]     = options

data/lib/goliath/rack/params.rb

@@ -17,16 +17,15 @@ module Goliath
       module Parser
         def retrieve_params(env)
           params = env['params'] || {}
-          params.merge!(::Rack::Utils.parse_nested_query(env['QUERY_STRING']))
+          begin
+            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
 
-          if env['rack.input']
-            post_params = ::Rack::Utils::Multipart.parse_multipart(env)
-            unless post_params
-              body = env['rack.input'].read
-              env['rack.input'].rewind
-
-              unless body.empty?
-                begin
+                unless body.empty?
                   post_params = case(env['CONTENT_TYPE'])
                   when URL_ENCODED then
                     ::Rack::Utils.parse_nested_query(body)
@@ -40,14 +39,14 @@ module Goliath
                   else
                     {}
                   end
-                rescue StandardError => e
-                  raise Goliath::Validation::BadRequestError, "Invalid parameters: #{e.class.to_s}"
+                else
+                  post_params = {}
                 end
-              else
-                post_params = {}
               end
+              params.merge!(post_params)
             end
-            params.merge!(post_params)
+          rescue StandardError => e
+            raise Goliath::Validation::BadRequestError, "Invalid parameters: #{e.class.to_s}"
           end
           params
         end

data/lib/goliath/rack/validation/param.rb

@@ -49,7 +49,7 @@ module Goliath
         include Goliath::Rack::Validator
         include Coerce
         include Required
-        UKNOWN_OPTIONS = "Uknown options: %s"
+        UNKNOWN_OPTIONS = "Unknown options: %s"
 
         attr_reader :key, :type, :optional, :message, :default
 
@@ -71,7 +71,7 @@ module Goliath
           @optional = opts.delete(:optional) || false
           @key = opts.delete(:key)
           raise Exception.new("key option required") unless @key
-          
+
           @type = opts.delete(:type) || @key
           @message = opts.delete(:message) || 'identifier missing'
           @default = opts.delete(:default)
@@ -79,7 +79,7 @@ module Goliath
           coerce_setup!(opts)
           required_setup!(opts)
 
-          raise Exception.new(UKNOWN_OPTIONS % opts.inspect) unless opts.empty?
+          raise Exception.new(UNKNOWN_OPTIONS % opts.inspect) unless opts.empty?
         end
 
         def call(env)

data/lib/goliath/request.rb

@@ -87,20 +87,20 @@ module Goliath
         @env[SERVER_PORT] = port if port
       end
 
-      uri = URI(parser.request_url)
+      begin
+        uri = URI(parser.request_url)
 
-      @env[REQUEST_METHOD]  = parser.http_method
-      @env[REQUEST_URI]     = parser.request_url
-      @env[QUERY_STRING]    = uri.query
-      @env[HTTP_VERSION]    = parser.http_version.join('.')
-      @env[SCRIPT_NAME]     = uri.path
-      @env[REQUEST_PATH]    = uri.path
-      @env[PATH_INFO]       = uri.path
-      @env[FRAGMENT]        = uri.fragment
+        @env[REQUEST_METHOD]  = parser.http_method
+        @env[REQUEST_URI]     = parser.request_url
+        @env[QUERY_STRING]    = uri.query
+        @env[HTTP_VERSION]    = parser.http_version.join('.')
+        @env[SCRIPT_NAME]     = ""
+        @env[REQUEST_PATH]    = uri.path
+        @env[PATH_INFO]       = uri.path
+        @env[FRAGMENT]        = uri.fragment
 
-      yield if block_given?
+        yield if block_given?
 
-      begin
         @env[ASYNC_HEADERS].call(@env, h) if @env[ASYNC_HEADERS]
       rescue Exception => e
         server_exception(e)

data/lib/goliath/server.rb

@@ -107,7 +107,6 @@ module Goliath
 
     # Stops the server running.
     def stop
-      logger.info('Stopping server...')
       EM.stop
     end
 

data/lib/goliath/version.rb

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

data/spec/integration/http_log_spec.rb

@@ -33,7 +33,7 @@ describe HttpLog do
   let(:api_options) { { :config => config_file } }
 
   def mock_mongo(api)
-    api.config['mongo'] = mock('mongo').as_null_object
+    api.config['mongo'] = double('mongo').as_null_object
   end
 
   it 'responds to requests' do

data/spec/integration/websocket_spec.rb

@@ -35,7 +35,7 @@ describe "WebSocket" do
     with_api(WebSocketEndPoint, {:verbose => true, :log_stdout => true}) do |server|
       ws_client_connect('/ws') do |client|
         client.send "hello"
-        client.receive.should == "hello"
+        client.receive.data.should == "hello"
       end
     end
   end

data/spec/unit/connection_spec.rb

@@ -7,25 +7,25 @@ describe Goliath::Connection do
 
   describe 'configuration' do
     it 'accepts an app' do
-      app = mock('app')
+      app = double('app')
       @c.app = app
       @c.app.should == app
     end
 
     it 'accepts a logger' do
-      logger = mock('logger')
+      logger = double('logger')
       @c.logger = logger
       @c.logger.should == logger
     end
 
     it 'accepts a status object' do
-      status = mock('status')
+      status = double('status')
       @c.status = status
       @c.status.should == status
     end
 
     it 'accepts config' do
-      config = mock('config')
+      config = double('config')
       @c.config = config
       @c.config.should == config
     end
@@ -40,10 +40,10 @@ describe Goliath::Connection do
 
   describe 'receive_data' do
     it 'passes data to the http parser' do
-      request_mock = mock("parser").as_null_object
+      request_mock = double("parser").as_null_object
       request_mock.should_receive(:<<)
 
-      current_mock = mock("current").as_null_object
+      current_mock = double("current").as_null_object
 
       @c.instance_variable_set("@parser", request_mock)
       @c.instance_variable_set("@current", current_mock)
@@ -51,7 +51,7 @@ describe Goliath::Connection do
     end
 
     it "closes the connection when a parse error is received" do
-      current_mock = mock("current").as_null_object
+      current_mock = double("current").as_null_object
       current_mock.should_receive(:close)
 
       @c.instance_variable_set("@current", current_mock)

data/spec/unit/rack/default_mime_type_spec.rb

@@ -3,11 +3,11 @@ require 'goliath/env'
 require 'goliath/rack/default_mime_type'
 
 describe Goliath::Rack::DefaultMimeType do
-  let(:app) { mock('app').as_null_object }
+  let(:app) { double('app').as_null_object }
   let(:dmt) { Goliath::Rack::DefaultMimeType.new(app) }
   let(:env) do
     env = Goliath::Env.new
-    env['status'] = mock('status').as_null_object
+    env['status'] = double('status').as_null_object
     env
   end
 
@@ -31,4 +31,4 @@ describe Goliath::Rack::DefaultMimeType do
       env['HTTP_ACCEPT'].should == '*/*'
     end
   end
-end
+end

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

@@ -8,7 +8,7 @@ describe Goliath::Rack::Formatters::JSON do
 
   describe 'with a formatter' do
     before(:each) do
-      @app = mock('app').as_null_object
+      @app = double('app').as_null_object
       @js = Goliath::Rack::Formatters::JSON.new(@app)
     end
 
@@ -21,7 +21,7 @@ describe Goliath::Rack::Formatters::JSON do
     end
 
     it 'calls the app with the provided environment' do
-      env_mock = mock('env').as_null_object
+      env_mock = double('env').as_null_object
       @app.should_receive(:call).with(env_mock).and_return([200, {}, {"a" => 1}])
       @js.call(env_mock)
     end

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

@@ -22,7 +22,7 @@ describe Goliath::Rack::Formatters::PLIST do
 
   describe 'with a formatter' do
     before(:each) do
-      @app = mock('app').as_null_object
+      @app = double('app').as_null_object
       @m = Goliath::Rack::Formatters::PLIST.new(@app)
     end
 

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

@@ -9,7 +9,7 @@ describe Goliath::Rack::Formatters::XML do
 
   describe 'with a formatter' do
     before(:each) do
-      @app = mock('app').as_null_object
+      @app = double('app').as_null_object
       @xml = Goliath::Rack::Formatters::XML.new(@app)
     end
 
@@ -22,7 +22,7 @@ describe Goliath::Rack::Formatters::XML do
     end
 
     it 'calls the app with the provided environment' do
-      env_mock = mock('env').as_null_object
+      env_mock = double('env').as_null_object
       @app.should_receive(:call).with(env_mock).and_return([200, {}, {"a" => 1}])
       @xml.call(env_mock)
     end