jbuilder 0.8.0 → 0.8.1

data/jbuilder.gemspec

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

data/lib/jbuilder.rb

@@ -3,7 +3,6 @@ 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'
 

data/lib/jbuilder_template.rb

@@ -24,12 +24,22 @@ class JbuilderTemplate < Jbuilder
   #     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
+    options[:force] = true unless @context.controller.perform_caching
+    value = ::Rails.cache.fetch(_cache_key(key), options) do
       _scope { yield self }
     end
+
     _merge(value)
   end
+
+  protected
+    def _cache_key(key)
+      if @context.respond_to?(:fragment_name_with_digest)
+        @context.fragment_name_with_digest(key)
+      else
+        ::ActiveSupport::Cache.expand_cache_key(key.is_a?(::Hash) ? url_for(key).split("://").last : key, :jbuilder)
+      end
+    end
 end
 
 class JbuilderHandler

data/test/jbuilder_template_test.rb

@@ -8,9 +8,11 @@ require 'jbuilder'
 module Rails
   class Cache
     def initialize
-      @cache = {}
+      clear
     end
 
+    def clear; @cache = {}; end
+
     def write(k, v, opt={})
       @cache[k] = v
     end
@@ -78,32 +80,34 @@ class JbuilderTemplateTest < ActionView::TestCase
   end
 
   test "fragment caching a JSON object" do
-    json = render_jbuilder <<-JBUILDER
+    self.controller.perform_caching = true
+    Rails.cache.clear
+    render_jbuilder <<-JBUILDER
       json.cache!("cachekey") do
         json.name "Cache"
       end
     JBUILDER
 
-    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 = render_jbuilder <<-JBUILDER
       json.cache!("cachekey") do
-        json.name "Cache"
+        json.name "Miss"
       end
     JBUILDER
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal "Something", parsed['name']
+      assert_equal "Cache", parsed['name']
     end
   end
 
   test "fragment caching deserializes an array" do
-    Rails.cache.write("jbuilder/cachekey", ["a", "b", "c"])
+    Rails.cache.clear
+    self.controller.perform_caching = true
+    render_jbuilder <<-JBUILDER
+      json.cache!("cachekey") do
+        json.array! ['a', 'b', 'c']
+      end
+    JBUILDER
+
     json = render_jbuilder <<-JBUILDER
       json.cache!("cachekey") do
         json.array! ['1', '2', '3']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152108040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152108040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: 
 email: david@37signals.com
 executables: []
@@ -30,8 +35,7 @@ extra_rdoc_files: []
 files:
 - ./Gemfile
 - ./Gemfile.lock
-- ./jbuilder-0.6.0.gem
-- ./jbuilder-0.7.0.gem
+- ./jbuilder-0.4.0.gem
 - ./jbuilder.gemspec
 - ./lib/jbuilder.rb
 - ./lib/jbuilder_template.rb
@@ -60,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Create JSON structures via a Builder-style DSL