Merge branch 'main' into skip_empty_collection_partial_render

Author: dhh

.github/workflows/ruby.yml

@@ -15,64 +15,21 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - "2.7"
           - "3.0"
           - "3.1"
           - "3.2"
           - "3.3"
 
         gemfile:
-          - "rails_6_1"
           - "rails_7_0"
           - "rails_7_1"
           - "rails_head"
 
         exclude:
-          - ruby: 2.7
-            gemfile: rails_head
           - ruby: '3.0'
             gemfile: rails_head
 
         include:
-          - ruby: 2.2
-            gemfile: rails_5_0
-          - ruby: 2.2
-            gemfile: rails_5_1
-          - ruby: 2.3
-            gemfile: rails_5_0
-          - ruby: 2.3
-            gemfile: rails_5_1
-          - ruby: 2.3
-            gemfile: rails_5_2
-          - ruby: 2.4
-            gemfile: rails_5_0
-          - ruby: 2.4
-            gemfile: rails_5_1
-          - ruby: 2.4
-            gemfile: rails_5_2
-          - ruby: 2.5
-            gemfile: rails_5_0
-          - ruby: 2.5
-            gemfile: rails_5_1
-          - ruby: 2.5
-            gemfile: rails_5_2
-          - ruby: 2.5
-            gemfile: rails_6_0
-          - ruby: 2.5
-            gemfile: rails_6_1
-          - ruby: 2.6
-            gemfile: rails_5_0
-          - ruby: 2.6
-            gemfile: rails_5_1
-          - ruby: 2.6
-            gemfile: rails_5_2
-          - ruby: 2.6
-            gemfile: rails_6_0
-          - ruby: 2.6
-            gemfile: rails_6_1
-          - ruby: 2.7
-            gemfile: rails_6_0
-
           - ruby: '3.1'
             gemfile: rails_head
           - ruby: '3.2'

Appraisals

@@ -1,30 +1,3 @@
-if RUBY_VERSION < "2.7.0"
-  appraise "rails-5-0" do
-    gem "rails", "~> 5.0.0"
-    gem "loofah", "< 2.21.0"
-  end
-
-  appraise "rails-5-1" do
-    gem "rails", "~> 5.1.0"
-    gem "loofah", "< 2.21.0"
-  end
-
-  appraise "rails-5-2" do
-    gem "rails", "~> 5.2.0"
-    gem "loofah", "< 2.21.0"
-  end
-end
-
-if RUBY_VERSION >= "2.5.0"
-  appraise "rails-6-0" do
-    gem "rails", "~> 6.0.0"
-  end
-
-  appraise "rails-6-1" do
-    gem "rails", "~> 6.1.0"
-  end
-end
-
 if RUBY_VERSION >= "2.7.0"
   appraise "rails-7-0" do
     gem "rails", "~> 7.0.0"

README.md

@@ -338,6 +338,10 @@ environment.rb for example):
 Jbuilder.deep_format_keys true
 ```
 
+## Testing JBuilder Response body with RSpec
+
+To test the response body of your controller spec, enable `render_views` in your RSpec context. This [configuration](https://rspec.info/features/6-0/rspec-rails/controller-specs/render-views) renders the views in a controller test.
+
 ## Contributing to Jbuilder
 
 Jbuilder is the work of many contributors. You're encouraged to submit pull requests, propose

gemfiles/rails_5_0.gemfile

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.11.5'
+  s.version  = '2.12.0'
   s.authors  = 'David Heinemeier Hansson'
   s.email    = '[email protected]'
   s.summary  = 'Create JSON structures via a Builder-style DSL'

gemfiles/rails_5_1.gemfile

@@ -30,7 +30,7 @@ def create
 
     respond_to do |format|
       if @<%= orm_instance.save %>
-        format.html { redirect_to <%= show_helper %>, notice: <%= %("#{human_name} was successfully created.") %> }
+        format.html { redirect_to <%= redirect_resource_name %>, notice: <%= %("#{human_name} was successfully created.") %> }
         format.json { render :show, status: :created, location: <%= "@#{singular_table_name}" %> }
       else
         format.html { render :new, status: :unprocessable_entity }
@@ -43,7 +43,7 @@ def create
   def update
     respond_to do |format|
       if @<%= orm_instance.update("#{singular_table_name}_params") %>
-        format.html { redirect_to <%= show_helper %>, notice: <%= %("#{human_name} was successfully updated.") %> }
+        format.html { redirect_to <%= redirect_resource_name %>, notice: <%= %("#{human_name} was successfully updated.") %> }
         format.json { render :show, status: :ok, location: <%= "@#{singular_table_name}" %> }
       else
         format.html { render :edit, status: :unprocessable_entity }
@@ -57,7 +57,7 @@ def destroy
     @<%= orm_instance.destroy %>
 
     respond_to do |format|
-      format.html { redirect_to <%= index_helper %>_url, notice: <%= %("#{human_name} was successfully destroyed.") %> }
+      format.html { redirect_to <%= index_helper %>_path, notice: <%= %("#{human_name} was successfully destroyed.") %> }
       format.json { head :no_content }
     end
   end

gemfiles/rails_5_2.gemfile

@@ -4,8 +4,11 @@
 require 'jbuilder/key_formatter'
 require 'jbuilder/errors'
 require 'json'
-require 'ostruct'
 require 'active_support/core_ext/hash/deep_merge'
+begin
+  require 'ostruct'
+rescue LoadError
+end
 
 class Jbuilder
   @@key_formatter = nil
@@ -28,7 +31,7 @@ def self.encode(*args, &block)
   end
 
   BLANK = Blank.new
-  NON_ENUMERABLES = [ ::Struct, ::OpenStruct ].to_set
+  NON_ENUMERABLES = defined?(::OpenStruct) ? [::Struct, ::OpenStruct].to_set : [::Struct].to_set
 
   def set!(key, value = BLANK, *args, &block)
     result = if ::Kernel.block_given?
@@ -292,7 +295,7 @@ def _extract_method_values(object, attributes)
 
   def _merge_block(key)
     current_value = _blank? ? BLANK : @attributes.fetch(_key(key), BLANK)
-    raise NullError.build(key) if current_value.nil?
+    ::Kernel.raise NullError.build(key) if current_value.nil?
     new_value = _scope{ yield self }
     _merge_values(current_value, new_value)
   end
@@ -307,7 +310,7 @@ def _merge_values(current_value, updates)
     elsif ::Hash === current_value && ::Hash === updates
       current_value.deep_merge(updates)
     else
-      raise MergeError.build(current_value, updates)
+      ::Kernel.raise MergeError.build(current_value, updates)
     end
   end
 
@@ -328,8 +331,8 @@ def _format_keys(hash_or_array)
   end
 
   def _set_value(key, value)
-    raise NullError.build(key) if @attributes.nil?
-    raise ArrayError.build(key) if ::Array === @attributes
+    ::Kernel.raise NullError.build(key) if @attributes.nil?
+    ::Kernel.raise ArrayError.build(key) if ::Array === @attributes
     return if @ignore_nil && value.nil? or _blank?(value)
     @attributes = {} if _blank?
     @attributes[_key(key)] = value

gemfiles/rails_6_0.gemfile

@@ -1,7 +1 @@
-Jbuilder = Class.new(begin
-  require 'active_support/proxy_object'
-  ActiveSupport::ProxyObject
-rescue LoadError
-  require 'active_support/basic_object'
-  ActiveSupport::BasicObject
-end)
+Jbuilder = Class.new(BasicObject)

gemfiles/rails_6_1.gemfile

@@ -89,7 +89,7 @@ def cache!(key=nil, options={})
   #   # json.extra 'This will not work either, the root must be exclusive'
   def cache_root!(key=nil, options={})
     if @context.controller.perform_caching
-      raise "cache_root! can't be used after JSON structures have been defined" if @attributes.present?
+      ::Kernel.raise "cache_root! can't be used after JSON structures have been defined" if @attributes.present?
 
       @cached_root = _cache_fragment_for([ :root, key ], options) { yield; target! }
     else
@@ -147,6 +147,14 @@ def _render_partial_with_options(options)
       options[:locals].merge!(json: self)
       collection = EnumerableCompat.new(collection) if collection.respond_to?(:count) && !collection.respond_to?(:size)
 
+      if options.has_key?(:layout)
+        ::Kernel.raise ::NotImplementedError, "The `:layout' option is not supported in collection rendering."
+      end
+
+      if options.has_key?(:spacer_template)
+        ::Kernel.raise ::NotImplementedError, "The `:spacer_template' option is not supported in collection rendering."
+      end
+
       if collection.present?
         if options.has_key?(:layout)
           raise ::NotImplementedError, "The `:layout' option is not supported in collection rendering."

jbuilder.gemspec

@@ -31,22 +31,22 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       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{format\.html \{ redirect_to post_url\(@post\), notice: "Post was successfully created\." \}}, m
+        assert_match %r{format\.html \{ redirect_to @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 %r{format\.html \{ redirect_to post_url\(@post\), notice: "Post was successfully updated\." \}}, m
+        assert_match %r{format\.html \{ redirect_to @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 %r{@post\.destroy}, m
-        assert_match %r{format\.html \{ redirect_to posts_url, notice: "Post was successfully destroyed\." \}}, m
+        assert_match %r{format\.html \{ redirect_to posts_path, notice: "Post was successfully destroyed\." \}}, m
         assert_match %r{format\.json \{ head :no_content \}}, m
       end
 
@@ -64,15 +64,15 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       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
+          assert_match %r{format\.html \{ redirect_to \[:admin, @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
+          assert_match %r{format\.html \{ redirect_to \[:admin, @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
+          assert_match %r{format\.html \{ redirect_to admin_posts_path, notice: "Post was successfully destroyed\." \}}, m
         end
       end
     end