jbuilder 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 141e8a9ebdb989259856973050722aae336d7b50
-  data.tar.gz: 265721f5266ccb8e444a291f04193ac562076abf
+  metadata.gz: 894288984c47a8024c8ad9aca1623537133d53b2
+  data.tar.gz: 988d1ca4d56c52d9e258c70f75e662864c6c8023
 SHA512:
-  metadata.gz: dd8f8b1bfdfff3270bd1abaee9e1248aa202779804997237633ac9fc5bbb08e33e4b9a1910e633bfeab12b3dbef0e5c21084dddf7f47d6030a8b1d52c44f7317
-  data.tar.gz: 299d5d6f3a75b3bba2f9c666031655ae0813273ea38584d3f410353dae8912dc4d2767e3f0e8092ed34470ff6464a1061e80396a9a4befd79b57ac7cdb308d0b
+  metadata.gz: 02aaa8faef28ac67519dca82810eb0b7d1a44a34550a63e134fc23f4db0710d0074b3ca2123adcafe825d50da7427f0593d7861e2edd4b7619bc0f92c27c2d9f
+  data.tar.gz: 825104af0dbf0885c2aa9457cd328384a8ecb9c0e4ff2463878b5dbc69b9f17096f1a1bd0ac826445c5b54944cf8190e9686367c6eb59456d604c963dc0bc8c1

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
+  - 1.9
+  - 2.0
+  - 2.1
+  - 2.2
+  - ruby-head
   - jruby-19mode
   - rbx
 
@@ -16,8 +18,10 @@ gemfile:
 
 matrix:
   allow_failures:
+    - rvm: 2.2
     - rvm: jruby-19mode
     - rvm: rbx
+    - rvm: ruby-head
   fast_finish: true
 
 notifications:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+2.2.1
+-----
+* [Fix empty block handling](https://github.com/rails/jbuilder/commit/972a11141403269e9b17b45b0c95f8a9788245ee)
+
 2.2.0
 -----
 * [Allow to skip `array!` iterations by calling `next`](https://github.com/rails/jbuilder/commit/81a63308fb9d5002519dd871f829ccc58067251a)

data/jbuilder.gemspec

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

@@ -25,7 +25,7 @@ class Jbuilder
 
   def set!(key, value = BLANK, *args, &block)
     result = if block
-      if BLANK != value
+      if !_blank?(value)
         # json.comments @post.comments { |comment| ... }
         # { "comments": [ { ... }, { ... } ] }
         _scope{ array! value, &block }
@@ -253,14 +253,18 @@ class Jbuilder
   end
 
   def _merge_block(key, &block)
-    current_value = _read(key, {})
+    current_value = _blank? ? BLANK : @attributes.fetch(_key(key), BLANK)
     raise NullError.build(key) if current_value.nil?
+
     value = _scope{ yield self }
-    value.nil? ? value : _merge_values(current_value, value)
-  end
 
-  def _read(key, default = nil)
-    _blank? ? default : @attributes.fetch(_key(key)){ default }
+    if _blank?(value)
+      current_value
+    elsif _blank?(current_value) || value.nil?
+      value
+    else
+      _merge_values(current_value, value)
+    end
   end
 
   def _write(key, value)
@@ -275,6 +279,7 @@ class Jbuilder
   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
   end
 
@@ -310,8 +315,8 @@ class Jbuilder
     attributes
   end
 
-  def _blank?
-    BLANK == @attributes
+  def _blank?(value=@attributes)
+    BLANK == value
   end
 end
 

data/test/jbuilder_test.rb

@@ -131,6 +131,17 @@ class JbuilderTest < ActiveSupport::TestCase
     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

metadata

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