Simplify merge block behavior

Also, add explicit error for weird cases
rails · Oct 31, 2014 · 4503162 · 4503162
1 parent 086a011
commit 4503162
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/jbuilder.rb b/lib/jbuilder.rb
@@ -265,15 +265,14 @@ def _merge_values(current_value, updates)
     elsif _blank?(current_value) || updates.nil?
       updates
     elsif ::Array === updates
-      current_value = ::Array === current_value ? current_value.dup : []
-      current_value.concat updates
+      ::Array === current_value ? current_value + updates : updates
+    elsif ::Hash === current_value
+      current_value.merge(updates)
     else
-      current_value = current_value.dup
-      current_value.update updates
+      raise "Can't merge #{updates.inspect} with #{current_value.inspect}"
     end
   end
 
-
   def _write(key, value)
     @attributes = {} if _blank?
     @attributes[_key(key)] = value