halfling 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9047695f3092b0f51b109315003f5147bded1972
-  data.tar.gz: 85edf877936c2bb6cc4b3524ebd2e5a8c97b39a7
+SHA256:
+  metadata.gz: bb2a8cc5cac3f1e57d3cd7f837462060165059730803da6a311f5b7d914286f2
+  data.tar.gz: f5610e1f0d2f5fcb102d1eb33847e9203c494ebfc301157ef330a6a180006169
 SHA512:
-  metadata.gz: 2b02ae742ccc5ac8f9ff3eca8d7bac57af7a48abe2628b61a99d41954661ee873a00616cf6014db0735b7c9847dcad04a332f61f16ba32468e9731d61cc5b459
-  data.tar.gz: 4e2474dda72c3ce476dda606c566b4c268dcdaa4b02b5aeaefcf6c84dc7b51697e1b8726e6a1e66dda47f9929da8023fd15ec887b64cfd3cd132e571d54f3ed5
+  metadata.gz: d08cf5e8c4ba7db1e278e7989fe379db4aa7ca8de00519a7ba95fa82ef925fc09da2e0a78fe0aa8704842af1d8b60f0c8e2d84cf249ccda41b3553fed7f1bbdd
+  data.tar.gz: 4a0ccb2f66ab84f557ec604d8c053462438b53d77a77956396d3915de27a0d2b149ec39d8ea36c551446584745c7c1ec2345bd35c8f7b36f1c1eb4ff0181eb2a

data/lib/halfling/base.rb

@@ -18,8 +18,8 @@ module Hobbit
       def inherited(sub)
         if sub.superclass == Base
           #config stuff
-          if File.exists?('config/env.yml')
-            all_conf=YAML.load_file 'config/env.yml'
+          if File.exist?('config/env.yml')
+            all_conf=YAML.unsafe_load_file 'config/env.yml'
             conf=all_conf[ENV['RACK_ENV']]
             @@templates={}
             @@config=conf
@@ -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.12'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: halfling
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Leo P.
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobbit
@@ -171,7 +170,6 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -186,9 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Halfling - a Hobbit with some Railsy structure
 test_files: []