Merge branch 'master' of github.com:postrank-labs/goliath

Author: joshbuddy

examples/env_use_statements.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+$:<< '../lib' << 'lib'
+
+require'goliath'
+require'yajl'
+
+classEnvUseStatements < Goliath::API
+ifGoliath.dev?
+useGoliath::Rack::Render,'json'
+elsifGoliath.prod?
+useGoliath::Rack::Render,'xml'
+end
+
+defresponse(env)
+[200,{},{'Test'=>'Response'}]
+end
+end

lib/goliath/api.rb

@@ -27,7 +27,7 @@ class << self
 #
 # In case of further subclassing, the very last class encountered is used.
 definherited(subclass)
-Goliath::Application.app_class=subclass.name
+Goliath::Application.app_class=subclass.nameifdefined?(Goliath::Application)
 end
 
 # Retrieves the middlewares defined by this API server

lib/goliath/application.rb

@@ -2,6 +2,19 @@
 require'goliath/runner'
 require'goliath/rack'
 
+# Pre-load the goliath environment so it's available as we try to parse the class.
+# This means we can use Goliath.dev? or Goliath.prod? in the use statements.
+#
+# Note, as implmented, you have to have -e as it's own flag, you can't do -sve dev
+# as it won't pickup the e flag.
+env=ENV['RACK_ENV']
+env ||= begin
+if((i=ARGV.index('-e')) || (i=ARGV.index('--environment')))
+ARGV[i + 1]
+end
+end
+Goliath.env=envifenv
+
 moduleGoliath
 # The main execution class for Goliath. This will execute in the at_exit
 # handler to run the server.
@@ -44,14 +57,14 @@ def self.app_file
 c= $0 if !c || c.empty?
 c
 end
-
+
 # Returns the userland class which inherits the Goliath API
 #
 # @return [String] The app class
 defself.app_class
 @app_class
 end
-
+
 # Sets the userland class that should use the Goliath API
 #
 # @param app_class [String|Symbol|Constant] The new app class

lib/goliath/goliath.rb

@@ -8,7 +8,7 @@
 moduleGoliath
 module_function
 
-ENVIRONMENTS=[:development,:production,:test]
+ENVIRONMENTS=[:development,:production,:test,:staging]
 
 # Retrieves the current goliath environment
 #
@@ -54,4 +54,11 @@ def dev?
 deftest?
 env == :test
 end
+
+# Determines if we are in the staging environment
+#
+# @return [Boolean] true if current environment is staging.
+defstaging?
+env == :staging
+end
 end

lib/goliath/test_helper.rb

@@ -127,5 +127,16 @@ def put_request(request_data ={}, errback = nil, &blk)
 req=EM::HttpRequest.new("http://localhost:9000#{path}").put(request_data)
 hookup_request_callbacks(req,errback, &blk)
 end
+
+# Make a DELETE request the currently launched API.
+#
+# @param request_data [Hash] Any data to pass to the DELETE request.
+# @param errback [Proc] An error handler to attach
+# @param blk [Proc] The callback block to execute
+defdelete_request(request_data={},errback=nil, &blk)
+path=request_data.delete(:path) || ''
+req=EM::HttpRequest.new("http://localhost:9000#{path}").delete(request_data)
+hookup_request_callbacks(req,errback, &blk)
+end
 end
 end

lib/goliath/version.rb

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