jbuilder 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d5b664cede402d0f7c028a234e22a7bf1114274
-  data.tar.gz: d4e163e75dea9c02ecb14ce79f7dafda0b5f32f3
+  metadata.gz: 141e8a9ebdb989259856973050722aae336d7b50
+  data.tar.gz: 265721f5266ccb8e444a291f04193ac562076abf
 SHA512:
-  metadata.gz: 88378366476f8fbaf94eecdc4e31be5bf000d605c9797c4c0a9b53ae3be63dc0f5c119e5cd349f42d1fa9459b69de9730d5dad2a2d7fd89e38cefe3808884cf7
-  data.tar.gz: 13134bb6ea6ff1df39592cfef8a3575f94e185864ebf629af38b8cd19911bdb9f6804eeaf87d5d2a256c1d482cec49cf93aa7b77094f2124a798f7fa959af048
+  metadata.gz: dd8f8b1bfdfff3270bd1abaee9e1248aa202779804997237633ac9fc5bbb08e33e4b9a1910e633bfeab12b3dbef0e5c21084dddf7f47d6030a8b1d52c44f7317
+  data.tar.gz: 299d5d6f3a75b3bba2f9c666031655ae0813273ea38584d3f410353dae8912dc4d2767e3f0e8092ed34470ff6464a1061e80396a9a4befd79b57ac7cdb308d0b

data/.gitignore

@@ -2,3 +2,4 @@ tmp
 gemfiles/*.lock
 Gemfile.lock
 .ruby-version
+pkg

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+2.2.0
+-----
+* [Allow to skip `array!` iterations by calling `next`](https://github.com/rails/jbuilder/commit/81a63308fb9d5002519dd871f829ccc58067251a)
+
 2.1.2
 -----
 * [Cast array-like objects to array before merging](https://github.com/rails/jbuilder/commit/7b8c8a1cb09b7f3dd26e5643ebbd6b2ec67185db)

data/README.md

@@ -16,26 +16,26 @@ generation process is fraught with conditionals and loops. Here's a simple
 example:
 
 ``` ruby
-Jbuilder.encode do |json|
-  json.content format_content(@message.content)
-  json.(@message, :created_at, :updated_at)
+# app/views/message/show.json.jbuilder
 
-  json.author do
-    json.name @message.creator.name.familiar
-    json.email_address @message.creator.email_address_with_name
-    json.url url_for(@message.creator, format: :json)
-  end
+json.content format_content(@message.content)
+json.(@message, :created_at, :updated_at)
 
-  if current_user.admin?
-    json.visitors calculate_visitors(@message)
-  end
+json.author do
+  json.name @message.creator.name.familiar
+  json.email_address @message.creator.email_address_with_name
+  json.url url_for(@message.creator, format: :json)
+end
 
-  json.comments @message.comments, :content, :created_at
+if current_user.admin?
+  json.visitors calculate_visitors(@message)
+end
 
-  json.attachments @message.attachments do |attachment|
-    json.filename attachment.filename
-    json.url url_for(attachment)
-  end
+json.comments @message.comments, :content, :created_at
+
+json.attachments @message.attachments do |attachment|
+  json.filename attachment.filename
+  json.url url_for(attachment)
 end
 ```
 
@@ -80,19 +80,26 @@ end
 Top level arrays can be handled directly.  Useful for index and other collection actions.
 
 ``` ruby
-# @people = People.all
-json.array! @people do |person|
-  json.name person.name
-  json.age calculate_age(person.birthday)
+# @comments = @post.comments
+
+json.array! @comments do |comment|
+  next if comment.marked_as_spam_by?(current_user)
+
+  json.body comment.body
+  json.author do
+    json.first_name comment.author.first_name
+    json.last_name comment.author.last_name
+  end
 end
 
-# => [ { "name": "David", "age": 32 }, { "name": "Jamie", "age": 31 } ]
+# => [ { "body": "great post...", "author": { "first_name": "Joe", "last_name": "Bloe" }} ]
 ```
 
 You can also extract attributes from array directly.
 
 ``` ruby
 # @people = People.all
+
 json.array! @people, :id, :name
 
 # => [ { "id": 1, "name": "David" }, { "id": 2, "name": "Jamie" } ]

data/jbuilder.gemspec

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

@@ -260,10 +260,11 @@ class Jbuilder
   end
 
   def _read(key, default = nil)
-    @attributes.fetch(_key(key)){ default }
+    _blank? ? default : @attributes.fetch(_key(key)){ default }
   end
 
   def _write(key, value)
+    @attributes = {} if _blank?
     @attributes[_key(key)] = value
   end
 
@@ -280,12 +281,12 @@ class Jbuilder
   def _map_collection(collection)
     collection.map do |element|
       _scope{ yield element }
-    end
+    end - [BLANK]
   end
 
   def _scope
     parent_attributes, parent_formatter = @attributes, @key_formatter
-    @attributes = {}
+    @attributes = BLANK
     yield
     @attributes
   ensure
@@ -308,6 +309,10 @@ class Jbuilder
 
     attributes
   end
+
+  def _blank?
+    BLANK == @attributes
+  end
 end
 
 require 'jbuilder/jbuilder_template' if defined?(ActionView::Template)

data/test/jbuilder_test.rb

@@ -373,6 +373,20 @@ class JbuilderTest < ActiveSupport::TestCase
     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) ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL