diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 154670c..60377fd 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -58,5 +58,7 @@ jobs:
# redis version: # optional, default is latest
# # Number of Redis databases
# number of databases: # optional, default is 16
+ - name: Run standard checks
+ run: bundle exec standardrb
- name: Run tests
run: bundle exec rake test
diff --git a/Gemfile b/Gemfile
index 291a23c..9904947 100755
--- a/Gemfile
+++ b/Gemfile
@@ -13,6 +13,7 @@ gemspec
# To use a debugger
# gem 'byebug', group: [:development, :test]
+gem "rails", "~> 7.2.0"
gem "pry"
gem "sqlite3"
@@ -40,3 +41,6 @@ gem "standard"
gem "sys-filesystem"
gem "sys-cpu"
gem "get_process_mem"
+
+gem "ostruct"
+gem "csv"
diff --git a/Gemfile.lock b/Gemfile.lock
index 7bb2319..c08cbb6 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,183 +9,247 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- actionmailer (7.0.4.3)
- actionpack (= 7.0.4.3)
- actionview (= 7.0.4.3)
- activejob (= 7.0.4.3)
- activesupport (= 7.0.4.3)
- mail (~> 2.5, >= 2.5.4)
- net-imap
- net-pop
- net-smtp
- rails-dom-testing (~> 2.0)
- actionpack (7.0.4.3)
- actionview (= 7.0.4.3)
- activesupport (= 7.0.4.3)
- rack (~> 2.0, >= 2.2.0)
+ actioncable (7.2.2)
+ actionpack (= 7.2.2)
+ activesupport (= 7.2.2)
+ nio4r (~> 2.0)
+ websocket-driver (>= 0.6.1)
+ zeitwerk (~> 2.6)
+ actionmailbox (7.2.2)
+ actionpack (= 7.2.2)
+ activejob (= 7.2.2)
+ activerecord (= 7.2.2)
+ activestorage (= 7.2.2)
+ activesupport (= 7.2.2)
+ mail (>= 2.8.0)
+ actionmailer (7.2.2)
+ actionpack (= 7.2.2)
+ actionview (= 7.2.2)
+ activejob (= 7.2.2)
+ activesupport (= 7.2.2)
+ mail (>= 2.8.0)
+ rails-dom-testing (~> 2.2)
+ actionpack (7.2.2)
+ actionview (= 7.2.2)
+ activesupport (= 7.2.2)
+ nokogiri (>= 1.8.5)
+ racc
+ rack (>= 2.2.4, < 3.2)
+ rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
- rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actionview (7.0.4.3)
- activesupport (= 7.0.4.3)
+ rails-dom-testing (~> 2.2)
+ rails-html-sanitizer (~> 1.6)
+ useragent (~> 0.16)
+ actiontext (7.2.2)
+ actionpack (= 7.2.2)
+ activerecord (= 7.2.2)
+ activestorage (= 7.2.2)
+ activesupport (= 7.2.2)
+ globalid (>= 0.6.0)
+ nokogiri (>= 1.8.5)
+ actionview (7.2.2)
+ activesupport (= 7.2.2)
builder (~> 3.1)
- erubi (~> 1.4)
- rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.1, >= 1.2.0)
- activejob (7.0.4.3)
- activesupport (= 7.0.4.3)
+ erubi (~> 1.11)
+ rails-dom-testing (~> 2.2)
+ rails-html-sanitizer (~> 1.6)
+ activejob (7.2.2)
+ activesupport (= 7.2.2)
globalid (>= 0.3.6)
- activemodel (7.0.4.3)
- activesupport (= 7.0.4.3)
- activerecord (7.0.4.3)
- activemodel (= 7.0.4.3)
- activesupport (= 7.0.4.3)
- activestorage (7.0.4.3)
- actionpack (= 7.0.4.3)
- activejob (= 7.0.4.3)
- activerecord (= 7.0.4.3)
- activesupport (= 7.0.4.3)
+ activemodel (7.2.2)
+ activesupport (= 7.2.2)
+ activerecord (7.2.2)
+ activemodel (= 7.2.2)
+ activesupport (= 7.2.2)
+ timeout (>= 0.4.0)
+ activestorage (7.2.2)
+ actionpack (= 7.2.2)
+ activejob (= 7.2.2)
+ activerecord (= 7.2.2)
+ activesupport (= 7.2.2)
marcel (~> 1.0)
- mini_mime (>= 1.1.0)
- activesupport (7.0.4.3)
- concurrent-ruby (~> 1.0, >= 1.0.2)
+ activesupport (7.2.2)
+ base64
+ benchmark (>= 0.3)
+ bigdecimal
+ concurrent-ruby (~> 1.0, >= 1.3.1)
+ connection_pool (>= 2.2.5)
+ drb
i18n (>= 1.6, < 2)
+ logger (>= 1.4.2)
minitest (>= 5.1)
- tzinfo (~> 2.0)
+ securerandom (>= 0.3)
+ tzinfo (~> 2.0, >= 2.0.5)
ast (2.4.2)
- bcrypt (3.1.18)
+ base64 (0.2.0)
+ bcrypt (3.1.20)
+ benchmark (0.4.0)
bigdecimal (3.1.8)
browser (5.3.1)
- builder (3.2.4)
+ builder (3.3.0)
coderay (1.1.3)
- concurrent-ruby (1.2.2)
- connection_pool (2.4.0)
+ concurrent-ruby (1.3.4)
+ connection_pool (2.4.1)
crass (1.0.6)
+ csv (3.3.0)
daemons (1.4.1)
- date (3.3.4)
- delayed_job (4.1.11)
- activesupport (>= 3.0, < 8.0)
- delayed_job_active_record (4.1.7)
- activerecord (>= 3.0, < 8.0)
+ date (3.4.0)
+ delayed_job (4.1.13)
+ activesupport (>= 3.0, < 9.0)
+ delayed_job_active_record (4.1.11)
+ activerecord (>= 3.0, < 9.0)
delayed_job (>= 3.0, < 5)
- devise (4.9.1)
+ devise (4.9.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
- docile (1.4.0)
- dry-core (1.0.0)
+ docile (1.4.1)
+ drb (2.2.1)
+ dry-core (1.0.2)
concurrent-ruby (~> 1.0)
+ logger
zeitwerk (~> 2.6)
- dry-inflector (1.0.0)
+ dry-inflector (1.1.0)
dry-logic (1.5.0)
concurrent-ruby (~> 1.0)
dry-core (~> 1.0, < 2)
zeitwerk (~> 2.6)
- dry-types (1.7.1)
+ dry-types (1.7.2)
+ bigdecimal (~> 3.0)
concurrent-ruby (~> 1.0)
dry-core (~> 1.0)
dry-inflector (~> 1.0)
dry-logic (~> 1.4)
zeitwerk (~> 2.6)
- erubi (1.12.0)
+ erubi (1.13.0)
ffi (1.17.0)
get_process_mem (1.0.0)
bigdecimal (>= 2.0)
ffi (~> 1.0)
globalid (1.2.1)
activesupport (>= 6.1)
- grape (1.7.0)
- activesupport
- builder
+ grape (2.2.0)
+ activesupport (>= 6)
dry-types (>= 1.1)
- mustermann-grape (~> 1.0.0)
- rack (>= 1.3.0)
- rack-accept
+ mustermann-grape (~> 1.1.0)
+ rack (>= 2)
+ zeitwerk
hashie (5.0.0)
hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0)
- i18n (1.12.0)
+ i18n (1.14.6)
concurrent-ruby (~> 1.0)
- json (2.7.4)
+ io-console (0.7.2)
+ irb (1.14.1)
+ rdoc (>= 4.0.0)
+ reline (>= 0.4.2)
+ json (2.8.2)
language_server-protocol (3.17.0.3)
lint_roller (1.1.0)
- loofah (2.19.1)
+ logger (1.6.1)
+ loofah (2.23.1)
crass (~> 1.0.2)
- nokogiri (>= 1.5.9)
+ nokogiri (>= 1.12.0)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
- marcel (1.0.2)
- method_source (1.0.0)
+ marcel (1.0.4)
+ method_source (1.1.0)
mimemagic (0.4.3)
nokogiri (~> 1)
rake
mini_mime (1.1.5)
- mini_portile2 (2.8.7)
- minitest (5.18.0)
- mustermann (3.0.0)
+ mini_portile2 (2.8.8)
+ minitest (5.25.2)
+ mustermann (3.0.3)
ruby2_keywords (~> 0.0.1)
- mustermann-grape (1.0.2)
+ mustermann-grape (1.1.0)
mustermann (>= 1.0.0)
- net-imap (0.4.4)
+ net-imap (0.5.1)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
- net-smtp (0.4.0)
+ net-smtp (0.5.0)
net-protocol
nio4r (2.7.4)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
orm_adapter (0.5.0)
- otr-activerecord (2.1.2)
- activerecord (>= 4.0, < 7.1)
+ ostruct (0.6.1)
+ otr-activerecord (2.4.0)
+ activerecord (>= 6.0, < 7.3)
hashie-forbidden_attributes (~> 0.1)
parallel (1.26.3)
- parser (3.3.5.0)
+ parser (3.3.6.0)
ast (~> 2.4.1)
racc
- pry (0.14.2)
+ pry (0.15.0)
coderay (~> 1.1)
method_source (~> 1.0)
- puma (6.2.1)
+ psych (5.2.0)
+ stringio
+ puma (6.5.0)
nio4r (~> 2.0)
racc (1.8.1)
- rack (2.2.6.4)
- rack-accept (0.4.5)
- rack (>= 0.4)
+ rack (3.1.8)
+ rack-session (2.0.0)
+ rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
- rails-dom-testing (2.0.3)
- activesupport (>= 4.2.0)
+ rackup (2.2.1)
+ rack (>= 3)
+ rails (7.2.2)
+ actioncable (= 7.2.2)
+ actionmailbox (= 7.2.2)
+ actionmailer (= 7.2.2)
+ actionpack (= 7.2.2)
+ actiontext (= 7.2.2)
+ actionview (= 7.2.2)
+ activejob (= 7.2.2)
+ activemodel (= 7.2.2)
+ activerecord (= 7.2.2)
+ activestorage (= 7.2.2)
+ activesupport (= 7.2.2)
+ bundler (>= 1.15.0)
+ railties (= 7.2.2)
+ rails-dom-testing (2.2.0)
+ activesupport (>= 5.0.0)
+ minitest
nokogiri (>= 1.6)
- rails-html-sanitizer (1.5.0)
- loofah (~> 2.19, >= 2.19.1)
- railties (7.0.4.3)
- actionpack (= 7.0.4.3)
- activesupport (= 7.0.4.3)
- method_source
+ rails-html-sanitizer (1.6.0)
+ loofah (~> 2.21)
+ nokogiri (~> 1.14)
+ railties (7.2.2)
+ actionpack (= 7.2.2)
+ activesupport (= 7.2.2)
+ irb (~> 1.13)
+ rackup (>= 1.0.0)
rake (>= 12.2)
- thor (~> 1.0)
- zeitwerk (~> 2.5)
+ thor (~> 1.0, >= 1.2.2)
+ zeitwerk (~> 2.6)
rainbow (3.1.1)
- rake (13.0.6)
- redis (5.0.6)
- redis-client (>= 0.9.0)
- redis-client (0.14.1)
+ rake (13.2.1)
+ rdoc (6.8.1)
+ psych (>= 4.0.0)
+ redis (5.3.0)
+ redis-client (>= 0.22.0)
+ redis-client (0.22.2)
connection_pool
regexp_parser (2.9.2)
- responders (3.1.0)
+ reline (0.5.11)
+ io-console (~> 0.5)
+ responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
- rubocop (1.66.1)
+ rubocop (1.68.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
@@ -195,37 +259,38 @@ GEM
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
- rubocop-ast (1.32.3)
+ rubocop-ast (1.36.1)
parser (>= 3.3.1.0)
rubocop-performance (1.22.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
- sidekiq (7.0.7)
- concurrent-ruby (< 2)
+ securerandom (0.3.2)
+ sidekiq (7.3.6)
connection_pool (>= 2.3.0)
+ logger
rack (>= 2.2.4)
- redis-client (>= 0.11.0)
+ redis-client (>= 0.22.2)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
- simplecov-html (0.12.3)
+ simplecov-html (0.13.1)
simplecov_json_formatter (0.1.4)
- sprockets (4.2.0)
+ sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
- sprockets-rails (3.4.2)
- actionpack (>= 5.2)
- activesupport (>= 5.2)
+ sprockets-rails (3.5.2)
+ actionpack (>= 6.1)
+ activesupport (>= 6.1)
sprockets (>= 3.0.0)
- sqlite3 (1.6.2)
+ sqlite3 (2.3.0)
mini_portile2 (~> 2.8.0)
- standard (1.41.1)
+ standard (1.42.1)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
- rubocop (~> 1.66.0)
+ rubocop (~> 1.68.0)
standard-custom (~> 1.0.0)
standard-performance (~> 1.5)
standard-custom (1.0.2)
@@ -236,20 +301,25 @@ GEM
rubocop-performance (~> 1.22.0)
standardrb (1.0.1)
standard
+ stringio (3.1.2)
sys-cpu (1.1.0)
ffi (~> 1.1)
sys-filesystem (1.5.3)
ffi (~> 1.1)
- thor (1.2.1)
- timeout (0.4.1)
+ thor (1.3.2)
+ timeout (0.4.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.6.0)
+ useragent (0.16.10)
warden (1.2.9)
rack (>= 2.0.9)
+ websocket-driver (0.7.6)
+ websocket-extensions (>= 0.1.0)
+ websocket-extensions (0.1.5)
wrapped_print (0.1.1)
activesupport
- zeitwerk (2.6.7)
+ zeitwerk (2.6.18)
PLATFORMS
ruby
@@ -257,15 +327,18 @@ PLATFORMS
DEPENDENCIES
actionmailer
activestorage
+ csv
daemons
delayed_job_active_record
devise
get_process_mem
grape
mimemagic (= 0.4.3)
+ ostruct
otr-activerecord
pry
puma
+ rails (~> 7.2.0)
rails_performance!
sidekiq
simplecov
diff --git a/lib/rails_performance/data_source.rb b/lib/rails_performance/data_source.rb
index 61dea49..f310a87 100755
--- a/lib/rails_performance/data_source.rb
+++ b/lib/rails_performance/data_source.rb
@@ -69,7 +69,7 @@ def query
when :custom
"custom|*#{compile_custom_query}*|END|#{RailsPerformance::SCHEMA}"
else
- raise "wrong type for datasource query builder"
+ raise "wrong type: \"#{type}\" for datasource query builder"
end
end
diff --git a/lib/rails_performance/gems/rake_ext.rb b/lib/rails_performance/gems/rake_ext.rb
index 640e1bc..fd5bbda 100755
--- a/lib/rails_performance/gems/rake_ext.rb
+++ b/lib/rails_performance/gems/rake_ext.rb
@@ -3,6 +3,8 @@ module Gems
class RakeExt
def self.init
::Rake::Task.class_eval do
+ next if method_defined?(:invoke_with_rails_performance)
+
def invoke_with_rails_performance(*args)
now = RailsPerformance::Utils.time
status = "success"
diff --git a/test/dummy/.rubocop.yml b/test/dummy/.rubocop.yml
new file mode 100644
index 0000000..8cec8cb
--- /dev/null
+++ b/test/dummy/.rubocop.yml
@@ -0,0 +1,2 @@
+AllCops:
+ TargetRubyVersion: 3.1
diff --git a/test/dummy/app/api/api.rb b/test/dummy/app/api/api.rb
index 8c19857..f69dee3 100755
--- a/test/dummy/app/api/api.rb
+++ b/test/dummy/app/api/api.rb
@@ -1,12 +1,12 @@
-require_relative "demo/worker1"
-require_relative "demo/worker2"
-require_relative "demo/worker3"
+require_relative "worker1"
+require_relative "worker2"
+require_relative "worker3"
class API < Grape::API
prefix "api"
format :json
- mount Demo::Worker1
- mount Demo::Worker2
- mount Demo::Worker3
+ mount Worker1
+ mount Worker2
+ mount Worker3
end
diff --git a/test/dummy/app/api/demo/worker1.rb b/test/dummy/app/api/demo/worker1.rb
deleted file mode 100755
index 5d4946c..0000000
--- a/test/dummy/app/api/demo/worker1.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Demo
- class Worker1 < Grape::API
- desc "Returns pong."
- get :ping do
- sleep(rand(2.0))
- {ping: params[:pong] || "pong"}
- end
- end
-end
diff --git a/test/dummy/app/api/demo/worker2.rb b/test/dummy/app/api/demo/worker2.rb
deleted file mode 100755
index 630ec1c..0000000
--- a/test/dummy/app/api/demo/worker2.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Demo
- class Worker2 < Grape::API
- desc "Returns users."
- get :users do
- sleep(rand(4.0))
- User.limit(10).order("random()")
- end
- end
-end
diff --git a/test/dummy/app/api/demo/worker3.rb b/test/dummy/app/api/demo/worker3.rb
deleted file mode 100755
index 6a9d10e..0000000
--- a/test/dummy/app/api/demo/worker3.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module Demo
- class Worker3 < Grape::API
- desc "Make crash"
- get :crash do
- 1 / 0
- end
- end
-end
diff --git a/test/dummy/app/api/worker1.rb b/test/dummy/app/api/worker1.rb
new file mode 100755
index 0000000..4e5a56b
--- /dev/null
+++ b/test/dummy/app/api/worker1.rb
@@ -0,0 +1,7 @@
+class Worker1 < Grape::API
+ desc "Returns pong."
+ get :ping do
+ sleep(rand(1000) * 0.001)
+ {ping: params[:pong] || "pong"}
+ end
+end
diff --git a/test/dummy/app/api/worker2.rb b/test/dummy/app/api/worker2.rb
new file mode 100755
index 0000000..257d205
--- /dev/null
+++ b/test/dummy/app/api/worker2.rb
@@ -0,0 +1,7 @@
+class Worker2 < Grape::API
+ desc "Returns users."
+ get :users do
+ sleep(rand(2000) * 0.001)
+ User.limit(10).order("random()")
+ end
+end
diff --git a/test/dummy/app/api/worker3.rb b/test/dummy/app/api/worker3.rb
new file mode 100755
index 0000000..2fc520b
--- /dev/null
+++ b/test/dummy/app/api/worker3.rb
@@ -0,0 +1,6 @@
+class Worker3 < Grape::API
+ desc "Make crash"
+ get :crash do
+ 1 / 0
+ end
+end
diff --git a/test/dummy/app/workers/crash_worker.rb b/test/dummy/app/workers/crash_worker.rb
new file mode 100644
index 0000000..611d849
--- /dev/null
+++ b/test/dummy/app/workers/crash_worker.rb
@@ -0,0 +1,7 @@
+class CrashWorker
+ include Sidekiq::Worker
+
+ def perform(*args)
+ 1 / 0
+ end
+end
diff --git a/test/dummy/bin/rubocop b/test/dummy/bin/rubocop
new file mode 100755
index 0000000..40330c0
--- /dev/null
+++ b/test/dummy/bin/rubocop
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require "bundler/setup"
+
+# explicit rubocop config increases performance slightly while avoiding config confusion.
+ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__))
+
+load Gem.bin_path("rubocop", "rubocop")
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
index bfafc9b..e01b884 100755
--- a/test/dummy/config/application.rb
+++ b/test/dummy/config/application.rb
@@ -8,7 +8,7 @@
module Dummy
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
- config.load_defaults 7.0
+ config.load_defaults 7.2
config.time_zone = "Europe/Kiev"
@@ -16,6 +16,7 @@ class Application < Rails::Application
config.paths.add "app/api", glob: "**/*.rb"
config.autoload_paths += Dir["#{Rails.root}/app/api/*"]
+ config.eager_load_paths += Dir["#{Rails.root}/app/api/*"]
# Settings in config/environments/* take precedence over those specified here.
# Application configuration can go into files in config/initializers
diff --git a/test/dummy/config/environments/development.rb b/test/dummy/config/environments/development.rb
index bd481aa..cfc85a5 100755
--- a/test/dummy/config/environments/development.rb
+++ b/test/dummy/config/environments/development.rb
@@ -1,10 +1,12 @@
+require "active_support/core_ext/integer/time"
+
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
- # In the development environment your application's code is reloaded on
- # every request. This slows down response time but is perfect for development
+ # In the development environment your application's code is reloaded any time
+ # it changes. This slows down response time but is perfect for development
# since you don't have to restart the web server when you make code changes.
- config.cache_classes = false
+ config.enable_reloading = true
# Do not eager load code on boot.
config.eager_load = false
@@ -12,16 +14,17 @@
# Show full error reports.
config.consider_all_requests_local = true
+ # Enable server timing.
+ config.server_timing = true
+
# Enable/disable caching. By default caching is disabled.
# Run rails dev:cache to toggle caching.
- if Rails.root.join("tmp", "caching-dev.txt").exist?
+ if Rails.root.join("tmp/caching-dev.txt").exist?
config.action_controller.perform_caching = true
config.action_controller.enable_fragment_cache_logging = true
config.cache_store = :memory_store
- config.public_file_server.headers = {
- "Cache-Control" => "public, max-age=#{2.days.to_i}"
- }
+ config.public_file_server.headers = {"Cache-Control" => "public, max-age=#{2.days.to_i}"}
else
config.action_controller.perform_caching = false
@@ -34,33 +37,45 @@
# Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false
+ # Disable caching for Action Mailer templates even if Action Controller
+ # caching is enabled.
config.action_mailer.perform_caching = false
+ config.action_mailer.default_url_options = {host: "localhost", port: 3000}
+
# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log
+ # Raise exceptions for disallowed deprecations.
+ config.active_support.disallowed_deprecation = :raise
+
+ # Tell Active Support which deprecation messages to disallow.
+ config.active_support.disallowed_deprecation_warnings = []
+
# Raise an error on page load if there are pending migrations.
config.active_record.migration_error = :page_load
# Highlight code that triggered database queries in logs.
config.active_record.verbose_query_logs = true
- # Debug mode disables concatenation and preprocessing of assets.
- # This option may cause significant delays in view rendering with a large
- # number of complex assets.
- config.assets.debug = true
+ # Highlight code that enqueued background job in logs.
+ config.active_job.verbose_enqueue_logs = true
# Suppress logger output for asset requests.
config.assets.quiet = true
# Raises error for missing translations.
- # config.action_view.raise_on_missing_translations = true
+ # config.i18n.raise_on_missing_translations = true
- # Use an evented file watcher to asynchronously detect changes in source code,
- # routes, locales, etc. This feature depends on the listen gem.
- # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+ # Annotate rendered view with file names.
+ config.action_view.annotate_rendered_view_with_filenames = true
- config.log_tags = [:request_id]
+ # Uncomment if you wish to allow Action Cable access from any origin.
+ # config.action_cable.disable_request_forgery_protection = true
- config.action_mailer.default_url_options = {host: "localhost", port: 3000}
+ # Raise error when a before_action's only/except options reference missing actions.
+ config.action_controller.raise_on_missing_callback_actions = true
+
+ # Apply autocorrection by RuboCop to files generated by `bin/rails generate`.
+ # config.generators.apply_rubocop_autocorrect_after_generate!
end
diff --git a/test/dummy/config/environments/production.rb b/test/dummy/config/environments/production.rb
index df70ef1..e1163fd 100644
--- a/test/dummy/config/environments/production.rb
+++ b/test/dummy/config/environments/production.rb
@@ -1,8 +1,10 @@
+require "active_support/core_ext/integer/time"
+
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
# Code is not reloaded between requests.
- config.cache_classes = true
+ config.enable_reloading = false
# Eager load code on boot. This eager loads most of Rails and
# your application in memory, allowing both threaded web servers
@@ -14,52 +16,66 @@
config.consider_all_requests_local = false
config.action_controller.perform_caching = true
- # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
- # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+ # Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key, or an environment
+ # key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files).
# config.require_master_key = true
- # Disable serving static files from the `/public` folder by default since
- # Apache or NGINX already handles this.
- config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
+ # Disable serving static files from `public/`, relying on NGINX/Apache to do so instead.
+ # config.public_file_server.enabled = false
# Compress CSS using a preprocessor.
# config.assets.css_compressor = :sass
- # Do not fallback to assets pipeline if a precompiled asset is missed.
+ # Do not fall back to assets pipeline if a precompiled asset is missed.
config.assets.compile = false
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
- # config.action_controller.asset_host = 'http://assets.example.com'
+ # config.asset_host = "http://assets.example.com"
# Specifies the header that your server uses for sending files.
- # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
- # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+ # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
+ # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
# Store uploaded files on the local file system (see config/storage.yml for options).
config.active_storage.service = :local
# Mount Action Cable outside main process or domain.
# config.action_cable.mount_path = nil
- # config.action_cable.url = 'wss://example.com/cable'
- # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+ # config.action_cable.url = "wss://example.com/cable"
+ # config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ]
+
+ # Assume all access to the app is happening through a SSL-terminating reverse proxy.
+ # Can be used together with config.force_ssl for Strict-Transport-Security and secure cookies.
+ # config.assume_ssl = true
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
- # config.force_ssl = true
+ config.force_ssl = true
- # Use the lowest log level to ensure availability of diagnostic information
- # when problems arise.
- config.log_level = :debug
+ # Skip http-to-https redirect for the default health check endpoint.
+ # config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } }
+
+ # Log to STDOUT by default
+ config.logger = ActiveSupport::Logger.new($stdout)
+ .tap { |logger| logger.formatter = ::Logger::Formatter.new }
+ .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
# Prepend all log lines with the following tags.
config.log_tags = [:request_id]
+ # "info" includes generic and useful information about system operation, but avoids logging too much
+ # information to avoid inadvertent exposure of personally identifiable information (PII). If you
+ # want to log everything, set the level to "debug".
+ config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
+
# Use a different cache store in production.
# config.cache_store = :mem_cache_store
# Use a real queuing backend for Active Job (and separate queues per environment).
- # config.active_job.queue_adapter = :resque
+ # config.active_job.queue_adapter = :resque
# config.active_job.queue_name_prefix = "dummy_production"
+ # Disable caching for Action Mailer templates even if Action Controller
+ # caching is enabled.
config.action_mailer.perform_caching = false
# Ignore bad email addresses and do not raise email delivery errors.
@@ -70,43 +86,20 @@
# the I18n.default_locale when a translation cannot be found).
config.i18n.fallbacks = true
- # Send deprecation notices to registered listeners.
- config.active_support.deprecation = :notify
-
- # Use default logging formatter so that PID and timestamp are not suppressed.
- config.log_formatter = ::Logger::Formatter.new
-
- # Use a different logger for distributed setups.
- # require 'syslog/logger'
- # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
-
- if ENV["RAILS_LOG_TO_STDOUT"].present?
- logger = ActiveSupport::Logger.new(STDOUT) # rubocop:disable Rails/Output, Style/GlobalStdStream
- logger.formatter = config.log_formatter
- config.logger = ActiveSupport::TaggedLogging.new(logger)
- end
+ # Don't log any deprecations.
+ config.active_support.report_deprecations = false
# Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false
- # Inserts middleware to perform automatic connection switching.
- # The `database_selector` hash is used to pass options to the DatabaseSelector
- # middleware. The `delay` is used to determine how long to wait after a write
- # to send a subsequent read to the primary.
- #
- # The `database_resolver` class is used by the middleware to determine which
- # database is appropriate to use based on the time delay.
- #
- # The `database_resolver_context` class is used by the middleware to set
- # timestamps for the last write to the primary. The resolver uses the context
- # class timestamps to determine how long to wait before reading from the
- # replica.
- #
- # By default Rails will store a last write timestamp in the session. The
- # DatabaseSelector middleware is designed as such you can define your own
- # strategy for connection switching and pass that into the middleware through
- # these configuration options.
- # config.active_record.database_selector = { delay: 2.seconds }
- # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
- # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
+ # Only use :id for inspections in production.
+ config.active_record.attributes_for_inspect = [:id]
+
+ # Enable DNS rebinding protection and other `Host` header attacks.
+ # config.hosts = [
+ # "example.com", # Allow requests from example.com
+ # /.*\.example\.com/ # Allow requests from subdomains like `www.example.com`
+ # ]
+ # Skip DNS rebinding protection for the default health check endpoint.
+ # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
end
diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
index 9b629da..2da5af2 100755
--- a/test/dummy/config/environments/test.rb
+++ b/test/dummy/config/environments/test.rb
@@ -1,3 +1,5 @@
+require "active_support/core_ext/integer/time"
+
# The test environment is used exclusively to run your application's
# test suite. You never need to work with it otherwise. Remember that
# your test database is "scratch space" for the test suite and is wiped
@@ -6,25 +8,24 @@
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
- config.cache_classes = false
+ # While tests run files are not watched, reloading is not necessary.
+ config.enable_reloading = false
- # Do not eager load code on boot. This avoids loading your whole application
- # just for the purpose of running a single test. If you are using a tool that
- # preloads Rails for running tests, you may have to set it to true.
- config.eager_load = false
+ # Eager loading loads your entire application. When running a single test locally,
+ # this is usually not necessary, and can slow down your test suite. However, it's
+ # recommended that you enable it in continuous integration systems to ensure eager
+ # loading is working properly before deploying your code.
+ config.eager_load = ENV["CI"].present?
# Configure public file server for tests with Cache-Control for performance.
- config.public_file_server.enabled = true
- config.public_file_server.headers = {
- "Cache-Control" => "public, max-age=#{1.hour.to_i}"
- }
+ config.public_file_server.headers = {"Cache-Control" => "public, max-age=#{1.hour.to_i}"}
# Show full error reports and disable caching.
config.consider_all_requests_local = true
config.action_controller.perform_caching = false
config.cache_store = :null_store
- # Raise exceptions instead of rendering exception templates.
+ # Render exception templates for rescuable exceptions and raise for other exceptions.
config.action_dispatch.show_exceptions = true
# Disable request forgery protection in test environment.
@@ -33,6 +34,8 @@
# Store uploaded files on the local file system in a temporary directory.
config.active_storage.service = :test
+ # Disable caching for Action Mailer templates even if Action Controller
+ # caching is enabled.
config.action_mailer.perform_caching = false
# Tell Action Mailer not to deliver emails to the real world.
@@ -40,9 +43,25 @@
# ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test
+ # Unlike controllers, the mailer instance doesn't have any context about the
+ # incoming request so you'll need to provide the :host parameter yourself.
+ config.action_mailer.default_url_options = {host: "www.example.com"}
+
# Print deprecation notices to the stderr.
config.active_support.deprecation = :stderr
+ # Raise exceptions for disallowed deprecations.
+ config.active_support.disallowed_deprecation = :raise
+
+ # Tell Active Support which deprecation messages to disallow.
+ config.active_support.disallowed_deprecation_warnings = []
+
# Raises error for missing translations.
- # config.action_view.raise_on_missing_translations = true
+ # config.i18n.raise_on_missing_translations = true
+
+ # Annotate rendered view with file names.
+ # config.action_view.annotate_rendered_view_with_filenames = true
+
+ # Raise error when a before_action's only/except options reference missing actions.
+ config.action_controller.raise_on_missing_callback_actions = true
end
diff --git a/test/dummy/config/initializers/assets.rb b/test/dummy/config/initializers/assets.rb
index 2eeef96..bd5bcd2 100644
--- a/test/dummy/config/initializers/assets.rb
+++ b/test/dummy/config/initializers/assets.rb
@@ -9,4 +9,4 @@
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in the app/assets
# folder are already added.
-# Rails.application.config.assets.precompile += %w( admin.js admin.css )
+# Rails.application.config.assets.precompile += %w[ admin.js admin.css ]
diff --git a/test/dummy/config/initializers/content_security_policy.rb b/test/dummy/config/initializers/content_security_policy.rb
index 41c4301..b3076b3 100644
--- a/test/dummy/config/initializers/content_security_policy.rb
+++ b/test/dummy/config/initializers/content_security_policy.rb
@@ -1,28 +1,25 @@
# Be sure to restart your server when you modify this file.
-# Define an application-wide content security policy
-# For further information see the following documentation
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+# Define an application-wide content security policy.
+# See the Securing Rails Applications Guide for more information:
+# https://guides.rubyonrails.org/security.html#content-security-policy-header
-# Rails.application.config.content_security_policy do |policy|
-# policy.default_src :self, :https
-# policy.font_src :self, :https, :data
-# policy.img_src :self, :https, :data
-# policy.object_src :none
-# policy.script_src :self, :https
-# policy.style_src :self, :https
-
-# # Specify URI for violation reports
-# # policy.report_uri "/csp-violation-report-endpoint"
+# Rails.application.configure do
+# config.content_security_policy do |policy|
+# policy.default_src :self, :https
+# policy.font_src :self, :https, :data
+# policy.img_src :self, :https, :data
+# policy.object_src :none
+# policy.script_src :self, :https
+# policy.style_src :self, :https
+# # Specify URI for violation reports
+# # policy.report_uri "/csp-violation-report-endpoint"
+# end
+#
+# # Generate session nonces for permitted importmap, inline scripts, and inline styles.
+# config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
+# config.content_security_policy_nonce_directives = %w(script-src style-src)
+#
+# # Report violations without enforcing the policy.
+# # config.content_security_policy_report_only = true
# end
-
-# If you are using UJS then enable automatic nonce generation
-# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
-
-# Set the nonce only to specific directives
-# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
-
-# Report CSP violations to a specified URI
-# For further information see the following documentation:
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
-# Rails.application.config.content_security_policy_report_only = true
diff --git a/test/dummy/config/initializers/filter_parameter_logging.rb b/test/dummy/config/initializers/filter_parameter_logging.rb
index 4a994e1..c010b83 100644
--- a/test/dummy/config/initializers/filter_parameter_logging.rb
+++ b/test/dummy/config/initializers/filter_parameter_logging.rb
@@ -1,4 +1,8 @@
# Be sure to restart your server when you modify this file.
-# Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
+# Configure parameters to be partially matched (e.g. passw matches password) and filtered from the log file.
+# Use this to limit dissemination of sensitive information.
+# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
+Rails.application.config.filter_parameters += [
+ :passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+]
diff --git a/test/dummy/config/initializers/inflections.rb b/test/dummy/config/initializers/inflections.rb
index d2d0d9b..f825ac9 100755
--- a/test/dummy/config/initializers/inflections.rb
+++ b/test/dummy/config/initializers/inflections.rb
@@ -4,15 +4,15 @@
# are locale specific, and you may define rules for as many different
# locales as you wish. All of these examples are active by default:
# ActiveSupport::Inflector.inflections(:en) do |inflect|
-# inflect.plural /^(ox)$/i, '\1en'
-# inflect.singular /^(ox)en/i, '\1'
-# inflect.irregular 'person', 'people'
+# inflect.plural /^(ox)$/i, "\\1en"
+# inflect.singular /^(ox)en/i, "\\1"
+# inflect.irregular "person", "people"
# inflect.uncountable %w( fish sheep )
# end
# These inflection rules are supported but not enabled by default:
# ActiveSupport::Inflector.inflections(:en) do |inflect|
-# inflect.acronym 'RESTful'
+# inflect.acronym "RESTful"
# end
ActiveSupport::Inflector.inflections(:en) do |inflect|
diff --git a/test/dummy/config/initializers/new_framework_defaults_7_2.rb b/test/dummy/config/initializers/new_framework_defaults_7_2.rb
new file mode 100644
index 0000000..b549c4a
--- /dev/null
+++ b/test/dummy/config/initializers/new_framework_defaults_7_2.rb
@@ -0,0 +1,70 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file eases your Rails 7.2 framework defaults upgrade.
+#
+# Uncomment each configuration one by one to switch to the new default.
+# Once your application is ready to run with all new defaults, you can remove
+# this file and set the `config.load_defaults` to `7.2`.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
+
+###
+# Controls whether Active Job's `#perform_later` and similar methods automatically defer
+# the job queuing to after the current Active Record transaction is committed.
+#
+# Example:
+# Topic.transaction do
+# topic = Topic.create(...)
+# NewTopicNotificationJob.perform_later(topic)
+# end
+#
+# In this example, if the configuration is set to `:never`, the job will
+# be enqueued immediately, even though the `Topic` hasn't been committed yet.
+# Because of this, if the job is picked up almost immediately, or if the
+# transaction doesn't succeed for some reason, the job will fail to find this
+# topic in the database.
+#
+# If `enqueue_after_transaction_commit` is set to `:default`, the queue adapter
+# will define the behaviour.
+#
+# Note: Active Job backends can disable this feature. This is generally done by
+# backends that use the same database as Active Record as a queue, hence they
+# don't need this feature.
+#++
+# Rails.application.config.active_job.enqueue_after_transaction_commit = :default
+
+###
+# Adds image/webp to the list of content types Active Storage considers as an image
+# Prevents automatic conversion to a fallback PNG, and assumes clients support WebP, as they support gif, jpeg, and png.
+# This is possible due to broad browser support for WebP, but older browsers and email clients may still not support
+# WebP. Requires imagemagick/libvips built with WebP support.
+#++
+# Rails.application.config.active_storage.web_image_content_types = %w[image/png image/jpeg image/gif image/webp]
+
+###
+# Enable validation of migration timestamps. When set, an ActiveRecord::InvalidMigrationTimestampError
+# will be raised if the timestamp prefix for a migration is more than a day ahead of the timestamp
+# associated with the current time. This is done to prevent forward-dating of migration files, which can
+# impact migration generation and other migration commands.
+#
+# Applications with existing timestamped migrations that do not adhere to the
+# expected format can disable validation by setting this config to `false`.
+#++
+# Rails.application.config.active_record.validate_migration_timestamps = true
+
+###
+# Controls whether the PostgresqlAdapter should decode dates automatically with manual queries.
+#
+# Example:
+# ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.select_value("select '2024-01-01'::date") #=> Date
+#
+# This query used to return a `String`.
+#++
+# Rails.application.config.active_record.postgresql_adapter_decode_dates = true
+
+###
+# Enables YJIT as of Ruby 3.3, to bring sizeable performance improvements. If you are
+# deploying to a memory constrained environment you may want to set this to `false`.
+#++
+# Rails.application.config.yjit = true
diff --git a/test/dummy/config/initializers/permissions_policy.rb b/test/dummy/config/initializers/permissions_policy.rb
new file mode 100644
index 0000000..7db3b95
--- /dev/null
+++ b/test/dummy/config/initializers/permissions_policy.rb
@@ -0,0 +1,13 @@
+# Be sure to restart your server when you modify this file.
+
+# Define an application-wide HTTP permissions policy. For further
+# information see: https://developers.google.com/web/updates/2018/06/feature-policy
+
+# Rails.application.config.permissions_policy do |policy|
+# policy.camera :none
+# policy.gyroscope :none
+# policy.microphone :none
+# policy.usb :none
+# policy.fullscreen :self
+# policy.payment :self, "https://secure.example.com"
+# end
diff --git a/test/dummy/config/puma.rb b/test/dummy/config/puma.rb
index 721b6e7..03c166f 100755
--- a/test/dummy/config/puma.rb
+++ b/test/dummy/config/puma.rb
@@ -1,38 +1,34 @@
-# Puma can serve each request in a thread from an internal thread pool.
-# The `threads` method setting takes two numbers: a minimum and maximum.
-# Any libraries that use thread pools should be configured to match
-# the maximum value specified for Puma. Default is set to 5 threads for minimum
-# and maximum; this matches the default thread size of Active Record.
-#
-max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
-min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
-threads min_threads_count, max_threads_count
+# This configuration file will be evaluated by Puma. The top-level methods that
+# are invoked here are part of Puma's configuration DSL. For more information
+# about methods provided by the DSL, see https://puma.io/puma/Puma/DSL.html.
-# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
+# Puma starts a configurable number of processes (workers) and each process
+# serves each request in a thread from an internal thread pool.
#
-port ENV.fetch("PORT") { 3000 }
-
-# Specifies the `environment` that Puma will run in.
+# The ideal number of threads per worker depends both on how much time the
+# application spends waiting for IO operations and on how much you wish to
+# to prioritize throughput over latency.
#
-environment ENV.fetch("RAILS_ENV") { "development" }
-
-# Specifies the `pidfile` that Puma will use.
-pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
-
-# Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked web server processes. If using threads and workers together
-# the concurrency of the application would be max `threads` * `workers`.
-# Workers do not work on JRuby or Windows (both of which do not support
-# processes).
+# As a rule of thumb, increasing the number of threads will increase how much
+# traffic a given process can handle (throughput), but due to CRuby's
+# Global VM Lock (GVL) it has diminishing returns and will degrade the
+# response time (latency) of the application.
#
-workers ENV.fetch("WEB_CONCURRENCY") { 3 }
-
-# Use the `preload_app!` method when specifying a `workers` number.
-# This directive tells Puma to first boot the application and load code
-# before forking the application. This takes advantage of Copy On Write
-# process behavior so workers use less memory.
+# The default is set to 3 threads as it's deemed a decent compromise between
+# throughput and latency for the average Rails application.
#
-# preload_app!
+# Any libraries that use a connection pool or another resource pool should
+# be configured to provide at least as many connections as the number of
+# threads. This includes Active Record's `pool` parameter in `database.yml`.
+threads_count = ENV.fetch("RAILS_MAX_THREADS", 3)
+threads threads_count, threads_count
+
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
+port ENV.fetch("PORT", 3000)
-# Allow puma to be restarted by `rails restart` command.
+# Allow puma to be restarted by `bin/rails restart` command.
plugin :tmp_restart
+
+# Specify the PID file. Defaults to tmp/pids/server.pid in development.
+# In other environments, only set the PID file if requested.
+pidfile ENV["PIDFILE"] if ENV["PIDFILE"]
diff --git a/test/dummy/config/storage.yml b/test/dummy/config/storage.yml
index d32f76e..4942ab6 100644
--- a/test/dummy/config/storage.yml
+++ b/test/dummy/config/storage.yml
@@ -6,27 +6,27 @@ local:
service: Disk
root: <%= Rails.root.join("storage") %>
-# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# Use bin/rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
# amazon:
# service: S3
# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
# region: us-east-1
-# bucket: your_own_bucket
+# bucket: your_own_bucket-<%= Rails.env %>
# Remember not to checkin your GCS keyfile to a repository
# google:
# service: GCS
# project: your_project
# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
-# bucket: your_own_bucket
+# bucket: your_own_bucket-<%= Rails.env %>
-# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# Use bin/rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
# microsoft:
# service: AzureStorage
# storage_account_name: your_account_name
# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
-# container: your_container_name
+# container: your_container_name-<%= Rails.env %>
# mirror:
# service: Mirror
diff --git a/test/dummy/db/migrate/20241125100650_add_service_name_to_active_storage_blobs.active_storage.rb b/test/dummy/db/migrate/20241125100650_add_service_name_to_active_storage_blobs.active_storage.rb
new file mode 100644
index 0000000..0267f12
--- /dev/null
+++ b/test/dummy/db/migrate/20241125100650_add_service_name_to_active_storage_blobs.active_storage.rb
@@ -0,0 +1,22 @@
+# This migration comes from active_storage (originally 20190112182829)
+class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0]
+ def up
+ return unless table_exists?(:active_storage_blobs)
+
+ unless column_exists?(:active_storage_blobs, :service_name)
+ add_column :active_storage_blobs, :service_name, :string
+
+ if (configured_service = ActiveStorage::Blob.service.name)
+ ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
+ end
+
+ change_column :active_storage_blobs, :service_name, :string, null: false
+ end
+ end
+
+ def down
+ return unless table_exists?(:active_storage_blobs)
+
+ remove_column :active_storage_blobs, :service_name
+ end
+end
diff --git a/test/dummy/db/migrate/20241125100651_create_active_storage_variant_records.active_storage.rb b/test/dummy/db/migrate/20241125100651_create_active_storage_variant_records.active_storage.rb
new file mode 100644
index 0000000..95fd27f
--- /dev/null
+++ b/test/dummy/db/migrate/20241125100651_create_active_storage_variant_records.active_storage.rb
@@ -0,0 +1,28 @@
+# This migration comes from active_storage (originally 20191206030411)
+class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
+ def change
+ return unless table_exists?(:active_storage_blobs)
+
+ # Use Active Record's configured type for primary key
+ create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t|
+ t.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type
+ t.string :variation_digest, null: false
+
+ t.index %i[blob_id variation_digest], name: "index_active_storage_variant_records_uniqueness", unique: true
+ t.foreign_key :active_storage_blobs, column: :blob_id
+ end
+ end
+
+ private
+
+ def primary_key_type
+ config = Rails.configuration.generators
+ config.options[config.orm][:primary_key_type] || :primary_key
+ end
+
+ def blobs_primary_key_type
+ pkey_name = connection.primary_key(:active_storage_blobs)
+ pkey_column = connection.columns(:active_storage_blobs).find { |c| c.name == pkey_name }
+ pkey_column.bigint? ? :bigint : pkey_column.type
+ end
+end
diff --git a/test/dummy/db/migrate/20241125100652_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb b/test/dummy/db/migrate/20241125100652_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
new file mode 100644
index 0000000..93c8b85
--- /dev/null
+++ b/test/dummy/db/migrate/20241125100652_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
@@ -0,0 +1,8 @@
+# This migration comes from active_storage (originally 20211119233751)
+class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0]
+ def change
+ return unless table_exists?(:active_storage_blobs)
+
+ change_column_null(:active_storage_blobs, :checksum, true)
+ end
+end
diff --git a/test/dummy/db/schema.rb b/test/dummy/db/schema.rb
index 6fc6cec..e609b97 100644
--- a/test/dummy/db/schema.rb
+++ b/test/dummy/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.0].define(version: 2023_04_01_083434) do
+ActiveRecord::Schema[7.2].define(version: 2024_11_25_100652) do
create_table "delayed_jobs", force: :cascade do |t|
t.integer "priority", default: 0, null: false
t.integer "attempts", default: 0, null: false
diff --git a/test/dummy/public/406-unsupported-browser.html b/test/dummy/public/406-unsupported-browser.html
new file mode 100644
index 0000000..7cf1e16
--- /dev/null
+++ b/test/dummy/public/406-unsupported-browser.html
@@ -0,0 +1,66 @@
+
+
+
+ Your browser is not supported (406)
+
+
+
+
+
+
+
+
+
Your browser is not supported.
+
Please upgrade your browser to continue.
+
+
+
+
diff --git a/test/dummy/public/icon.png b/test/dummy/public/icon.png
new file mode 100644
index 0000000..f3b5abc
Binary files /dev/null and b/test/dummy/public/icon.png differ
diff --git a/test/dummy/public/icon.svg b/test/dummy/public/icon.svg
new file mode 100644
index 0000000..78307cc
--- /dev/null
+++ b/test/dummy/public/icon.svg
@@ -0,0 +1,3 @@
+
diff --git a/test/dummy/public/robots.txt b/test/dummy/public/robots.txt
new file mode 100644
index 0000000..c19f78a
--- /dev/null
+++ b/test/dummy/public/robots.txt
@@ -0,0 +1 @@
+# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
diff --git a/test/rake_ext_test.rb b/test/rake_ext_test.rb
index 5ec63fc..b5882b8 100755
--- a/test/rake_ext_test.rb
+++ b/test/rake_ext_test.rb
@@ -1,6 +1,7 @@
require "test_helper"
require "rake"
+Object.send(:remove_const, :APP_RAKEFILE) if defined?(APP_RAKEFILE) # hack for warning
APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __dir__)
load "rails/tasks/engine.rake"
load "rails/tasks/statistics.rake"
@@ -9,11 +10,12 @@
require "rake/testtask"
require_relative "../lib/rails_performance/gems/rake_ext"
-RailsPerformance::Gems::RakeExt.init
-
class RakeExtTest < ActiveSupport::TestCase
# this test works only when runing "bundle exec rake test"
test "can exclude rake tasks" do
+ RailsPerformance.redis.flushdb
+ RailsPerformance::Gems::RakeExt.init
+
RailsPerformance.skipable_rake_tasks = ["db:version"]
count_before = count_records_in_redis
subject = Rake::Task["db:version"]
diff --git a/test/sidekiq_test.rb b/test/sidekiq_test.rb
index 78c3947..21b9655 100755
--- a/test/sidekiq_test.rb
+++ b/test/sidekiq_test.rb
@@ -1,4 +1,5 @@
require "test_helper"
+require "sidekiq/testing"
class SidekiqTest < ActiveSupport::TestCase
test "works" do
@@ -11,4 +12,21 @@ class SidekiqTest < ActiveSupport::TestCase
assert_equal 42, res
end
+
+ test "sidekiq worker with error" do
+ RailsPerformance.redis.flushdb
+
+ begin
+ s = RailsPerformance::Gems::SidekiqExt.new
+ s.call("worker", "msg", -> {}) do
+ 1 / 0
+ end
+ rescue
+ "ignore me"
+ end
+
+ datasource = RailsPerformance::DataSource.new(q: {}, type: :sidekiq)
+ db = datasource.db
+ assert_equal db.data.last.status, "exception"
+ end
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 5084a69..24cadcc 100755
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -17,10 +17,10 @@
# Load fixtures from the engine
if ActiveSupport::TestCase.respond_to?(:fixture_path=)
- ActiveSupport::TestCase.fixture_path = File.expand_path("fixtures", __dir__)
- ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
- ActiveSupport::TestCase.file_fixture_path = ActiveSupport::TestCase.fixture_path + "/files"
- ActiveSupport::TestCase.fixtures :all
+ # ActiveSupport::TestCase.fixture_path = File.expand_path("fixtures", __dir__)
+ # ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
+ # ActiveSupport::TestCase.file_fixture_path = ActiveSupport::TestCase.fixture_path + "/files"
+ # ActiveSupport::TestCase.fixtures :all
end
def dummy_event(time: RailsPerformance::Utils.time, controller: "Home", action: "index", status: 200, path: "/", method: "GET", request_id: SecureRandom.hex(16))