jbuilder 2.2.7 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e99a9ab21f1d52d88b6de5b930ca5bd8a504948f
-  data.tar.gz: 8cd28fb1bd10fd3d22ef5a5455c0b7855f4d0e0c
+  metadata.gz: c6fff76c0587398f3f158d2263ddb193fd0781fe
+  data.tar.gz: 3c1f56012c79d825f11fda61fcfd9bdaa61abdd4
 SHA512:
-  metadata.gz: b1364a2ff7640fc119b93e410877fb6979d28306176bb894f4511c05671ef79c2288829959d1c12960b9fe63662eb8606a9588452867fbedab42904408200317
-  data.tar.gz: 53dd379414c1c9c66caa31a43555d05904922bb32e661ac440530549bb32bce282eea873e85c691330f30f42715113a2295f2ab3dd48a99792d8fcc8e1a47baa
+  metadata.gz: 8965ab307c6d4f8a0e1f5ad3774273bc0954e82603db9951fcb48ccddffef5ccf0cc90955f2827cd778d951d2f8d76c4fe0ab2e0c9a36c86d3ae6aa2fa42d81d
+  data.tar.gz: bea36a97b8097ca854c8b9d07a463d1d4dd03d89799d995dcc4909c9f458cd57bb85406820d69f7311b8902e24aa530e16d2abd63a1bc265ba16d7f65257ceab

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+2.2.8
+-----
+* [Raise ArrayError when trying to add key to an array](https://github.com/rails/jbuilder/commit/869e4be1ad165ce986d8fca78311bdd3ed166087)
+
 2.2.7
 -----
 * [Make Blank object serializable with Marshal](https://github.com/rails/jbuilder/commit/7083f28d8b665aa60d0d1b1927ae88bb5c6290ba)

data/jbuilder.gemspec

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

@@ -274,20 +274,16 @@ class Jbuilder
     end
   end
 
-  def _write(key, value)
-    @attributes = {} if _blank?
-    @attributes[_key(key)] = value
-  end
-
   def _key(key)
     @key_formatter.format(key)
   end
 
   def _set_value(key, value)
     raise NullError.build(key) if @attributes.nil?
-    return if @ignore_nil && value.nil?
-    return if _blank?(value)
-    _write key, value
+    raise ArrayError.build(key) if ::Array === @attributes
+    return if @ignore_nil && value.nil? or _blank?(value)
+    @attributes = {} if _blank?
+    @attributes[_key(key)] = value
   end
 
   def _map_collection(collection)

data/lib/jbuilder/errors.rb

@@ -7,4 +7,11 @@ class Jbuilder
       new(message)
     end
   end
+
+  class ArrayError < ::StandardError
+    def self.build(key)
+      message = "Failed to add #{key.to_s.inspect} property to an array"
+      new(message)
+    end
+  end
 end

data/test/jbuilder_test.rb

@@ -645,11 +645,21 @@ class JbuilderTest < ActiveSupport::TestCase
     assert_nil result['author']
   end
 
+  test 'throws ArrayError when trying to add a key to an array' do
+    assert_raise Jbuilder::ArrayError do
+      jbuild do |json|
+        json.array! %w[foo bar]
+        json.fizz "buzz"
+      end
+    end
+  end
+
   test 'throws NullError when trying to add properties to null' do
-    json = Jbuilder.new
-    json.null!
     assert_raise Jbuilder::NullError do
-      json.foo 'bar'
+      jbuild do |json|
+        json.null!
+        json.foo 'bar'
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.2.8
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport