flame 3.5.2 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23607516bfdad9950e8dda86e0d603026a852a26
-  data.tar.gz: 35085671967fa0ed58751675b9f23305a0376a56
+  metadata.gz: bcf30b3c7d0ec4bc8ad73a500492c9d3dcf8c72b
+  data.tar.gz: 4a983a6a28dfadd477337400752190d8a8cd54f8
 SHA512:
-  metadata.gz: 91dac6fe1127feb439fe69c68bb9de9528a9834a742e807377fe38788fe78b4f2b8e81766225b5a1c675d6abdb7dba38c3d56b1a10fe2d0232e81dbc37b916d6
-  data.tar.gz: ae3703f5353e6896e72a7aa25dc9517de0debc8b0ac51987d918b3d59953bb74ed22b241da0ffd26fb2c2ebc00c32e6c21a2afd8cacad6c4974c3a4111207fc1
+  metadata.gz: 05fa7acabaa2b16f9cde14dc5de48fb4869bd3424dceece06c8068d2cc5ea5afa683c9b39fcd15319f1ebf94dc5af53679eef1c215aa7090cfd9b811829e5b79
+  data.tar.gz: 11c78bdbba3080266fb0486b42ebd9cfcbdfb02f7f90fcb88b2acf7a9d37e784655dad9954105f30b2d02aeb00500b5a5074a404fdd0381f553024696e94e17a

data/lib/flame/dispatcher.rb

@@ -28,6 +28,7 @@ module Flame
 				  try_static(File.join(__dir__, '..', '..', 'public')) ||
 				  try_error(404)
 			end
+			response.write body
 			response.finish
 		end
 
@@ -37,6 +38,10 @@ module Flame
 			value ? response.status = value : response.status
 		end
 
+		def body(value = nil)
+			value ? @body = value : @body
+		end
+
 		def params
 			@params ||= request.params.merge(request.params.keys_to_sym)
 		end
@@ -60,14 +65,14 @@ module Flame
 			path.empty? ? '/' : path
 		end
 
-		def halt(new_status = nil, body = nil, new_headers = {})
+		def halt(new_status = nil, new_body = nil, new_headers = {})
 			case new_status
-			when String then body = new_status
+			when String then new_body = new_status
 			when Integer then status new_status
 			end
 			# new_status.is_a?(String) ? () : (status new_status)
-			body = default_body if body.nil? && response.body.empty?
-			response.body = body if body
+			new_body = default_body if new_body.nil? && body.empty?
+			body new_body if new_body
 			response.headers.merge!(new_headers)
 			throw :halt
 		end
@@ -101,7 +106,7 @@ module Flame
 
 		def execute_route(route)
 			exec_route = route.executable
-			response.body = exec_route.run!(self)
+			exec_route.run!(self)
 		rescue => exception
 			dump_error(exception)
 			# status 500

data/lib/flame/response.rb

@@ -1,11 +1,5 @@
 module Flame
 	## Class for responses
 	class Response < Rack::Response
-		## Rewrite body assign (reset Content-Length and use #write)
-		def body=(value)
-			@length = 0
-			body.clear
-			write value
-		end
 	end
 end

data/lib/flame/route.rb

@@ -104,9 +104,8 @@ module Flame
 			def run!(dispatcher)
 				@ctrl = @route[:controller].new(dispatcher)
 				execute_hooks(:before)
-				result = @ctrl.send(@route[:action], *arranged_params)
+				dispatcher.body @ctrl.send(@route[:action], *arranged_params)
 				execute_hooks(:after)
-				result
 			end
 
 			def execute_errors(status = 500)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.6.0
 platform: ruby
 authors:
 - Alexander Popov