jbuilder 2.2.16 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79566456f0f777b15fdab405ea286da70467e78c
-  data.tar.gz: 73ac0f91316aea81448cca1e2d414d4b1c20fde4
+  metadata.gz: e35bd234795a5d5f23c73a30d259ca195e42f6e5
+  data.tar.gz: 3e884978c900ea0ef14aa7e68e611246b2b74814
 SHA512:
-  metadata.gz: cef291a3f61cd86b1f36bbf171dcea06bc4388cb23cde5a309cf4c9217d6dad9b3641b6d3cc2994fcee3b6b21018763a53d0d3358d938570b1e5b274f356dafd
-  data.tar.gz: 4b4e043b1b7a029bebecf8f90bc9f9fb46c5ed6be43e0cdefca0711ef292302651b126ae6c033f02c15c715c7f65a0f86c3bb1248375083cf0e09dd117bb639f
+  metadata.gz: de29407995773a316901cee9012d9f363366ac02ecd4faeb98ab58099536dc5377d53e3c07242f24f17e039111a7f45842ecb5cfc37be67af5852e4ce7c471de
+  data.tar.gz: 9bc528a7c2f5fe784567d0d62012a51b3e398debf13a72e68496f7345be69f0f62c401b6dfa07e1a38773a4d4d952b768e63b83c32fa24e64041fe62b6dd3778

data/.travis.yml

@@ -1,10 +1,15 @@
 language: ruby
 
+sudo: false
+cache: bundler
+
 rvm:
   - 1.9
   - 2.0
   - 2.1
-  - 2.2
+  - 2.2.5
+  - 2.3.1
+  - 2.4.0
   - ruby-head
   - jruby-19mode
   - rbx
@@ -16,6 +21,8 @@ gemfile:
   - gemfiles/rails_4_0.gemfile
   - gemfiles/rails_4_1.gemfile
   - gemfiles/rails_4_2.gemfile
+  - gemfiles/rails_5_0.gemfile
+  - gemfiles/rails_5_1.gemfile
 
 matrix:
   allow_failures:
@@ -23,6 +30,37 @@ matrix:
     - rvm: rbx
     - rvm: ruby-head
   fast_finish: true
+  exclude:
+    - rvm: 1.9
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 1.9
+      gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: rbx
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: rbx
+      gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_3_0.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_3_1.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_3_2.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4_0.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4_1.gemfile
 
 notifications:
   email: false

data/Appraisals

@@ -1,32 +1,50 @@
 appraise "rails-3-0" do
   gem "test-unit"
-  gem "railties",   "~> 3.0.0"
-  gem "actionpack", "~> 3.0.0"
+  gem "railties",    "~> 3.0.0"
+  gem "actionpack",  "~> 3.0.0"
+  gem "activemodel", "~> 3.0.0"
 end
 
 appraise "rails-3-1" do
   gem "test-unit"
-  gem "railties",   "~> 3.1.0"
-  gem "actionpack", "~> 3.1.0"
+  gem "railties",    "~> 3.1.0"
+  gem "actionpack",  "~> 3.1.0"
+  gem "activemodel", "~> 3.1.0"
 end
 
 appraise "rails-3-2" do
   gem "test-unit"
-  gem "railties",   "~> 3.2.0"
-  gem "actionpack", "~> 3.2.0"
+  gem "railties",    "~> 3.2.0"
+  gem "actionpack",  "~> 3.2.0"
+  gem "activemodel", "~> 3.2.0"
 end
 
 appraise "rails-4-0" do
-  gem "railties",   "~> 4.0.0"
-  gem "actionpack", "~> 4.0.0"
+  gem "railties",    "~> 4.0.0"
+  gem "actionpack",  "~> 4.0.0"
+  gem "activemodel", "~> 4.0.0"
 end
 
 appraise "rails-4-1" do
-  gem "railties",   "~> 4.1.0"
-  gem "actionpack", "~> 4.1.0"
+  gem "railties",    "~> 4.1.0"
+  gem "actionpack",  "~> 4.1.0"
+  gem "activemodel", "~> 4.1.0"
 end
 
 appraise "rails-4-2" do
-  gem "railties",   "~> 4.2.0"
-  gem "actionpack", "~> 4.2.0"
+  gem "railties",    "~> 4.2.0"
+  gem "actionpack",  "~> 4.2.0"
+  gem "activemodel", "~> 4.2.0"
+end
+
+appraise "rails-5-0" do
+  gem "railties",    "~> 5.0.0"
+  gem "actionpack",  "~> 5.0.0"
+  gem "activemodel", "~> 5.0.0"
+end
+
+appraise "rails-5-1" do
+  gem "railties",    ">= 5.1.0", "< 5.2"
+  gem "actionpack",  ">= 5.1.0", "< 5.2"
+  gem "activemodel", ">= 5.1.0", "< 5.2"
 end

data/CHANGELOG.md

@@ -1,5 +1,65 @@
 # Changelog
 
+2.6.4
+-----
+
+* Drop the pessimistic upper-bound restriction on Active Support and MultiJSON to prevent future gemfile resolution deadlocks *DHH*
+
+2.6.3
+-----
+
+* Support Rails 5.1
+
+2.6.2
+-----
+
+* Fix thor warnings
+
+2.6.1
+-----
+
+* [Optimize root caches with cache_root!](https://github.com/rails/jbuilder/pull/370)
+
+2.6.0
+-----
+
+* [Rails 5 cache! with expire support](https://github.com/rails/jbuilder/commit/d61e3354563863731bc1f358f495b1dbb7ae9d32)
+* [Generated view DRYed by using model partial](https://github.com/rails/jbuilder/commit/83256f4d7e9211c9dc47972feaed7fd31e4f7cac)
+
+2.5.0
+-----
+
+* [Rails 5 compatibility](https://github.com/rails/jbuilder/commit/64c510ec69d9e63b73ffd5942e802d21a7d14701)
+
+2.4.1
+-----
+
+* [Fix controller generators to be Rails 5 compatible](https://github.com/rails/jbuilder/commit/2dc6203c5c4a98701d5b64c2a5200835a48bb533)
+
+2.4.0
+-----
+
+* [Rails 5 compatibility](https://github.com/rails/jbuilder/commit/4aa2cfcc19a4634d65a28ffc75f0ac0cb8304115)
+
+2.3.2
+-----
+
+* [Remove Mime Types deprecation message](https://github.com/rails/jbuilder/commit/5ba4e4ac654cc8388619538f576fe234659b84ec)
+
+2.3.1
+-----
+
+* [Explicitly require ostruct to prevent NameError](https://github.com/rails/jbuilder/pull/281)
+
+2.3.0
+-----
+
+* [Add new in-place partial invocation support](https://github.com/rails/jbuilder/commit/1feda7ee605c136e59fb4de970f4674de518e6de)
+* [Add implicit partial rendering for AM::Models](https://github.com/rails/jbuilder/commit/4d5bf7d0ea92765adb7be36834e84f9855a061df)
+* [Generate API controller if Rails API option is enabled](https://github.com/rails/jbuilder/commit/db68f6bd327cf42b47ef22d455fb5721a8c2cf5f)
+* [JBuilder's templates have less priority than app templates](https://github.com/rails/jbuilder/commit/7c1a5f25603ec1f4e51fba3dbba9db23726a5d69)
+* [Add AC::Helpers module to jbuilder for api only apps](https://github.com/rails/jbuilder/commit/7cf1d1eb7d125caf38309b5427952030011c1aa0)
+
 2.2.16
 ------
 
@@ -13,12 +73,12 @@
 2.2.13
 ------
 
-* Several peformance optimizations: [#260](https://github.com/rails/jbuilder/pull/260) & [#261](https://github.com/rails/jbuilder/pull/261)
+* Several performance optimizations: [#260](https://github.com/rails/jbuilder/pull/260) & [#261](https://github.com/rails/jbuilder/pull/261)
 
 2.2.12
 ------
 
-* [Replace explici block calls with yield for performance](https://github.com/rails/jbuilder/commit/3184f941276ad03a071cf977133d1a32302afa47)
+* [Replace explicit block calls with yield for performance](https://github.com/rails/jbuilder/commit/3184f941276ad03a071cf977133d1a32302afa47)
 
 2.2.11
 ------
@@ -162,7 +222,7 @@
 -----
 * [Add quick collection attribute extraction](https://github.com/rails/jbuilder/commit/c2b966cf653ea4264fbb008b8cc6ce5359ebe40a)
 * [Block has priority over attributes extraction](https://github.com/rails/jbuilder/commit/77c24766362c02769d81dac000b1879a9e4d4a00)
-* [Meaningfull error messages when adding properties to null](https://github.com/rails/jbuilder/commit/e26764602e34b3772e57e730763d512e59489e3b)
+* [Meaningful error messages when adding properties to null](https://github.com/rails/jbuilder/commit/e26764602e34b3772e57e730763d512e59489e3b)
 * [Do not enforce template format, enforce handlers instead](https://github.com/rails/jbuilder/commit/72576755224b15da45e50cbea877679800ab1398)
 
 1.3.0
@@ -171,7 +231,7 @@
 
 1.2.1
 -----
-* [Added explicit dependency for MultiJson](https://github.com/rails/jbuilder/commit/4d58eacb6cd613679fb243484ff73a79bbbff2d2
+* [Added explicit dependency for MultiJson](https://github.com/rails/jbuilder/commit/4d58eacb6cd613679fb243484ff73a79bbbff2d2)
 
 1.2.0
 -----

data/CONTRIBUTING.md

@@ -0,0 +1,108 @@
+Contributing to Jbuilder
+=====================
+
+[![Build Status](https://api.travis-ci.org/rails/jbuilder.svg?branch=master)][travis]
+[![Gem Version](https://badge.fury.io/rb/jbuilder.svg)][gem]
+[![Code Climate](https://codeclimate.com/github/rails/jbuilder/badges/gpa.svg)][codeclimate]
+[![Dependencies Status](https://gemnasium.com/rails/jbuilder.svg)][gemnasium]
+
+[travis]: https://travis-ci.org/rails/jbuilder
+[gem]: https://rubygems.org/gems/jbuilder
+[codeclimate]: https://codeclimate.com/github/rails/jbuilder
+[gemnasium]: https://gemnasium.com/rails/jbuilder
+
+Jbuilder is work of [many contributors](https://github.com/rails/jbuilder/graphs/contributors). You're encouraged to submit [pull requests](https://github.com/rails/jbuilder/pulls), [propose features and discuss issues](https://github.com/rails/jbuilder/issues).
+
+#### Fork the Project
+
+Fork the [project on Github](https://github.com/rails/jbuilder) and check out your copy.
+
+```
+git clone https://github.com/contributor/jbuilder.git
+cd jbuilder
+git remote add upstream https://github.com/rails/jbuilder.git
+```
+
+#### Create a Topic Branch
+
+Make sure your fork is up-to-date and create a topic branch for your feature or bug fix.
+
+```
+git checkout master
+git pull upstream master
+git checkout -b my-feature-branch
+```
+
+#### Bundle Install and Test
+
+Ensure that you can build the project and run tests.
+
+```
+bundle install
+appraisal install
+appraisal rake test
+```
+
+#### Write Tests
+
+Try to write a test that reproduces the problem you're trying to fix or describes a feature that you want to build. Add to [test](test).
+
+We definitely appreciate pull requests that highlight or reproduce a problem, even without a fix.
+
+#### Write Code
+
+Implement your feature or bug fix.
+
+Make sure that `appraisal rake test` completes without errors.
+
+#### Write Documentation
+
+Document any external behavior in the [README](README.md).
+
+#### Commit Changes
+
+Make sure git knows your name and email address:
+
+```
+git config --global user.name "Your Name"
+git config --global user.email "contributor@example.com"
+```
+
+Writing good commit logs is important. A commit log should describe what changed and why.
+
+```
+git add ...
+git commit
+```
+
+#### Push
+
+```
+git push origin my-feature-branch
+```
+
+#### Make a Pull Request
+
+Visit your forked repo and click the 'New pull request' button. Select your feature branch, fill out the form, and click the 'Create pull request' button. Pull requests are usually reviewed within a few days.
+
+#### Rebase
+
+If you've been working on a change for a while, rebase with upstream/master.
+
+```
+git fetch upstream
+git rebase upstream/master
+git push origin my-feature-branch -f
+```
+
+#### Check on Your Pull Request
+
+Go back to your pull request after a few minutes and see whether it passed muster with Travis-CI. Everything should look green, otherwise fix issues and amend your commit as described above.
+
+#### Be Patient
+
+It's likely that your change will not be merged and that the nitpicky maintainers will ask you to do more, or fix seemingly benign problems. Hang in there!
+
+#### Thank You
+
+Please do know that we really appreciate and value your time and work. We love you, really.

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 gem "rake"
 gem "mocha", require: false
 gem "appraisal"
+gem "pry"

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2014 David Heinemeier Hansson, 37signals
+Copyright (c) 2011-2017 David Heinemeier Hansson, 37signals
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,22 +1,12 @@
 # Jbuilder
 
-[![Build Status](https://api.travis-ci.org/rails/jbuilder.svg)][travis]
-[![Gem Version](http://img.shields.io/gem/v/jbuilder.svg)][gem]
-[![Code Climate](http://img.shields.io/codeclimate/github/rails/jbuilder.svg)][codeclimate]
-[![Dependencies Status](http://img.shields.io/gemnasium/rails/jbuilder.svg)][gemnasium]
-
-[travis]: https://travis-ci.org/rails/jbuilder
-[gem]: https://rubygems.org/gems/jbuilder
-[codeclimate]: https://codeclimate.com/github/rails/jbuilder
-[gemnasium]: https://gemnasium.com/rails/jbuilder
-
 Jbuilder gives you a simple DSL for declaring JSON structures that beats
-massaging giant hash structures. This is particularly helpful when the
+manipulating giant hash structures. This is particularly helpful when the
 generation process is fraught with conditionals and loops. Here's a simple
 example:
 
 ``` ruby
-# app/views/message/show.json.jbuilder
+# app/views/messages/show.json.jbuilder
 
 json.content format_content(@message.content)
 json.(@message, :created_at, :updated_at)
@@ -74,7 +64,7 @@ json.set! :author do
   json.set! :name, 'David'
 end
 
-# => "author": { "name": "David" }
+# => {"author": { "name": "David" }}
 ```
 
 Top level arrays can be handled directly.  Useful for index and other collection actions.
@@ -134,7 +124,7 @@ company.to_builder.target!
 ```
 
 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
+language. When required in Rails, you can create views a la show.json.jbuilder
 (the json is already yielded):
 
 ``` ruby
@@ -178,7 +168,7 @@ json.partial! partial: 'posts/post', collection: @posts, as: :post
 
 # or
 
-json.comments @post.comments, partial: 'comment/comment', as: :comment
+json.comments @post.comments, partial: 'comments/comment', as: :comment
 ```
 
 You can pass any objects into partial templates with or without `:locals` option.
@@ -206,6 +196,15 @@ json.author do
 end
 ```
 
+To prevent Jbuilder from including null values in the output, you can use the `ignore_nil!` method:
+
+```ruby
+json.ignore_nil!
+json.foo nil
+json.bar "bar"
+# => { "bar": "bar" }
+```
+
 Fragment caching is supported, it uses `Rails.cache` and works like caching in
 HTML templates:
 
@@ -258,3 +257,13 @@ for MultiJson:
 require 'multi_json'
 MultiJson.use :yajl
  ```
+
+## Contributing to Jbuilder
+
+Jbuilder is the work of many contributors. You're encouraged to submit pull requests, propose
+features and discuss issues.
+
+See [CONTRIBUTING](CONTRIBUTING.md).
+
+## License
+Jbuilder is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/gemfiles/rails_3_0.gemfile

@@ -5,8 +5,10 @@ source "https://rubygems.org"
 gem "rake"
 gem "mocha", :require => false
 gem "appraisal"
+gem "pry"
 gem "test-unit"
 gem "railties", "~> 3.0.0"
 gem "actionpack", "~> 3.0.0"
+gem "activemodel", "~> 3.0.0"
 
 gemspec :path => "../"

data/gemfiles/rails_3_1.gemfile

@@ -5,8 +5,10 @@ source "https://rubygems.org"
 gem "rake"
 gem "mocha", :require => false
 gem "appraisal"
+gem "pry"
 gem "test-unit"
 gem "railties", "~> 3.1.0"
 gem "actionpack", "~> 3.1.0"
+gem "activemodel", "~> 3.1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_3_2.gemfile

@@ -5,8 +5,10 @@ source "https://rubygems.org"
 gem "rake"
 gem "mocha", :require => false
 gem "appraisal"
+gem "pry"
 gem "test-unit"
 gem "railties", "~> 3.2.0"
 gem "actionpack", "~> 3.2.0"
+gem "activemodel", "~> 3.2.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4_0.gemfile

@@ -5,7 +5,9 @@ source "https://rubygems.org"
 gem "rake"
 gem "mocha", :require => false
 gem "appraisal"
+gem "pry"
 gem "railties", "~> 4.0.0"
 gem "actionpack", "~> 4.0.0"
+gem "activemodel", "~> 4.0.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4_1.gemfile

@@ -5,7 +5,9 @@ source "https://rubygems.org"
 gem "rake"
 gem "mocha", :require => false
 gem "appraisal"
+gem "pry"
 gem "railties", "~> 4.1.0"
 gem "actionpack", "~> 4.1.0"
+gem "activemodel", "~> 4.1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4_2.gemfile

@@ -5,7 +5,10 @@ source "https://rubygems.org"
 gem "rake"
 gem "mocha", :require => false
 gem "appraisal"
+gem "pry"
 gem "railties", "~> 4.2.0"
 gem "actionpack", "~> 4.2.0"
+gem "activemodel", "~> 4.2.0"
+gem "nokogiri", "< 1.7" if RUBY_VERSION < "2.1"
 
 gemspec :path => "../"

data/gemfiles/rails_5_0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "mocha", :require => false
+gem "appraisal"
+gem "pry"
+gem "railties", "~> 5.0.0"
+gem "actionpack", "~> 5.0.0"
+gem "activemodel", "~> 5.0.0"
+
+gemspec :path => "../"

data/gemfiles/rails_5_1.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "mocha", :require => false
+gem "appraisal"
+gem "pry"
+gem "railties", ">= 5.1.0", "< 5.2"
+gem "actionpack", ">= 5.1.0", "< 5.2"
+gem "activemodel", ">= 5.1.0", "< 5.2"
+
+gemspec :path => "../"

data/jbuilder.gemspec

@@ -1,16 +1,16 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.2.16'
-  s.authors  = ['David Heinemeier Hansson', 'Pavel Pravosud']
-  s.email    = ['david@37signals.com', 'pavel@pravosud.com']
+  s.version  = '2.6.4'
+  s.authors  = ['David Heinemeier Hansson']
+  s.email    = ['david@37signals.com']
   s.summary  = 'Create JSON structures via a Builder-style DSL'
   s.homepage = 'https://github.com/rails/jbuilder'
   s.license  = 'MIT'
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency 'activesupport', '>= 3.0.0', '< 5'
-  s.add_dependency 'multi_json',    '~> 1.2'
+  s.add_dependency 'activesupport', '>= 3.0.0'
+  s.add_dependency 'multi_json',    '>= 1.2'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")

data/lib/generators/rails/jbuilder_generator.rb

@@ -20,6 +20,7 @@ module Rails
           filename = filename_with_extensions(view)
           template filename, File.join('app/views', controller_file_path, filename)
         end
+        template filename_with_extensions('partial'), File.join('app/views', controller_file_path, filename_with_extensions("_#{singular_table_name}"))
       end
 
 

data/lib/generators/rails/scaffold_controller_generator.rb

@@ -4,9 +4,9 @@ require 'rails/generators/rails/scaffold_controller/scaffold_controller_generato
 module Rails
   module Generators
     class ScaffoldControllerGenerator
-      source_paths.unshift File.expand_path('../templates', __FILE__)
+      source_paths << File.expand_path('../templates', __FILE__)
 
-      hook_for :jbuilder, default: true
+      hook_for :jbuilder, type: :boolean, default: true
     end
   end
 end

data/lib/generators/rails/templates/api_controller.rb

@@ -0,0 +1,63 @@
+<% if namespaced? -%>
+require_dependency "<%= namespaced_file_path %>/application_controller"
+
+<% end -%>
+<% module_namespacing do -%>
+class <%= controller_class_name %>Controller < ApplicationController
+  before_action :set_<%= singular_table_name %>, only: [:show, :update, :destroy]
+
+  # GET <%= route_url %>
+  # GET <%= route_url %>.json
+  def index
+    @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
+  end
+
+  # GET <%= route_url %>/1
+  # GET <%= route_url %>/1.json
+  def show
+  end
+
+  # POST <%= route_url %>
+  # POST <%= route_url %>.json
+  def create
+    @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
+
+    if @<%= orm_instance.save %>
+      render :show, status: :created, location: <%= "@#{singular_table_name}" %>
+    else
+      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+    end
+  end
+
+  # PATCH/PUT <%= route_url %>/1
+  # PATCH/PUT <%= route_url %>/1.json
+  def update
+    if @<%= orm_instance.update("#{singular_table_name}_params") %>
+      render :show, status: :ok, location: <%= "@#{singular_table_name}" %>
+    else
+      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+    end
+  end
+
+  # DELETE <%= route_url %>/1
+  # DELETE <%= route_url %>/1.json
+  def destroy
+    @<%= orm_instance.destroy %>
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_<%= singular_table_name %>
+      @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def <%= "#{singular_table_name}_params" %>
+      <%- if attributes_names.empty? -%>
+      params.fetch(<%= ":#{singular_table_name}" %>, {})
+      <%- else -%>
+      params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
+      <%- end -%>
+    end
+end
+<% end -%>

data/lib/generators/rails/templates/controller.rb

@@ -75,7 +75,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     # Never trust parameters from the scary internet, only allow the white list through.
     def <%= "#{singular_table_name}_params" %>
       <%- if attributes_names.empty? -%>
-      params[<%= ":#{singular_table_name}" %>]
+      params.fetch(<%= ":#{singular_table_name}" %>, {})
       <%- else -%>
       params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
       <%- end -%>

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

@@ -1,4 +1 @@
-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
+json.array! @<%= plural_table_name %>, partial: '<%= plural_table_name %>/<%= singular_table_name %>', as: :<%= singular_table_name %>

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

@@ -0,0 +1,2 @@
+json.extract! <%= singular_table_name %>, <%= attributes_list_with_timestamps %>
+json.url <%= singular_table_name %>_url(<%= singular_table_name %>, format: :json)