Merge pull request #574 from pixeltrix/fix-warnings-and-version-constant

Fix warnings and prevent Jbuilder::VERSION constant from being obliterated

Author: rafaelfranca

.github/workflows/ruby.yml

@@ -24,14 +24,19 @@ jobs:
         gemfile:
           - "rails_7_0"
           - "rails_7_1"
+          - "rails_7_2"
           - "rails_8_0"
           - "rails_head"
 
         exclude:
+          - ruby: '3.0'
+            gemfile: rails_7_2
           - ruby: '3.0'
             gemfile: rails_8_0
           - ruby: '3.0'
             gemfile: rails_head
+          - ruby: '3.1'
+            gemfile: rails_7_2
           - ruby: '3.1'
             gemfile: rails_8_0
           - ruby: '3.1'

Appraisals

@@ -9,6 +9,10 @@ appraise "rails-7-1" do
   gem "rails", "~> 7.1.0"
 end
 
+appraise "rails-7-2" do
+  gem "rails", "~> 7.2.0"
+end
+
 appraise "rails-8-0" do
   gem "rails", "~> 8.0.0"
 end

bin/test

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 set -e
 
 bundle install

gemfiles/rails_7_2.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "mocha", require: false
+gem "appraisal"
+gem "rails", "~> 7.2.0"
+
+gemspec path: "../"

lib/jbuilder.rb

@@ -5,7 +5,6 @@
 require 'jbuilder/blank'
 require 'jbuilder/key_formatter'
 require 'jbuilder/errors'
-require 'jbuilder/version'
 require 'json'
 require 'active_support/core_ext/hash/deep_merge'
 

lib/jbuilder/errors.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'jbuilder/jbuilder'
+require 'jbuilder/version'
 
 class Jbuilder
   class NullError < ::NoMethodError

lib/jbuilder/jbuilder.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-Jbuilder = Class.new(BasicObject)
+require 'jbuilder/version'

lib/jbuilder/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-class Jbuilder
+class Jbuilder < BasicObject
   VERSION = "2.13.0"
 end

test/scaffold_api_controller_generator_test.rb

@@ -4,7 +4,7 @@
 
 class ScaffoldApiControllerGeneratorTest < Rails::Generators::TestCase
   tests Rails::Generators::ScaffoldControllerGenerator
-  arguments %w(Post title body:text images:attachments --api)
+  arguments %w(Post title body:text images:attachments --api --skip-routes)
   destination File.expand_path('../tmp', __FILE__)
   setup :prepare_destination
 
@@ -53,7 +53,7 @@ class ScaffoldApiControllerGeneratorTest < Rails::Generators::TestCase
   end
 
   test "don't use require and permit if there are no attributes" do
-    run_generator %w(Post --api)
+    run_generator %w(Post --api --skip-routes)
 
     assert_file 'app/controllers/posts_controller.rb' do |content|
       assert_match %r{def post_params}, content
@@ -62,7 +62,7 @@ class ScaffoldApiControllerGeneratorTest < Rails::Generators::TestCase
   end
 
   test 'handles virtual attributes' do
-    run_generator ["Message", "content:rich_text", "video:attachment", "photos:attachments"]
+    run_generator %w(Message content:rich_text video:attachment photos:attachments --skip-routes)
 
     assert_file 'app/controllers/messages_controller.rb' do |content|
       if Rails::VERSION::MAJOR >= 8

test/scaffold_controller_generator_test.rb

@@ -4,7 +4,7 @@
 
 class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   tests Rails::Generators::ScaffoldControllerGenerator
-  arguments %w(Post title body:text images:attachments)
+  arguments %w(Post title body:text images:attachments --skip-routes)
   destination File.expand_path('../tmp', __FILE__)
   setup :prepare_destination
 
@@ -67,7 +67,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   end
 
   test 'controller with namespace' do
-    run_generator %w(Admin::Post --model-name=Post)
+    run_generator %w(Admin::Post --model-name=Post --skip-routes)
     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\], notice: "Post was successfully created\." \}}, m
@@ -84,7 +84,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   end
 
   test "don't use require and permit if there are no attributes" do
-    run_generator %w(Post)
+    run_generator %w(Post --skip-routes)
 
     assert_file 'app/controllers/posts_controller.rb' do |content|
       assert_match %r{def post_params}, content
@@ -93,7 +93,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   end
 
   test 'handles virtual attributes' do
-    run_generator %w(Message content:rich_text video:attachment photos:attachments)
+    run_generator %w(Message content:rich_text video:attachment photos:attachments --skip-routes)
 
     assert_file 'app/controllers/messages_controller.rb' do |content|
       if Rails::VERSION::MAJOR >= 8