jbuilder 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 076e206930dcf4260390206ed366028320a9b897
-  data.tar.gz: ad02cd2d181c768614d5eb87feedc326ebb9646e
+  metadata.gz: 8d5b664cede402d0f7c028a234e22a7bf1114274
+  data.tar.gz: d4e163e75dea9c02ecb14ce79f7dafda0b5f32f3
 SHA512:
-  metadata.gz: 8430c22ceacd53c3b3b26fc762e4e6051cd865b1542d0b38091953a5d2371890ea392a51e675a1d8d0c1fb4bbaa171fecd1d37d95c1448f6bd065a03b98f8875
-  data.tar.gz: 968917e192f36be06d5adf63803bd0a26443f474b29b71716c111cf29df08a283a47044eaef684091ecbd363c36cdf88ac14b5d8d17c4a40e1d3340ecb3a51f1
+  metadata.gz: 88378366476f8fbaf94eecdc4e31be5bf000d605c9797c4c0a9b53ae3be63dc0f5c119e5cd349f42d1fa9459b69de9730d5dad2a2d7fd89e38cefe3808884cf7
+  data.tar.gz: 13134bb6ea6ff1df39592cfef8a3575f94e185864ebf629af38b8cd19911bdb9f6804eeaf87d5d2a256c1d482cec49cf93aa7b77094f2124a798f7fa959af048

data/Rakefile

@@ -1,4 +1,5 @@
 require "bundler/setup"
+require "bundler/gem_tasks"
 require "rake/testtask"
 
 if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.1.2'
+  s.version  = '2.1.3'
   s.authors  = ['David Heinemeier Hansson', 'Pavel Pravosud']
   s.email    = ['david@37signals.com', 'pavel@pravosud.com']
   s.summary  = 'Create JSON structures via a Builder-style DSL'

data/lib/jbuilder/jbuilder_template.rb

@@ -27,7 +27,7 @@ class JbuilderTemplate < Jbuilder
       options[:collection] = locals[:collection] if locals.key?(:collection)
     end
 
-    _handle_partial_options options
+    _render_partial_with_options options
   end
 
   def array!(collection = [], *attributes, &block)
@@ -75,17 +75,19 @@ class JbuilderTemplate < Jbuilder
 
   protected
 
-  def _handle_partial_options(options)
+  def _render_partial_with_options(options)
     options.reverse_merge! locals: {}
     options.reverse_merge! ::JbuilderTemplate.template_lookup_options
     as = options[:as]
 
     if as && options.key?(:collection)
-      collection = options.delete(:collection) || []
-      array!(collection) do |member|
-        options[:locals].merge! as => member
-        options[:locals].merge! collection: collection
-        _render_partial options
+      collection = options.delete(:collection)
+      locals = options.delete(:locals)
+      array! collection do |member|
+        member_locals = locals.clone
+        member_locals.merge! collection: collection
+        member_locals.merge! as => member
+        _render_partial options.merge(locals: member_locals)
       end
     else
       _render_partial options

data/test/jbuilder_template_test.rb

@@ -15,9 +15,15 @@ BLOG_POST_PARTIAL = <<-JBUILDER
   end
 JBUILDER
 
+COLLECTION_PARTIAL = <<-JBUILDER
+  json.extract! collection, :id, :name
+JBUILDER
+
 BlogPost = Struct.new(:id, :body, :author_name)
+Collection = Struct.new(:id, :name)
 blog_authors = [ 'David Heinemeier Hansson', 'Pavel Pravosud' ].cycle
 BLOG_POST_COLLECTION = 10.times.map{ |i| BlogPost.new(i+1, "post body #{i+1}", blog_authors.next) }
+COLLECTION_COLLECTION = 5.times.map{ |i| Collection.new(i+1, "collection #{i+1}") }
 
 module Rails
   def self.cache
@@ -34,7 +40,8 @@ class JbuilderTemplateTest < ActionView::TestCase
   def partials
     {
       '_partial.json.jbuilder'  => 'json.content "hello"',
-      '_blog_post.json.jbuilder' => BLOG_POST_PARTIAL
+      '_blog_post.json.jbuilder' => BLOG_POST_PARTIAL,
+      '_collection.json.jbuilder' => COLLECTION_PARTIAL
     }
   end
 
@@ -47,7 +54,7 @@ class JbuilderTemplateTest < ActionView::TestCase
   def undef_context_methods(*names)
     self.class_eval do
       names.each do |name|
-        undef_method name.to_sym if self.method_defined?(name.to_sym)
+        undef_method name.to_sym if method_defined?(name.to_sym)
       end
     end
   end
@@ -110,6 +117,12 @@ class JbuilderTemplateTest < ActionView::TestCase
     assert_collection_rendered json
   end
 
+  test 'partial! renders collections as collections' do
+    json = render_jbuilder <<-JBUILDER
+      json.partial! 'collection', collection: COLLECTION_COLLECTION, as: :collection
+    JBUILDER
+  end
+
   test 'partial! renders as empty array for nil-collection' do
     json = render_jbuilder <<-JBUILDER
       json.partial! 'blog_post', :collection => nil, :as => :blog_post

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport