jbuilder 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 894288984c47a8024c8ad9aca1623537133d53b2
-  data.tar.gz: 988d1ca4d56c52d9e258c70f75e662864c6c8023
+  metadata.gz: 9f0f1117607f1ce588b332bf20b2632688b59402
+  data.tar.gz: d46da468729687703e46e268464f56f2f93566d4
 SHA512:
-  metadata.gz: 02aaa8faef28ac67519dca82810eb0b7d1a44a34550a63e134fc23f4db0710d0074b3ca2123adcafe825d50da7427f0593d7861e2edd4b7619bc0f92c27c2d9f
-  data.tar.gz: 825104af0dbf0885c2aa9457cd328384a8ecb9c0e4ff2463878b5dbc69b9f17096f1a1bd0ac826445c5b54944cf8190e9686367c6eb59456d604c963dc0bc8c1
+  metadata.gz: 6bddcfa86d3e8d8129dc23916b2521397737b111ead9249900e82f216e7d50a5f77b1f3babfdb489d58744813c5ed8d7623144be10596f5752ea0a6953a1c336
+  data.tar.gz: 0dc6deeefefa9327a4ecff277ccd254f5ba4df32dd027eb0f8bad0b5f79492a4bf9eb6ed827f40df5a84dcf7f6cb5a3a2e5f0f58fbe64267d423f8f9d5300087

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+2.2.2
+-----
+* [Fix `Jbuilder#merge!` inside block](https://github.com/rails/jbuilder/commit/a7b328552eb0d36315f75bff813bea7eecf8c1d7)
+
 2.2.1
 -----
 * [Fix empty block handling](https://github.com/rails/jbuilder/commit/972a11141403269e9b17b45b0c95f8a9788245ee)

data/jbuilder.gemspec

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

@@ -255,18 +255,25 @@ class Jbuilder
   def _merge_block(key, &block)
     current_value = _blank? ? BLANK : @attributes.fetch(_key(key), BLANK)
     raise NullError.build(key) if current_value.nil?
+    new_value = _scope{ yield self }
+    _merge_values(current_value, new_value)
+  end
 
-    value = _scope{ yield self }
-
-    if _blank?(value)
+  def _merge_values(current_value, updates)
+    if _blank?(updates)
       current_value
-    elsif _blank?(current_value) || value.nil?
-      value
+    elsif _blank?(current_value) || updates.nil?
+      updates
+    elsif ::Array === updates
+      current_value = ::Array === current_value ? current_value.dup : []
+      current_value.concat updates
     else
-      _merge_values(current_value, value)
+      current_value = current_value.dup
+      current_value.update updates
     end
   end
 
+
   def _write(key, value)
     @attributes = {} if _blank?
     @attributes[_key(key)] = value
@@ -302,19 +309,6 @@ class Jbuilder
     value.respond_to?(:map)
   end
 
-  def _merge_values(attributes, hash_or_array)
-    attributes = attributes.dup
-
-    if ::Array === hash_or_array
-      attributes = [] unless ::Array === attributes
-      attributes.concat hash_or_array
-    else
-      attributes.update hash_or_array
-    end
-
-    attributes
-  end
-
   def _blank?(value=@attributes)
     BLANK == value
   end

data/test/jbuilder_test.rb

@@ -157,6 +157,24 @@ class JbuilderTest < ActiveSupport::TestCase
     assert_equal 32, result['author']['age']
   end
 
+  test 'support merge! method' do
+    result = jbuild do |json|
+      json.merge! 'foo' => 'bar'
+    end
+
+    assert_equal 'bar', result['foo']
+  end
+
+  test 'support merge! method in a block' do
+    result = jbuild do |json|
+      json.author do
+        json.merge! 'name' => 'Pavel'
+      end
+    end
+
+    assert_equal 'Pavel', result['author']['name']
+  end
+
   test 'blocks are additive via extract syntax' do
     person = Person.new('Pavel', 27)
 

metadata

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