jbuilder 0.6.0 → 0.7.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jbuilder (0.6.0)
+    jbuilder (0.7.0)
       activesupport (>= 3.0.0)
 
 GEM

data/jbuilder.gemspec

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

data/lib/jbuilder.rb

@@ -2,7 +2,9 @@ require 'active_support/basic_object'
 require 'active_support/ordered_hash'
 require 'active_support/core_ext/array/access'
 require 'active_support/core_ext/enumerable'
+require 'active_support/core_ext/hash'
 require 'active_support/json'
+require 'active_support/cache'
 require 'multi_json'
 
 class Jbuilder < ActiveSupport::BasicObject
@@ -156,8 +158,18 @@ class Jbuilder < ActiveSupport::BasicObject
   #   end
   #
   #   { "people": [ { "name": David", "age": 32 }, { "name": Jamie", "age": 31 } ] }
+  #
+  # If you omit the block then you can set the top level array directly:
+  #
+  #   json.array! [1, 2, 3]
+  #
+  #   [1,2,3]
   def array!(collection)
-    @attributes = _map_collection(collection) { |element| yield self, element }
+    @attributes = if block_given?
+      _map_collection(collection) { |element| yield self, element }
+    else
+      collection
+    end
   end
 
   # Extracts the mentioned attributes or hash elements from the passed object and turns them into attributes of the JSON.
@@ -203,6 +215,30 @@ class Jbuilder < ActiveSupport::BasicObject
     ::MultiJson.encode @attributes
   end
 
+  # Caches the json constructed within the block passed. 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! ['v1', @person], :expires_in => 10.minutes do |json|
+  #     json.extract! @person, :name, :age
+  #   end
+  def cache!(key=nil, options={}, &block)
+    cache_key = ::ActiveSupport::Cache.expand_cache_key(key.is_a?(::Hash) ? url_for(key).split("://").last : key, :jbuilder)
+    value = ::Rails.cache.fetch(cache_key, options) do
+      jb = ::Jbuilder.new
+      yield jb
+      jb.attributes!
+    end
+
+    if value.is_a?(::Array)
+      array! value
+    else
+      value.each do |k, v|
+        set! k, v
+      end
+    end
+  end
 
   protected
     def _set_value(key, value)

data/test/jbuilder_test.rb

@@ -1,9 +1,32 @@
 require 'test/unit'
 require 'active_support/test_case'
+require 'active_support/cache'
 require 'active_support/inflector'
 
 require 'jbuilder'
 
+module Rails
+  class Cache
+    def initialize
+      @cache = {}
+    end
+
+    def write(k, v, opt={})
+      @cache[k] = v
+    end
+
+    def read(k, opt={})
+      @cache[k]
+    end
+
+    def fetch(k, opt={}, &block)
+      @cache[k] || @cache[k] = block.call
+    end
+  end
+
+  def self.cache; @cache ||= Cache.new; end
+end
+
 class JbuilderTest < ActiveSupport::TestCase
   test "single key" do
     json = Jbuilder.encode do |json|
@@ -395,4 +418,42 @@ class JbuilderTest < ActiveSupport::TestCase
 
     assert_equal [], Jbuilder.send(:class_variable_get, "@@key_formatter").instance_variable_get("@cache").keys
   end
+
+  test "fragment caching a JSON object" do
+    json = Jbuilder.encode do |json|
+      json.cache!("cachekey") do |json|
+        json.name "Cache"
+      end
+    end
+
+    Rails.cache.read("jbuilder/cachekey").tap do |parsed|
+      assert_equal "Cache", parsed['name']
+    end
+  end
+
+  test "fragment caching deserializes a JSON object" do
+    Rails.cache.write("jbuilder/cachekey", {'name' => "Something"})
+    json = Jbuilder.encode do |json|
+      json.cache!("cachekey") do |json|
+        json.name "Cache"
+      end
+    end
+
+    JSON.parse(json).tap do |parsed|
+      assert_equal "Something", parsed['name']
+    end
+  end
+
+  test "fragment caching deserializes an array" do
+    Rails.cache.write("jbuilder/cachekey", ["a", "b", "c"])
+    json = Jbuilder.encode do |json|
+      json.cache!("cachekey") do |json|
+        json.array! ['1', '2', '3']
+      end
+    end
+
+    JSON.parse(json).tap do |parsed|
+      assert_equal ["a", "b", "c"], parsed
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152682460 !ruby/object:Gem::Requirement
+  requirement: &2152334840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152682460
+  version_requirements: *2152334840
 description: 
 email: david@37signals.com
 executables: []
@@ -30,6 +30,7 @@ extra_rdoc_files: []
 files:
 - ./Gemfile
 - ./Gemfile.lock
+- ./jbuilder-0.6.0.gem
 - ./jbuilder.gemspec
 - ./lib/jbuilder.rb
 - ./lib/jbuilder_template.rb