jbuilder 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17575b4f4e87733b1e46d7762554f5387904cbd9
-  data.tar.gz: 75c4a40da60c398469b52b1f2aeede6b7daf4527
+  metadata.gz: 4ac0617f83abd9f18566f7abb54b4bfb40f43292
+  data.tar.gz: 81ee411aedba8b8532011a4d02b30a287352aefc
 SHA512:
-  metadata.gz: 221cc1da2d52352427b3631dbc7204db44bdcf0b71b2964afbe6cf527731f456f774b2b5cbeafacb4d6a00f898313152d1823c937593e22457fe01a1aa56442d
-  data.tar.gz: 49801cf8ba732d8a6cea0586ae0b31bbc2bebb1a1ade669aacf89e7505fca992570710379f1916eb0b71377024447295dd8e5dd2fa85e4c306c55254ee89d998
+  metadata.gz: 9775756c8e0bceed5f9187629e23c50b11440c6d98f96831c90e0763319b540437d353be56737132a383a15514d1348b032d512448cee6bda4b9c76bae03173c
+  data.tar.gz: d56cca82eb949371a3dc93a4a6e2820de63b58426f9256907473874c46e6448c29dd96479115cd56ba26cff59f9c9a5aa30ae9dd253d47e7991639922c19e306

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+2.0.4
+-----
+* [Add cache_if! to conditionally cache JSON fragments](https://github.com/rails/jbuilder/commit/commit/14a5afd8a2c939a6fd710d355a194c114db96eb2)
+
 2.0.3
 -----
 * [Pass options when calling cache_fragment_name](https://github.com/rails/jbuilder/commit/07c2cc7486fe9ef423d7bc821b83f6d485f330e0)

data/README.md

@@ -182,6 +182,14 @@ json.cache! ['v1', @person], expires_in: 10.minutes do
 end
 ```
 
+You can also conditionally cache a block by using `cache_if!` like this:
+
+```ruby
+json.cache_if! !admin?, ['v1', @person], expires_in: 10.minutes do
+  json.extract! @person, :name, :age
+end
+```
+
 Keys can be auto formatted using `key_format!`, this can be used to convert keynames from the standard ruby_format to CamelCase:
 
 ``` ruby

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.0.3'
+  s.version  = '2.0.4'
   s.author   = 'David Heinemeier Hansson'
   s.email    = 'david@37signals.com'
   s.summary  = 'Create JSON structures via a Builder-style DSL'

data/lib/jbuilder/jbuilder_template.rb

@@ -60,6 +60,19 @@ class JbuilderTemplate < Jbuilder
     end
   end
 
+  # Conditionally catches the json depending in the condition given as first parameter. Has the same
+  # signature as the `cache` helper method in `ActionView::Helpers::CacheHelper` and so can be used in
+  # the same way.
+  #
+  # Example:
+  #
+  #   json.cache_if! !admin?, @person, expires_in: 10.minutes do
+  #     json.extract! @person, :name, :age
+  #   end
+  def cache_if!(condition, *args, &block)
+    condition ? cache!(*args, &block) : yield
+  end
+
   protected
     def _handle_partial_options(options)
       options.reverse_merge! locals: {}

data/test/jbuilder_template_test.rb

@@ -185,6 +185,32 @@ class JbuilderTemplateTest < ActionView::TestCase
     assert_equal 'Cache', parsed['name']
   end
 
+  test 'conditionally fragment caching a JSON object' do
+    undef_context_methods :fragment_name_with_digest, :cache_fragment_name
+
+    render_jbuilder <<-JBUILDER
+      json.cache_if! true, 'cachekey' do
+        json.test1 'Cache'
+      end
+      json.cache_if! false, 'cachekey' do
+        json.test2 'Cache'
+      end
+    JBUILDER
+
+    json = render_jbuilder <<-JBUILDER
+      json.cache_if! true, 'cachekey' do
+        json.test1 'Miss'
+      end
+      json.cache_if! false, 'cachekey' do
+        json.test2 'Miss'
+      end
+    JBUILDER
+
+    parsed = MultiJson.load(json)
+    assert_equal 'Cache', parsed['test1']
+    assert_equal 'Miss', parsed['test2']
+  end
+
   test 'fragment caching deserializes an array' do
     undef_context_methods :fragment_name_with_digest, :cache_fragment_name
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL