flame 4.0.6 → 4.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e3eff2ff95d66cad8d31d30b8938ee7f7936726
-  data.tar.gz: c8b3793fab9614b8c710f71e01f22f2c25dde926
+  metadata.gz: 10ea7a8158cb464a542f980ccd107c59ba36d5b4
+  data.tar.gz: c93a1fb11b44d074c48aeb16e99fe8e29f3d807c
 SHA512:
-  metadata.gz: 98e65d7b60f888c271b83e987b4cbf5c56a800f0fcf30678d29f1df5546d835194728656c9bcf0808ded1e278e897a116f90ead91899f05cde915cb1d053cff8
-  data.tar.gz: 5d7e63b49ad424fa33d3319daaa585e038a0942cc633489a3d139f0557b59d035f1f4787b4459375713a42f2ac2e8791de020d4f05c3ff2165de4c7484c25bb6
+  metadata.gz: f971c4a0fa36f66472b062aa35ebf9258af56886aceb8cd965b43e94819c348ce2f870f5322f71c2abcc9dbc061d7e020f5145549920a1ae3edd018b1b348ace
+  data.tar.gz: f2c36b5da0332076131edb4829a1504931cbe092ef0f164124b2ba3a4e91b9d964882bde24bd7fb0108de726b1ff9e7861d7e2bbdf4e3a37f059dabc5d2c0f05

data/lib/flame/render.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 require 'tilt'
 require 'tilt/plain'
 require 'tilt/erb'
@@ -41,6 +43,10 @@ module Flame
 			end
 		end
 
+		def views_dir
+			@ctrl.config[:views_dir]
+		end
+
 		using GorillaPatch::ModuleExt
 
 		## Compile file with Tilt engine
@@ -51,11 +57,12 @@ module Flame
 
 		## @todo Add `views_dir` for Application and Controller
 		## @todo Add `layout` method for Controller
-		def find_file(path)
+		def find_file(path, layout: false)
 			## Get full filename
+			dirs = layout ? layout_dirs : controller_dirs
 			Dir[File.join(
-				@ctrl.config[:views_dir],
-				"{#{controller_dirs.join(',')},}",
+				views_dir,
+				"{#{dirs.join(',')},}",
 				"#{path}.*"
 			)].uniq.find do |file|
 				Tilt[file]
@@ -67,18 +74,25 @@ module Flame
 			controller_dir_parts = @ctrl.class.underscore.split('/').map do |part|
 				(part.split('_') - %w(controller controllers ctrl)).join('_')
 			end
-			controller_dir = controller_dir_parts.join('/')
-			[controller_dir,
-			 controller_dir_parts[1..-1].join('/'),
-			 controller_dir_parts[1..-2].join('/'),
-			 controller_dir_parts.last]
+			controller_dir_parts.map.with_index do |_part, ind|
+				controller_dir_parts[ind..-1].join('/')
+			end
+		end
+
+		def layout_dirs
+			file_dir = Pathname.new(@filename).dirname
+			diff_path = file_dir.relative_path_from Pathname.new(views_dir)
+			diff_parts = diff_path.to_s.split('/')
+			diff_parts.map.with_index do |_part, ind|
+				diff_parts[0..-(ind + 1)].join('/')
+			end
 		end
 
 		## 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_file = find_file(@layout, layout: true)
 			## Compile layout to hash
 			return result unless layout_file
 			layout =

data/lib/flame/version.rb

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

metadata

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