jbuilder 1.5.3 → 2.11.5

data/test/jbuilder_test.rb

@@ -1,295 +1,356 @@
-require 'test/unit'
-require 'active_support/test_case'
+require 'test_helper'
 require 'active_support/inflector'
 require 'jbuilder'
 
-Comment = Struct.new(:content, :id)
-
-unless JbuilderProxy.method_defined? :instance_eval
-  # Faking Object#instance_eval for 1.8 and some newer JRubies
-  class JbuilderProxy
-    def instance_eval(code)
-      eval code
-    end
-  end
+def jbuild(*args, &block)
+  Jbuilder.new(*args, &block).attributes!
 end
 
+Comment = Struct.new(:content, :id)
+
 class NonEnumerable
   def initialize(collection)
     @collection = collection
   end
 
-  def map(&block)
-    @collection.map(&block)
+  delegate :map, :count, to: :@collection
+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
+
+  def initialize(name, age)
+    @name, @age = name, age
+  end
+end
+
+class RelationMock
+  include Enumerable
+
+  def each(&block)
+    [Person.new('Bob', 30), Person.new('Frank', 50)].each(&block)
+  end
+
+  def empty?
+    false
   end
 end
 
+
 class JbuilderTest < ActiveSupport::TestCase
+  teardown do
+    Jbuilder.send :class_variable_set, '@@key_formatter', nil
+  end
+
   test 'single key' do
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.content 'hello'
     end
 
-    assert_equal 'hello', MultiJson.load(json)['content']
+    assert_equal 'hello', result['content']
   end
 
   test 'single key with false value' do
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.content false
     end
 
-    assert_equal false, MultiJson.load(json)['content']
+    assert_equal false, result['content']
   end
 
   test 'single key with nil value' do
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.content nil
     end
 
-    assert MultiJson.load(json).has_key?('content')
-    assert_equal nil, MultiJson.load(json)['content']
+    assert result.has_key?('content')
+    assert_nil result['content']
   end
 
   test 'multiple keys' do
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.title 'hello'
       json.content 'world'
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal 'hello', parsed['title']
-    assert_equal 'world', parsed['content']
+    assert_equal 'hello', result['title']
+    assert_equal 'world', result['content']
   end
 
   test 'extracting from object' do
     person = Struct.new(:name, :age).new('David', 32)
 
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.extract! person, :name, :age
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal 'David', parsed['name']
-    assert_equal 32, parsed['age']
-  end
-
-  test 'extracting from object using private method' do
-    person = Struct.new(:name) do
-      private
-      def age
-        32
-      end
-    end.new('David')
-
-    message = 'Private method :age was used to extract value. This will be' +
-      ' an error in future versions of Jbuilder'
-
-    ::ActiveSupport::Deprecation.expects(:warn).with(message)
-    json = Jbuilder.encode do |json|
-      json.extract! person, :name, :age
-    end
+    assert_equal 'David', result['name']
+    assert_equal 32, result['age']
   end
 
-  test 'extracting from object using call style for 1.9' do
+  test 'extracting from object using call style' do
     person = Struct.new(:name, :age).new('David', 32)
 
-    json = Jbuilder.encode do |json|
-      if ::RUBY_VERSION > '1.9'
-        instance_eval 'json.(person, :name, :age)'
-      else
-        instance_eval 'json.call(person, :name, :age)'
-      end
+    result = jbuild do |json|
+      json.(person, :name, :age)
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal 'David', parsed['name']
-    assert_equal 32, parsed['age']
+    assert_equal 'David', result['name']
+    assert_equal 32, result['age']
   end
 
   test 'extracting from hash' do
     person = {:name => 'Jim', :age => 34}
 
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.extract! person, :name, :age
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal 'Jim', parsed['name']
-    assert_equal 34, parsed['age']
+    assert_equal 'Jim', result['name']
+    assert_equal 34, result['age']
   end
 
   test 'nesting single child with block' do
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.author do
         json.name 'David'
         json.age  32
       end
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal 'David', parsed['author']['name']
-    assert_equal 32, parsed['author']['age']
+    assert_equal 'David', result['author']['name']
+    assert_equal 32, result['author']['age']
+  end
+
+  test 'empty block handling' do
+    result = jbuild do |json|
+      json.foo 'bar'
+      json.author do
+      end
+    end
+
+    assert_equal 'bar', result['foo']
+    assert !result.key?('author')
+  end
+
+  test 'blocks are additive' do
+    result = jbuild do |json|
+      json.author do
+        json.name 'David'
+      end
+
+      json.author do
+        json.age  32
+      end
+    end
+
+    assert_equal 'David', result['author']['name']
+    assert_equal 32, result['author']['age']
+  end
+
+  test 'nested blocks are additive' do
+    result = jbuild do |json|
+      json.author do
+        json.name do
+          json.first 'David'
+        end
+      end
+
+      json.author do
+        json.name do
+          json.last 'Heinemeier Hansson'
+        end
+      end
+    end
+
+    assert_equal 'David', result['author']['name']['first']
+    assert_equal 'Heinemeier Hansson', result['author']['name']['last']
+  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 'support merge! method with Jbuilder instance' do
+    obj = jbuild do |json|
+      json.foo 'bar'
+    end
+
+    result = jbuild do |json|
+      json.merge! obj
+    end
+
+    assert_equal 'bar', result['foo']
+  end
+
+  test 'blocks are additive via extract syntax' do
+    person = Person.new('Pavel', 27)
+
+    result = jbuild do |json|
+      json.author person, :age
+      json.author person, :name
+    end
+
+    assert_equal 'Pavel', result['author']['name']
+    assert_equal 27, result['author']['age']
+  end
+
+  test 'arrays are additive' do
+    result = jbuild do |json|
+      json.array! %w[foo]
+      json.array! %w[bar]
+    end
+
+    assert_equal %w[foo bar], result
   end
 
   test 'nesting multiple children with block' do
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.comments do
         json.child! { json.content 'hello' }
         json.child! { json.content 'world' }
       end
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal 'hello', parsed['comments'].first['content']
-    assert_equal 'world', parsed['comments'].second['content']
+    assert_equal 'hello', result['comments'].first['content']
+    assert_equal 'world', result['comments'].second['content']
   end
 
   test 'nesting single child with inline extract' do
-    person = Class.new do
-      attr_reader :name, :age
-
-      def initialize(name, age)
-        @name, @age = name, age
-      end
-    end.new('David', 32)
+    person = Person.new('David', 32)
 
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.author person, :name, :age
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal 'David', parsed['author']['name']
-    assert_equal 32,      parsed['author']['age']
+    assert_equal 'David', result['author']['name']
+    assert_equal 32,      result['author']['age']
   end
 
   test 'nesting multiple children from array' do
     comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.comments comments, :content
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal ['content'], parsed['comments'].first.keys
-    assert_equal 'hello', parsed['comments'].first['content']
-    assert_equal 'world', parsed['comments'].second['content']
+    assert_equal ['content'], result['comments'].first.keys
+    assert_equal 'hello', result['comments'].first['content']
+    assert_equal 'world', result['comments'].second['content']
   end
 
   test 'nesting multiple children from array when child array is empty' do
     comments = []
 
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.name 'Parent'
       json.comments comments, :content
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal 'Parent', parsed['name']
-    assert_equal [], parsed['comments']
+    assert_equal 'Parent', result['name']
+    assert_equal [], result['comments']
   end
 
   test 'nesting multiple children from array with inline loop' do
     comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.comments comments do |comment|
         json.content comment.content
       end
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal ['content'], parsed['comments'].first.keys
-    assert_equal 'hello', parsed['comments'].first['content']
-    assert_equal 'world', parsed['comments'].second['content']
+    assert_equal ['content'], result['comments'].first.keys
+    assert_equal 'hello', result['comments'].first['content']
+    assert_equal 'world', result['comments'].second['content']
   end
 
   test 'handles nil-collections as empty arrays' do
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.comments nil do |comment|
         json.content comment.content
       end
     end
 
-    assert_equal [], MultiJson.load(json)['comments']
+    assert_equal [], result['comments']
   end
 
   test 'nesting multiple children from a non-Enumerable that responds to #map' do
     comments = NonEnumerable.new([ Comment.new('hello', 1), Comment.new('world', 2) ])
 
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.comments comments, :content
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal ['content'], parsed['comments'].first.keys
-    assert_equal 'hello', parsed['comments'].first['content']
-    assert_equal 'world', parsed['comments'].second['content']
+    assert_equal ['content'], result['comments'].first.keys
+    assert_equal 'hello', result['comments'].first['content']
+    assert_equal 'world', result['comments'].second['content']
   end
 
-  test 'nesting multiple chilren from a non-Enumerable that responds to #map with inline loop' do
+  test 'nesting multiple children from a non-Enumerable that responds to #map with inline loop' do
     comments = NonEnumerable.new([ Comment.new('hello', 1), Comment.new('world', 2) ])
 
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.comments comments do |comment|
         json.content comment.content
       end
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal ['content'], parsed['comments'].first.keys
-    assert_equal 'hello', parsed['comments'].first['content']
-    assert_equal 'world', parsed['comments'].second['content']
+    assert_equal ['content'], result['comments'].first.keys
+    assert_equal 'hello', result['comments'].first['content']
+    assert_equal 'world', result['comments'].second['content']
   end
 
-  test 'nesting multiple children from array with inline loop with old api' do
-    comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
+  test 'array! casts array-like objects to array before merging' do
+    wrapped_array = VeryBasicWrapper.new(%w[foo bar])
 
-    json = Jbuilder.encode do |json|
-      ::ActiveSupport::Deprecation.silence do
-        json.comments comments do |json, comment|
-          json.content comment.content
-        end
-      end
+    result = jbuild do |json|
+      json.array! wrapped_array
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal ['content'], parsed['comments'].first.keys
-    assert_equal 'hello', parsed['comments'].first['content']
-    assert_equal 'world', parsed['comments'].second['content']
+    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) ]
 
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.call(comments) do |comment|
         json.content comment.content
       end
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal 'hello', parsed.first['content']
-    assert_equal 'world', parsed.second['content']
-  end
-
-  test 'nesting multiple children from array with inline loop on root with old api' do
-    comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
-
-    json = Jbuilder.encode do |json|
-      ::ActiveSupport::Deprecation.silence do
-        json.call(comments) do |json, comment|
-          json.content comment.content
-        end
-      end
-    end
-
-    parsed = MultiJson.load(json)
-    assert_equal 'hello', parsed.first['content']
-    assert_equal 'world', parsed.second['content']
+    assert_equal 'hello', result.first['content']
+    assert_equal 'world', result.second['content']
   end
 
   test 'array nested inside nested hash' do
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.author do
         json.name 'David'
         json.age  32
@@ -301,13 +362,12 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal 'hello', parsed['author']['comments'].first['content']
-    assert_equal 'world', parsed['author']['comments'].second['content']
+    assert_equal 'hello', result['author']['comments'].first['content']
+    assert_equal 'world', result['author']['comments'].second['content']
   end
 
   test 'array nested inside array' do
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.comments do
         json.child! do
           json.authors do
@@ -319,12 +379,13 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
 
-    assert_equal 'david', MultiJson.load(json)['comments'].first['authors'].first['name']
+    assert_equal 'david', result['comments'].first['authors'].first['name']
   end
 
   test 'directly set an array nested in another array' do
     data = [ { :department => 'QA', :not_in_json => 'hello', :names => ['John', 'David'] } ]
-    json = Jbuilder.encode do |json|
+
+    result = jbuild do |json|
       json.array! data do |object|
         json.department object[:department]
         json.names do
@@ -333,294 +394,548 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
 
-    assert_equal 'David', MultiJson.load(json)[0]['names'].last
-    assert_not_equal 'hello', MultiJson.load(json)[0]['not_in_json']
-  end
-
-  test 'directly set an array nested in another array with old api' do
-    data = [ { :department => 'QA', :not_in_json => 'hello', :names => ['John', 'David'] } ]
-    json = Jbuilder.encode do |json|
-      ::ActiveSupport::Deprecation.silence do
-        json.array! data do |json, object|
-          json.department object[:department]
-          json.names do
-            json.array! object[:names]
-          end
-        end
-      end
-    end
-
-    parsed = MultiJson.load(json)
-    assert_equal 'David', parsed.first['names'].last
-    assert_not_equal 'hello', parsed.first['not_in_json']
+    assert_equal 'David', result[0]['names'].last
+    assert !result[0].key?('not_in_json')
   end
 
   test 'nested jbuilder objects' do
-    to_nest = Jbuilder.new
-    to_nest.nested_value 'Nested Test'
-    json = Jbuilder.encode do |json|
+    to_nest = Jbuilder.new{ |json| json.nested_value 'Nested Test' }
+
+    result = jbuild do |json|
       json.value 'Test'
       json.nested to_nest
     end
 
-    result = {'value' => 'Test', 'nested' => {'nested_value' => 'Nested Test'}}
-    assert_equal result, MultiJson.load(json)
+    expected = {'value' => 'Test', 'nested' => {'nested_value' => 'Nested Test'}}
+    assert_equal expected, result
   end
 
   test 'nested jbuilder object via set!' do
-    to_nest = Jbuilder.new
-    to_nest.nested_value 'Nested Test'
-    json = Jbuilder.encode do |json|
+    to_nest = Jbuilder.new{ |json| json.nested_value 'Nested Test' }
+
+    result = jbuild do |json|
       json.value 'Test'
       json.set! :nested, to_nest
     end
 
-    result = {'value' => 'Test', 'nested' => {'nested_value' => 'Nested Test'}}
-    assert_equal result, MultiJson.load(json)
+    expected = {'value' => 'Test', 'nested' => {'nested_value' => 'Nested Test'}}
+    assert_equal expected, result
   end
 
   test 'top-level array' do
     comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 
-    json = Jbuilder.encode do |json|
-      json.array!(comments) do |comment|
+    result = jbuild do |json|
+      json.array! comments do |comment|
         json.content comment.content
       end
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal 'hello', parsed.first['content']
-    assert_equal 'world', parsed.second['content']
+    assert_equal 'hello', result.first['content']
+    assert_equal 'world', result.second['content']
+  end
+
+  test 'it allows using next in array block to skip value' do
+    comments = [ Comment.new('hello', 1), Comment.new('skip', 2), Comment.new('world', 3) ]
+    result = jbuild do |json|
+      json.array! comments do |comment|
+        next if comment.id == 2
+        json.content comment.content
+      end
+    end
+
+    assert_equal 2, result.length
+    assert_equal 'hello', result.first['content']
+    assert_equal 'world', result.second['content']
   end
 
   test 'extract attributes directly from array' do
     comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.array! comments, :content, :id
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal 'hello', parsed.first['content']
-    assert_equal       1, parsed.first['id']
-    assert_equal 'world', parsed.second['content']
-    assert_equal       2, parsed.second['id']
+    assert_equal 'hello', result.first['content']
+    assert_equal       1, result.first['id']
+    assert_equal 'world', result.second['content']
+    assert_equal       2, result.second['id']
   end
 
   test 'empty top-level array' do
     comments = []
 
-    json = Jbuilder.encode do |json|
-      json.array!(comments) do |comment|
+    result = jbuild do |json|
+      json.array! comments do |comment|
         json.content comment.content
       end
     end
 
-    assert_equal [], MultiJson.load(json)
+    assert_equal [], result
   end
 
   test 'dynamically set a key/value' do
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.set! :each, 'stuff'
     end
 
-    assert_equal 'stuff', MultiJson.load(json)['each']
+    assert_equal 'stuff', result['each']
   end
 
   test 'dynamically set a key/nested child with block' do
-    json = Jbuilder.encode do |json|
-      json.set!(:author) do
+    result = jbuild do |json|
+      json.set! :author do
         json.name 'David'
         json.age 32
       end
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal 'David', parsed['author']['name']
-    assert_equal 32, parsed['author']['age']
+    assert_equal 'David', result['author']['name']
+    assert_equal 32, result['author']['age']
   end
 
   test 'dynamically sets a collection' do
     comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 
-    json = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.set! :comments, comments, :content
     end
 
-    parsed = MultiJson.load(json)
-    assert_equal ['content'], parsed['comments'].first.keys
-    assert_equal 'hello', parsed['comments'].first['content']
-    assert_equal 'world', parsed['comments'].second['content']
+    assert_equal ['content'], result['comments'].first.keys
+    assert_equal 'hello', result['comments'].first['content']
+    assert_equal 'world', result['comments'].second['content']
   end
 
   test 'query like object' do
-    class Person
-      attr_reader :name, :age
-
-      def initialize(name, age)
-        @name, @age = name, age
-      end
-    end
-    class RelationMock
-      include Enumerable
-
-      def each(&block)
-        [Person.new('Bob', 30), Person.new('Frank', 50)].each(&block)
-      end
-      def empty?
-        false
-      end
-    end
-
-    result = Jbuilder.encode do |json|
+    result = jbuild do |json|
       json.relations RelationMock.new, :name, :age
     end
 
-    parsed = MultiJson.load(result)
-    assert_equal 2, parsed['relations'].length
-    assert_equal 'Bob', parsed['relations'][0]['name']
-    assert_equal 50, parsed['relations'][1]['age']
+    assert_equal 2, result['relations'].length
+    assert_equal 'Bob', result['relations'][0]['name']
+    assert_equal 50, result['relations'][1]['age']
   end
 
   test 'initialize via options hash' do
-    jbuilder = Jbuilder.new(:key_formatter => 1, :ignore_nil => 2)
-    assert_equal 1, jbuilder.instance_eval('@key_formatter')
-    assert_equal 2, jbuilder.instance_eval('@ignore_nil')
+    jbuilder = Jbuilder.new(key_formatter: 1, ignore_nil: 2)
+    assert_equal 1, jbuilder.instance_eval{ @key_formatter }
+    assert_equal 2, jbuilder.instance_eval{ @ignore_nil }
   end
 
   test 'key_format! with parameter' do
-    json = Jbuilder.new
-    json.key_format! :camelize => [:lower]
-    json.camel_style 'for JS'
+    result = jbuild do |json|
+      json.key_format! camelize: [:lower]
+      json.camel_style 'for JS'
+    end
 
-    assert_equal ['camelStyle'], json.attributes!.keys
+    assert_equal ['camelStyle'], result.keys
   end
 
   test 'key_format! with parameter not as an array' do
-    json = Jbuilder.new
-    json.key_format! :camelize => :lower
-    json.camel_style 'for JS'
+    result = jbuild do |json|
+      json.key_format! :camelize => :lower
+      json.camel_style 'for JS'
+    end
 
-    assert_equal ['camelStyle'], json.attributes!.keys
+    assert_equal ['camelStyle'], result.keys
   end
 
   test 'key_format! propagates to child elements' do
-    json = Jbuilder.new
-    json.key_format! :upcase
-    json.level1 'one'
-    json.level2 do
-      json.value 'two'
+    result = jbuild do |json|
+      json.key_format! :upcase
+      json.level1 'one'
+      json.level2 do
+        json.value 'two'
+      end
     end
 
-    result = json.attributes!
     assert_equal 'one', result['LEVEL1']
     assert_equal 'two', result['LEVEL2']['VALUE']
   end
 
   test 'key_format! resets after child element' do
-    json = Jbuilder.new
-    json.level2 do
-      json.key_format! :upcase
-      json.value 'two'
+    result = jbuild do |json|
+      json.level2 do
+        json.key_format! :upcase
+        json.value 'two'
+      end
+      json.level1 'one'
     end
-    json.level1 'one'
 
-    result = json.attributes!
     assert_equal 'two', result['level2']['VALUE']
     assert_equal 'one', result['level1']
   end
 
+  test 'key_format! can be changed in child elements' do
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+
+      json.level_one do
+        json.key_format! :upcase
+        json.value 'two'
+      end
+    end
+
+    assert_equal ['levelOne'], result.keys
+    assert_equal ['VALUE'], result['levelOne'].keys
+  end
+
+  test 'key_format! can be changed in array!' do
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+
+      json.level_one do
+        json.array! [{value: 'two'}] do |object|
+          json.key_format! :upcase
+          json.value object[:value]
+        end
+      end
+    end
+
+    assert_equal ['levelOne'], result.keys
+    assert_equal ['VALUE'], result['levelOne'][0].keys
+  end
+
   test 'key_format! with no parameter' do
-    json = Jbuilder.new
-    json.key_format! :upcase
-    json.lower 'Value'
+    result = jbuild do |json|
+      json.key_format! :upcase
+      json.lower 'Value'
+    end
 
-    assert_equal ['LOWER'], json.attributes!.keys
+    assert_equal ['LOWER'], result.keys
   end
 
   test 'key_format! with multiple steps' do
-    json = Jbuilder.new
-    json.key_format! :upcase, :pluralize
-    json.pill ''
+    result = jbuild do |json|
+      json.key_format! :upcase, :pluralize
+      json.pill 'foo'
+    end
 
-    assert_equal ['PILLs'], json.attributes!.keys
+    assert_equal ['PILLs'], result.keys
   end
 
   test 'key_format! with lambda/proc' do
-    json = Jbuilder.new
-    json.key_format! lambda { |key| key + ' and friends' }
-    json.oats ''
+    result = jbuild do |json|
+      json.key_format! ->(key){ key + ' and friends' }
+      json.oats 'foo'
+    end
 
-    assert_equal ['oats and friends'], json.attributes!.keys
+    assert_equal ['oats and friends'], result.keys
   end
 
-  test 'default key_format!' do
-    Jbuilder.key_format :camelize => :lower
-    json = Jbuilder.new
-    json.camel_style 'for JS'
+  test 'key_format! is not applied deeply by default' do
+    names = { first_name: 'camel', last_name: 'case' }
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+      json.set! :all_names, names
+    end
 
-    assert_equal ['camelStyle'], json.attributes!.keys
-    Jbuilder.send(:class_variable_set, '@@key_formatter', Jbuilder::KeyFormatter.new)
+    assert_equal %i[first_name last_name], result['allNames'].keys
   end
 
-  test 'do not use default key formatter directly' do
-    json = Jbuilder.new
-    json.key 'value'
+  test 'applying key_format! deeply can be enabled per scope' do
+    names = { first_name: 'camel', last_name: 'case' }
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+      json.scope do
+        json.deep_format_keys!
+        json.set! :all_names, names
+      end
+      json.set! :all_names, names
+    end
 
-    assert_equal [], Jbuilder.send(:class_variable_get, '@@key_formatter').instance_variable_get('@cache').keys
+    assert_equal %w[firstName lastName], result['scope']['allNames'].keys
+    assert_equal %i[first_name last_name], result['allNames'].keys
+  end
+
+  test 'applying key_format! deeply can be disabled per scope' do
+    names = { first_name: 'camel', last_name: 'case' }
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+      json.deep_format_keys!
+      json.set! :all_names, names
+      json.scope do
+        json.deep_format_keys! false
+        json.set! :all_names, names
+      end
+    end
+
+    assert_equal %w[firstName lastName], result['allNames'].keys
+    assert_equal %i[first_name last_name], result['scope']['allNames'].keys
+  end
+
+  test 'applying key_format! deeply can be enabled globally' do
+    names = { first_name: 'camel', last_name: 'case' }
+
+    Jbuilder.deep_format_keys true
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+      json.set! :all_names, names
+    end
+
+    assert_equal %w[firstName lastName], result['allNames'].keys
+    Jbuilder.send(:class_variable_set, '@@deep_format_keys', false)
+  end
+
+  test 'deep key_format! with merge!' do
+    hash = { camel_style: 'for JS' }
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+      json.deep_format_keys!
+      json.merge! hash
+    end
+
+    assert_equal ['camelStyle'], result.keys
+  end
+
+  test 'deep key_format! with merge! deep' do
+    hash = { camel_style: { sub_attr: 'for JS' } }
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+      json.deep_format_keys!
+      json.merge! hash
+    end
+
+    assert_equal ['subAttr'], result['camelStyle'].keys
+  end
+
+  test 'deep key_format! with set! array of hashes' do
+    names = [{ first_name: 'camel', last_name: 'case' }]
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+      json.deep_format_keys!
+      json.set! :names, names
+    end
+
+    assert_equal %w[firstName lastName], result['names'][0].keys
+  end
+
+  test 'deep key_format! with set! extracting hash from object' do
+    comment = Struct.new(:author).new({ first_name: 'camel', last_name: 'case' })
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+      json.deep_format_keys!
+      json.set! :comment, comment, :author
+    end
+
+    assert_equal %w[firstName lastName], result['comment']['author'].keys
+  end
+
+  test 'deep key_format! with array! of hashes' do
+    names = [{ first_name: 'camel', last_name: 'case' }]
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+      json.deep_format_keys!
+      json.array! names
+    end
+
+    assert_equal %w[firstName lastName], result[0].keys
+  end
+
+  test 'deep key_format! with merge! array of hashes' do
+    names = [{ first_name: 'camel', last_name: 'case' }]
+    new_names = [{ first_name: 'snake', last_name: 'case' }]
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+      json.deep_format_keys!
+      json.array! names
+      json.merge! new_names
+    end
+
+    assert_equal %w[firstName lastName], result[1].keys
+  end
+
+  test 'deep key_format! is applied to hash extracted from object' do
+    comment = Struct.new(:author).new({ first_name: 'camel', last_name: 'case' })
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+      json.deep_format_keys!
+      json.extract! comment, :author
+    end
+
+    assert_equal %w[firstName lastName], result['author'].keys
+  end
+
+  test 'deep key_format! is applied to hash extracted from hash' do
+    comment = {author: { first_name: 'camel', last_name: 'case' }}
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+      json.deep_format_keys!
+      json.extract! comment, :author
+    end
+
+    assert_equal %w[firstName lastName], result['author'].keys
+  end
+
+  test 'deep key_format! is applied to hash extracted directly from array' do
+    comments = [Struct.new(:author).new({ first_name: 'camel', last_name: 'case' })]
+    result = jbuild do |json|
+      json.key_format! camelize: :lower
+      json.deep_format_keys!
+      json.array! comments, :author
+    end
+
+    assert_equal %w[firstName lastName], result[0]['author'].keys
+  end
+
+  test 'default key_format!' do
+    Jbuilder.key_format camelize: :lower
+    result = jbuild{ |json| json.camel_style 'for JS' }
+    assert_equal ['camelStyle'], result.keys
+  end
+
+  test 'do not use default key formatter directly' do
+    Jbuilder.key_format
+    jbuild{ |json| json.key 'value' }
+    formatter = Jbuilder.send(:class_variable_get, '@@key_formatter')
+    cache = formatter.instance_variable_get('@cache')
+    assert_empty cache
   end
 
   test 'ignore_nil! without a parameter' do
-    json = Jbuilder.new
-    json.ignore_nil!
-    json.test nil
+    result = jbuild do |json|
+      json.ignore_nil!
+      json.test nil
+    end
 
-    assert_equal [], json.attributes!.keys
+    assert_empty result.keys
   end
 
   test 'ignore_nil! with parameter' do
-    json = Jbuilder.new
-    json.ignore_nil! true
-    json.name 'Bob'
-    json.dne nil
+    result = jbuild do |json|
+      json.ignore_nil! true
+      json.name 'Bob'
+      json.dne nil
+    end
 
-    assert_equal ['name'], json.attributes!.keys
+    assert_equal ['name'], result.keys
 
-    json = Jbuilder.new
-    json.ignore_nil! false
-    json.name 'Bob'
-    json.dne nil
+    result = jbuild do |json|
+      json.ignore_nil! false
+      json.name 'Bob'
+      json.dne nil
+    end
 
-    assert_equal ['name', 'dne'], json.attributes!.keys
+    assert_equal ['name', 'dne'], result.keys
   end
 
   test 'default ignore_nil!' do
     Jbuilder.ignore_nil
-    json = Jbuilder.new
-    json.name 'Bob'
-    json.dne nil
 
-    assert_equal ['name'], json.attributes!.keys
+    result = jbuild do |json|
+      json.name 'Bob'
+      json.dne nil
+    end
+
+    assert_equal ['name'], result.keys
     Jbuilder.send(:class_variable_set, '@@ignore_nil', false)
   end
 
   test 'nil!' do
-    json = Jbuilder.new
-    json.key 'value'
-    json.nil!
-    assert_nil json.attributes!
+    result = jbuild do |json|
+      json.key 'value'
+      json.nil!
+    end
+
+    assert_nil result
   end
 
   test 'null!' do
-    json = Jbuilder.new
-    json.key 'value'
-    json.null!
-    assert_nil json.attributes!
+    result = jbuild do |json|
+      json.key 'value'
+      json.null!
+    end
+
+    assert_nil result
+  end
+
+  test 'null! in a block' do
+    result = jbuild do |json|
+      json.author do
+        json.name 'David'
+      end
+
+      json.author do
+        json.null!
+      end
+    end
+
+    assert result.key?('author')
+    assert_nil result['author']
+  end
+
+  test 'empty attributes respond to empty?' do
+    attributes = Jbuilder.new.attributes!
+    assert attributes.empty?
+    assert attributes.blank?
+    assert !attributes.present?
+  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
+    assert_raise Jbuilder::NullError do
+      jbuild do |json|
+        json.null!
+        json.foo 'bar'
+      end
+    end
   end
 
-  test 'throws meaningfull error when on trying to add properties to null' do
-    json = Jbuilder.new
-    json.null!
-    assert_raise(Jbuilder::NullError) { json.foo 'bar' }
+  test 'throws NullError when trying to add properties to null using block syntax' do
+    assert_raise Jbuilder::NullError do
+      jbuild do |json|
+        json.author do
+          json.null!
+        end
+
+        json.author do
+          json.name "Pavel"
+        end
+      end
+    end
+  end
+
+  test "throws MergeError when trying to merge array with non-empty hash" do
+    assert_raise Jbuilder::MergeError do
+      jbuild do |json|
+        json.name "Daniel"
+        json.merge! []
+      end
+    end
+  end
+
+  test "throws MergeError when trying to merge hash with array" do
+    assert_raise Jbuilder::MergeError do
+      jbuild do |json|
+        json.array!
+        json.merge!({})
+      end
+    end
+  end
+
+  test "throws MergeError when trying to merge invalid objects" do
+    assert_raise Jbuilder::MergeError do
+      jbuild do |json|
+        json.name "Daniel"
+        json.merge! "Nope"
+      end
+    end
+  end
+
+  if RUBY_VERSION >= "2.2.10"
+    test "respects JSON encoding customizations" do
+      # Active Support overrides Time#as_json for custom formatting.
+      # Ensure we call #to_json on the final attributes instead of JSON.dump.
+      result = JSON.load(Jbuilder.encode { |json| json.time Time.parse("2018-05-13 11:51:00.485 -0400") })
+      assert_equal "2018-05-13T11:51:00.485-04:00", result["time"]
+    end
   end
 end