flame 3.2.2 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d56480a76f309437a815068dc46798bff1f3eda
-  data.tar.gz: 41544a764ed20300aefeceea0522138ba373a8a4
+  metadata.gz: a61779c08e772e1bd54da4364ad652061bfdac29
+  data.tar.gz: 1eac1e3b00890e638ea378ca86cb68b3c76fdca8
 SHA512:
-  metadata.gz: aad138df611e1abbaff6c91eb83f171e932df2e46d592989b39f4eb0d18c1a2e4ebbfc1e5b11d2f23e5d3305c4ea673d251c8908bb525fa2a9f01fc9528c2606
-  data.tar.gz: 680b01ef29626ff4bca78c7d69a07c8ab0fdc29aeff980f77de10babc551c3183f64c9b8b41cfca2e5885098d83a273e6033493814461bc9ae865e301488f237
+  metadata.gz: 36f71c677b77b0bbf1a8ba925a3dea66b4b37b015af2173588c610607506aad4855cfcea07cabccb174d5426860298edfbf86eba8327565aa59c1c5179181acb
+  data.tar.gz: 491e236bd4b08481e913bd27645e01333c698e97234c012cf09cd8adb8053e4cf76a5dd2796b1d3a29f54277236c0e1dd71b82a41fc29a28a2724ca7d40f6e96

data/lib/flame/application.rb

@@ -19,6 +19,8 @@ module Flame
 				app,
 				default_config_dirs(
 					root_dir: File.dirname(caller[0].split(':')[0])
+				).merge(
+					environment: ENV['RACK_ENV'] || 'development'
 				)
 			)
 			# app.use Rack::Session::Pool

data/lib/flame/controller.rb

@@ -22,11 +22,12 @@ module Flame
 		end
 
 		def view(path = nil, options = {})
-			Flame::Render.new(
+			template = Flame::Render.new(
 				self,
 				(path || caller_locations(1, 1)[0].label.to_sym),
 				options
-			).render
+			)
+			template.render(cache: config[:environment] == 'production')
 		end
 		alias_method :render, :view
 

data/lib/flame/dispatcher.rb

@@ -49,11 +49,11 @@ module Flame
 			path.empty? ? '/' : path
 		end
 
-		def halt(new_status, body = '', new_headers = {})
+		def halt(new_status, body = nil, new_headers = {})
 			new_status.is_a?(String) ? (body = new_status) : (status new_status)
 			response.headers.merge!(new_headers)
 			# p response.body
-			if body.empty? &&
+			if body.nil? &&
 			   !Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(status)
 				body = Rack::Utils::HTTP_STATUS_CODES[status]
 			end

data/lib/flame/render.rb

@@ -15,26 +15,26 @@ module Flame
 			## Find filename
 			@filename = find_file(path)
 			@layout = nil if File.basename(@filename)[0] == '_'
-			## Compile Tilt to instance hash
-			tilts[@filename] ||= Tilt.new(@filename)
 		end
 
-		def render
+		def render(cache: true)
+			## Compile Tilt to instance hash
+			tilt = cache ? self.class.tilts[@filename] ||= compile : compile
 			## Render Tilt from instance hash with new options
-			layout_render tilts[@filename].render(@scope, @locals)
+			layout_render tilt.render(@scope, @locals), cache: cache
 		end
 
 	private
 
-		def self.tilts
-			@tilts ||= {}
-		end
+		using GorillaPatch::StringExt
 
-		def tilts
-			self.class.tilts
+		def compile(filename = @filename)
+			Tilt.new(filename)
 		end
 
-		using GorillaPatch::StringExt
+		def self.tilts
+			@tilts ||= {}
+		end
 
 		## TODO: Add `views_dir` for Application and Controller
 		## TODO: Add `layout` method for Controller
@@ -61,13 +61,18 @@ module Flame
 			 controller_dir_parts.last]
 		end
 
-		def layout_render(result)
-			layout_filename = find_file(@layout)
+		def layout_render(result, cache: true)
+			layout_file = find_file(@layout)
 			## Compile layout to hash
-			return result unless layout_filename
-			tilts[layout_filename] ||= Tilt.new(layout_filename)
-			return result unless tilts[layout_filename]
-			tilts[layout_filename].render(@scope, @locals) { result }
+			return result unless layout_file
+			layout =
+				if cache
+					self.class.tilts[layout_file] ||= compile(layout_file)
+				else
+					compile(layout_file)
+				end
+			return result unless layout
+			layout.render(@scope, @locals) { result }
 		end
 	end
 end

metadata

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