jbuilder 1.0.2 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f77252f3bcb2ef3d4b51adb825d326df4804bc00
+  data.tar.gz: 6d2a626cfe5b9e37a18deb6f544be39e83a1c4d0
+SHA512:
+  metadata.gz: 7890f2df618e57810e26afa21c626183b17a45067e476d3f872b3cbe60466d00fc0e32184637e8f87166417b9d573932eb2ac381d6a024e7356a9fcc7d923294
+  data.tar.gz: 02e87a25b940a5700ba1bed69ed670003598aeb7c312d03e5d9c16662538fed7b24debae031944b99951739844f1521095b0f3d7f2e7703085a942ae834f996c

data/.gitignore

@@ -0,0 +1,4 @@
+tmp
+Gemfile.lock
+Gemfile.edge.lock
+.ruby-version

data/.travis.yml

@@ -0,0 +1,32 @@
+language: ruby
+before_install:
+  - gem install bundler
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head
+  - ree
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+gemfile:
+  - Gemfile
+  - Gemfile.edge
+matrix:
+  exclude:
+    # Edge Rails is only compatible with 1.9.3
+    - gemfile: Gemfile.edge
+      rvm: 1.8.7
+    - gemfile: Gemfile.edge
+      rvm: 1.9.2
+    - gemfile: Gemfile.edge
+      rvm: ree
+    - gemfile: Gemfile.edge
+      rvm: jruby-18mode
+    - gemfile: Gemfile.edge
+      rvm: rbx-18mode
+
+notifications:
+  email: false

data/Gemfile

@@ -1,8 +1,6 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 
-git 'git://github.com/rails/rails.git' do
-  gem 'railties'
-  gem 'actionpack'
-end
+gem 'mocha', :require => false
+gem 'actionpack', '~> 3.0'

data/Gemfile.edge

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'mocha', require: false
+
+git 'git://github.com/rails/rails.git' do
+  gem 'railties', require: 'rails/railtie'
+  gem 'actionpack'
+end

data/README.md

@@ -1,4 +1,4 @@
-Jbuilder [![Build Status](https://travis-ci.org/rails/jbuilder.png)](https://travis-ci.org/rails/jbuilder)
+Jbuilder [![Build Status](https://travis-ci.org/rails/jbuilder.png)](https://travis-ci.org/rails/jbuilder) [![Gem Version](https://badge.fury.io/rb/jbuilder.png)](https://rubygems.org/gems/jbuilder) [![Code Climate](https://codeclimate.com/github/rails/jbuilder.png)](https://codeclimate.com/github/rails/jbuilder)
 ========
 
 Jbuilder gives you a simple DSL for declaring JSON structures that beats massaging giant hash structures. This is particularly helpful when the generation process is fraught with conditionals and loops. Here's a simple example:
@@ -31,7 +31,7 @@ This will build the following structure:
 
 ``` javascript
 {
-  "content": "<p>This is <i>serious</i> monkey business",
+  "content": "<p>This is <i>serious</i> monkey business</p>",
   "created_at": "2011-10-29T20:45:28-05:00",
   "updated_at": "2011-10-29T20:45:28-05:00",
 
@@ -55,15 +55,26 @@ This will build the following structure:
 }
 ```
 
+To define attribute and structure names dynamically, use the `set!` method:
+
+``` ruby
+json.set! :author do
+  json.set! :name, "David"
+end
+
+# => "author": { "name": "David" }
+```
+
 Top level arrays can be handled directly.  Useful for index and other collection actions.
 
 ``` ruby
 # @people = People.all
-json.array!(@people) do |person|
+json.array! @people do |person|
   json.name person.name
   json.age calculate_age(person.birthday)
 end
-# => [ { "name": David", "age": 32 }, { "name": Jamie", "age": 31 } ]
+
+# => [ { "name": "David", "age": 32 }, { "name": "Jamie", "age": 31 } ]
 ```
 
 Jbuilder objects can be directly nested inside each other.  Useful for composing objects.
@@ -124,10 +135,10 @@ Keys can be auto formatted using `key_format!`, this can be used to convert keyn
 json.key_format! :camelize => :lower
 json.first_name "David"
 
-# { "firstName": "David" }
+# => { "firstName": "David" }
 ```
 
-You can set this globaly with the class method `key_format` (from inside your enviorment.rb for example):
+You can set this globaly with the class method `key_format` (from inside your environment.rb for example):
 
 ``` ruby
 Jbuilder.key_format :camelize => :lower

data/Rakefile

@@ -4,10 +4,10 @@ require 'rake/testtask'
 Bundler.require
 
 Rake::TestTask.new do |test|
-  if ::RUBY_VERSION < '1.9'
-    test.test_files = %w(test/jbuilder_template_test.rb test/jbuilder_test.rb)
-  else
+  if defined?(::Rails::Railtie)
     test.test_files = FileList['test/*_test.rb']
+  else
+    test.test_files = %w(test/jbuilder_template_test.rb test/jbuilder_test.rb)
   end
 end
 

data/jbuilder.gemspec

@@ -1,12 +1,14 @@
 Gem::Specification.new do |s|
   s.name    = 'jbuilder'
-  s.version = '1.0.2'
+  s.version = '1.2.0'
   s.author  = 'David Heinemeier Hansson'
   s.email   = 'david@37signals.com'
   s.summary = 'Create JSON structures via a Builder-style DSL'
+  s.license = 'MIT'
 
   s.add_dependency 'activesupport', '>= 3.0.0'
   s.add_development_dependency 'rake', '~> 10.0.3'
 
-  s.files = Dir["#{File.dirname(__FILE__)}/**/*"]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- test/*`.split("\n")
 end

data/lib/generators/rails/jbuilder_generator.rb

@@ -11,7 +11,8 @@ module Rails
       argument :attributes, type: :array, default: [], banner: 'field:type field:type'
 
       def create_root_folder
-        empty_directory File.join('app/views', controller_file_path)
+        path = File.join('app/views', controller_file_path)
+        empty_directory path unless File.directory?(path)
       end
 
       def copy_view_files
@@ -30,8 +31,12 @@ module Rails
         def attributes_list_with_timestamps
           attributes_list(attributes_names + %w(created_at updated_at))
         end
-        
+
         def attributes_list(attributes = attributes_names)
+          if self.attributes.any? {|attr| attr.name == 'password' && attr.type == :digest}
+            attributes = attributes.reject {|name| %w(password password_confirmation).include? name}
+          end
+
           attributes.map { |a| ":#{a}"} * ', '
         end
     end

data/lib/generators/rails/{jbuilder_scaffold_controller_generator.rb → scaffold_controller_generator.rb}

@@ -1,11 +1,12 @@
+require 'rails/generators'
 require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
 
 module Rails
   module Generators
-    class JbuilderScaffoldControllerGenerator < ScaffoldControllerGenerator
+    class ScaffoldControllerGenerator
       source_root File.expand_path('../templates', __FILE__)
 
-      hook_for :json_template_engine, as: :scaffold
+      hook_for :jbuilder, default: true
     end
   end
 end

data/lib/generators/rails/templates/index.json.jbuilder

@@ -1,4 +1,4 @@
 json.array!(@<%= plural_table_name %>) do |<%= singular_table_name %>|
   json.extract! <%= singular_table_name %>, <%= attributes_list %>
   json.url <%= singular_table_name %>_url(<%= singular_table_name %>, format: :json)
-end
+end

data/lib/jbuilder.rb

@@ -35,10 +35,10 @@ class Jbuilder < JbuilderProxy
     def format(key)
       @cache[key] ||= @format.inject(key.to_s) do |result, args|
         func, args = args
-        if func.is_a? Proc
-          func.call(result, *args)
+        if func.is_a?(::Proc)
+          func.call result, *args
         else
-          result.send(func, *args)
+          result.send func, *args
         end
       end
     end
@@ -70,30 +70,47 @@ class Jbuilder < JbuilderProxy
     yield self if ::Kernel.block_given?
   end
 
-  # Dynamically set a key value pair.
-  #
-  # Example:
-  #
-  #   json.set!(:each, "stuff")
-  #
-  #   { "each": "stuff" }
-  #
-  # You can also pass a block for nested attributes
-  #
-  #   json.set!(:author) do
-  #     json.name "David"
-  #     json.age 32
-  #   end
-  #
-  #   { "author": { "name": "David", "age": 32 } }
-  def set!(key, value = nil)
-    if ::Kernel::block_given?
-      _set_value(key, _scope { yield self })
+  BLANK = ::Object.new
+
+  def set!(key, value = BLANK, *args, &block)
+    result = if ::Kernel.block_given?
+      if BLANK != value
+        # json.comments @post.comments { |comment| ... }
+        # { "comments": [ { ... }, { ... } ] }
+        _scope{ array! value, &block }
+      else
+        # json.comments { ... }
+        # { "comments": ... }
+        _scope { yield self }
+      end
+    elsif args.empty?
+      if ::Jbuilder === value
+        # json.age 32
+        # json.person another_jbuilder
+        # { "age": 32, "person": { ...  }
+        value.attributes!
+      else
+        # json.age 32
+        # { "age": 32 }
+        value
+      end
+    elsif value.respond_to?(:map)
+      # json.comments @post.comments, :content, :created_at
+      # { "comments": [ { "content": "hello", "created_at": "..." }, { "content": "world", "created_at": "..." } ] }
+      _map_collection(value){ |element| extract! element, *args }
     else
-      _set_value(key, value)
+      # json.author @post.creator, :name, :email_address
+      # { "author": { "name": "David", "email_address": "david@loudthinking.com" } }
+      _scope { extract! value, *args }
     end
+
+    _set_value key, result
   end
 
+  alias_method :method_missing, :set!
+  private :method_missing
+
+
   # Specifies formatting to be applied to the key. Passing in a name of a function
   # will cause that function to be called on the key.  So :upcase will upper case
   # the key.  You can also pass in lambdas for more complex transformations.
@@ -136,12 +153,12 @@ class Jbuilder < JbuilderProxy
   # not to receive keys which have null values.
   #
   # Example:
-  #   json.ignore_nil!
+  #   json.ignore_nil! false
   #   json.id User.new.id
   #
   #   { "id": null }
   #
-  #   json.ignore_nil
+  #   json.ignore_nil!
   #   json.id User.new.id
   #
   #   {}
@@ -172,7 +189,7 @@ class Jbuilder < JbuilderProxy
   #     json.content comment.formatted_content
   #   end
   def child!
-    @attributes = [] unless @attributes.is_a? ::Array
+    @attributes = [] unless @attributes.is_a?(::Array)
     @attributes << _scope { yield self }
   end
 
@@ -206,9 +223,9 @@ class Jbuilder < JbuilderProxy
   #   json.array! [1, 2, 3]
   #
   #   [1,2,3]
-  def array!(collection)
+  def array!(collection, &block)
     @attributes = if ::Kernel::block_given?
-      _map_collection(collection) { |element| if ::Proc.new.arity == 2 then yield self, element else yield element end }
+      _map_collection(collection) { |element| block.arity == 2 ? block[self, element] : block[element] }
     else
       collection
     end
@@ -233,17 +250,17 @@ class Jbuilder < JbuilderProxy
   #   json.(@person, :name, :age)
   def extract!(object, *attributes)
     if object.is_a?(::Hash)
-      attributes.each {|attribute| _set_value attribute, object.send(:fetch, attribute)}
+      attributes.each { |attribute| _set_value attribute, object.fetch(attribute) }
     else
-      attributes.each {|attribute| _set_value attribute, object.send(attribute)}
+      attributes.each { |attribute| _set_value attribute, object.send(attribute) }
     end
   end
 
   def call(object = nil, *attributes)
     if attributes.empty?
-      array!(object, &::Proc.new)
+      array! object, &::Proc.new
     else
-      extract!(object, *attributes)
+      extract! object, *attributes
     end
   end
 
@@ -254,62 +271,17 @@ class Jbuilder < JbuilderProxy
 
   # Encodes the current builder as JSON.
   def target!
-    ::MultiJson.encode @attributes
+    ::MultiJson.dump @attributes
   end
 
-  protected
+  private
+
     def _set_value(key, value)
       unless @ignore_nil && value.nil?
         @attributes[@key_formatter.format(key)] = value
       end
     end
 
-  private
-
-    BLANK = ::Object.new
-
-    def method_missing(method, value = BLANK, *args)
-      result = if ::Kernel.block_given?
-        if BLANK != value
-          # json.comments @post.comments { |comment| ... }
-          # { "comments": [ { ... }, { ... } ] }
-          _map_collection(value) { |element| if ::Proc.new.arity == 2 then yield self, element else yield element end }
-        else
-          # json.comments { ... }
-          # { "comments": ... }
-          _scope { yield self }
-        end
-      else
-        if args.empty?
-          if ::Jbuilder === value
-            # json.age 32
-            # json.person another_jbuilder
-            # { "age": 32, "person": { ...  }
-            value.attributes!
-          else
-            # json.age 32
-            # { "age": 32 }
-            value
-          end
-        else
-          if value.respond_to?(:map)
-            # json.comments(@post.comments, :content, :created_at)
-            # { "comments": [ { "content": "hello", "created_at": "..." }, { "content": "world", "created_at": "..." } ] }
-            _map_collection(value) do |element|
-              args.each do |attribute|
-                _set_value attribute, element.send(attribute)
-              end
-            end
-          else
-            # json.author @post.creator, :name, :email_address
-            # { "author": { "name": "David", "email_address": "david@loudthinking.com" } }
-            _scope { extract! value, *args }
-          end
-        end
-      end
-      _set_value method, result
-    end
-
     def _map_collection(collection)
       return [] if collection.nil?
 
@@ -329,17 +301,13 @@ class Jbuilder < JbuilderProxy
 
     def _merge(hash_or_array)
       if hash_or_array.is_a?(::Array)
-        @attributes = [] unless @attributes.is_a? ::Array
-        @attributes.concat(hash_or_array)
+        @attributes = [] unless @attributes.is_a?(::Array)
+        @attributes.concat hash_or_array
       else
-        @attributes.update(hash_or_array)
+        @attributes.update hash_or_array
       end
     end
 end
 
-require 'jbuilder_template' if defined?(ActionView::Template)
-
-begin
-  require 'railtie' if Rails::VERSION::MAJOR == 4
-rescue NameError
-end
+require 'jbuilder/jbuilder_template' if defined?(ActionView::Template)
+require 'jbuilder/railtie' if defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR == 4

data/lib/{jbuilder_template.rb → jbuilder/jbuilder_template.rb}

@@ -34,7 +34,12 @@ class JbuilderTemplate < Jbuilder
 
   protected
     def _cache_key(key)
-      if @context.respond_to?(:fragment_name_with_digest)
+      if @context.respond_to?(:cache_fragment_name)
+        # Current compatibility, fragment_name_with_digest is private again and cache_fragment_name
+        # should be used instead.
+        @context.cache_fragment_name(key)
+      elsif @context.respond_to?(:fragment_name_with_digest)
+        # Backwards compatibility for period of time when fragment_name_with_digest was made public.
         @context.fragment_name_with_digest(key)
       else
         ::ActiveSupport::Cache.expand_cache_key(key.is_a?(::Hash) ? url_for(key).split('://').last : key, :jbuilder)

data/lib/jbuilder/railtie.rb

@@ -0,0 +1,11 @@
+require 'rails/railtie'
+
+class Jbuilder
+  class Railtie < ::Rails::Railtie
+    generators do |app|
+      Rails::Generators.configure! app.config.generators
+      Rails::Generators.hidden_namespaces.uniq!
+      require 'generators/rails/scaffold_controller_generator'
+    end
+  end
+end

data/test/jbuilder_generator_test.rb

@@ -3,8 +3,8 @@ require 'generators/rails/jbuilder_generator'
 
 class JbuilderGeneratorTest < Rails::Generators::TestCase
   tests Rails::Generators::JbuilderGenerator
-  arguments %w(Post title body:text)
-  destination File.expand_path('../tmp', File.dirname(__FILE__))
+  arguments %w(Post title body:text password:digest)
+  destination File.expand_path('../tmp', __FILE__)
   setup :prepare_destination
 
   test 'views are generated' do
@@ -28,4 +28,4 @@ class JbuilderGeneratorTest < Rails::Generators::TestCase
       assert_match /json\.extract! @post, :title, :body, :created_at, :updated_at/, content
     end
   end
-end
+end

data/test/jbuilder_template_test.rb

@@ -1,121 +1,151 @@
 require 'test/unit'
+require 'mocha/setup'
 require 'action_view'
 require 'action_view/testing/resolvers'
 require 'active_support/cache'
 require 'jbuilder'
 
 module Rails
-  class Cache
-    def initialize
-      clear
-    end
-
-    def clear; @cache = {}; end
-
-    def write(k, v, opt={})
-      @cache[k] = v
-    end
-
-    def read(k, opt={})
-      @cache[k]
-    end
-
-    def fetch(k, opt={}, &block)
-      @cache[k] || @cache[k] = block.call
-    end
+  def self.cache
+    @cache ||= ActiveSupport::Cache::MemoryStore.new
   end
-
-  def self.cache; @cache ||= Cache.new; end
 end
 
 class JbuilderTemplateTest < ActionView::TestCase
+  setup do
+    @context = self
+    Rails.cache.clear
+  end
+
   def partials
-    { "_partial.json.jbuilder" => 'json.content "hello"' }
+    { '_partial.json.jbuilder' => 'json.content "hello"' }
   end
 
   def render_jbuilder(source)
     @rendered = []
-    lookup_context.view_paths = [ActionView::FixtureResolver.new(partials.merge("test.json.jbuilder" => source))]
-    ActionView::Template.new(source, "test", JbuilderHandler, :virtual_path => "test").render(self, {}).strip
+    lookup_context.view_paths = [ActionView::FixtureResolver.new(partials.merge('test.json.jbuilder' => source))]
+    ActionView::Template.new(source, 'test', JbuilderHandler, :virtual_path => 'test').render(self, {}).strip
+  end
+
+  def undef_context_methods(*names)
+    self.class_eval do
+      names.each do |name|
+        undef_method name.to_sym if self.method_defined?(name.to_sym)
+      end
+    end
   end
 
-  test "rendering" do
+  test 'rendering' do
     json = render_jbuilder <<-JBUILDER
-      json.content "hello"
+      json.content 'hello'
     JBUILDER
 
-    assert_equal "hello", MultiJson.load(json)["content"]
+    assert_equal 'hello', MultiJson.load(json)['content']
   end
 
-  test "key_format! with parameter" do
+  test 'key_format! with parameter' do
     json = render_jbuilder <<-JBUILDER
       json.key_format! :camelize => [:lower]
-      json.camel_style "for JS"
+      json.camel_style 'for JS'
     JBUILDER
 
     assert_equal ['camelStyle'], MultiJson.load(json).keys
   end
 
-  test "key_format! propagates to child elements" do
+  test 'key_format! propagates to child elements' do
     json = render_jbuilder <<-JBUILDER
       json.key_format! :upcase
-      json.level1 "one"
+      json.level1 'one'
       json.level2 do
-        json.value "two"
+        json.value 'two'
       end
     JBUILDER
 
     result = MultiJson.load(json)
-    assert_equal "one", result["LEVEL1"]
-    assert_equal "two", result["LEVEL2"]["VALUE"]
+    assert_equal 'one', result['LEVEL1']
+    assert_equal 'two', result['LEVEL2']['VALUE']
   end
 
-  test "partial! renders partial" do
+  test 'partial! renders partial' do
     json = render_jbuilder <<-JBUILDER
       json.partial! 'partial'
     JBUILDER
 
-    assert_equal "hello", MultiJson.load(json)["content"]
+    assert_equal 'hello', MultiJson.load(json)['content']
   end
 
-  test "fragment caching a JSON object" do
-    self.controller.perform_caching = true
-    Rails.cache.clear
+  test 'fragment caching a JSON object' do
+    undef_context_methods :fragment_name_with_digest, :cache_fragment_name
+
     render_jbuilder <<-JBUILDER
-      json.cache!("cachekey") do
-        json.name "Cache"
+      json.cache! 'cachekey' do
+        json.name 'Cache'
       end
     JBUILDER
 
     json = render_jbuilder <<-JBUILDER
-      json.cache!("cachekey") do
-        json.name "Miss"
+      json.cache! 'cachekey' do
+        json.name 'Miss'
       end
     JBUILDER
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal "Cache", parsed['name']
-    end
+    parsed = MultiJson.load(json)
+    assert_equal 'Cache', parsed['name']
   end
 
-  test "fragment caching deserializes an array" do
-    Rails.cache.clear
-    self.controller.perform_caching = true
+  test 'fragment caching deserializes an array' do
+    undef_context_methods :fragment_name_with_digest, :cache_fragment_name
+
     render_jbuilder <<-JBUILDER
-      json.cache!("cachekey") do
-        json.array! ['a', 'b', 'c']
+      json.cache! 'cachekey' do
+        json.array! %w(a b c)
       end
     JBUILDER
 
     json = render_jbuilder <<-JBUILDER
-      json.cache!("cachekey") do
-        json.array! ['1', '2', '3']
+      json.cache! 'cachekey' do
+        json.array! %w(1 2 3)
       end
     JBUILDER
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal ["a", "b", "c"], parsed
-    end
+    parsed = MultiJson.load(json)
+    assert_equal %w(a b c), parsed
   end
 
-end
+  test 'fragment caching works with previous version of cache digests' do
+    undef_context_methods :cache_fragment_name
+
+    @context.expects :fragment_name_with_digest
+
+    render_jbuilder <<-JBUILDER
+      json.cache! 'cachekey' do
+        json.name 'Cache'
+      end
+    JBUILDER
+  end
+
+  test 'fragment caching works with current cache digests' do
+    undef_context_methods :fragment_name_with_digest
+
+    @context.expects :cache_fragment_name
+
+    render_jbuilder <<-JBUILDER
+      json.cache! 'cachekey' do
+        json.name 'Cache'
+      end
+    JBUILDER
+  end
+
+  test 'fragment caching falls back on ActiveSupport::Cache.expand_cache_key' do
+    undef_context_methods :fragment_name_with_digest, :cache_fragment_name
+
+    ActiveSupport::Cache.expects :expand_cache_key
+
+    render_jbuilder <<-JBUILDER
+      json.cache! 'cachekey' do
+        json.name 'Cache'
+      end
+    JBUILDER
+  end
+
+end

data/test/jbuilder_test.rb

@@ -1,9 +1,10 @@
 require 'test/unit'
 require 'active_support/test_case'
 require 'active_support/inflector'
-
 require 'jbuilder'
 
+Comment = Struct.new(:content, :id)
+
 class JbuilderProxy
   # Faking Object#instance_eval for 1.8
   def instance_eval(code)
@@ -53,10 +54,9 @@ class JbuilderTest < ActiveSupport::TestCase
       json.content 'world'
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal 'hello', parsed['title']
-      assert_equal 'world', parsed['content']
-    end
+    parsed = MultiJson.load(json)
+    assert_equal 'hello', parsed['title']
+    assert_equal 'world', parsed['content']
   end
 
   test 'extracting from object' do
@@ -66,10 +66,9 @@ class JbuilderTest < ActiveSupport::TestCase
       json.extract! person, :name, :age
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal 'David', parsed['name']
-      assert_equal 32, parsed['age']
-    end
+    parsed = MultiJson.load(json)
+    assert_equal 'David', parsed['name']
+    assert_equal 32, parsed['age']
   end
 
   test 'extracting from object using call style for 1.9' do
@@ -83,10 +82,9 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal 'David', parsed['name']
-      assert_equal 32, parsed['age']
-    end
+    parsed = MultiJson.load(json)
+    assert_equal 'David', parsed['name']
+    assert_equal 32, parsed['age']
   end
 
   test 'extracting from hash' do
@@ -96,10 +94,9 @@ class JbuilderTest < ActiveSupport::TestCase
       json.extract! person, :name, :age
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal 'Jim', parsed['name']
-      assert_equal 34, parsed['age']
-    end
+    parsed = MultiJson.load(json)
+    assert_equal 'Jim', parsed['name']
+    assert_equal 34, parsed['age']
   end
 
   test 'nesting single child with block' do
@@ -110,10 +107,9 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal 'David', parsed['author']['name']
-      assert_equal 32, parsed['author']['age']
-    end
+    parsed = MultiJson.load(json)
+    assert_equal 'David', parsed['author']['name']
+    assert_equal 32, parsed['author']['age']
   end
 
   test 'nesting multiple children with block' do
@@ -124,10 +120,9 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal 'hello', parsed['comments'].first['content']
-      assert_equal 'world', parsed['comments'].second['content']
-    end
+    parsed = MultiJson.load(json)
+    assert_equal 'hello', parsed['comments'].first['content']
+    assert_equal 'world', parsed['comments'].second['content']
   end
 
   test 'nesting single child with inline extract' do
@@ -143,24 +138,22 @@ class JbuilderTest < ActiveSupport::TestCase
       json.author person, :name, :age
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal 'David', parsed['author']['name']
-      assert_equal 32,      parsed['author']['age']
-    end
+    parsed = MultiJson.load(json)
+    assert_equal 'David', parsed['author']['name']
+    assert_equal 32,      parsed['author']['age']
   end
 
   test 'nesting multiple children from array' do
-    comments = [ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ]
+    comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 
     json = Jbuilder.encode do |json|
       json.comments comments, :content
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal ['content'], parsed['comments'].first.keys
-      assert_equal 'hello', parsed['comments'].first['content']
-      assert_equal 'world', parsed['comments'].second['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']
   end
 
   test 'nesting multiple children from array when child array is empty' do
@@ -171,14 +164,13 @@ class JbuilderTest < ActiveSupport::TestCase
       json.comments comments, :content
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal 'Parent', parsed['name']
-      assert_equal [], parsed['comments']
-    end
+    parsed = MultiJson.load(json)
+    assert_equal 'Parent', parsed['name']
+    assert_equal [], parsed['comments']
   end
 
   test 'nesting multiple children from array with inline loop' do
-    comments = [ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ]
+    comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 
     json = Jbuilder.encode do |json|
       json.comments comments do |comment|
@@ -186,11 +178,10 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal ['content'], parsed['comments'].first.keys
-      assert_equal 'hello', parsed['comments'].first['content']
-      assert_equal 'world', parsed['comments'].second['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']
   end
 
   test 'handles nil-collections as empty arrays' do
@@ -204,21 +195,20 @@ class JbuilderTest < ActiveSupport::TestCase
   end
 
   test 'nesting multiple children from a non-Enumerable that responds to #map' do
-    comments = NonEnumerable.new([ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ])
+    comments = NonEnumerable.new([ Comment.new('hello', 1), Comment.new('world', 2) ])
 
     json = Jbuilder.encode do |json|
       json.comments comments, :content
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal ['content'], parsed['comments'].first.keys
-      assert_equal 'hello', parsed['comments'].first['content']
-      assert_equal 'world', parsed['comments'].second['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']
   end
 
   test 'nesting multiple chilren from a non-Enumerable that responds to #map with inline loop' do
-    comments = NonEnumerable.new([ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ])
+    comments = NonEnumerable.new([ Comment.new('hello', 1), Comment.new('world', 2) ])
 
     json = Jbuilder.encode do |json|
       json.comments comments do |comment|
@@ -226,15 +216,14 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal ['content'], parsed['comments'].first.keys
-      assert_equal 'hello', parsed['comments'].first['content']
-      assert_equal 'world', parsed['comments'].second['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']
   end
 
   test 'nesting multiple children from array with inline loop with old api' do
-    comments = [ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ]
+    comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 
     json = Jbuilder.encode do |json|
       json.comments comments do |json, comment|
@@ -242,15 +231,14 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal ['content'], parsed['comments'].first.keys
-      assert_equal 'hello', parsed['comments'].first['content']
-      assert_equal 'world', parsed['comments'].second['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']
   end
 
   test 'nesting multiple children from array with inline loop on root' do
-    comments = [ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ]
+    comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 
     json = Jbuilder.encode do |json|
       json.call(comments) do |comment|
@@ -258,14 +246,13 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal 'hello', parsed.first['content']
-      assert_equal 'world', parsed.second['content']
-    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 = [ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ]
+    comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 
     json = Jbuilder.encode do |json|
       json.call(comments) do |json, comment|
@@ -273,10 +260,9 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal 'hello', parsed.first['content']
-      assert_equal 'world', parsed.second['content']
-    end
+    parsed = MultiJson.load(json)
+    assert_equal 'hello', parsed.first['content']
+    assert_equal 'world', parsed.second['content']
   end
 
   test 'array nested inside nested hash' do
@@ -292,10 +278,9 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal 'hello', parsed['author']['comments'].first['content']
-      assert_equal 'world', parsed['author']['comments'].second['content']
-    end
+    parsed = MultiJson.load(json)
+    assert_equal 'hello', parsed['author']['comments'].first['content']
+    assert_equal 'world', parsed['author']['comments'].second['content']
   end
 
   test 'array nested inside array' do
@@ -351,13 +336,25 @@ class JbuilderTest < ActiveSupport::TestCase
       json.value 'Test'
       json.nested to_nest
     end
-    parsed = MultiJson.load(json)
-    assert_equal 'Test', parsed['value']
-    assert_equal 'Nested Test', parsed['nested']['nested_value']
+
+    result = {'value' => 'Test', 'nested' => {'nested_value' => 'Nested Test'}}
+    assert_equal result, MultiJson.load(json)
+  end
+
+  test 'nested jbuilder object via set!' do
+    to_nest = Jbuilder.new
+    to_nest.nested_value 'Nested Test'
+    json = Jbuilder.encode 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)
   end
 
   test 'top-level array' do
-    comments = [ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ]
+    comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
 
     json = Jbuilder.encode do |json|
       json.array!(comments) do |comment|
@@ -365,10 +362,9 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal 'hello', parsed.first['content']
-      assert_equal 'world', parsed.second['content']
-    end
+    parsed = MultiJson.load(json)
+    assert_equal 'hello', parsed.first['content']
+    assert_equal 'world', parsed.second['content']
   end
 
   test 'empty top-level array' do
@@ -385,7 +381,7 @@ class JbuilderTest < ActiveSupport::TestCase
 
   test 'dynamically set a key/value' do
     json = Jbuilder.encode do |json|
-      json.set!(:each, 'stuff')
+      json.set! :each, 'stuff'
     end
 
     assert_equal 'stuff', MultiJson.load(json)['each']
@@ -399,10 +395,22 @@ class JbuilderTest < ActiveSupport::TestCase
       end
     end
 
-    MultiJson.load(json).tap do |parsed|
-      assert_equal 'David', parsed['author']['name']
-      assert_equal 32, parsed['author']['age']
+    parsed = MultiJson.load(json)
+    assert_equal 'David', parsed['author']['name']
+    assert_equal 32, parsed['author']['age']
+  end
+
+  test 'dynamically sets a collection' do
+    comments = [ Comment.new('hello', 1), Comment.new('world', 2) ]
+
+    json = Jbuilder.encode 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']
   end
 
   test 'query like object' do

data/test/scaffold_controller_generator_test.rb

@@ -1,10 +1,10 @@
 require 'rails/generators/test_case'
-require 'generators/rails/jbuilder_scaffold_controller_generator'
+require 'generators/rails/scaffold_controller_generator'
 
-class JbuilderScaffoldControllerGeneratorTest < Rails::Generators::TestCase
-  tests Rails::Generators::JbuilderScaffoldControllerGenerator
+class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
+  tests Rails::Generators::ScaffoldControllerGenerator
   arguments %w(Post title body:text)
-  destination File.expand_path('../tmp', File.dirname(__FILE__))
+  destination File.expand_path('../tmp', __FILE__)
   setup :prepare_destination
 
   test 'controller content' do

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,49 +44,52 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ./Gemfile
-- ./Gemfile-1.8
-- ./jbuilder-0.9.0.gem
-- ./jbuilder-1.0.0.gem
-- ./jbuilder-1.0.1.gem
-- ./jbuilder.gemspec
-- ./lib/generators/rails/jbuilder_generator.rb
-- ./lib/generators/rails/jbuilder_scaffold_controller_generator.rb
-- ./lib/generators/rails/templates/controller.rb
-- ./lib/generators/rails/templates/index.json.jbuilder
-- ./lib/generators/rails/templates/show.json.jbuilder
-- ./lib/jbuilder.rb
-- ./lib/jbuilder_template.rb
-- ./lib/railtie.rb
-- ./MIT-LICENSE
-- ./Rakefile
-- ./README.md
-- ./test/jbuilder_generator_test.rb
-- ./test/jbuilder_template_test.rb
-- ./test/jbuilder_test.rb
-- ./test/scaffold_controller_generator_test.rb
+- .gitignore
+- .travis.yml
+- Gemfile
+- Gemfile.edge
+- MIT-LICENSE
+- README.md
+- Rakefile
+- jbuilder.gemspec
+- lib/generators/rails/jbuilder_generator.rb
+- lib/generators/rails/scaffold_controller_generator.rb
+- lib/generators/rails/templates/controller.rb
+- lib/generators/rails/templates/index.json.jbuilder
+- lib/generators/rails/templates/show.json.jbuilder
+- lib/jbuilder.rb
+- lib/jbuilder/jbuilder_template.rb
+- lib/jbuilder/railtie.rb
+- test/jbuilder_generator_test.rb
+- test/jbuilder_template_test.rb
+- test/jbuilder_test.rb
+- test/scaffold_controller_generator_test.rb
 homepage: 
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Create JSON structures via a Builder-style DSL
-test_files: []
+test_files:
+- test/jbuilder_generator_test.rb
+- test/jbuilder_template_test.rb
+- test/jbuilder_test.rb
+- test/scaffold_controller_generator_test.rb

data/Gemfile-1.8

@@ -1,5 +0,0 @@
-source :rubygems
-
-gemspec
-
-gem 'actionpack', '~> 3.0'

data/lib/railtie.rb

@@ -1,8 +0,0 @@
-require 'rails/engine'
-
-class Jbuilder
-  class Engine < ::Rails::Engine
-    config.app_generators.scaffold_controller = :jbuilder_scaffold_controller
-    config.app_generators.json_template_engine = :jbuilder
-  end
-end