diff --git a/benchmarks/erubi-rails/Gemfile b/benchmarks/erubi-rails/Gemfile index ecfb3f71..2244bc46 100644 --- a/benchmarks/erubi-rails/Gemfile +++ b/benchmarks/erubi-rails/Gemfile @@ -7,20 +7,18 @@ gem "cgi" # Workaround cgi extraction in Ruby 3.5.0-dev # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main' -# Everything except Action Cable. It's unused and it installs native gems. +# Skip ActionCable and ActiveRecord, which are unused and depend on native gems. +# Other unused components that depend on ActiveRecord are also excluded. %w[ - actionmailbox actionmailer actionpack actionview - actiontext activejob activemodel activerecord - activestorage activesupport railties + actionmailer actionpack actionview + activejob activemodel + activesupport railties ].each do |rails_gem| gem rails_gem, '~> 8.0' end gem 'sprockets-rails', '3.4.0' -# Use sqlite3 as the database for Active Record -gem 'sqlite3', platform: :ruby -gem 'activerecord-jdbcsqlite3-adapter', '~> 70', platform: :jruby # Use Puma as the app server # gem 'puma', '~> 5.6' # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker diff --git a/benchmarks/erubi-rails/Gemfile.lock b/benchmarks/erubi-rails/Gemfile.lock index d76152a2..d4953e89 100644 --- a/benchmarks/erubi-rails/Gemfile.lock +++ b/benchmarks/erubi-rails/Gemfile.lock @@ -1,13 +1,6 @@ GEM remote: https://rubygems.org/ specs: - actionmailbox (8.0.3) - actionpack (= 8.0.3) - activejob (= 8.0.3) - activerecord (= 8.0.3) - activestorage (= 8.0.3) - activesupport (= 8.0.3) - mail (>= 2.8.0) actionmailer (8.0.3) actionpack (= 8.0.3) actionview (= 8.0.3) @@ -25,13 +18,6 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (8.0.3) - actionpack (= 8.0.3) - activerecord (= 8.0.3) - activestorage (= 8.0.3) - activesupport (= 8.0.3) - globalid (>= 0.6.0) - nokogiri (>= 1.8.5) actionview (8.0.3) activesupport (= 8.0.3) builder (~> 3.1) @@ -43,16 +29,6 @@ GEM globalid (>= 0.3.6) activemodel (8.0.3) activesupport (= 8.0.3) - activerecord (8.0.3) - activemodel (= 8.0.3) - activesupport (= 8.0.3) - timeout (>= 0.4.0) - activestorage (8.0.3) - actionpack (= 8.0.3) - activejob (= 8.0.3) - activerecord (= 8.0.3) - activesupport (= 8.0.3) - marcel (~> 1.0) activesupport (8.0.3) base64 benchmark (>= 0.3) @@ -113,7 +89,6 @@ GEM net-imap net-pop net-smtp - marcel (1.0.4) matrix (0.4.3) mini_mime (1.1.5) mini_portile2 (2.8.9) @@ -196,9 +171,6 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (2.7.3) - mini_portile2 (~> 2.8.0) - sqlite3 (2.7.3-x86_64-linux-gnu) stringio (3.1.7) strscan (3.1.5) thor (1.4.0) @@ -229,16 +201,11 @@ PLATFORMS x86_64-linux DEPENDENCIES - actionmailbox (~> 8.0) actionmailer (~> 8.0) actionpack (~> 8.0) - actiontext (~> 8.0) actionview (~> 8.0) activejob (~> 8.0) activemodel (~> 8.0) - activerecord (~> 8.0) - activerecord-jdbcsqlite3-adapter (~> 70) - activestorage (~> 8.0) activesupport (~> 8.0) base64 bigdecimal @@ -255,22 +222,17 @@ DEPENDENCIES selenium-webdriver spring sprockets-rails (= 3.4.0) - sqlite3 turbolinks (~> 5) tzinfo-data webdrivers webpacker (~> 5.0) CHECKSUMS - actionmailbox (8.0.3) sha256=2a0444f8937c641db100128a1826554c5298ade65c62b623a1fcb34a1dc6bd2f actionmailer (8.0.3) sha256=6dc0c3701065a96f845a05a28e9d7a60055222cfc324cc6c3a281cec148cc723 actionpack (8.0.3) sha256=d63c21cb109e0529d785ffdb657a092928890327c5c8ea2e46f63b6751be5ad3 - actiontext (8.0.3) sha256=1c46fdfa60ffa282bf29cccc0714071128826bef5740c4f2a88d375d206a9df4 actionview (8.0.3) sha256=5171946ff07d1e95bf3d805ad9425a89040a013dea11bb1f4cf604f108b1ce66 activejob (8.0.3) sha256=469eddb3822aff1c6a0df0bd3398f28bff8fcd1bd0e9d309e6b7ccbd0bdba1b6 activemodel (8.0.3) sha256=406907245a1c6c04cdf2187cc4590fdc081d7a07392123d322125677022ea67c - activerecord (8.0.3) sha256=9b95c63b2ae9ccb57bb15db730300fdd02af387e12474eb9002a668acab3cea8 - activestorage (8.0.3) sha256=4f4eadeb5d128a35ed21d960eeece027225b36d54542512c8a36ad5316988c5e activesupport (8.0.3) sha256=a711ce5e30660b23232f26a38699469f8d859d47aa1f722e183fda6d7cc17823 addressable (2.8.7) sha256=462986537cf3735ab5f3c0f557f14155d778f4b43ea4f485a9deb9c8f7c58232 base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b @@ -297,7 +259,6 @@ CHECKSUMS logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 loofah (2.24.1) sha256=655a30842b70ec476410b347ab1cd2a5b92da46a19044357bbd9f401b009a337 mail (2.8.1) sha256=ec3b9fadcf2b3755c78785cb17bc9a0ca9ee9857108a64b6f5cfc9c0b5bfc9ad - marcel (1.0.4) sha256=0d5649feb64b8f19f3d3468b96c680bae9746335d02194270287868a661516a4 matrix (0.4.3) sha256=a0d5ab7ddcc1973ff690ab361b67f359acbb16958d1dc072b8b956a286564c5b mini_mime (1.1.5) sha256=8681b7e2e4215f2a159f9400b5816d85e9d8c6c6b491e96a12797e798f8bccef mini_portile2 (2.8.9) sha256=0cd7c7f824e010c072e33f68bc02d85a00aeb6fce05bb4819c03dfd3c140c289 @@ -335,8 +296,6 @@ CHECKSUMS spring (4.4.0) sha256=ec4e6cf5fb48d96b9ec9a80ebb40f962f2467b651c000693f33c14b6d6c340af sprockets (4.2.2) sha256=761e5a49f1c288704763f73139763564c845a8f856d52fba013458f8af1b59b1 sprockets-rails (3.4.0) sha256=b6e13b773c652e79d8b703632375fb7e7c7db2a553814aadc6bf6cd3c744866c - sqlite3 (2.7.3) sha256=d2b2fecd9341132f2cea3fde9061ee0fab9c9d532a8ecccfab4fe63d9621bf57 - sqlite3 (2.7.3-x86_64-linux-gnu) sha256=11b2612fddf56602d238be7a984fa0633e591edd034f7520747bc0927b7fa865 stringio (3.1.7) sha256=5b78b7cb242a315fb4fca61a8255d62ec438f58da2b90be66048546ade4507fa strscan (3.1.5) sha256=f8413b90ea9395a69609a4414a8c88551bcda64337e234272c24fcd4c83e5947 thor (1.4.0) sha256=8763e822ccb0f1d7bee88cde131b19a65606657b847cc7b7b4b82e772bcd8a3d diff --git a/benchmarks/erubi-rails/app/models/application_record.rb b/benchmarks/erubi-rails/app/models/application_record.rb deleted file mode 100644 index 10a4cba8..00000000 --- a/benchmarks/erubi-rails/app/models/application_record.rb +++ /dev/null @@ -1,3 +0,0 @@ -class ApplicationRecord < ActiveRecord::Base - self.abstract_class = true -end diff --git a/benchmarks/erubi-rails/app/models/concerns/.keep b/benchmarks/erubi-rails/app/models/concerns/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/benchmarks/erubi-rails/config/application.rb b/benchmarks/erubi-rails/config/application.rb index 01543d8f..6b293e7d 100644 --- a/benchmarks/erubi-rails/config/application.rb +++ b/benchmarks/erubi-rails/config/application.rb @@ -4,12 +4,12 @@ # Pick the frameworks you want: require "active_model/railtie" require "active_job/railtie" -require "active_record/railtie" -require "active_storage/engine" +# require "active_record/railtie" +# require "active_storage/engine" require "action_controller/railtie" require "action_mailer/railtie" -require "action_mailbox/engine" -require "action_text/engine" +# require "action_mailbox/engine" +# require "action_text/engine" require "action_view/railtie" # require "action_cable/engine" require "rails/test_unit/railtie" diff --git a/benchmarks/erubi-rails/config/database.yml b/benchmarks/erubi-rails/config/database.yml deleted file mode 100644 index 4a8a1b26..00000000 --- a/benchmarks/erubi-rails/config/database.yml +++ /dev/null @@ -1,25 +0,0 @@ -# SQLite. Versions 3.8.0 and up are supported. -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -# -default: &default - adapter: sqlite3 - pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - timeout: 5000 - -development: - <<: *default - database: db/development.sqlite3 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - <<: *default - database: db/test.sqlite3 - -production: - <<: *default - database: db/production.sqlite3 diff --git a/benchmarks/erubi-rails/config/environments/development.rb b/benchmarks/erubi-rails/config/environments/development.rb index c129b5ff..c99a8958 100644 --- a/benchmarks/erubi-rails/config/environments/development.rb +++ b/benchmarks/erubi-rails/config/environments/development.rb @@ -34,7 +34,7 @@ end # Store uploaded files on the local file system (see config/storage.yml for options). - config.active_storage.service = :local + # config.active_storage.service = :local # Don't care if the mailer can't send. config.action_mailer.raise_delivery_errors = false @@ -51,10 +51,10 @@ config.active_support.disallowed_deprecation_warnings = [] # Raise an error on page load if there are pending migrations. - config.active_record.migration_error = :page_load + # config.active_record.migration_error = :page_load # Highlight code that triggered database queries in logs. - config.active_record.verbose_query_logs = true + # config.active_record.verbose_query_logs = true # Highlight code that enqueued background job in logs. config.active_job.verbose_enqueue_logs = true diff --git a/benchmarks/erubi-rails/config/environments/production.rb b/benchmarks/erubi-rails/config/environments/production.rb index f2b3bddc..415aacbe 100644 --- a/benchmarks/erubi-rails/config/environments/production.rb +++ b/benchmarks/erubi-rails/config/environments/production.rb @@ -37,7 +37,7 @@ # 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 + # config.active_storage.service = :local # 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. @@ -80,7 +80,7 @@ config.active_support.report_deprecations = false # Do not dump schema after migrations. - config.active_record.dump_schema_after_migration = false + # config.active_record.dump_schema_after_migration = false # Enable DNS rebinding protection and other `Host` header attacks. # config.hosts = [ diff --git a/benchmarks/erubi-rails/config/environments/test.rb b/benchmarks/erubi-rails/config/environments/test.rb index adbb4a6f..6049334e 100644 --- a/benchmarks/erubi-rails/config/environments/test.rb +++ b/benchmarks/erubi-rails/config/environments/test.rb @@ -35,7 +35,7 @@ config.action_controller.allow_forgery_protection = false # Store uploaded files on the local file system in a temporary directory. - config.active_storage.service = :test + # config.active_storage.service = :test config.action_mailer.perform_caching = false