jbuilder 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f70e328fa8dca8b3a98c6d5d87102512f624ce9
-  data.tar.gz: 1d99855c2c28b3752b696ae47298663dd8a5f311
+  metadata.gz: 17575b4f4e87733b1e46d7762554f5387904cbd9
+  data.tar.gz: 75c4a40da60c398469b52b1f2aeede6b7daf4527
 SHA512:
-  metadata.gz: 9e8b3f0e5f8111b07dbc24fb0fed99bd975358d89dcc1c9fec20fea572c8de756b69c00af85b2b118f85316bdcc78b0c8605c15394692e0829d6178c54fb4063
-  data.tar.gz: 5f599be397203a899995cbe9fcfc67f76b9aaed89a8f9dc50a695adbc805705cf81bae83b431bf83caa9968d96c9d1856946011115bd7a2b6b05e7f0c20956be
+  metadata.gz: 221cc1da2d52352427b3631dbc7204db44bdcf0b71b2964afbe6cf527731f456f774b2b5cbeafacb4d6a00f898313152d1823c937593e22457fe01a1aa56442d
+  data.tar.gz: 49801cf8ba732d8a6cea0586ae0b31bbc2bebb1a1ade669aacf89e7505fca992570710379f1916eb0b71377024447295dd8e5dd2fa85e4c306c55254ee89d998

data/CHANGELOG.md

@@ -0,0 +1,81 @@
+# Changelog
+
+2.0.3
+-----
+* [Pass options when calling cache_fragment_name](https://github.com/rails/jbuilder/commit/07c2cc7486fe9ef423d7bc821b83f6d485f330e0)
+
+2.0.2
+-----
+* [Fix Dependency Tracking fail to detect single-quoted partial correctly](https://github.com/rails/jbuilder/commit/448679a6d3098eb34d137f782a05f1767711991a)
+* [Prevent Dependency Tracker constants leaking into global namespace](https://github.com/rails/jbuilder/commit/3544b288b63f504f46fa8aafd1d17ee198d77536)
+
+2.0.1
+-----
+* [Dependency tracking support for Rails 3 with cache_digest gem](https://github.com/rails/jbuilder/commit/6b471d7a38118e8f7645abec21955ef793401daf)
+
+2.0.0
+-----
+* [Respond to PUT/PATCH API request with :ok](https://github.com/rails/jbuilder/commit/9dbce9c12181e89f8f472ac23c764ffe8438040a)
+* [Remove Ruby 1.8 support](https://github.com/rails/jbuilder/commit/d53fff42d91f33d662eafc2561c4236687ecf6c9)
+* [Remove deprecated two argument block call](https://github.com/rails/jbuilder/commit/07a35ee7e79ae4b06dba9dbff5c4e07c1e627218)
+* [Make Jbuilder object initialize with single hash](https://github.com/rails/jbuilder/commit/38bf551db0189327aaa90b9be010c0d1b792c007)
+* [Track template dependencies](https://github.com/rails/jbuilder/commit/8e73cea39f60da1384afd687cc8e5e399630d8cc)
+* [Expose merge! method](https://github.com/rails/jbuilder/commit/0e2eb47f6f3c01add06a1a59b37cdda8baf24f29)
+
+1.5.3
+-----
+* [Generators add `:id` column by default](https://github.com/rails/jbuilder/commit/0b52b86773e48ac2ce35d4155c7b70ad8b3e8937)
+
+1.5.2
+-----
+* [Nil-collection should be treated as empty array](https://github.com/rails/jbuilder/commit/2f700bb00ab663c6b7fcb28d2967aeb989bd43c7)
+
+1.5.1
+-----
+* [Expose template lookup options](https://github.com/rails/jbuilder/commit/404c18dee1af96ac6d8052a04062629ef1db2945)
+
+1.5.0
+-----
+* [Do not perform any caching when `controller.perform_caching` is false](https://github.com/rails/jbuilder/commit/94633facde1ac43580f8cd5e13ae9cc83e1da8f4)
+* [Add partial collection rendering](https://github.com/rails/jbuilder/commit/e8c10fc885e41b18178aaf4dcbc176961c928d76)
+* [Deprecate extract! calling private methods](https://github.com/rails/jbuilder/commit/b9e19536c2105d7f2e813006bbcb8ca5730d28a3)
+* [Add array of partials rendering](https://github.com/rails/jbuilder/commit/7d7311071720548047f98f14ad013c560b8d9c3a)
+
+1.4.2
+-----
+* [Require MIME dependency explicitly](https://github.com/rails/jbuilder/commit/b1ed5ac4f08b056f8839b4b19b43562e81e02a59)
+
+1.4.1
+-----
+* [Removed deprecated positioned arguments initializer support](https://github.com/rails/jbuilder/commit/6e03e0452073eeda77e6dfe66aa31e5ec67a3531)
+* [Deprecate two-arguments block calling](https://github.com/rails/jbuilder/commit/2b10bb058bb12bc782cbcc16f6ec67b489e5ed43)
+
+1.4.0
+-----
+* [Add quick collection attribute extraction](https://github.com/rails/jbuilder/commit/c2b966cf653ea4264fbb008b8cc6ce5359ebe40a)
+* [Block has priority over attributes extraction](https://github.com/rails/jbuilder/commit/77c24766362c02769d81dac000b1879a9e4d4a00)
+* [Meaningfull error messages when adding properties to null](https://github.com/rails/jbuilder/commit/e26764602e34b3772e57e730763d512e59489e3b)
+* [Do not enforce template format, enforce handlers instead](https://github.com/rails/jbuilder/commit/72576755224b15da45e50cbea877679800ab1398)
+
+1.3.0
+-----
+* [Add nil! method for nil JSON](https://github.com/rails/jbuilder/commit/822a906f68664f61a1209336bb681077692c8475)
+
+1.2.1
+-----
+* [Added explicit dependency for MultiJson](https://github.com/rails/jbuilder/commit/4d58eacb6cd613679fb243484ff73a79bbbff2d2
+
+1.2.0
+-----
+* Multiple documentation improvements and internal refactoring
+* [Fixes fragment caching to work with latest digests](https://github.com/rails/jbuilder/commit/da937d6b8732124074c612abb7ff38868d1d96c0)
+
+1.0.2
+-----
+* [Support non-Enumerable collections](https://github.com/rails/jbuilder/commit/4c20c59bf8131a1e419bb4ebf84f2b6bdcb6b0cf)
+* [Ensure that the default URL is in json format](https://github.com/rails/jbuilder/commit/0b46782fb7b8c34a3c96afa801fe27a5a97118a4)
+
+1.0.0
+-----
+* Adopt Semantic Versioning
+* Add rails generators

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.0.2'
+  s.version  = '2.0.3'
   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

@@ -50,7 +50,7 @@ class JbuilderTemplate < Jbuilder
   #   end
   def cache!(key=nil, options={}, &block)
     if @context.controller.perform_caching
-      value = ::Rails.cache.fetch(_cache_key(key), options) do
+      value = ::Rails.cache.fetch(_cache_key(key, options), options) do
         _scope { yield self }
       end
 
@@ -83,11 +83,11 @@ class JbuilderTemplate < Jbuilder
       @context.render options
     end
 
-    def _cache_key(key)
+    def _cache_key(key, options)
       if @context.respond_to?(:cache_fragment_name)
         # Current compatibility, fragment_name_with_digest is private again and cache_fragment_name
         # should be used instead.
-        @context.cache_fragment_name(key)
+        @context.cache_fragment_name(key, options)
       elsif @context.respond_to?(:fragment_name_with_digest)
         # Backwards compatibility for period of time when fragment_name_with_digest was made public.
         @context.fragment_name_with_digest(key)

data/test/jbuilder_template_test.rb

@@ -228,6 +228,18 @@ class JbuilderTemplateTest < ActionView::TestCase
     JBUILDER
   end
 
+  test 'current cache digest option accepts options' do
+    undef_context_methods :fragment_name_with_digest
+
+    @context.expects(:cache_fragment_name).with('cachekey', skip_digest: true)
+
+    render_jbuilder <<-JBUILDER
+      json.cache! 'cachekey', skip_digest: true do
+        json.name 'Cache'
+      end
+    JBUILDER
+  end
+
   test 'does not perform caching when controller.perform_caching is false' do
     controller.perform_caching = false
     render_jbuilder <<-JBUILDER

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 description: 
@@ -44,8 +44,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.old
 - MIT-LICENSE
@@ -76,17 +77,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL