query_reviewer 0.1.1 → 0.1.2

data/lib/query_reviewer.rb

@@ -12,9 +12,9 @@ module QueryReviewer
     CONFIGURATION.merge!(default_config["all"] || {})
     CONFIGURATION.merge!(default_config[Rails.env || "test"] || {})
 
-    app_config_file = File.join(Rails.root.to_s, "config", "query_reviewer.yml")
+    app_config_file = Rails.root + "config/query_reviewer.yml"
 
-    if File.exist?(app_config_file)
+    if app_config_file.exist?
       app_config = YAML.load(ERB.new(IO.read(app_config_file)).result)
       CONFIGURATION.merge!(app_config["all"] || {})
       CONFIGURATION.merge!(app_config[Rails.env || "test"] || {})
@@ -29,6 +29,15 @@ module QueryReviewer
       rescue
         CONFIGURATION["uv"] ||= false
       end
+
+      require "query_reviewer/query_warning"
+      require "query_reviewer/array_extensions"
+      require "query_reviewer/sql_query"
+      require "query_reviewer/mysql_analyzer"
+      require "query_reviewer/sql_sub_query"
+      require "query_reviewer/mysql_adapter_extensions"
+      require "query_reviewer/controller_extensions"
+      require "query_reviewer/sql_query_collection"
     end
   end
 
@@ -37,18 +46,5 @@ module QueryReviewer
   end
 end
 
-QueryReviewer.load_configuration
-
-if QueryReviewer.enabled?
-  require "query_reviewer/query_warning"
-  require "query_reviewer/array_extensions"
-  require "query_reviewer/sql_query"
-  require "query_reviewer/mysql_analyzer"
-  require "query_reviewer/sql_sub_query"
-  require "query_reviewer/mysql_adapter_extensions"
-  require "query_reviewer/controller_extensions"
-  require "query_reviewer/sql_query_collection"
-end
-
 # Rails Integration
-require 'query_reviewer/rails' if defined?(Rails)
+require 'query_reviewer/rails' if defined?(Rails)

data/lib/query_reviewer/rails.rb

@@ -24,10 +24,14 @@ if defined?(Rails::Railtie)
       end
 
       initializer "query_reviewer.initialize" do
+        QueryReviewer.load_configuration
+
         QueryReviewer.inject_reviewer if QueryReviewer.enabled?
       end
     end
   end
 else # Rails 2
+  QueryReviewer.load_configuration
+
   QueryReviewer.inject_reviewer
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: query_reviewer
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
+  hash: 31
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - dsboulder, nesquena
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -08:00
+date: 2011-03-07 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Runs explain before each select query and displays results in an overlayed div