grape-rabl 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 808bb9d1fe12e1f3879525ff73e61415fcc3135e
-  data.tar.gz: 95e2e7e6f1b8d73d1cf38bbe24139f424b3af6de
+  metadata.gz: 4f66c2fd9f44ff3363235629017ad85ef7aed831
+  data.tar.gz: d97536b97d1bce6b360f967d59b8047651a1afda
 SHA512:
-  metadata.gz: e1652a0a0d314bdd17d8e1bb174a22959891a82fcf0ed5aec5968c4a438a4c0c67711238294ca64697fc60767b730c598de62f6d8aca2af72da559b4c26fc8cb
-  data.tar.gz: ddeb3a86e10961f115295db92624b8f5d5c3c627cd6b4938f79b5b2f5f236435ec49b4c6141b7a6f150f91c3eee1de43b1f16e3e8322811514cca0ab70fce431
+  metadata.gz: a044c927a6dd449c97963c3f8dcf4450aa548db7d382c6fbb371f6ec43d0e3c6fbf4b4a896ae095648ffdf8233c8e342ca0148d49427c09103d8269ed06eb483
+  data.tar.gz: 4dae323c5e5ef547e406eeb2c6b11ea7d2e3a473bc67fe6a7452ff0290fdcd7db4a395e004920f9bb8d22acc41d2d9396fd36aee8ceb974288e95ce199623fa0

data/.rubocop.yml

@@ -3,32 +3,4 @@ AllCops:
     - 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
+inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -0,0 +1,50 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-06-08 16:00:13 -0400 using RuboCop version 0.40.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+Lint/RescueException:
+  Exclude:
+    - 'spec/grape_rabl_spec.rb'
+
+# Offense count: 21
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 148
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 13
+
+# Offense count: 5
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/grape-rabl.rb'
+    - 'lib/grape-rabl/configuration.rb'
+    - 'lib/grape-rabl/formatter.rb'
+    - 'lib/grape-rabl/render.rb'
+    - 'lib/grape/rabl.rb'
+
+# Offense count: 1
+Style/DoubleNegation:
+  Exclude:
+    - 'lib/grape-rabl/formatter.rb'
+
+# Offense count: 1
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
+Style/FileName:
+  Exclude:
+    - 'lib/grape-rabl.rb'
+
+# Offense count: 1
+Style/IfInsideElse:
+  Exclude:
+    - 'lib/grape-rabl/formatter.rb'

data/.travis.yml

@@ -1,14 +1,14 @@
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
   - ruby-head
   - jruby-19mode
   - jruby-head
-  - rbx-2.2.10
+  - rbx-2
 
 matrix:
   allow_failures:
     - rvm: jruby-19mode
     - rvm: jruby-head
     - rvm: ruby-head
+    - rvm: rbx-2

data/CHANGELOG.md

@@ -1,70 +1,74 @@
+#### v0.4.2
+
+* Fix template caching for multiple formats. [#43](https://github.com/ruby-grape/grape-rabl/pull/43) [@kushkella](https://github.com/kushkella)
+
 #### v0.4.1
 
-* Automatically require 'grape/rabl'. [#39](https://github.com/LTe/grape-rabl/issues/39) [@martinezcoder](https://github.com/martinezcoder)
+* Automatically require 'grape/rabl'. [#39](https://github.com/ruby-grape/grape-rabl/issues/39) [@martinezcoder](https://github.com/martinezcoder)
 
 #### v0.4.0
 
-* Make grape-rabl thread-safe. [#37](https://github.com/LTe/grape-rabl/issues/37) [@kushkella](https://github.com/kushkella)
+* Make grape-rabl thread-safe. [#37](https://github.com/ruby-grape/grape-rabl/issues/37) [@kushkella](https://github.com/kushkella)
 
 #### v0.3.1
 
-* The `render` method will no longer modify endpoint options at runtime. [#35](https://github.com/LTe/grape-rabl/issues/35) [@yesmeck](https://github.com/yesmeck)
+* The `render` method will no longer modify endpoint options at runtime. [#35](https://github.com/ruby-grape/grape-rabl/issues/35) [@yesmeck](https://github.com/yesmeck)
 
 #### 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)
+* Enable using a layout template in Rabl. [@koko1000ban](https://github.com/koko1000ban) [view commit](https://github.com/ruby-grape/grape-rabl/commit/1fbfbd58c3fb320be1b52b3247fda2a23cacc9fc)
+* Implemented Rubocop, Ruby style linter. [@dblock](https://github.com/dblock) [view commit](https://github.com/ruby-grape/grape-rabl/commit/1211056de22a5989c063d57b7b37ebb1f1977e83)
+* Removed JRuby support. [@dblock](https://github.com/dblock) [view commit](https://github.com/ruby-grape/grape-rabl/commit/59905c1b09670fe08501e09bad4ec8714839f2d3)
+* Enable using locals with #render. [@hobofan](https://github.com/hobofan) [view commit](https://github.com/ruby-grape/grape-rabl/commit/6c24130f6a670e52e6119c56904b8ed2e6f60b39)
+* Enable support for template caching. [#28](https://github.com/ruby-grape/grape-rabl/pull/28) [@kushkella](https://github.com/kushkella) [view commit](https://github.com/ruby-grape/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)
+* Relaxed dependency on a specific version of Grape. [#20](https://github.com/ruby-grape/grape-rabl/pull/20) [@cheef](https://github.com/cheef) [view commit](https://github.com/ruby-grape/grape-rabl/commit/56da0a5bcecb16501cdd93ac25f3b6ca6d7a86f0)
 
 #### v0.2.1
 
-* Fix: render template according to request format. [#11](https://github.com/LTe/grape-rabl/pull/11) [@alovak](https://github.com/alovak) [view commit](http://github.com/LTe/grape-rabl/commit/f9658cf7a3026122afbb77e0da613731a5828338)
+* Fix: render template according to request format. [#11](https://github.com/ruby-grape/grape-rabl/pull/11) [@alovak](https://github.com/alovak) [view commit](http://github.com/ruby-grape/grape-rabl/commit/f9658cf7a3026122afbb77e0da613731a5828338)
 
 #### v0.2.0
 
-* Allow to use partials in Grape. [#10](https://github.com/LTe/grape-rabl/pull/10) [@ichilton](https://github.com/ichilton) [view commit](http://github.com/LTe/grape-rabl/commit/72c96c5acc9d8000f56ee8400ae0229053fb3e7e)
-* Stick to gem conventions. [@LTe](https://github.com/lte) [view commit](http://github.com/LTe/grape-rabl/commit/aabd0e2ad72f56a75427eebcc586deed57cf5f58)
-* Update for Grape 0.3 compatibility. [@alovak](https://github.com/alovak) [view commit](http://github.com/LTe/grape-rabl/commit/78bfdceffbfe90b700868ff1e79ab87e8baded81)
-* Format fix. [@LTe](https://github.com/lte) [view commit](http://github.com/LTe/grape-rabl/commit/13749cc18d332dcd0050bb32980cc233868a7992)
+* Allow to use partials in Grape. [#10](https://github.com/ruby-grape/grape-rabl/pull/10) [@ichilton](https://github.com/ichilton) [view commit](http://github.com/ruby-grape/grape-rabl/commit/72c96c5acc9d8000f56ee8400ae0229053fb3e7e)
+* Stick to gem conventions. [@LTe](https://github.com/lte) [view commit](http://github.com/ruby-grape/grape-rabl/commit/aabd0e2ad72f56a75427eebcc586deed57cf5f58)
+* Update for Grape 0.3 compatibility. [@alovak](https://github.com/alovak) [view commit](http://github.com/ruby-grape/grape-rabl/commit/78bfdceffbfe90b700868ff1e79ab87e8baded81)
+* Format fix. [@LTe](https://github.com/lte) [view commit](http://github.com/ruby-grape/grape-rabl/commit/13749cc18d332dcd0050bb32980cc233868a7992)
 
 #### v0.1.0
 
-* Updated w/ released Grape 0.2.3. [view commit](http://github.com/LTe/grape-rabl/commit/9a055dfd8e13e0952a587de7a2e19c9f762e939c)
-* Added link to Rabl. [view commit](http://github.com/LTe/grape-rabl/commit/2a7650cb5f9327761cac8b928453e451a973e131)
-* Grape 0.2.x and put back dependency status. [view commit](http://github.com/LTe/grape-rabl/commit/9c1183f3758db8a79737ff35f0c328be646a3f65)
-* Grape 0.2.3. [view commit](http://github.com/LTe/grape-rabl/commit/d06a6559a02095e1d84fbbd8df0c3eccdd31930b)
-* Updated Grape dependency via .gemspec. [view commit](http://github.com/LTe/grape-rabl/commit/fd44b6a91fa327438eac968fea62ac00ec3ae01f)
+* Updated w/ released Grape 0.2.3. [view commit](http://github.com/ruby-grape/grape-rabl/commit/9a055dfd8e13e0952a587de7a2e19c9f762e939c)
+* Added link to Rabl. [view commit](http://github.com/ruby-grape/grape-rabl/commit/2a7650cb5f9327761cac8b928453e451a973e131)
+* Grape 0.2.x and put back dependency status. [view commit](http://github.com/ruby-grape/grape-rabl/commit/9c1183f3758db8a79737ff35f0c328be646a3f65)
+* Grape 0.2.3. [view commit](http://github.com/ruby-grape/grape-rabl/commit/d06a6559a02095e1d84fbbd8df0c3eccdd31930b)
+* Updated Grape dependency via .gemspec. [view commit](http://github.com/ruby-grape/grape-rabl/commit/fd44b6a91fa327438eac968fea62ac00ec3ae01f)
 
 #### v0.0.6
 
-* Use Grape formatter syntax instead of monkey-patching. [view commit](http://github.com/LTe/grape-rabl/commit/bfba4c382933fd0f912d9114676b6d79d627c3be)
-* Close block code in README. [view commit](http://github.com/LTe/grape-rabl/commit/f397a0de4399d0797b5e327d56234464091d7e3d)
-* Change home to user. [view commit](http://github.com/LTe/grape-rabl/commit/45178ec13c613d872c65475b330d20a548459681)
+* Use Grape formatter syntax instead of monkey-patching. [view commit](http://github.com/ruby-grape/grape-rabl/commit/bfba4c382933fd0f912d9114676b6d79d627c3be)
+* Close block code in README. [view commit](http://github.com/ruby-grape/grape-rabl/commit/f397a0de4399d0797b5e327d56234464091d7e3d)
+* Change home to user. [view commit](http://github.com/ruby-grape/grape-rabl/commit/45178ec13c613d872c65475b330d20a548459681)
 
 #### v0.0.5
 
-* Respect default_format for rabl response. [view commit](http://github.com/LTe/grape-rabl/commit/ac54ebbb1d43d1fb76ee9516c5aa683c750c73b0)
+* Respect default_format for rabl response. [view commit](http://github.com/ruby-grape/grape-rabl/commit/ac54ebbb1d43d1fb76ee9516c5aa683c750c73b0)
 
 #### v0.0.4
 
-* Require `grape/rabl`. [view commit](http://github.com/LTe/grape-rabl/commit/e99a185b20974f5e72ac3c19ec377a5853780a33)
+* Require `grape/rabl`. [view commit](http://github.com/ruby-grape/grape-rabl/commit/e99a185b20974f5e72ac3c19ec377a5853780a33)
 
 #### v0.0.3
 
-* Template without `.rabl`. [view commit](http://github.com/LTe/grape-rabl/commit/cecca03a680f8ae50b406e1b8c170eba27d1bc99)
+* Template without `.rabl`. [view commit](http://github.com/ruby-grape/grape-rabl/commit/cecca03a680f8ae50b406e1b8c170eba27d1bc99)
 
 #### v0.0.2
 
-* Add Travis. [view commit](http://github.com/LTe/grape-rabl/commit/71c905bc91066c6fdb628afb555561e23219e213)
-* Remove ruby debug. [view commit](http://github.com/LTe/grape-rabl/commit/f80fad14a49b14ae7264b08eff12832c37cbd0b2)
-* Works with rubinius. [view commit](http://github.com/LTe/grape-rabl/commit/fceece344de095916ded7c477bb5891537bb8663)
-* Add dependency status. [view commit](http://github.com/LTe/grape-rabl/commit/66820fb52155c65d4cd9bd7b67f0f22c1105fa46)
+* Add Travis. [view commit](http://github.com/ruby-grape/grape-rabl/commit/71c905bc91066c6fdb628afb555561e23219e213)
+* Remove ruby debug. [view commit](http://github.com/ruby-grape/grape-rabl/commit/f80fad14a49b14ae7264b08eff12832c37cbd0b2)
+* Works with rubinius. [view commit](http://github.com/ruby-grape/grape-rabl/commit/fceece344de095916ded7c477bb5891537bb8663)
+* Add dependency status. [view commit](http://github.com/ruby-grape/grape-rabl/commit/66820fb52155c65d4cd9bd7b67f0f22c1105fa46)
 
 #### v0.0.1
 

data/CONTRIBUTING.md

@@ -0,0 +1,118 @@
+Contributing to Grape-Rabl
+==========================
+
+Grape-Rabl is work of [many of contributors](https://github.com/ruby-grape/grape-rabl/graphs/contributors). You're encouraged to submit [pull requests](https://github.com/ruby-grape/grape-rabl/pulls), [propose features and discuss issues](https://github.com/ruby-grape/grape-rabl/issues). When in doubt, ask a question in the [Grape Google Group](http://groups.google.com/group/ruby-grape).
+
+#### Fork the Project
+
+Fork the [project on Github](https://github.com/ruby-grape/grape-rabl) and check out your copy.
+
+```
+git clone https://github.com/contributor/grape-rabl.git
+cd grape-rabl
+git remote add upstream https://github.com/ruby-grape/grape-rabl.git
+```
+
+#### Create a Topic Branch
+
+Make sure your fork is up-to-date and create a topic branch for your feature or bug fix.
+
+```
+git checkout master
+git pull upstream master
+git checkout -b my-feature-branch
+```
+
+#### Bundle Install and Test
+
+Ensure that you can build the project and run tests.
+
+```
+bundle install
+bundle exec rake
+```
+
+#### Write Tests
+
+Try to write a test that reproduces the problem you're trying to fix or describes a feature that you want to build. Add to [spec/grape-rabl](spec/grape-rabl).
+
+We definitely appreciate pull requests that highlight or reproduce a problem, even without a fix.
+
+#### Write Code
+
+Implement your feature or bug fix.
+
+Ruby style is enforced with [Rubocop](https://github.com/bbatsov/rubocop), run `bundle exec rubocop` and fix any style issues highlighted.
+
+Make sure that `bundle exec rake` completes without errors.
+
+#### Write Documentation
+
+Document any external behavior in the [README](README.md).
+
+#### Update Changelog
+
+Add a line to [CHANGELOG](CHANGELOG.md) under *Next Release*. Make it look like every other line, including your name and link to your Github account.
+
+#### Commit Changes
+
+Make sure git knows your name and email address:
+
+```
+git config --global user.name "Your Name"
+git config --global user.email "contributor@example.com"
+```
+
+Writing good commit logs is important. A commit log should describe what changed and why.
+
+```
+git add ...
+git commit
+```
+
+#### Push
+
+```
+git push origin my-feature-branch
+```
+
+#### Make a Pull Request
+
+Go to https://github.com/contributor/grape-rabl and select your feature branch. Click the 'Pull Request' button and fill out the form. Pull requests are usually reviewed within a few days.
+
+#### Rebase
+
+If you've been working on a change for a while, rebase with upstream/master.
+
+```
+git fetch upstream
+git rebase upstream/master
+git push origin my-feature-branch -f
+```
+
+#### Update CHANGELOG Again
+
+Update the [CHANGELOG](CHANGELOG.md) with the pull request number. A typical entry looks as follows.
+
+```
+* [#123](https://github.com/ruby-grape/grape-rabl/pull/123): Reticulated splines - [@contributor](https://github.com/contributor).
+```
+
+Amend your previous commit and force push the changes.
+
+```
+git commit --amend
+git push origin my-feature-branch -f
+```
+
+#### Check on Your Pull Request
+
+Go back to your pull request after a few minutes and see whether it passed muster with Travis-CI. Everything should look green, otherwise fix issues and amend your commit as described above.
+
+#### Be Patient
+
+It's likely that your change will not be merged and that the nitpicky maintainers will ask you to do more, or fix seemingly benign problems. Hang on there!
+
+#### Thank You
+
+Please do know that we really appreciate and value your time and work. We love you, really.

data/Gemfile

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

data/README.md

@@ -3,10 +3,10 @@
 Use [Rabl](https://github.com/nesquena/rabl) templates in [Grape](https://github.com/intridea/grape)!
 
 [![Gem Version](http://img.shields.io/gem/v/grape-rabl.svg)](http://badge.fury.io/rb/grape-rabl)
-[![Build Status](http://img.shields.io/travis/LTe/grape-rabl.svg)](https://travis-ci.org/LTe/grape-rabl)
-[![Dependency Status](https://gemnasium.com/LTe/grape-rabl.svg)](https://gemnasium.com/LTe/grape-rabl)
-[![Code Climate](https://codeclimate.com/github/LTe/grape-rabl.svg)](https://codeclimate.com/github/LTe/grape-rabl)
-[![Coverage Status](https://img.shields.io/coveralls/LTe/grape-rabl.svg)](https://coveralls.io/r/LTe/grape-rabl?branch=master)
+[![Build Status](http://img.shields.io/travis/ruby-grape/grape-rabl.svg)](https://travis-ci.org/ruby-grape/grape-rabl)
+[![Dependency Status](https://gemnasium.com/ruby-grape/grape-rabl.svg)](https://gemnasium.com/ruby-grape/grape-rabl)
+[![Code Climate](https://codeclimate.com/github/ruby-grape/grape-rabl.svg)](https://codeclimate.com/github/ruby-grape/grape-rabl)
+[![Coverage Status](https://img.shields.io/coveralls/ruby-grape/grape-rabl.svg)](https://coveralls.io/r/ruby-grape/grape-rabl?branch=master)
 
 ## Installation
 
@@ -77,7 +77,7 @@ end
 
 ### Enable template caching
 
-Gape-rabl allows for template caching after templates are loaded initially.
+Grape-rabl allows for template caching after templates are loaded initially.
 
 You can enable template caching:
 
@@ -204,5 +204,5 @@ Enjoy :)
 5. Create new Pull Request
 
 
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/LTe/grape-rabl/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ruby-grape/grape-rabl/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 

data/Rakefile

@@ -1,5 +1,5 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -9,6 +9,6 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
 require 'rubocop/rake_task'
-Rubocop::RakeTask.new(:rubocop)
+RuboCop::RakeTask.new(:rubocop)
 
 task default: [:rubocop, :spec]

data/grape-rabl.gemspec

@@ -3,21 +3,21 @@ require File.expand_path('../lib/grape-rabl/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Piotr Niełacny"]
-  gem.email         = ["piotr.nielacny@gmail.com"]
-  gem.description   = %q{Use rabl in grape}
-  gem.summary       = %q{Use rabl in grape}
-  gem.homepage      = "https://github.com/LTe/grape-rabl"
+  gem.email         = ['piotr.nielacny@gmail.com']
+  gem.description   = 'Use rabl in grape'
+  gem.summary       = 'Use rabl in grape'
+  gem.homepage      = 'https://github.com/ruby-grape/grape-rabl'
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "grape-rabl"
-  gem.require_paths = ["lib"]
+  gem.name          = 'grape-rabl'
+  gem.require_paths = ['lib']
   gem.version       = Grape::Rabl::VERSION
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_dependency "grape"
-  gem.add_dependency "rabl"
-  gem.add_dependency "tilt"
-  gem.add_dependency "i18n"
+  gem.add_dependency 'grape'
+  gem.add_dependency 'rabl'
+  gem.add_dependency 'tilt'
+  gem.add_dependency 'i18n'
 end

data/lib/grape-rabl.rb

@@ -11,7 +11,7 @@ require 'grape-rabl/configuration'
 module Grape
   module Rabl
     class << self
-      def configure(&block)
+      def configure
         yield(configuration)
         configuration
       end

data/lib/grape-rabl/formatter.rb

@@ -48,7 +48,7 @@ module Grape
       end
 
       def rabl
-        fail 'missing rabl template' unless rabl_template
+        raise 'missing rabl template' unless rabl_template
         set_view_root unless env['api.tilt.root']
         yield rabl_template
       end
@@ -62,12 +62,12 @@ module Grape
       end
 
       def set_view_root
-        fail "Use Rack::Config to set 'api.tilt.root' in config.ru"
+        raise "Use Rack::Config to set 'api.tilt.root' in config.ru"
       end
 
       def tilt_template(template)
         if Grape::Rabl.configuration.cache_template_loading
-          Grape::Rabl::Formatter.tilt_cache.fetch(template) { ::Tilt.new(view_path(template), tilt_options) }
+          Grape::Rabl::Formatter.tilt_cache.fetch(tilt_cache_key(template)) { ::Tilt.new(view_path(template), tilt_options) }
         else
           ::Tilt.new(view_path(template), tilt_options)
         end
@@ -80,11 +80,15 @@ module Grape
       def layout_template
         layout_path = view_path(env['api.tilt.layout'] || 'layouts/application')
         if Grape::Rabl.configuration.cache_template_loading
-          Grape::Rabl::Formatter.tilt_cache.fetch(layout_path) { ::Tilt.new(layout_path, tilt_options) if File.exist?(layout_path) }
+          Grape::Rabl::Formatter.tilt_cache.fetch(tilt_cache_key(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
+
+      def tilt_cache_key(path)
+        Digest::MD5.hexdigest("#{path}#{tilt_options}")
+      end
     end
   end
 end

data/lib/grape-rabl/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Rabl
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'.freeze
   end
 end

data/spec/grape_rabl_configuration.rb

@@ -3,16 +3,16 @@ require 'spec_helper'
 describe 'Grape::Rabl configuration' do
   context 'configuration' do
     it 'returns default values' do
-      Grape::Rabl.configuration.cache_template_loading.should == false
+      expect(Grape::Rabl.configuration.cache_template_loading).to eq(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
+      expect(Grape::Rabl.configuration.cache_template_loading).to eq(true)
       Grape::Rabl.reset_configuration!
-      Grape::Rabl.configuration.cache_template_loading.should == false
+      expect(Grape::Rabl.configuration.cache_template_loading).to eq(false)
     end
   end
 end

data/spec/grape_rabl_layout_spec.rb

@@ -28,8 +28,9 @@ describe 'Grape::Rabl layout' do
       end
 
       get('/about')
-      parsed_response.should ==
-        JSON.parse(%Q({"status":200,"result":{"user":{"name":"LTe","project":{"name":"First"}}}}))
+      expect(parsed_response).to eq(
+        JSON.parse(%({"status":200,"result":{"user":{"name":"LTe","project":{"name":"First"}}}}))
+      )
     end
   end
 
@@ -47,17 +48,18 @@ describe 'Grape::Rabl layout' do
 
       get('/about')
       puts last_response.body
-      parsed_response.should ==
-        JSON.parse(%Q({"result":{"user":{"name":"LTe","project":{"name":"First"}}}}))
+      expect(parsed_response).to eq(
+        JSON.parse(%({"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]
+      @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.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')
@@ -75,24 +77,24 @@ describe 'Grape::Rabl layout' do
         config.cache_template_loading = true
       end
       get '/home'
-      last_response.status.should be == 200
+      expect(last_response.status).to eq(200)
       old_response = last_response.body
       open(@layout, 'a') { |f| f << 'node(:test) { "test" }' }
       get '/home'
-      last_response.status.should be == 200
+      expect(last_response.status).to eq(200)
       new_response = last_response.body
-      old_response.should == new_response
+      expect(old_response).to eq(new_response)
     end
 
     it 'should serve new template if cache_template_loading' do
       get '/home'
-      last_response.status.should be == 200
+      expect(last_response.status).to eq(200)
       old_response = last_response.body
       open(@layout, 'a') { |f| f << 'node(:test) { "test" }' }
       get '/home'
-      last_response.status.should be == 200
+      expect(last_response.status).to eq(200)
       new_response = last_response.body
-      old_response.should_not == new_response
+      expect(old_response).not_to eq(new_response)
     end
   end
 end

data/spec/grape_rabl_partials_spec.rb

@@ -25,7 +25,8 @@ describe 'Grape::Rabl partials' do
     end
 
     get('/home')
-    parsed_response.should ==
-      JSON.parse("{\"project\":{\"name\":\"First\",\"info\":{\"type\":\"paper\"},\"author\":{\"author\":\"LTe\"}}}")
+    expect(parsed_response).to eq(
+      JSON.parse('{"project":{"name":"First","info":{"type":"paper"},"author":{"author":"LTe"}}}')
+    )
   end
 end

data/spec/grape_rabl_spec.rb

@@ -6,8 +6,9 @@ describe Grape::Rabl do
   end
 
   before do
-    subject.format :json
+    subject.default_format :json
     subject.formatter :json, Grape::Formatter::Rabl
+    subject.formatter :xml, Grape::Formatter::Rabl
     subject.helpers MyHelper
   end
 
@@ -18,7 +19,7 @@ describe Grape::Rabl do
   it 'should work without rabl template' do
     subject.get('/home') { 'Hello World' }
     get '/home'
-    last_response.body.should == "\"Hello World\""
+    expect(last_response.body).to eq('"Hello World"')
   end
 
   it 'should raise error about root directory' do
@@ -26,11 +27,11 @@ describe Grape::Rabl do
       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"
+      expect(e.message).to 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
     let(:parsed_response) { JSON.parse(last_response.body) }
 
     before do
@@ -41,7 +42,7 @@ describe Grape::Rabl do
       it 'should execute helper' do
         subject.get('/home', rabl: 'helper') { @user = OpenStruct.new }
         get '/home'
-        parsed_response.should == JSON.parse("{\"user\":{\"helper\":\"my_helper\"}}")
+        expect(parsed_response).to eq(JSON.parse('{"user":{"helper":"my_helper"}}'))
       end
     end
 
@@ -75,33 +76,33 @@ describe Grape::Rabl do
 
       it 'renders template passed as argument to render method' do
         get('/home')
-        parsed_response.should == JSON.parse('{"admin":{"name":"LTe"}}')
+        expect(parsed_response).to eq(JSON.parse('{"admin":{"name":"LTe"}}'))
       end
 
       it 'renders admin template' do
         get('/admin/1')
-        parsed_response.should == JSON.parse('{"admin":{"name":"LTe"}}')
+        expect(parsed_response).to eq(JSON.parse('{"admin":{"name":"LTe"}}'))
       end
 
       it 'renders user template' do
         get('/admin/2')
-        parsed_response.should == JSON.parse('{"user":{"name":"LTe","project":null}}')
+        expect(parsed_response).to eq(JSON.parse('{"user":{"name":"LTe","project":null}}'))
       end
 
       it 'renders template passed as argument to render method with locals' do
         get('/home-detail')
-        parsed_response.should == JSON.parse('{"admin":{"name":"LTe","details":"amazing detail"}}')
+        expect(parsed_response).to eq(JSON.parse('{"admin":{"name":"LTe","details":"amazing detail"}}'))
       end
 
       it 'renders with locals without overriding template' do
         get('/about-detail')
-        parsed_response.should == JSON.parse('{"user":{"name":"LTe","details":"just a user","project":null}}')
+        expect(parsed_response).to eq(JSON.parse('{"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')
-        parsed_response.should == JSON.parse('{"user":{"name":"LTe","project":null}}')
+        expect(parsed_response).to eq(JSON.parse('{"user":{"name":"LTe","project":null}}'))
       end
 
       it 'does not modify endpoint options' do
@@ -113,14 +114,14 @@ describe Grape::Rabl do
     it 'should respond with proper content-type' do
       subject.get('/home', rabl: 'user') {}
       get('/home')
-      last_response.headers['Content-Type'].should == 'application/json'
+      expect(last_response.headers['Content-Type']).to eq('application/json')
     end
 
     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"
+      expect(last_response.status).to eq 200
+      expect(last_response.body).not_to include "Use Rack::Config to set 'api.tilt.root' in config.ru"
     end
 
     ['user', 'user.rabl'].each do |rabl_option|
@@ -131,16 +132,16 @@ describe Grape::Rabl do
         end
 
         get '/home'
-        parsed_response.should == JSON.parse('{"user":{"name":"LTe","email":"email@example.com","project":{"name":"First"}}}')
+        expect(parsed_response).to eq(JSON.parse('{"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]
+        @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.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')
@@ -157,24 +158,44 @@ describe Grape::Rabl do
           config.cache_template_loading = true
         end
         get '/home'
-        last_response.status.should be == 200
+        expect(last_response.status).to eq(200)
         old_response = last_response.body
         open(@template, 'a') { |f| f << 'node(:test) { "test" }' }
         get '/home'
-        last_response.status.should be == 200
+        expect(last_response.status).to eq(200)
         new_response = last_response.body
-        old_response.should == new_response
+        expect(old_response).to eq(new_response)
       end
 
-      it 'should serve new template if cache_template_loading' do
+      it 'should maintain different cached templates for different formats' do
+        Grape::Rabl.configure do |config|
+          config.cache_template_loading = true
+        end
+        get '/home'
+        expect(last_response.status).to eq(200)
+        json_response = last_response.body
+        get '/home.xml'
+        expect(last_response.status).to eq(200)
+        xml_response = last_response.body
+        expect(json_response).not_to eq(xml_response)
+        open(@template, 'a') { |f| f << 'node(:test) { "test" }' }
+        get '/home.xml'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq(xml_response)
+        get '/home.json'
+        expect(last_response.status).to eq(200)
+        expect(last_response.body).to eq(json_response)
+      end
+
+      it 'should serve new template unless cache_template_loading' do
         get '/home'
-        last_response.status.should be == 200
+        expect(last_response.status).to eq(200)
         old_response = last_response.body
         open(@template, 'a') { |f| f << 'node(:test) { "test" }' }
         get '/home'
-        last_response.status.should be == 200
+        expect(last_response.status).to eq(200)
         new_response = last_response.body
-        old_response.should_not == new_response
+        expect(old_response).not_to eq(new_response)
       end
     end
   end

data/spec/grape_rabl_xml_spec.rb

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

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ require 'ostruct'
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods
+  config.raise_errors_for_deprecations!
 end
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-rabl
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Piotr Niełacny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -77,8 +77,10 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -107,7 +109,7 @@ files:
 - spec/views/layout_test/user.rabl
 - spec/views/project.rabl
 - spec/views/user.rabl
-homepage: https://github.com/LTe/grape-rabl
+homepage: https://github.com/ruby-grape/grape-rabl
 licenses: []
 metadata: {}
 post_install_message: 
@@ -126,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Use rabl in grape