unicorn-cuba-base 1.0.0 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/unicorn-cuba-base.rb

@@ -21,6 +21,7 @@ class Controler < Cuba
 end
 
 require_relative 'unicorn-cuba-base/stats_reporter'
+require_relative 'unicorn-cuba-base/default_error_reporter'
 
 class Application
 	def cli(&block)
@@ -90,9 +91,9 @@ class Application
 		access_log_file = @settings.access_log_file.open('a+')
 		access_log_file.sync = true
 		main_controler.use Rack::CommonLogger, access_log_file
+		main_controler.use Rack::MemoryLimit, @settings.limit_memory * 1024 ** 2
 		main_controler.use Rack::ErrorHandling
 		main_controler.use Rack::UnhandledRequest
-		main_controler.use Rack::MemoryLimit, @settings.limit_memory * 1024 ** 2
 
 		Unicorn::HttpServer.new(main_controler, unicorn_settings).start.join
 	end

data/lib/unicorn-cuba-base/default_error_reporter.rb

@@ -0,0 +1,24 @@
+class DefaultErrorReporter < Controler
+	self.define do
+		on error Rack::UnhandledRequest::UnhandledRequestError do |error|
+			write_error 404, error
+		end
+
+		on error Unicorn::ClientShutdown do |error|
+			log.warn 'client disconnected prematurely', error
+			raise error
+		end
+
+		on error StandardError do |error|
+			log.error "unhandled error while processing request: #{env['REQUEST_METHOD']} #{env['SCRIPT_NAME']}[#{env["PATH_INFO"]}]", error
+			log.debug {
+				out = StringIO.new
+				PP::pp(env, out, 200)
+				"Request: \n" + out.string
+			}
+
+			write_error 500, error
+		end
+	end
+end
+

data/lib/unicorn-cuba-base/memory_limit.rb

@@ -15,7 +15,7 @@ class MemoryLimit
 		end
 		
 		def read(bytes = nil)
-			data = @root_limit.get do |max_read_bytes|
+			data = @root_limit.get("#{self.class.name} IO read") do |max_read_bytes|
 				if not bytes or bytes > max_read_bytes
 					data = super max_read_bytes
 					raise MemoryLimitedExceededError unless eof?
@@ -28,27 +28,36 @@ class MemoryLimit
 	end	
 
 	def initialize(bytes = 256 * 1024 ** 2)
-		log.info "using memory limit of #{bytes} bytes" if bytes
+		log.info "setting up new memory limit of #{bytes} bytes" if bytes
 		@limit = bytes
 	end
 
 	attr_reader :limit
 
-	def get
+	def get(reason = nil)
 		yield(@limit).tap do |data|
-			borrow data.bytesize if data
+			borrow(data.bytesize, reason) if data
 		end
 	end
 
-	def borrow(bytes)
-		log.debug "borrowing #{bytes} from #{@limit} bytes of limit"
+	def borrow(bytes, reason = nil)
+		if reason
+			log.debug "borrowing #{bytes} from #{@limit} bytes of limit for #{reason}"
+		else
+			log.debug "borrowing #{bytes} from #{@limit} bytes of limit"
+		end
+		
 		bytes > @limit and raise MemoryLimitedExceededError
 		@limit -= bytes
 		bytes
 	end
 
-	def return(bytes)
-		log.debug "returning #{bytes} to #{@limit} bytes of limit"
+	def return(bytes, reason = nil)
+		if reason
+			log.debug "returning #{bytes} to #{@limit} bytes of limit used for #{reason}"
+		else
+			log.debug "returning #{bytes} to #{@limit} bytes of limit"
+		end
 		@limit += bytes
 		bytes
 	end

data/lib/unicorn-cuba-base/plugin/response_helpers.rb

@@ -1,4 +1,5 @@
 require 'securerandom'
+require 'json'
 require 'unicorn-cuba-base/stats'
 
 module Plugin
@@ -12,33 +13,39 @@ module Plugin
 			:total_write_error_part
 		)
 
-		def write(code, content_type, body)
+		def write(code, content_type, body, headers = {})
 			req.body.read # read all remaining upload before we send response so that client will read it
 			res.status = code
 			res["Content-Type"] = content_type
+			headers.each do |key, value|
+				res[key] = value
+			end
 			ResponseHelpers.stats.incr_total_write
 			res.write body
 		end
 
-		def write_plain(code, msg)
+		def write_text(code, content_type, msg, headers = {})
 			msg = msg.join("\r\n") if msg.is_a? Array
-			write code, 'text/plain', msg.gsub(/(?<!\r)\n/, "\r\n") + "\r\n"
+			write code, content_type, (msg.gsub(/(?<!\r)\n/, "\r\n") + "\r\n"), headers
 		end
 
-		def write_url_list(code, msg)
-			msg = msg.join("\r\n") if msg.is_a? Array
-			write code, 'text/uri-list', msg.gsub(/(?<!\r)\n/, "\r\n") + "\r\n"
+		def write_plain(code, msg, headers = {})
+			write_text code, 'text/plain', msg, headers
+		end
+
+		def write_url_list(code, msg, headers = {})
+			write_text code, 'text/uri-list', msg, headers
 		end
 
-		def write_error(code, error)
+		def write_error(code, error, headers = {})
 			msg = error.message
 			log.warn "sending #{code} error response: #{msg}"
 			ResponseHelpers.stats.incr_total_write_error
-			write_plain code, msg
+			write_plain code, msg, headers
 		end
 
-		def write_url_list(code, urls)
-			write code, 'text/uri-list', urls.join("\r\n") + "\r\n"
+		def write_json(code, obj, headers = {})
+			write code, 'application/json', obj.to_json, headers
 		end
 
 		# Multipart
@@ -68,11 +75,11 @@ module Plugin
 			write_part 'text/plain', msg.to_s.gsub("\n", "\r\n"), headers
 		end
 
-		def write_error_part(code, error)
+		def write_error_part(code, error, headers = {})
 			msg = error.message
 			log.warn "sending error in multipart response part: #{msg}"
 			ResponseHelpers.stats.incr_total_write_error_part
-			write_plain_part msg, 'Status' => code
+			write_plain_part msg, headers.merge('Status' => code)
 		end
 
 		def write_epilogue

data/unicorn-cuba-base.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "unicorn-cuba-base"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2013-07-16"
+  s.date = "2013-09-11"
   s.description = "web application base powered by Unicorn HTTP server and based on Cuba framework extended with additional Rack middleware and Cuba plugins"
   s.email = "jpastuszek@gmail.com"
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/unicorn-cuba-base.rb",
+    "lib/unicorn-cuba-base/default_error_reporter.rb",
     "lib/unicorn-cuba-base/memory_limit.rb",
     "lib/unicorn-cuba-base/plugin/error_matcher.rb",
     "lib/unicorn-cuba-base/plugin/logging.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-cuba-base
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
@@ -173,6 +173,7 @@ files:
 - Rakefile
 - VERSION
 - lib/unicorn-cuba-base.rb
+- lib/unicorn-cuba-base/default_error_reporter.rb
 - lib/unicorn-cuba-base/memory_limit.rb
 - lib/unicorn-cuba-base/plugin/error_matcher.rb
 - lib/unicorn-cuba-base/plugin/logging.rb
@@ -203,7 +204,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3548490658984311397
+      hash: 463697011492453799
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: