rabl 0.6.6 → 0.6.7

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.6.7
+
+  * Fix format to default to json in the event that it is a 'hash' (Thanks @databyte)
+  * Support using cache keys within extended templates (Thanks @databyte)
+
 ## 0.6.6
 
   * Even more improvements to Rails template resolution (Thanks @databyte)

data/fixtures/rails3/script/rails

@@ -1,4 +1,4 @@
-+#!/usr/bin/env ruby
+#!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
 APP_PATH = File.expand_path('../../config/application',  __FILE__)

data/fixtures/rails3_2/test/functional/posts_controller_test.rb

@@ -144,6 +144,10 @@ context "PostsController" do
       end.equals { @posts.map(&:title) }
 
       asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'json'] }
+
+      asserts("contains cache hits per object (posts by title)") do
+        json_output['articles'].map { |o| o['article']['title'] }
+      end.equals { @posts.map{ |p| cache_hit([p, nil, 'hash'])[:title] } }
     end # index action, caching, json
 
     context "for index action with caching in xml" do

data/lib/rabl/builder.rb

@@ -127,7 +127,8 @@ module Rabl
     # Returns a guess at the format in this scope
     # request_format => "xml"
     def request_format
-      @options[:format] if @options[:format] != "hash"
+      format = @options[:format]
+      format && format != "hash" ? format : 'json'
     end
 
     # Caches the results of the block based on object cache_key

data/lib/rabl/engine.rb

@@ -121,6 +121,7 @@ module Rabl
     # cache 'user', expires_in: 1.hour
     # options is passed through to the cache store
     def cache(key, options = nil)
+      key ||= @_data # if called but missing, use object
       @_cache = [key, options]
     end
 

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/test/integration/rails3_2/posts_controller_test.rb

@@ -144,6 +144,10 @@ context "PostsController" do
       end.equals { @posts.map(&:title) }
 
       asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'json'] }
+
+      asserts("contains cache hits per object (posts by title)") do
+        json_output['articles'].map { |o| o['article']['title'] }
+      end.equals { @posts.map{ |p| cache_hit([p, nil, 'hash'])[:title] } }
     end # index action, caching, json
 
     context "for index action with caching in xml" do

metadata

@@ -2,7 +2,7 @@
 name: rabl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-31 00:00:00 Z
+date: 2012-04-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport