diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index c4647bd..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,97 +0,0 @@ -PATH - remote: . - specs: - sql_queries_count (0.0.1) - rails (~> 3.2.1) - -GEM - remote: http://rubygems.org/ - specs: - actionmailer (3.2.3) - actionpack (= 3.2.3) - mail (~> 2.4.4) - actionpack (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) - builder (~> 3.0.0) - erubis (~> 2.7.0) - journey (~> 1.0.1) - rack (~> 1.4.0) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.3) - activesupport (= 3.2.3) - builder (~> 3.0.0) - activerecord (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) - activesupport (3.2.3) - i18n (~> 0.6) - multi_json (~> 1.0) - arel (3.0.2) - builder (3.0.0) - erubis (2.7.0) - hike (1.2.1) - i18n (0.6.0) - journey (1.0.3) - jquery-rails (2.0.1) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) - json (1.6.6) - mail (2.4.4) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.18) - multi_json (1.2.0) - polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) - rack (>= 0.4) - rack-ssl (1.3.2) - rack - rack-test (0.6.1) - rack (>= 1.0) - rails (3.2.3) - actionmailer (= 3.2.3) - actionpack (= 3.2.3) - activerecord (= 3.2.3) - activeresource (= 3.2.3) - activesupport (= 3.2.3) - bundler (~> 1.0) - railties (= 3.2.3) - railties (3.2.3) - actionpack (= 3.2.3) - activesupport (= 3.2.3) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) - sprockets (2.1.2) - hike (~> 1.2) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.5) - thor (0.14.6) - tilt (1.3.3) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.32) - -PLATFORMS - ruby - -DEPENDENCIES - jquery-rails - sql_queries_count! - sqlite3 diff --git a/MIT-LICENSE b/MIT-LICENSE index 406f17b..ff6af32 100644 --- a/MIT-LICENSE +++ b/MIT-LICENSE @@ -1,4 +1,4 @@ -Copyright 2012 YOURNAME +Copyright 2012 Kacper Cieśla (comboy) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/lib/sql_queries_count/controller_runtime.rb b/lib/sql_queries_count/controller_runtime.rb index 85b7ca9..9be704e 100644 --- a/lib/sql_queries_count/controller_runtime.rb +++ b/lib/sql_queries_count/controller_runtime.rb @@ -2,6 +2,7 @@ module SqlQueriesCount module ControllerRuntime + extend ActiveSupport::Concern protected @@ -9,9 +10,6 @@ module ControllerRuntime attr_internal :db_runtime def process_action(action, *args) - # We also need to reset the runtime before each action - # because of queries in middleware or in cases we are streaming - # and it won't be cleaned up by the method below. QueryCounter.reset_counter super end @@ -24,11 +22,6 @@ def append_info_to_payload(payload) end - #def append_info_to_payload(payload) - # super - # payload[:solr_runtime] = SolrInstrumentation::LogSubscriber.runtime - #end - module ClassMethods def log_process_action(payload) messages, sql_count = super, payload[:db_query_count] @@ -36,6 +29,7 @@ def log_process_action(payload) messages end end + end end diff --git a/lib/tasks/sql_queries_count_tasks.rake b/lib/tasks/sql_queries_count_tasks.rake deleted file mode 100644 index 9640c36..0000000 --- a/lib/tasks/sql_queries_count_tasks.rake +++ /dev/null @@ -1,4 +0,0 @@ -# desc "Explaining what the task does" -# task :sql_queries_count do -# # Task goes here -# end