query_reviewer_defaults.yml @@ -1,25 +1,30 @@ # QueryReviewer require "ostruct" -require "query_reviewer/array_extensions" -require "query_reviewer/sql_query" -require "query_reviewer/sql_sub_query" -require "query_reviewer/mysql_adapter_extensions" -require "query_reviewer/controller_extensions" - module QueryReviewer - CONFIGURATION = YAML.load(File.read(File.join(File.dirname(__FILE__), "..", "query_reviewer.yml")))["all"] || {} - CONFIGURATION.merge!(YAML.load(File.read(File.join(File.dirname(__FILE__), "..", "query_reviewer.yml")))[RAILS_ENV || "development"]) + CONFIGURATION = {} - if CONFIGURATION["enabled"] - begin - CONFIGURATION["uv"] ||= !Gem.searcher.find("uv").nil? - if CONFIGURATION["uv"] - require "uv" - end - rescue - CONFIGURATION["uv"] ||= false + def self.load_configuration + CONFIGURATION.merge!(YAML.load(File.read(File.join(File.dirname(__FILE__), "..", "query_reviewer_defaults.yml")))["all"] || {}) + CONFIGURATION.merge!(YAML.load(File.read(File.join(File.dirname(__FILE__), "..", "query_reviewer_defaults.yml")))[RAILS_ENV || "test"] || {}) + + app_config_file = File.join(RAILS_ROOT, "config", "query_reviewer.yml") + + if File.exist?(app_config_file) + CONFIGURATION.merge!(YAML.load(File.read(app_config_file))["all"] || {}) + CONFIGURATION.merge!(YAML.load(File.read(app_config_file))[RAILS_ENV || "test"] || {}) end + + if CONFIGURATION["enabled"] + begin + CONFIGURATION["uv"] ||= !Gem.searcher.find("uv").nil? + if CONFIGURATION["uv"] + require "uv" + end + rescue + CONFIGURATION["uv"] ||= false + end + end end class QueryWarning @@ -37,4 +42,11 @@ module QueryReviewer @id = (self.class.next_id += 1) end end -end \ No newline at end of file +end + +QueryReviewer.load_configuration +require "query_reviewer/array_extensions" +require "query_reviewer/sql_query" +require "query_reviewer/sql_sub_query" +require "query_reviewer/mysql_adapter_extensions" +require "query_reviewer/controller_extensions" \ No newline at end of file lib/query_reviewer.rb @@ -7,22 +7,27 @@ module QueryReviewer end def self.included(base) - base.alias_method_chain :perform_action, :query_review + base.alias_method_chain :perform_action, :query_review if QueryReviewer::CONFIGURATION["inject_view"] base.alias_method_chain :process, :query_review + base.helper_method :query_review_output end def add_query_output_to_view if response.body.match(/<\/body>/i) && Thread.current["queries"] idx = (response.body =~ /<\/body>/i) - faux_view = QueryViewBase.new([File.join(File.dirname(__FILE__), "views")], {}, self) - queries = SqlQueryCollection.new(Thread.current["queries"]) - queries.analyze! - faux_view.instance_variable_set("@queries", queries) - html = faux_view.render(:partial => "/box.rhtml") + html = query_review_output response.body.insert(idx, html) end end + def query_review_output + faux_view = QueryViewBase.new([File.join(File.dirname(__FILE__), "views")], {}, self) + queries = SqlQueryCollection.new(Thread.current["queries"]) + queries.analyze! + faux_view.instance_variable_set("@queries", queries) + html = faux_view.render(:partial => "/box.rhtml") + end + def perform_action_with_query_review r = perform_action_without_query_review add_query_output_to_view if response.content_type.blank? || response.content_type == "text/html" lib/query_reviewer/controller_extensions.rb @@ -31,7 +31,7 @@ module QueryReviewer end def max_severity - warnings.empty? && collection_warnings.empty? ? 0 : [warnings.collect(&:severity).flatten.max, collection_warnings.collect(&:severity).flatten.max].max + warnings.empty? && collection_warnings.empty? ? 0 : [warnings.empty? ? 0 : warnings.collect(&:severity).flatten.max, collection_warnings.empty? ? 0 : collection_warnings.collect(&:severity).flatten.max].max end def total_severity lib/query_reviewer/sql_query_collection.rb @@ -1,4 +1,7 @@ # desc "Explaining what the task does" -# task :query_reviewer do -# # Task goes here -# end +namespace :query_reviewer do + desc "Create a default config/query_reviewer.yml" + task :setup do + FileUtils.copy(File.join(File.dirname(__FILE__), "..", "query_reviewer_defaults.yml"), File.join(RAILS_ROOT, "config", "query_reviewer.yml")) + end +end tasks/query_reviewer_tasks.rake install.rb query_reviewer.yml uninstall.rb 9485a8f98951f0be7641c9c8a6b756aecba496d9 David Stevenson david@flouri.sh http://github.com/dsboulder/query_reviewer/commit/cc95a571168dd6b1b1da2801294ff27d10e3747c cc95a571168dd6b1b1da2801294ff27d10e3747c 2007-12-09T11:25:30-08:00 2007-12-09T11:25:30-08:00 fixes to defaults, view helper avail 362270093d1b5478d3ed5b22920f484922b347dc David Stevenson david@flouri.sh