jbuilder 0.3.2 → 0.4.0

data/README.md

@@ -48,13 +48,24 @@ This will build the following structure:
     { "content": "To you my good sir!", "created_at": "2011-10-29T20:47:28-05:00" }
   ],
   
-  "attachment": [
+  "attachments": [
     { "filename": "forecast.xls", "url": "http://example.com/downloads/forecast.xls" },
     { "filename": "presentation.pdf", "url": "http://example.com/downloads/presentation.pdf" }
   ]
 }
 ```
 
+Top level arrays can be handled directly.  Useful for index and other collection actions.
+
+``` ruby
+# @people = People.all
+json.array!(@people) do |json, person|
+  json.name person.name
+  json.age calculate_age(person.birthday)
+end
+# => [ { "name": David", "age": 32 }, { "name": Jamie", "age": 31 } ]
+```
+
 You can either use Jbuilder stand-alone or directly as an ActionView template language. When required in Rails, you can create views ala show.json.jbuilder (the json is already yielded):
 
 ``` ruby
@@ -72,14 +83,17 @@ if current_user.admin?
   json.visitors calculate_visitors(@message)
 end
 
-# You can use partials as well, just remember to pass in the json instance
-json.partial! "api/comments/comments", @message.comments
+# You can use partials as well. The following line will render the file
+# RAILS_ROOT/app/views/api/comments/_comments, and set a local variable
+# 'comments' with all this message's comments, which you can use inside
+# the partial.
+json.partial! "api/comments/comments", comments: @message.comments
 ```
 
-Libraries similar to this in some form or another includes:
+Libraries similar to this in some form or another include:
 
 * RABL: https://github.com/nesquena/rabl
 * JsonBuilder: https://github.com/nov/jsonbuilder
 * JSON Builder: https://github.com/dewski/json_builder
 * Jsonify: https://github.com/bsiggelkow/jsonify
-* RepresentationView: https://github.com/mdub/representative_view
+* RepresentationView: https://github.com/mdub/representative_view

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'jbuilder'
-  s.version = '0.3.2'
+  s.version = '0.4.0'
   s.author  = 'David Heinemeier Hansson'
   s.email   = 'david@37signals.com'
   s.summary = 'Create JSON structures via a Builder-style DSL'

data/lib/jbuilder.rb

@@ -126,7 +126,7 @@ class Jbuilder < BlankSlate
 
       # json.age 32
       # { "age": 32 }
-      when args.one?
+      when args.length == 1
         set! method, args.first
 
       # json.comments { |json| ... }
@@ -182,4 +182,4 @@ class Jbuilder < BlankSlate
     end
 end
 
-require "jbuilder_template" if defined?(ActionView::Template)
+require "jbuilder_template" if defined?(ActionView::Template)

data/test/jbuilder_test.rb

@@ -12,6 +12,23 @@ class JbuilderTest < ActiveSupport::TestCase
     assert_equal "hello", JSON.parse(json)["content"]
   end
 
+  test "single key with false value" do
+    json = Jbuilder.encode do |json|
+      json.content false
+    end
+
+    assert_equal false, JSON.parse(json)["content"]
+  end
+
+  test "single key with nil value" do
+    json = Jbuilder.encode do |json|
+      json.content nil
+    end
+
+    assert JSON.parse(json).has_key?("content")
+    assert_equal nil, JSON.parse(json)["content"]
+  end
+
   test "multiple keys" do
     json = Jbuilder.encode do |json|
       json.title "hello"
@@ -225,4 +242,4 @@ class JbuilderTest < ActiveSupport::TestCase
     
     assert_equal "stuff", JSON.parse(json)["each"]
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000 Z
+date: 2012-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70205624198380 !ruby/object:Gem::Requirement
+  requirement: &70191736347120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70205624198380
+  version_requirements: *70191736347120
 - !ruby/object:Gem::Dependency
   name: blankslate
-  requirement: &70205624197900 !ruby/object:Gem::Requirement
+  requirement: &70191736346420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 2.1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70205624197900
+  version_requirements: *70191736346420
 description: 
 email: david@37signals.com
 executables: []
@@ -42,6 +42,7 @@ files:
 - ./Gemfile
 - ./Gemfile.lock
 - ./jbuilder-0.3.1.gem
+- ./jbuilder-0.3.2.gem
 - ./jbuilder-0.3.gem
 - ./jbuilder.gemspec
 - ./lib/jbuilder.rb