jbuilder 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b2efe8946f99533187a724fea0e4662030b87df
-  data.tar.gz: 8e4e8c1beb1d460ed25e900579399516b039a1c0
+  metadata.gz: 076e206930dcf4260390206ed366028320a9b897
+  data.tar.gz: ad02cd2d181c768614d5eb87feedc326ebb9646e
 SHA512:
-  metadata.gz: 1a343030413f3bbaa974c9e2e781c9c3ce8460d23ffd3e094baa2f168cc99d84bd74e3a6413a1579734479bdcb01688ea863dd6ad37a1315b1aa1836c63adfc9
-  data.tar.gz: 872168b9ea2354d3915a680af7d32373f72805962001ab707b473bfd423a29d027e647d9d14e5b245ec66f5a535d8164f8657b11a9c9c18cea8aef16643b8e05
+  metadata.gz: 8430c22ceacd53c3b3b26fc762e4e6051cd865b1542d0b38091953a5d2371890ea392a51e675a1d8d0c1fb4bbaa171fecd1d37d95c1448f6bd065a03b98f8875
+  data.tar.gz: 968917e192f36be06d5adf63803bd0a26443f474b29b71716c111cf29df08a283a47044eaef684091ecbd363c36cdf88ac14b5d8d17c4a40e1d3340ecb3a51f1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+2.1.2
+-----
+* [Cast array-like objects to array before merging](https://github.com/rails/jbuilder/commit/7b8c8a1cb09b7f3dd26e5643ebbd6b2ec67185db)
+
 2.1.1
 -----
 * [Remove unused file](https://github.com/rails/jbuilder/commit/e49e1047976fac93b8242ab212c7b1a463b70809)

data/jbuilder.gemspec

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

@@ -174,12 +174,14 @@ class Jbuilder
   #
   #   [1,2,3]
   def array!(collection = [], *attributes, &block)
-    array = if block
+    array = if collection.nil?
+      []
+    elsif block
       _map_collection(collection, &block)
     elsif attributes.any?
       _map_collection(collection) { |element| extract! element, *attributes }
     else
-      collection
+      collection.to_a
     end
 
     merge! array
@@ -276,8 +278,6 @@ class Jbuilder
   end
 
   def _map_collection(collection)
-    return [] if collection.nil?
-
     collection.map do |element|
       _scope{ yield element }
     end

data/test/jbuilder_test.rb

@@ -18,6 +18,16 @@ class NonEnumerable
   end
 end
 
+class VeryBasicWrapper < BasicObject
+  def initialize(thing)
+    @thing = thing
+  end
+
+  def method_missing(name, *args, &block)
+    @thing.send name, *args, &block
+  end
+end
+
 # This is not Struct, because structs are Enumerable
 class Person
   attr_reader :name, :age
@@ -254,6 +264,16 @@ class JbuilderTest < ActiveSupport::TestCase
     assert_equal 'world', result['comments'].second['content']
   end
 
+  test 'array! casts array-like objects to array before merging' do
+    wrapped_array = VeryBasicWrapper.new(%w[foo bar])
+
+    result = jbuild do |json|
+      json.array! wrapped_array
+    end
+
+    assert_equal %w[foo bar], result
+  end
+
   test 'nesting multiple children from array with inline loop on root' do
     comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 

metadata

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