rack-app-front_end 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8263ef1b0f815302a5f193b612eea031505235d3
-  data.tar.gz: 44c45827ede78fbfb9e03c5a128b13141e4ba2a0
+  metadata.gz: a5983723b1ed5893aa432c049e76c58734f9113b
+  data.tar.gz: 3ddce6ab78b7939cf2e5fe9c55b99887926918ec
 SHA512:
-  metadata.gz: 010619359363d3cab25b6e9e658ba453d59ed6b0f10fa941d6ca19cbb513e42ad9b94c209de8656c83ebf2a7a20a1108124e1a91b6a92ce3ab7bfb55b8128b9a
-  data.tar.gz: 3bdcfe2c79bad69d8e0f4d142218436176fae383ed12969ddaf68d0de0f125d45952545207a752a32df5eccf9222938b80133c4d1a489c5b41b0265aa6010640
+  metadata.gz: 69ee00d52045b883dbea6d5cb38af91b2ce1c6134b97da4d2d526c73cfd63af75f15662a3949b89cc839a8789ed21a0a80668c5fe37e6a11623b193ae32c7f9b
+  data.tar.gz: 0b868ba5876ef8c515b2f5d1525d4225b1b274e1599e9a58f0ad3b9a7a2ceec5fcfa46927946780b96641c2c4db0a4a155fa7b4a51dcc750a2b9837dd634e0ee

data/VERSION

@@ -1 +1 @@
-0.12.0
+0.13.0

data/lib/rack/app/front_end/instance_methods.rb

@@ -1,9 +1,13 @@
 module Rack::App::FrontEnd::InstanceMethods
 
-  def render(template_path)
+  def render(template_path, *args, &block)
     full_path = Rack::App::Utils.expand_path(template_path)
-    template = Rack::App::FrontEnd::Template.new(full_path, self.class)
-    return template.render(self)
+    template = Rack::App::FrontEnd::Template.new(full_path, __runtime_properties__[:layout], self.class)
+    return template.render(self, *args, &block)
+  end
+
+  def __runtime_properties__
+    @__runtime_properties__ ||= {}
   end
 
 end

data/lib/rack/app/front_end/template.rb

@@ -1,5 +1,6 @@
 require 'tilt'
 class Rack::App::FrontEnd::Template
+  NO_LAYOUT_KEYWORD = :none
 
   require 'rack/app/front_end/template/default_layout'
 
@@ -13,14 +14,16 @@ class Rack::App::FrontEnd::Template
 
   protected
 
-  def initialize(file_path, klass)
-    @file_path = file_path
+  def initialize(template_path, layout, klass)
+    @file_path = template_path
+    @layout = layout
     @class = klass
   end
 
   def render_result(scope, *args, &block)
     return Rack::App::File::Streamer.new(@file_path) unless it_is_a_template?
-    scope.extend(@class.helpers) if @class.respond_to?(:helpers)
+    extend_with_helpers(scope)
+    block_layouts_for(scope)
     layout.render(scope, *args) { template.render(scope, *args, &block) }
   end
 
@@ -33,13 +36,31 @@ class Rack::App::FrontEnd::Template
   end
 
   def layout
-    return DefaultLayout if @class.respond_to?(:layout) and @class.layout.nil?
-    return DefaultLayout if @file_path =~ /^#{Regexp.escape(Rack::App::Utils.namespace_folder(@class.layout))}/
-    get_template(@class.layout)
+    return DefaultLayout if use_default_layout?
+
+    get_template(layout_path)
+  end
+
+  def layout_path
+    return @class.layout
+  end
+
+  def use_default_layout?
+    (@layout == NO_LAYOUT_KEYWORD) or
+        (@class.respond_to?(:layout) and @class.layout.nil?) or
+        (@file_path =~ /^#{Regexp.escape(Rack::App::Utils.namespace_folder(layout_path))}/)
   end
 
   def get_template(file_path)
     self.class.cache.fetch(file_path) { Tilt.new(file_path) }
   end
 
+  def extend_with_helpers(scope)
+    scope.extend(@class.helpers) if @class.respond_to?(:helpers)
+  end
+
+  def block_layouts_for(scope)
+    scope.__runtime_properties__[:layout]= NO_LAYOUT_KEYWORD
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-app-front_end
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -106,7 +106,6 @@ files:
 - lib/rack/app/front_end/template/default_layout.rb
 - lib/rack/app/front_end/version.rb
 - rack-app-front_end.gemspec
-- spike/test.html.erb
 homepage: http://www.rack-app.com/
 licenses:
 - Apache License 2.0

data/spike/test.html.erb

@@ -1,3 +0,0 @@
-<p><%= test %></p>
-<p><%= asdf %></p>
-<p><%= hello_world! %></p>