halfling 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9047695f3092b0f51b109315003f5147bded1972
-  data.tar.gz: 85edf877936c2bb6cc4b3524ebd2e5a8c97b39a7
+  metadata.gz: f4a9da0caf2833ae34205b76870cd21a9da0e4e8
+  data.tar.gz: 348e7f584cc4ee4a358c726b3c90ea6428d4e4d3
 SHA512:
-  metadata.gz: 2b02ae742ccc5ac8f9ff3eca8d7bac57af7a48abe2628b61a99d41954661ee873a00616cf6014db0735b7c9847dcad04a332f61f16ba32468e9731d61cc5b459
-  data.tar.gz: 4e2474dda72c3ce476dda606c566b4c268dcdaa4b02b5aeaefcf6c84dc7b51697e1b8726e6a1e66dda47f9929da8023fd15ec887b64cfd3cd132e571d54f3ed5
+  metadata.gz: 2b5c8adaaf1bccbad5ada58a5b69c290a19c1bc439ccc364677e78459faf4aebe41f6f6f02e465a7004df65b697419f9cae249831b0e096401fde0db5019896a
+  data.tar.gz: 230716d12d27fe2ac78d591c0b244572d2096d79e2e2d90e61007c4f9ee629fdcb47161e5131dd5cbc3f6d8cc1635127873c5da07799ab77d73bc0bcdb976799

data/lib/halfling/base.rb

@@ -111,22 +111,34 @@ module Hobbit
         end
         @@root_controller = nil
       end
+      @render_nesting_level = 0
       super
     end
     
     #template stuff
     def find_template(template)
       tmpl_path=@@templates[template.to_sym]
-      raise "template #{template} not found" unless tmpl_path
+      raise "template \"#{template}\" not found" unless tmpl_path
       tmpl_path
     end
     def default_layout
-      find_template :"layouts/application"
+      if @render_nesting_level <= 1
+        find_template :"layouts/application"
+      else
+        #with nested rendering, default layout is nil.
+        nil
+      end
     end
     def template_engine
       raise "template_engine shouldn't be called"
     end
-
+    
+    def render(*args)
+      @render_nesting_level += 1
+      ret = super
+      @render_nesting_level -= 1
+      ret
+    end
     
     #convenience stuff
     def set_content_type (val)

data/lib/halfling/version.rb

@@ -1,3 +1,3 @@
 module Halfling
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halfling
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Leo P.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobbit