rocketio 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac3f7fe3763afbbeeb150a57c2c6a7c9035f69ac
-  data.tar.gz: fe5bc128ab925c17d8e42a9e1a4b39c85412eea8
+  metadata.gz: 942f43f23ee1bc2f6bb2e18dcf097be9dab83ee4
+  data.tar.gz: 1b08c4e3b19666272ca2489f514b069d835e79dc
 SHA512:
-  metadata.gz: 9dd0a9f073d34f056e7201930adaeddfe69fa79d7552bc6da01c0cbbce52e0b9e9d2300f2a10510ec634ee4da5aa6b5de856bdb1328eb4e62784f8474a8a3bdf
-  data.tar.gz: 9f7c2206703d808ce8c0e05f8879030ab404ceee35270f7f8132cab34fb4dd933ef48a88af14672e3974ac3f9ae71a0180a3af28f34184397230793c9ac9b918
+  metadata.gz: 3ed0309cf937f7d1828b952ba00781d9aab142f75fb9df192fcb8c17698d9bd0e5d3c9aca341e797de078fcb55f456c9eeccc0101645df61ae926441b974766f
+  data.tar.gz: 84c5a944dcabaa1150817e7e63a0acbb066e292016c27e69a18a70cfca68f0014206b711d97851afc1aff3f4f25b27e63ad4843af822ac9ebfd090f9cf7175e0

data/lib/rocketio/controller/render.rb

@@ -77,9 +77,19 @@ module RocketIO
 
     # render a template that yields the given block.
     # that's it, a layout is a template that yields given string.
+    #
+    # layout can be specified two ways:
+    #   - as layout name
+    #   - as string
+    #
+    # if both given a ArgumentError error raised.
+    # if :template option given, no layout lookups will occur.
+    #
+    # otherwise...
     # if no layout name given, it will use the one set at class level.
     # if no layout set at class level and no layout given, it will raise a RuntimeError.
-    # it will firstly search for given layout between defined ones.
+    #
+    # then it will search for given layout between defined ones.
     # if none found, it will search a file in `path_to_layouts` folder.
     # it will try each extension registered with effective engine.
     # if no file found it will raise a TemplateError.
@@ -87,11 +97,19 @@ module RocketIO
     # block is required and should return the string to be yielded.
     #
     def render_layout template = nil, opts = {}, &block
+      template && opts[:template] && raise(ArgumentError, 'Both layout name and :template option given. Please use either one.')
+
       opts, template = template, nil if template.is_a?(::Hash)
-      template ||= self.layout
-      template || raise(RocketIO::LayoutError, 'No default layout set and no explicit layout given')
       engine, engine_opts = resolve_engine(opts)
-      template = resolve_layout(template, engine)
+      template = if template
+        resolve_layout(template, engine)
+      else
+        opts[:template] || begin
+          self.layout || raise(RocketIO::LayoutError, 'No default layout set and no explicit layout given')
+          resolve_layout(self.layout, engine)
+        end
+      end
+
       scope    = opts.fetch(:scope, self)
       locals   = opts.fetch(:locals, RocketIO::EMPTY_HASH).freeze
       compile_template(template, engine, engine_opts)

data/lib/rocketio/version.rb

@@ -1,3 +1,3 @@
 module RocketIO
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

data/test/render/layout_test.rb

@@ -100,5 +100,20 @@ spec :Views do
       post
       assert(last_response).is_ok_with_body('y')
     end
+
+    it 'accepts layout as :template option' do
+      app mock_controller {
+        def get; render_layout(template: '+<%= yield %>+') {'='}; end
+      }
+      get
+      assert(last_response).is_ok_with_body('+=+')
+    end
+
+    it 'raises ArgumentError if both layout name and :template option given' do
+      app mock_controller {
+        def get; render_layout(:x, template: '+<%= yield %>+') {'='}; end
+      }
+      assert {get}.raise ArgumentError, /both/i
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketio
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -207,8 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: '["rocketio-0.0.4", "Simple, fast, scalable web framework for Ruby"]'
+summary: '["rocketio-0.0.5", "Simple, fast, scalable web framework for Ruby"]'
 test_files: []