jbuilder 2.0.6 → 2.11.5

data/test/scaffold_api_controller_generator_test.rb

@@ -0,0 +1,70 @@
+require 'test_helper'
+require 'rails/generators/test_case'
+require 'generators/rails/scaffold_controller_generator'
+
+if Rails::VERSION::MAJOR > 4
+
+  class ScaffoldApiControllerGeneratorTest < Rails::Generators::TestCase
+    tests Rails::Generators::ScaffoldControllerGenerator
+    arguments %w(Post title body:text images:attachments --api)
+    destination File.expand_path('../tmp', __FILE__)
+    setup :prepare_destination
+
+    test 'controller content' do
+      run_generator
+
+      assert_file 'app/controllers/posts_controller.rb' do |content|
+        assert_instance_method :index, content do |m|
+          assert_match %r{@posts = Post\.all}, m
+        end
+
+        assert_instance_method :show, content do |m|
+          assert m.blank?
+        end
+
+        assert_instance_method :create, content do |m|
+          assert_match %r{@post = Post\.new\(post_params\)}, m
+          assert_match %r{@post\.save}, m
+          assert_match %r{render :show, status: :created, location: @post}, m
+          assert_match %r{render json: @post\.errors, status: :unprocessable_entity}, m
+        end
+
+        assert_instance_method :update, content do |m|
+          assert_match %r{render :show, status: :ok, location: @post}, m
+          assert_match %r{render json: @post.errors, status: :unprocessable_entity}, m
+        end
+
+        assert_instance_method :destroy, content do |m|
+          assert_match %r{@post\.destroy}, m
+        end
+
+        assert_match %r{def post_params}, content
+        if Rails::VERSION::MAJOR >= 6
+          assert_match %r{params\.require\(:post\)\.permit\(:title, :body, images: \[\]\)}, content
+        else
+          assert_match %r{params\.require\(:post\)\.permit\(:title, :body, :images\)}, content
+        end
+      end
+    end
+
+    test "don't use require and permit if there are no attributes" do
+      run_generator %w(Post --api)
+
+      assert_file 'app/controllers/posts_controller.rb' do |content|
+        assert_match %r{def post_params}, content
+        assert_match %r{params\.fetch\(:post, \{\}\)}, content
+      end
+    end
+
+
+    if Rails::VERSION::MAJOR >= 6
+      test 'handles virtual attributes' do
+        run_generator ["Message", "content:rich_text", "video:attachment", "photos:attachments"]
+
+        assert_file 'app/controllers/messages_controller.rb' do |content|
+          assert_match %r{params\.require\(:message\)\.permit\(:content, :video, photos: \[\]\)}, content
+        end
+      end
+    end
+  end
+end

data/test/scaffold_controller_generator_test.rb

@@ -1,9 +1,10 @@
+require 'test_helper'
 require 'rails/generators/test_case'
 require 'generators/rails/scaffold_controller_generator'
 
 class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   tests Rails::Generators::ScaffoldControllerGenerator
-  arguments %w(Post title body:text)
+  arguments %w(Post title body:text images:attachments)
   destination File.expand_path('../tmp', __FILE__)
   setup :prepare_destination
 
@@ -12,7 +13,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
 
     assert_file 'app/controllers/posts_controller.rb' do |content|
       assert_instance_method :index, content do |m|
-        assert_match /@posts = Post\.all/, m
+        assert_match %r{@posts = Post\.all}, m
       end
 
       assert_instance_method :show, content do |m|
@@ -20,7 +21,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       end
 
       assert_instance_method :new, content do |m|
-        assert_match /@post = Post\.new/, m
+        assert_match %r{@post = Post\.new}, m
       end
 
       assert_instance_method :edit, content do |m|
@@ -28,29 +29,71 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       end
 
       assert_instance_method :create, content do |m|
-        assert_match /@post = Post\.new\(post_params\)/, m
-        assert_match /@post\.save/, m
-        assert_match /format\.html \{ redirect_to @post, notice: 'Post was successfully created\.' \}/, m
-        assert_match /format\.json \{ render :show, status: :created, location: @post \}/, m
-        assert_match /format\.html \{ render :new \}/, m
-        assert_match /format\.json \{ render json: @post\.errors, status: :unprocessable_entity \}/, m
+        assert_match %r{@post = Post\.new\(post_params\)}, m
+        assert_match %r{@post\.save}, m
+        assert_match %r{format\.html \{ redirect_to post_url\(@post\), notice: "Post was successfully created\." \}}, m
+        assert_match %r{format\.json \{ render :show, status: :created, location: @post \}}, m
+        assert_match %r{format\.html \{ render :new, status: :unprocessable_entity \}}, m
+        assert_match %r{format\.json \{ render json: @post\.errors, status: :unprocessable_entity \}}, m
       end
 
       assert_instance_method :update, content do |m|
-        assert_match /format\.html \{ redirect_to @post, notice: 'Post was successfully updated\.' \}/, m
-        assert_match /format\.json \{ render :show, status: :ok, location: @post \}/, m
-        assert_match /format\.html \{ render :edit \}/, m
-        assert_match /format\.json \{ render json: @post.errors, status: :unprocessable_entity \}/, m
+        assert_match %r{format\.html \{ redirect_to post_url\(@post\), notice: "Post was successfully updated\." \}}, m
+        assert_match %r{format\.json \{ render :show, status: :ok, location: @post \}}, m
+        assert_match %r{format\.html \{ render :edit, status: :unprocessable_entity \}}, m
+        assert_match %r{format\.json \{ render json: @post.errors, status: :unprocessable_entity \}}, m
       end
 
       assert_instance_method :destroy, content do |m|
-        assert_match /@post\.destroy/, m
-        assert_match /format\.html { redirect_to posts_url \}/, m
-        assert_match /format\.json \{ head :no_content \}/, m
+        assert_match %r{@post\.destroy}, m
+        assert_match %r{format\.html \{ redirect_to posts_url, notice: "Post was successfully destroyed\." \}}, m
+        assert_match %r{format\.json \{ head :no_content \}}, m
       end
 
-      assert_match(/def post_params/, content)
-      assert_match(/params\.require\(:post\)\.permit\(:title, :body\)/, content)
+      assert_match %r{def post_params}, content
+      if Rails::VERSION::MAJOR >= 6
+        assert_match %r{params\.require\(:post\)\.permit\(:title, :body, images: \[\]\)}, content
+      else
+        assert_match %r{params\.require\(:post\)\.permit\(:title, :body, :images\)}, content
+      end
+    end
+  end
+
+  if Rails::VERSION::MAJOR >= 6
+    test 'controller with namespace' do
+      run_generator %w(Admin::Post --model-name=Post)
+      assert_file 'app/controllers/admin/posts_controller.rb' do |content|
+        assert_instance_method :create, content do |m|
+          assert_match %r{format\.html \{ redirect_to admin_post_url\(@post\), notice: "Post was successfully created\." \}}, m
+        end
+
+        assert_instance_method :update, content do |m|
+          assert_match %r{format\.html \{ redirect_to admin_post_url\(@post\), notice: "Post was successfully updated\." \}}, m
+        end
+
+        assert_instance_method :destroy, content do |m|
+          assert_match %r{format\.html \{ redirect_to admin_posts_url, notice: "Post was successfully destroyed\." \}}, m
+        end
+      end
+    end
+  end
+
+  test "don't use require and permit if there are no attributes" do
+    run_generator %w(Post)
+
+    assert_file 'app/controllers/posts_controller.rb' do |content|
+      assert_match %r{def post_params}, content
+      assert_match %r{params\.fetch\(:post, \{\}\)}, content
+    end
+  end
+
+  if Rails::VERSION::MAJOR >= 6
+    test 'handles virtual attributes' do
+      run_generator %w(Message content:rich_text video:attachment photos:attachments)
+
+      assert_file 'app/controllers/messages_controller.rb' do |content|
+        assert_match %r{params\.require\(:message\)\.permit\(:content, :video, photos: \[\]\)}, content
+      end
     end
   end
-end
+end

data/test/test_helper.rb

@@ -0,0 +1,36 @@
+require "bundler/setup"
+
+require "rails"
+
+require "jbuilder"
+
+require "active_support/core_ext/array/access"
+require "active_support/cache/memory_store"
+require "active_support/json"
+require "active_model"
+
+require "active_support/testing/autorun"
+require "mocha/minitest"
+
+ActiveSupport.test_order = :random
+
+class << Rails
+  def cache
+    @cache ||= ActiveSupport::Cache::MemoryStore.new
+  end
+end
+
+Jbuilder::CollectionRenderer.collection_cache = Rails.cache
+
+class Post < Struct.new(:id, :body, :author_name)
+  def cache_key
+    "post-#{id}"
+  end
+end
+
+class Racer < Struct.new(:id, :name)
+  extend ActiveModel::Naming
+  include ActiveModel::Conversion
+end
+
+ActionView::Template.register_template_handler :jbuilder, JbuilderHandler

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.11.5
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,67 +16,81 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 5.0.0
 description: 
-email: david@37signals.com
+email: david@basecamp.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
-- CHANGELOG.md
+- Appraisals
+- CONTRIBUTING.md
 - Gemfile
-- Gemfile.old
 - MIT-LICENSE
 - README.md
 - Rakefile
+- gemfiles/rails_5_0.gemfile
+- gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
+- gemfiles/rails_head.gemfile
 - jbuilder.gemspec
 - lib/generators/rails/jbuilder_generator.rb
 - lib/generators/rails/scaffold_controller_generator.rb
+- lib/generators/rails/templates/api_controller.rb
 - lib/generators/rails/templates/controller.rb
 - lib/generators/rails/templates/index.json.jbuilder
+- lib/generators/rails/templates/partial.json.jbuilder
 - lib/generators/rails/templates/show.json.jbuilder
 - lib/jbuilder.rb
+- lib/jbuilder/blank.rb
+- lib/jbuilder/collection_renderer.rb
 - lib/jbuilder/dependency_tracker.rb
+- lib/jbuilder/errors.rb
+- lib/jbuilder/jbuilder.rb
 - lib/jbuilder/jbuilder_template.rb
+- lib/jbuilder/key_formatter.rb
 - lib/jbuilder/railtie.rb
 - test/jbuilder_dependency_tracker_test.rb
 - test/jbuilder_generator_test.rb
 - test/jbuilder_template_test.rb
 - test/jbuilder_test.rb
+- test/scaffold_api_controller_generator_test.rb
 - test/scaffold_controller_generator_test.rb
+- test/test_helper.rb
 homepage: https://github.com/rails/jbuilder
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/rails/jbuilder/issues
+  changelog_uri: https://github.com/rails/jbuilder/releases/tag/v2.11.5
+  mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
+  source_code_uri: https://github.com/rails/jbuilder/tree/v2.11.5
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -85,15 +99,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Create JSON structures via a Builder-style DSL
@@ -102,4 +115,6 @@ test_files:
 - test/jbuilder_generator_test.rb
 - test/jbuilder_template_test.rb
 - test/jbuilder_test.rb
+- test/scaffold_api_controller_generator_test.rb
 - test/scaffold_controller_generator_test.rb
+- test/test_helper.rb

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - jruby-19mode
-  - rbx
-
-gemfile:
-  - Gemfile.old
-  - Gemfile
-
-matrix:
-  allow_failures:
-    - rvm: jruby-19mode
-    - rvm: rbx
-
-notifications:
-  email: false

data/CHANGELOG.md

@@ -1,89 +0,0 @@
-# Changelog
-
-2.0.5
------
-* [Fix edgecase when json is defined as a method](https://github.com/rails/jbuilder/commit/ca711a0c0a5760e26258ce2d93c14bef8fff0ead)
-
-2.0.4
------
-* [Add cache_if! to conditionally cache JSON fragments](https://github.com/rails/jbuilder/commit/14a5afd8a2c939a6fd710d355a194c114db96eb2)
-
-2.0.3
------
-* [Pass options when calling cache_fragment_name](https://github.com/rails/jbuilder/commit/07c2cc7486fe9ef423d7bc821b83f6d485f330e0)
-
-2.0.2
------
-* [Fix Dependency Tracking fail to detect single-quoted partial correctly](https://github.com/rails/jbuilder/commit/448679a6d3098eb34d137f782a05f1767711991a)
-* [Prevent Dependency Tracker constants leaking into global namespace](https://github.com/rails/jbuilder/commit/3544b288b63f504f46fa8aafd1d17ee198d77536)
-
-2.0.1
------
-* [Dependency tracking support for Rails 3 with cache_digest gem](https://github.com/rails/jbuilder/commit/6b471d7a38118e8f7645abec21955ef793401daf)
-
-2.0.0
------
-* [Respond to PUT/PATCH API request with :ok](https://github.com/rails/jbuilder/commit/9dbce9c12181e89f8f472ac23c764ffe8438040a)
-* [Remove Ruby 1.8 support](https://github.com/rails/jbuilder/commit/d53fff42d91f33d662eafc2561c4236687ecf6c9)
-* [Remove deprecated two argument block call](https://github.com/rails/jbuilder/commit/07a35ee7e79ae4b06dba9dbff5c4e07c1e627218)
-* [Make Jbuilder object initialize with single hash](https://github.com/rails/jbuilder/commit/38bf551db0189327aaa90b9be010c0d1b792c007)
-* [Track template dependencies](https://github.com/rails/jbuilder/commit/8e73cea39f60da1384afd687cc8e5e399630d8cc)
-* [Expose merge! method](https://github.com/rails/jbuilder/commit/0e2eb47f6f3c01add06a1a59b37cdda8baf24f29)
-
-1.5.3
------
-* [Generators add `:id` column by default](https://github.com/rails/jbuilder/commit/0b52b86773e48ac2ce35d4155c7b70ad8b3e8937)
-
-1.5.2
------
-* [Nil-collection should be treated as empty array](https://github.com/rails/jbuilder/commit/2f700bb00ab663c6b7fcb28d2967aeb989bd43c7)
-
-1.5.1
------
-* [Expose template lookup options](https://github.com/rails/jbuilder/commit/404c18dee1af96ac6d8052a04062629ef1db2945)
-
-1.5.0
------
-* [Do not perform any caching when `controller.perform_caching` is false](https://github.com/rails/jbuilder/commit/94633facde1ac43580f8cd5e13ae9cc83e1da8f4)
-* [Add partial collection rendering](https://github.com/rails/jbuilder/commit/e8c10fc885e41b18178aaf4dcbc176961c928d76)
-* [Deprecate extract! calling private methods](https://github.com/rails/jbuilder/commit/b9e19536c2105d7f2e813006bbcb8ca5730d28a3)
-* [Add array of partials rendering](https://github.com/rails/jbuilder/commit/7d7311071720548047f98f14ad013c560b8d9c3a)
-
-1.4.2
------
-* [Require MIME dependency explicitly](https://github.com/rails/jbuilder/commit/b1ed5ac4f08b056f8839b4b19b43562e81e02a59)
-
-1.4.1
------
-* [Removed deprecated positioned arguments initializer support](https://github.com/rails/jbuilder/commit/6e03e0452073eeda77e6dfe66aa31e5ec67a3531)
-* [Deprecate two-arguments block calling](https://github.com/rails/jbuilder/commit/2b10bb058bb12bc782cbcc16f6ec67b489e5ed43)
-
-1.4.0
------
-* [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)
-* [Do not enforce template format, enforce handlers instead](https://github.com/rails/jbuilder/commit/72576755224b15da45e50cbea877679800ab1398)
-
-1.3.0
------
-* [Add nil! method for nil JSON](https://github.com/rails/jbuilder/commit/822a906f68664f61a1209336bb681077692c8475)
-
-1.2.1
------
-* [Added explicit dependency for MultiJson](https://github.com/rails/jbuilder/commit/4d58eacb6cd613679fb243484ff73a79bbbff2d2
-
-1.2.0
------
-* Multiple documentation improvements and internal refactoring
-* [Fixes fragment caching to work with latest digests](https://github.com/rails/jbuilder/commit/da937d6b8732124074c612abb7ff38868d1d96c0)
-
-1.0.2
------
-* [Support non-Enumerable collections](https://github.com/rails/jbuilder/commit/4c20c59bf8131a1e419bb4ebf84f2b6bdcb6b0cf)
-* [Ensure that the default URL is in json format](https://github.com/rails/jbuilder/commit/0b46782fb7b8c34a3c96afa801fe27a5a97118a4)
-
-1.0.0
------
-* Adopt Semantic Versioning
-* Add rails generators

data/Gemfile.old

@@ -1,14 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-gem 'rake'
-gem 'mocha', :require => false
-gem 'actionpack', '~> 3.0'
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'json', '~> 1.8'
-  gem 'rubysl-test-unit'
-  gem 'rubinius-developer_tools'
-end