@@ -1,10 +1,14 @@ require "rack" module Rack::Bug - require "rack/bug/toolbar" - require "rack/bug/panel" - require "rack/bug/panel_app" - + autoload :Options, "rack/bug/options" + autoload :Panel, "rack/bug/panel" + autoload :PanelApp, "rack/bug/panel_app" + autoload :ParamsSignature, "rack/bug/params_signature" + autoload :Render, "rack/bug/render" + autoload :Toolbar, "rack/bug/toolbar" + + # Panels autoload :ActiveRecordPanel, "rack/bug/panels/active_record_panel" autoload :CachePanel, "rack/bug/panels/cache_panel" autoload :LogPanel, "rack/bug/panels/log_panel" lib/rack/bug.rb @@ -1,5 +1,3 @@ -require "rack/bug/params_signature" - module Rack module Bug lib/rack/bug/panel_app.rb @@ -1,4 +1,3 @@ -require "rack/bug/panel" require "rack/bug/panels/active_record_panel/activerecord_extensions" module Rack lib/rack/bug/panels/active_record_panel.rb @@ -2,15 +2,14 @@ require "rack/bug/panels/cache_panel/memcache_extension" module Rack module Bug - + class CachePanel < Panel - - require "rack/bug/panels/cache_panel/stats" - require "rack/bug/panels/cache_panel/panel_app" - + autoload :PanelApp, "rack/bug/panels/cache_panel/panel_app" + autoload :Stats, "rack/bug/panels/cache_panel/stats" + def self.record(method, *keys, &block) return block.call unless Rack::Bug.enabled? - + start_time = Time.now result = block.call total_time = Time.now - start_time @@ -18,23 +17,23 @@ module Rack stats.record_call(method, total_time * 1_000, hit, *keys) return result end - + def self.reset Thread.current["rack.bug.cache"] = Stats.new end - + def self.stats Thread.current["rack.bug.cache"] ||= Stats.new end - + def panel_app PanelApp.new end - + def name "cache" end - + def heading "Cache: %.2fms (#{self.class.stats.queries.size} calls)" % self.class.stats.time end @@ -44,8 +43,8 @@ module Rack self.class.reset return result end - + end - + end end \ No newline at end of file lib/rack/bug/panels/cache_panel.rb @@ -1,5 +1,3 @@ -require "rack/bug/panel_app" - module Rack module Bug class CachePanel lib/rack/bug/panels/cache_panel/panel_app.rb @@ -1,44 +1,44 @@ module Rack module Bug - + class RedisPanel < Panel - - require "rack/bug/panels/redis_panel/stats" require "rack/bug/panels/redis_panel/redis_extension" - + + autoload :Stats, "rack/bug/panels/redis_panel/stats" + def self.record(*redis_command_args, &block) return block.call unless Rack::Bug.enabled? - + start_time = Time.now result = block.call total_time = Time.now - start_time stats.record_call(total_time * 1_000, redis_command_args) return result end - + def self.reset Thread.current["rack.bug.redis"] = Stats.new end - + def self.stats Thread.current["rack.bug.redis"] ||= Stats.new end - + def name "redis" end - + def heading "Redis: %.2fms (#{self.class.stats.queries.size} calls)" % self.class.stats.time end - + def content result = render_template "panels/redis", :stats => self.class.stats self.class.reset return result end - + end - + end end \ No newline at end of file lib/rack/bug/panels/redis_panel.rb @@ -2,43 +2,43 @@ require "digest" module Rack module Bug - + class SQLPanel < Panel - require "rack/bug/panels/sql_panel/sql_extension" - require "rack/bug/panels/sql_panel/query" - require "rack/bug/panels/sql_panel/panel_app" - + + autoload :PanelApp, "rack/bug/panels/sql_panel/panel_app" + autoload :Query, "rack/bug/panels/sql_panel/query" + def panel_app PanelApp.new end - + def self.record(sql, backtrace = [], &block) return block.call unless Rack::Bug.enabled? - + start_time = Time.now result = block.call queries << Query.new(sql, Time.now - start_time, backtrace) - + return result end - + def self.reset Thread.current["rack.test.queries"] = [] end - + def self.queries Thread.current["rack.test.queries"] ||= [] end - + def self.total_time (queries.inject(0) { |memo, query| memo + query.time}) * 1_000 end - + def name "sql" end - + def heading "#{self.class.queries.size} Queries (%.2fms)" % self.class.total_time end @@ -48,8 +48,8 @@ module Rack self.class.reset return result end - + end - + end end \ No newline at end of file lib/rack/bug/panels/sql_panel.rb @@ -1,5 +1,3 @@ -require "rack/bug/panel_app" - module Rack module Bug class SQLPanel lib/rack/bug/panels/sql_panel/panel_app.rb @@ -1,33 +1,33 @@ module Rack module Bug - + class TemplatesPanel < Panel - require "rack/bug/panels/templates_panel/actionview_extension" - require "rack/bug/panels/templates_panel/trace" - require "rack/bug/panels/templates_panel/rendering" - + + autoload :Trace, "rack/bug/panels/templates_panel/trace" + autoload :Rendering, "rack/bug/panels/templates_panel/rendering" + def self.record(template, &block) return block.call unless Rack::Bug.enabled? - + template_trace.start(template) result = block.call template_trace.finished(template) return result end - + def self.reset Thread.current["rack.bug.template_trace"] = Trace.new end - + def self.template_trace Thread.current["rack.bug.template_trace"] ||= Trace.new end - + def name "templates" end - + def heading "Templates: %.2fms" % (self.class.template_trace.total_time * 1_000) end @@ -37,8 +37,8 @@ module Rack self.class.reset return result end - + end - + end end \ No newline at end of file lib/rack/bug/panels/templates_panel.rb @@ -1,4 +1,3 @@ -require "rack/bug/panel" require "benchmark" module Rack lib/rack/bug/panels/timer_panel.rb @@ -7,7 +7,6 @@ module Rack include ERB::Util def signed_params(hash) - # require "rubygems"; require "ruby-debug"; Debugger.start; debugger ParamsSignature.sign(request, hash) end lib/rack/bug/render.rb @@ -1,9 +1,6 @@ require "ipaddr" require "digest" -require "rack/bug/options" -require "rack/bug/render" - module Rack module Bug class RackStaticBugAvoider lib/rack/bug/toolbar.rb bc61239712366a412ee41e1aafac26c2f665d159 Bryan Helmkamp bryan@brynary.com http://github.com/adkron/rack-bug/commit/e3185575ed99a2498e2c808d0f40e0420039e94d e3185575ed99a2498e2c808d0f40e0420039e94d 2009-11-05T04:48:59-08:00 2009-07-27T21:03:26-07:00 Switch to all autoload f6a6055dedfedd41ad05f2bef5caeeb2324f307c Amos King amos.l.king@gmail.com