flame 4.2.1 → 4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 143c89bd2f9b509aacac88782cc376339135cbfe
-  data.tar.gz: f7feaffc253e6ea95233f381f2e8d550929e0af3
+  metadata.gz: aa9181ef76573d3f62778f9534e09e0714695993
+  data.tar.gz: cdbf13a1103537a6e1de7a1e6f0bd995b6203dcc
 SHA512:
-  metadata.gz: d166e036f47a0a738ef4a859ec02a707d03f6740b4f173976f1a4f8114ed510d988e3e88aa992a020ce1e701a969059aff9f48c4c2a04be2057c585d3e0d82b5
-  data.tar.gz: 938a0b0d6761742b91698f418fd935432fb2c67821379a3475fcb2701155af9a017e2c81df081bfc5ad6956d613b968e39510c9ff66c8375e46088ab55591a78
+  metadata.gz: 6b3a2cf7e74d4cf4480c482298c17c512b64a28ad1337ba0fd6b4751b0ccbd788b79fa164c394cb363c00451c096b0edef2b1c5d1e627b9c10500bf2b9d42d42
+  data.tar.gz: 17e953a8119939d35579cacd740c0497e420430c9cfb519eba7f0569afa35a1a32330832ed81fb8b74ded1e1c34d223ec6ef95581577e85fde708d8244192558

data/lib/flame/render.rb

@@ -26,11 +26,12 @@ module Flame
 		## Render template
 		## @param cache [Boolean] cache compiles or not
 		def render(cache: true)
+			@cache = cache
 			## Compile Tilt to instance hash
 			return unless @filename
-			tilt = cache ? self.class.tilts[@filename] ||= compile : compile
+			tilt = compile_file
 			## Render Tilt from instance hash with new options
-			layout_render tilt.render(@scope, @locals), cache: cache
+			layout_render tilt.render(@scope, @locals)
 		end
 
 		private
@@ -51,22 +52,30 @@ module Flame
 
 		## Compile file with Tilt engine
 		## @param filename [String] filename
-		def compile(filename = @filename)
-			Tilt.new(filename)
+		def compile_file(filename = @filename)
+			cached = self.class.tilts[filename]
+			return cached if @cache
+			compiled = Tilt.new(filename)
+			self.class.tilts[filename] ||= compiled if @cache
+			compiled
 		end
 
 		## @todo Add `views_dir` for Application and Controller
 		## @todo Add `layout` method for Controller
-		def find_file(path, layout: false)
-			## Get full filename
-			dirs = layout ? layout_dirs : controller_dirs
-			Dir[File.join(
-				views_dir,
-				"{#{dirs.join(',')},}",
-				"#{path}.*"
-			)].uniq.find do |file|
-				Tilt[file]
-			end
+
+		## Common method for `find_file` and `find_layouts`
+		def find_files(path, dirs)
+			Dir[File.join(views_dir, "{#{dirs.join(',')},}", "#{path}.*")].uniq
+		end
+
+		## Find template-file by path
+		def find_file(path)
+			find_files(path, controller_dirs).find { |file| Tilt[file] }
+		end
+
+		## Find layout-files by path
+		def find_layouts(path)
+			find_files(path, layout_dirs).select { |file| Tilt[file] }.sort!.reverse!
 		end
 
 		## Find possible directories for the controller
@@ -103,19 +112,14 @@ module Flame
 
 		## Render the layout with template
 		## @param result [String] result of template rendering
-		## @param cache [Boolean] cache compiles or not
-		def layout_render(result, cache: true)
-			layout_file = find_file(@layout, layout: true)
-			## Compile layout to hash
-			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 }
+		def layout_render(content)
+			return content unless @layout
+			layout_files = find_layouts(@layout)
+			return content if layout_files.empty?
+			layout_files.each_with_object(content) do |layout_file, result|
+				layout = compile_file(layout_file)
+				result.replace layout.render(@scope, @locals) { result }
+			end
 		end
 	end
 end

data/lib/flame/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flame
-	VERSION = '4.2.1'.freeze
+	VERSION = '4.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: '4.3'
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack