From 5d07da742df32b745fa0306002311ae8860e6955 Mon Sep 17 00:00:00 2001 From: Gannon McGibbon Date: Wed, 8 Feb 2023 13:21:04 -0600 Subject: [PATCH] Simplify requires - Make module files require their nested contents - Move library requires to the files that use them - Remove require for timeout because it isn't used - Remove require for thread because it is required by default This patch also allows for easier transition to autoloading should we choose to use it later. --- lib/mini_profiler.rb | 11 ++++++++++ lib/mini_profiler/storage.rb | 7 ++++++ lib/mini_profiler/storage/file_store.rb | 2 ++ lib/mini_profiler/storage/memory_store.rb | 2 ++ lib/mini_profiler/storage/redis_store.rb | 1 + lib/mini_profiler/timer_struct.rb | 8 +++++++ lib/mini_profiler/timer_struct/base.rb | 2 ++ lib/mini_profiler/timer_struct/sql.rb | 2 ++ lib/rack-mini-profiler.rb | 26 +---------------------- spec/integration/railtie_methods_spec.rb | 1 + 10 files changed, 37 insertions(+), 25 deletions(-) create mode 100644 lib/mini_profiler/storage.rb create mode 100644 lib/mini_profiler/timer_struct.rb diff --git a/lib/mini_profiler.rb b/lib/mini_profiler.rb index f7f73211..714617d3 100644 --- a/lib/mini_profiler.rb +++ b/lib/mini_profiler.rb @@ -1,6 +1,17 @@ # frozen_string_literal: true require 'cgi' +require 'json' +require 'erb' + +require 'mini_profiler/timer_struct' +require 'mini_profiler/storage' +require 'mini_profiler/config' +require 'mini_profiler/profiling_methods' +require 'mini_profiler/context' +require 'mini_profiler/client_settings' +require 'mini_profiler/gc_profiler' +require 'mini_profiler/snapshots_transporter' module Rack class MiniProfiler diff --git a/lib/mini_profiler/storage.rb b/lib/mini_profiler/storage.rb new file mode 100644 index 00000000..5e32849f --- /dev/null +++ b/lib/mini_profiler/storage.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +require 'mini_profiler/storage/abstract_store' +require 'mini_profiler/storage/memcache_store' +require 'mini_profiler/storage/memory_store' +require 'mini_profiler/storage/redis_store' +require 'mini_profiler/storage/file_store' diff --git a/lib/mini_profiler/storage/file_store.rb b/lib/mini_profiler/storage/file_store.rb index 812cec59..938f7153 100644 --- a/lib/mini_profiler/storage/file_store.rb +++ b/lib/mini_profiler/storage/file_store.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require 'securerandom' + module Rack class MiniProfiler class FileStore < AbstractStore diff --git a/lib/mini_profiler/storage/memory_store.rb b/lib/mini_profiler/storage/memory_store.rb index 52068d0b..63475761 100644 --- a/lib/mini_profiler/storage/memory_store.rb +++ b/lib/mini_profiler/storage/memory_store.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require 'securerandom' + module Rack class MiniProfiler class MemoryStore < AbstractStore diff --git a/lib/mini_profiler/storage/redis_store.rb b/lib/mini_profiler/storage/redis_store.rb index d1ec3c1d..7f286905 100644 --- a/lib/mini_profiler/storage/redis_store.rb +++ b/lib/mini_profiler/storage/redis_store.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require 'digest' +require 'securerandom' module Rack class MiniProfiler diff --git a/lib/mini_profiler/timer_struct.rb b/lib/mini_profiler/timer_struct.rb new file mode 100644 index 00000000..b3cc5168 --- /dev/null +++ b/lib/mini_profiler/timer_struct.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +require 'mini_profiler/timer_struct/base' +require 'mini_profiler/timer_struct/page' +require 'mini_profiler/timer_struct/sql' +require 'mini_profiler/timer_struct/custom' +require 'mini_profiler/timer_struct/client' +require 'mini_profiler/timer_struct/request' diff --git a/lib/mini_profiler/timer_struct/base.rb b/lib/mini_profiler/timer_struct/base.rb index 2757413d..15a46982 100644 --- a/lib/mini_profiler/timer_struct/base.rb +++ b/lib/mini_profiler/timer_struct/base.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require 'json' + module Rack class MiniProfiler module TimerStruct diff --git a/lib/mini_profiler/timer_struct/sql.rb b/lib/mini_profiler/timer_struct/sql.rb index 12397eb4..e9a78c75 100644 --- a/lib/mini_profiler/timer_struct/sql.rb +++ b/lib/mini_profiler/timer_struct/sql.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require 'erb' + module Rack class MiniProfiler diff --git a/lib/rack-mini-profiler.rb b/lib/rack-mini-profiler.rb index ad023f3f..f6cc80d8 100644 --- a/lib/rack-mini-profiler.rb +++ b/lib/rack-mini-profiler.rb @@ -1,34 +1,10 @@ # frozen_string_literal: true -require 'erb' -require 'json' -require 'timeout' -require 'thread' -require 'securerandom' - require 'mini_profiler/version' require 'mini_profiler/asset_version' -require 'mini_profiler/timer_struct/base' -require 'mini_profiler/timer_struct/page' -require 'mini_profiler/timer_struct/sql' -require 'mini_profiler/timer_struct/custom' -require 'mini_profiler/timer_struct/client' -require 'mini_profiler/timer_struct/request' - -require 'mini_profiler/storage/abstract_store' -require 'mini_profiler/storage/memcache_store' -require 'mini_profiler/storage/memory_store' -require 'mini_profiler/storage/redis_store' -require 'mini_profiler/storage/file_store' - -require 'mini_profiler/config' -require 'mini_profiler/profiling_methods' -require 'mini_profiler/context' -require 'mini_profiler/client_settings' -require 'mini_profiler/gc_profiler' -require 'mini_profiler/snapshots_transporter' require 'mini_profiler' + require 'patches/sql_patches' require 'patches/net_patches' diff --git a/spec/integration/railtie_methods_spec.rb b/spec/integration/railtie_methods_spec.rb index 6cc655de..ccea3ad3 100644 --- a/spec/integration/railtie_methods_spec.rb +++ b/spec/integration/railtie_methods_spec.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +require 'securerandom' require 'rack/test' require File.expand_path('../../../lib/mini_profiler_rails/railtie_methods', __FILE__)