grape-rabl 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ebef1acc9ea4453a55850d6af0a663f497681f23
+  data.tar.gz: ccb43ab0335200f0c3194325e3b1de87d711be62
+SHA512:
+  metadata.gz: a2dee5455c625c89ec8c2c86858b6d4ba27c6f6b6d63b47e6ad23d6b824d089cd23958de9e1bd1a3731364cd60170d7b4dd701902edcf149530b1f88e9227c48
+  data.tar.gz: 129d37a3b51bd384bcaeda98b092eba9b94d6adacb494c9731279ca398e5876cbf14136d1ab8edd459f757060ff63b172a97962f9c3866c50ed8f0e71713c090

data/.rubocop.yml

@@ -0,0 +1,34 @@
+AllCops:
+  Exclude:
+    - vendor/**
+    - .bundle
+
+LineLength:
+  Enabled: false
+
+MethodLength:
+  Enabled: false
+
+ClassLength:
+  Enabled: false
+
+Documentation:
+  # don't require classes to be documented
+  Enabled: false
+
+Encoding:
+  # no need to always specify encoding
+  Enabled: false
+
+CollectionMethods:
+  # don't prefer map to collect, recuce to inject
+  Enabled: false
+
+RescueException:
+  Enabled: false
+
+DoubleNegation:
+  Enabled: false
+
+FileName:
+  Enabled: false

data/.travis.yml

@@ -1,10 +1,14 @@
 rvm:
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
   - ruby-head
-  - rbx-19mode
   - jruby-19mode
-env:
-   - JRUBY_OPTS="--1.9"
+  - jruby-head
+  - rbx-2.2.10
+
 matrix:
   allow_failures:
+    - rvm: jruby-19mode
+    - rvm: jruby-head
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+#### v0.3.0
+
+* Enable using a layout template in Rabl [@koko1000ban](https://github.com/koko1000ban) [view commit](https://github.com/LTe/grape-rabl/commit/1fbfbd58c3fb320be1b52b3247fda2a23cacc9fc)
+* Implemented Rubocop, Ruby style linter [@dblock](https://github.com/dblock) [view commit](https://github.com/LTe/grape-rabl/commit/1211056de22a5989c063d57b7b37ebb1f1977e83)
+* Removed JRuby support [@dblock](https://github.com/dblock) [view commit](https://github.com/LTe/grape-rabl/commit/59905c1b09670fe08501e09bad4ec8714839f2d3)
+* Enable using locals with #render [@hobofan](https://github.com/hobofan) [view commit](https://github.com/LTe/grape-rabl/commit/6c24130f6a670e52e6119c56904b8ed2e6f60b39)
+* Enable support for template caching. [#28](https://github.com/LTe/grape-rabl/pull/28) [@kushkella](https://github.com/kushkella) [view commit](https://github.com/LTe/grape-rabl/commit/79b1e58d767c6286b510af669e718310c0ad25c2)
+
 #### v0.2.2
 
 * Relaxed dependency on a specific version of Grape [#20](https://github.com/LTe/grape-rabl/pull/20) [@cheef](https://github.com/cheef) [view commit](https://github.com/LTe/grape-rabl/commit/56da0a5bcecb16501cdd93ac25f3b6ca6d7a86f0)

data/Gemfile

@@ -2,10 +2,18 @@ source 'https://rubygems.org'
 
 gemspec
 
+group :development do
+  gem "rubocop", "0.20.1"
+end
+
 group :test do
   gem "json", '~> 1.7.7'
   gem "rspec", "~> 2.12.0"
   gem "rack-test"
   gem "rake"
   gem "coveralls", require: false
+
+  platforms :rbx do
+    gem "iconv"
+  end
 end

data/README.md

@@ -70,6 +70,37 @@ child @project => :project do
 end
 ```
 
+### Use rabl layout
+
+Gape-rabl first looks for a layout file in `#{env['api.tilt.root']}/layouts/application.rabl`.
+
+You can override the default layout conventions:
+
+```ruby
+# config.ru
+require 'grape/rabl'
+
+use Rack::Config do |env|
+  env['api.tilt.root'] = '/path/to/view/root/directory'
+  env['api.tilt.layout'] = 'layouts/another'
+end
+```
+
+### Enable template caching
+
+Gape-rabl allows for template caching after templates are loaded initially.
+
+You can enable template caching:
+
+```ruby
+# config.ru
+require 'grape/rabl'
+
+Grape::Rabl.configure do |config|
+  config.cache_template_loading = true # default: false
+end
+```
+
 ## You can omit .rabl
 
 The following are identical.
@@ -96,6 +127,11 @@ class UserAPI < Grape::API
   # use rabl with 'user.rabl' template
   get '/user/:id', :rabl => 'user' do
     @user = User.find(params[:id])
+
+    if @user.admin?
+      # overwrite the template (and pass locals) with the #render method
+      render rabl: 'admin', locals: { details: 'this user is a admin' }
+    end
   end
 
   # do not use rabl, fallback to the defalt Grape JSON formatter

data/Rakefile

@@ -8,4 +8,7 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+require 'rubocop/rake_task'
+Rubocop::RakeTask.new(:rubocop)
+
+task default: [:rubocop, :spec]

data/lib/grape-rabl/configuration.rb

@@ -0,0 +1,11 @@
+module Grape
+  module Rabl
+    class Configuration
+      attr_accessor :cache_template_loading
+
+      def initialize
+        @cache_template_loading = false
+      end
+    end
+  end
+end

data/lib/grape-rabl/formatter.rb

@@ -4,51 +4,81 @@ module Grape
   module Formatter
     module Rabl
       class << self
-
         attr_reader :env
         attr_reader :endpoint
 
         def call(object, env)
-
           @env = env
           @endpoint = env['api.endpoint']
 
           if rablable?
             rabl do |template|
-              engine = ::Tilt.new(view_path(template), {format: env['api.format'], view_path: env['api.tilt.root']})
-              engine.render endpoint, {}
+              engine = tilt_template(template)
+              output = engine.render endpoint, locals
+              if layout_template
+                layout_template.render(endpoint) { output }
+              else
+                output
+              end
             end
           else
             Grape::Formatter::Json.call object, env
           end
-
         end
 
         private
 
-          def view_path(template)
-            if template.split(".")[-1] == "rabl"
-              File.join(env['api.tilt.root'], template)
-            else
-              File.join(env['api.tilt.root'], (template + ".rabl"))
-            end
+        def view_path(template)
+          if template.split('.')[-1] == 'rabl'
+            File.join(env['api.tilt.root'], template)
+          else
+            File.join(env['api.tilt.root'], (template + '.rabl'))
           end
+        end
 
-          def rablable?
-            !! endpoint.options[:route_options][:rabl]
-          end
+        def rablable?
+          !!endpoint.options[:route_options][:rabl]
+        end
 
-          def rabl
-            template = endpoint.options[:route_options][:rabl]
-            raise "missing rabl template" unless template
-            set_view_root unless env['api.tilt.root']
-            yield template
-          end
+        def rabl
+          template = endpoint.options[:route_options][:rabl]
+          fail 'missing rabl template' unless template
+          set_view_root unless env['api.tilt.root']
+          yield template
+        end
+
+        def locals
+          endpoint.options[:route_options][:rabl_locals] || {}
+        end
 
-          def set_view_root
-            raise "Use Rack::Config to set 'api.tilt.root' in config.ru"
+        def set_view_root
+          fail "Use Rack::Config to set 'api.tilt.root' in config.ru"
+        end
+
+        def tilt_template(template)
+          if Grape::Rabl.configuration.cache_template_loading
+            tilt_cache.fetch(template) { ::Tilt.new(view_path(template), tilt_options) }
+          else
+            ::Tilt.new(view_path(template), tilt_options)
           end
+        end
+
+        def tilt_cache
+          @tilt_cache ||= ::Tilt::Cache.new
+        end
 
+        def tilt_options
+          { format: env['api.format'], view_path: env['api.tilt.root'] }
+        end
+
+        def layout_template
+          layout_path = view_path(env['api.tilt.layout'] || 'layouts/application')
+          if Grape::Rabl.configuration.cache_template_loading
+            tilt_cache.fetch(layout_path) { ::Tilt.new(layout_path, tilt_options) if File.exist?(layout_path) }
+          else
+            ::Tilt.new(layout_path, tilt_options) if File.exist?(layout_path)
+          end
+        end
       end
     end
   end

data/lib/grape-rabl/render.rb

@@ -1,7 +1,8 @@
 module GrapeRabl
   module Render
     def render(options = {})
-      env['api.endpoint'].options[:route_options][:rabl] = options.delete(:rabl)
+      env['api.endpoint'].options[:route_options][:rabl] = options.delete(:rabl) if options.include?(:rabl)
+      env['api.endpoint'].options[:route_options][:rabl_locals] = options.delete(:locals)
     end
   end
 end

data/lib/grape-rabl/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Rabl
-    VERSION = "0.2.2"
+    VERSION = '0.3.0'
   end
 end

data/lib/grape-rabl.rb

@@ -1,7 +1,27 @@
-require "rabl"
-require "grape"
-require "hashie/hash"
-require "grape-rabl/tilt"
-require "grape-rabl/version"
-require "grape-rabl/formatter"
-require "grape-rabl/render"
+require 'rabl'
+require 'grape'
+require 'hashie/hash'
+require 'grape-rabl/tilt'
+require 'grape-rabl/version'
+require 'grape-rabl/formatter'
+require 'grape-rabl/render'
+require 'grape-rabl/configuration'
+
+module Grape
+  module Rabl
+    class << self
+      def configure(&block)
+        yield(configuration)
+        configuration
+      end
+
+      def configuration
+        @configuration ||= Configuration.new
+      end
+
+      def reset_configuration!
+        @configuration = nil
+      end
+    end
+  end
+end

data/spec/grape_rabl_configuration.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'Grape::Rabl configuration' do
+  context 'configuration' do
+    it 'returns default values' do
+      Grape::Rabl.configuration.cache_template_loading.should == false
+    end
+
+    it 'should set and reset configuration' do
+      Grape::Rabl.configure do |config|
+        config.cache_template_loading = true
+      end
+      Grape::Rabl.configuration.cache_template_loading.should be == true
+      Grape::Rabl.reset_configuration!
+      Grape::Rabl.configuration.cache_template_loading.should == false
+    end
+  end
+end

data/spec/grape_rabl_layout_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+describe 'Grape::Rabl layout' do
+  subject do
+    Class.new(Grape::API)
+  end
+
+  before do
+    subject.format :json
+    subject.formatter :json, Grape::Formatter::Rabl
+    subject.before do
+      env['api.tilt.root'] = "#{File.dirname(__FILE__)}/views/layout_test"
+    end
+  end
+
+  def app
+    subject
+  end
+
+  context 'default' do
+    it 'proper render with default layout' do
+      subject.get('/about', rabl: 'user') do
+        @user = OpenStruct.new(name: 'LTe')
+        @project = OpenStruct.new(name: 'First')
+        @status = 200
+      end
+
+      get('/about')
+      last_response.body.should ==
+        %Q({"status":200,"result":{"user":{"name":"LTe","project":{"name":"First"}}}})
+    end
+  end
+
+  context 'tilt layout is setup' do
+    before do
+      subject.before { env['api.tilt.layout'] = 'layouts/another' }
+    end
+
+    it 'proper render with specified layout' do
+      subject.get('/about', rabl: 'user') do
+        @user = OpenStruct.new(name: 'LTe')
+        @project = OpenStruct.new(name: 'First')
+        @status = 200
+      end
+
+      get('/about')
+      puts last_response.body
+      last_response.body.should ==
+        %Q({"result":{"user":{"name":"LTe","project":{"name":"First"}}}})
+    end
+  end
+
+  context 'layout cache' do
+    before do
+      @views_dir = FileUtils.mkdir_p("#{File.expand_path("..", File.dirname(__FILE__))}/tmp")[0]
+      @layout = "#{@views_dir}/layouts/application.rabl"
+      FileUtils.cp_r("#{File.dirname(__FILE__)}/views/layout_test/.", @views_dir)
+      subject.before { env['api.tilt.root'] = "#{File.expand_path("..", File.dirname(__FILE__))}/tmp" }
+      subject.get('/home', rabl: 'user') do
+        @user = OpenStruct.new(name: 'LTe', email: 'email@example.com')
+        @project = OpenStruct.new(name: 'First')
+        @status = 200
+      end
+    end
+
+    after do
+      Grape::Rabl.reset_configuration!
+      FileUtils.rm_f(@views_dir)
+    end
+
+    it 'should serve from cache if cache_template_loading' do
+      Grape::Rabl.configure do |config|
+        config.cache_template_loading = true
+      end
+      get '/home'
+      last_response.status.should be == 200
+      old_response = last_response.body
+      open(@layout, 'a') { |f| f << 'node(:test) { "test" }' }
+      get '/home'
+      last_response.status.should be == 200
+      new_response = last_response.body
+      old_response.should == new_response
+    end
+
+    it 'should serve new template if cache_template_loading' do
+      get '/home'
+      last_response.status.should be == 200
+      old_response = last_response.body
+      open(@layout, 'a') { |f| f << 'node(:test) { "test" }' }
+      get '/home'
+      last_response.status.should be == 200
+      new_response = last_response.body
+      old_response.should_not == new_response
+    end
+  end
+end

data/spec/grape_rabl_partials_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Grape::Rabl partials" do
+describe 'Grape::Rabl partials' do
   subject do
     Class.new(Grape::API)
   end
@@ -8,22 +8,22 @@ describe "Grape::Rabl partials" do
   before do
     subject.format :json
     subject.formatter :json, Grape::Formatter::Rabl
-    subject.before { env["api.tilt.root"] = "#{File.dirname(__FILE__)}/views" }
+    subject.before { env['api.tilt.root'] = "#{File.dirname(__FILE__)}/views" }
   end
 
   def app
     subject
   end
 
-  it "proper render partials" do
-    subject.get("/home", :rabl => "project") do
-      @author   = OpenStruct.new(:author => "LTe")
-      @type     = OpenStruct.new(:type => "paper")
-      @project  = OpenStruct.new(:name => "First", :type => @type, :author => @author)
+  it 'proper render partials' do
+    subject.get('/home', rabl: 'project') do
+      @author   = OpenStruct.new(author: 'LTe')
+      @type     = OpenStruct.new(type: 'paper')
+      @project  = OpenStruct.new(name: 'First', type: @type, author: @author)
     end
 
-    get("/home")
+    get('/home')
     last_response.body.should ==
       "{\"project\":{\"name\":\"First\",\"info\":{\"type\":\"paper\"},\"author\":{\"author\":\"LTe\"}}}"
   end
-end
+end

data/spec/grape_rabl_spec.rb

@@ -16,81 +16,143 @@ describe Grape::Rabl do
   end
 
   it 'should work without rabl template' do
-    subject.get("/home") {"Hello World"}
-    get "/home"
+    subject.get('/home') { 'Hello World' }
+    get '/home'
     last_response.body.should == "\"Hello World\""
   end
 
-  it "should raise error about root directory" do
+  it 'should raise error about root directory' do
     begin
-      subject.get("/home", :rabl => true){}
-      get "/home"
+      subject.get('/home', rabl: true) {}
+      get '/home'
     rescue Exception => e
       e.message.should include "Use Rack::Config to set 'api.tilt.root' in config.ru"
     end
   end
 
-  context "titl root is setup"  do
+  context 'titl root is setup'  do
     before do
-      subject.before { env["api.tilt.root"] = "#{File.dirname(__FILE__)}/views" }
+      subject.before { env['api.tilt.root'] = "#{File.dirname(__FILE__)}/views" }
     end
 
-    describe "helpers" do
-      it "should execute helper" do
-        subject.get("/home", :rabl => "helper") { @user = OpenStruct.new }
-        get "/home"
+    describe 'helpers' do
+      it 'should execute helper' do
+        subject.get('/home', rabl: 'helper') { @user = OpenStruct.new }
+        get '/home'
         last_response.body.should == "{\"user\":{\"helper\":\"my_helper\"}}"
       end
     end
 
-    describe "#render" do
+    describe '#render' do
       before do
-        subject.get("/home", :rabl => "user") do
-          @user = OpenStruct.new(:name => "LTe")
-          render :rabl => "admin"
+        subject.get('/home', rabl: 'user') do
+          @user = OpenStruct.new(name: 'LTe')
+          render rabl: 'admin'
         end
 
-        subject.get("/about", :rabl => "user") do
-          @user = OpenStruct.new(:name => "LTe")
+        subject.get('/home-detail', rabl: 'user') do
+          @user = OpenStruct.new(name: 'LTe')
+          render rabl: 'admin', locals: { details: 'amazing detail' }
+        end
+
+        subject.get('/about', rabl: 'user') do
+          @user = OpenStruct.new(name: 'LTe')
+        end
+
+        subject.get('/about-detail', rabl: 'user') do
+          @user = OpenStruct.new(name: 'LTe')
+          render locals: { details: 'just a user' }
         end
       end
 
-      it "renders template passed as argument to reneder method" do
-        get("/home")
+      it 'renders template passed as argument to render method' do
+        get('/home')
         last_response.body.should == '{"admin":{"name":"LTe"}}'
       end
 
-      it "does not save rabl options after called #render method" do
-        get("/home")
-        get("/about")
+      it 'renders template passed as argument to render method with locals' do
+        get('/home-detail')
+        last_response.body.should == '{"admin":{"name":"LTe","details":"amazing detail"}}'
+      end
+
+      it 'renders with locals without overriding template' do
+        get('/about-detail')
+        last_response.body.should == '{"user":{"name":"LTe","details":"just a user","project":null}}'
+      end
+
+      it 'does not save rabl options after called #render method' do
+        get('/home')
+        get('/about')
         last_response.body.should == '{"user":{"name":"LTe","project":null}}'
       end
     end
 
-
-    it "should respond with proper content-type" do
-      subject.get("/home", :rabl => "user"){}
-      get("/home")
-      last_response.headers["Content-Type"].should == "application/json"
+    it 'should respond with proper content-type' do
+      subject.get('/home', rabl: 'user') {}
+      get('/home')
+      last_response.headers['Content-Type'].should == 'application/json'
     end
 
-    it "should not raise error about root directory" do
-      subject.get("/home", :rabl => "user"){}
-      get "/home"
-      last_response.status.should == 200
+    it 'should not raise error about root directory' do
+      subject.get('/home', rabl: 'user') {}
+      get '/home'
+      last_response.status.should eq 200
       last_response.body.should_not include "Use Rack::Config to set 'api.tilt.root' in config.ru"
     end
 
-    ["user", "user.rabl"].each do |rabl_option|
+    ['user', 'user.rabl'].each do |rabl_option|
       it "should render rabl template (#{rabl_option})" do
-        subject.get("/home", :rabl => rabl_option) do
-          @user = OpenStruct.new(:name => "LTe", :email => "email@example.com")
-          @project = OpenStruct.new(:name => "First")
+        subject.get('/home', rabl: rabl_option) do
+          @user = OpenStruct.new(name: 'LTe', email: 'email@example.com')
+          @project = OpenStruct.new(name: 'First')
         end
 
-        get "/home"
+        get '/home'
         last_response.body.should == '{"user":{"name":"LTe","email":"email@example.com","project":{"name":"First"}}}'
       end
     end
+
+    describe 'template cache' do
+      before do
+        @views_dir = FileUtils.mkdir_p("#{File.expand_path("..", File.dirname(__FILE__))}/tmp")[0]
+        @template = "#{@views_dir}/user.rabl"
+        FileUtils.cp("#{File.dirname(__FILE__)}/views/user.rabl", @template)
+        subject.before { env['api.tilt.root'] = "#{File.expand_path("..", File.dirname(__FILE__))}/tmp" }
+        subject.get('/home', rabl: 'user') do
+          @user = OpenStruct.new(name: 'LTe', email: 'email@example.com')
+          @project = OpenStruct.new(name: 'First')
+        end
+      end
+
+      after do
+        Grape::Rabl.reset_configuration!
+        FileUtils.rm_r(@views_dir)
+      end
+
+      it 'should serve from cache if cache_template_loading' do
+        Grape::Rabl.configure do |config|
+          config.cache_template_loading = true
+        end
+        get '/home'
+        last_response.status.should be == 200
+        old_response = last_response.body
+        open(@template, 'a') { |f| f << 'node(:test) { "test" }' }
+        get '/home'
+        last_response.status.should be == 200
+        new_response = last_response.body
+        old_response.should == new_response
+      end
+
+      it 'should serve new template if cache_template_loading' do
+        get '/home'
+        last_response.status.should be == 200
+        old_response = last_response.body
+        open(@template, 'a') { |f| f << 'node(:test) { "test" }' }
+        get '/home'
+        last_response.status.should be == 200
+        new_response = last_response.body
+        old_response.should_not == new_response
+      end
+    end
   end
 end

data/spec/grape_rabl_xml_spec.rb

@@ -14,30 +14,38 @@ describe Grape::Rabl do
     subject
   end
 
-  context "with xml format"  do
+  context 'with xml format'  do
     before do
-      subject.before {
-        env["api.tilt.root"] = "#{File.dirname(__FILE__)}/views"
-        env["api.format"] = :xml
-      }
+      subject.before do
+        env['api.tilt.root'] = "#{File.dirname(__FILE__)}/views"
+        env['api.format'] = :xml
+      end
     end
 
-    it "should respond with proper content-type" do
-      subject.get("/home", :rabl => "user"){}
-      get("/home")
-      last_response.headers["Content-Type"].should == "application/xml"
+    it 'should respond with proper content-type' do
+      subject.get('/home', rabl: 'user') {}
+      get('/home')
+      last_response.headers['Content-Type'].should == 'application/xml'
     end
 
-    ["user", "user.rabl"].each do |rabl_option|
+    ['user', 'user.rabl'].each do |rabl_option|
       it "should render rabl template (#{rabl_option})" do
-        subject.get("/home", :rabl => rabl_option) do
-          @user = OpenStruct.new(:name => "LTe", :email => "email@example.com")
-          @project = OpenStruct.new(:name => "First")
+        subject.get('/home', rabl: rabl_option) do
+          @user = OpenStruct.new(name: 'LTe', email: 'email@example.com')
+          @project = OpenStruct.new(name: 'First')
         end
 
-        get "/home"
-
-        last_response.body.should == %Q{<?xml version="1.0" encoding="UTF-8"?>\n<user>\n  <name>LTe</name>\n  <email>email@example.com</email>\n  <project>\n    <name>First</name>\n  </project>\n</user>\n}
+        get '/home'
+
+        last_response.body.should == %Q(<?xml version="1.0" encoding="UTF-8"?>
+<user>
+  <name>LTe</name>
+  <email>email@example.com</email>
+  <project>
+    <name>First</name>
+  </project>
+</user>
+)
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,21 +1,20 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'bundler'
-Bundler.setup :default, :test
-
-require 'coveralls'
-Coveralls.wear!
-
-require 'active_support/core_ext/hash/conversions'
-require 'grape/rabl'
-require 'rspec'
-require 'rack/test'
-require 'ostruct'
-
-RSpec.configure do |config|
-  config.include Rack::Test::Methods
-end
-
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'bundler'
+Bundler.setup :default, :test
+
+require 'coveralls'
+Coveralls.wear!
+
+require 'active_support/core_ext/hash/conversions'
+require 'grape/rabl'
+require 'rspec'
+require 'rack/test'
+require 'ostruct'
+
+RSpec.configure do |config|
+  config.include Rack::Test::Methods
+end
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/spec/support/my_helper.rb

@@ -1,5 +1,5 @@
 module MyHelper
   def my_helper
-    "my_helper"
+    'my_helper'
   end
-end
+end

data/spec/views/admin.rabl

@@ -1,2 +1,6 @@
 object @user => :admin
 attributes :name
+
+node :details, :unless => lambda { |n| locals[:details].nil? } do |m|
+  locals[:details]
+end

data/spec/views/layout_test/layouts/another.rabl

@@ -0,0 +1,3 @@
+node(:result) do
+  JSON.parse(yield)
+end

data/spec/views/layout_test/layouts/application.rabl

@@ -0,0 +1,5 @@
+node(:status) { @status }
+
+node(:result) do
+  JSON.parse(yield)
+end

data/spec/views/layout_test/user.rabl

@@ -0,0 +1,6 @@
+object @user => :user
+attributes :name, :email
+
+child @project => :project do
+  attributes :name
+end

data/spec/views/user.rabl

@@ -4,3 +4,7 @@ attributes :name, :email
 child @project => :project do
   attributes :name
 end
+
+node :details, :unless => lambda { |n| locals[:details].nil? } do |m|
+  locals[:details]
+end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: grape-rabl
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Piotr Niełacny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Use rabl in grape
@@ -85,6 +76,7 @@ files:
 - .coveralls.yml
 - .gitignore
 - .rspec
+- .rubocop.yml
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -93,11 +85,14 @@ files:
 - Rakefile
 - grape-rabl.gemspec
 - lib/grape-rabl.rb
+- lib/grape-rabl/configuration.rb
 - lib/grape-rabl/formatter.rb
 - lib/grape-rabl/render.rb
 - lib/grape-rabl/tilt.rb
 - lib/grape-rabl/version.rb
 - lib/grape/rabl.rb
+- spec/grape_rabl_configuration.rb
+- spec/grape_rabl_layout_spec.rb
 - spec/grape_rabl_partials_spec.rb
 - spec/grape_rabl_spec.rb
 - spec/grape_rabl_xml_spec.rb
@@ -107,36 +102,37 @@ files:
 - spec/views/admin.rabl
 - spec/views/helper.rabl
 - spec/views/info.rabl
+- spec/views/layout_test/layouts/another.rabl
+- spec/views/layout_test/layouts/application.rabl
+- spec/views/layout_test/user.rabl
 - spec/views/project.rabl
 - spec/views/user.rabl
 homepage: https://github.com/LTe/grape-rabl
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1720124762415562213
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use rabl in grape
 test_files:
+- spec/grape_rabl_configuration.rb
+- spec/grape_rabl_layout_spec.rb
 - spec/grape_rabl_partials_spec.rb
 - spec/grape_rabl_spec.rb
 - spec/grape_rabl_xml_spec.rb
@@ -146,5 +142,8 @@ test_files:
 - spec/views/admin.rabl
 - spec/views/helper.rabl
 - spec/views/info.rabl
+- spec/views/layout_test/layouts/another.rabl
+- spec/views/layout_test/layouts/application.rabl
+- spec/views/layout_test/user.rabl
 - spec/views/project.rabl
 - spec/views/user.rabl