query_diet 0.2.3 → 0.3.0

data/README.rdoc

@@ -42,3 +42,5 @@ Henning Koch
 {makandra.com}[http://makandra.com/]
 
 {gem-session.com}[http://gem-session.com/]
+
+{Michael Grosser}[https://github.com/grosser]

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/lib/query_diet/logger.rb

@@ -1,26 +1,29 @@
 module QueryDiet
   class Logger
     class << self
-
-      attr_accessor :count, :time, :bad_count, :bad_time
+      attr_accessor :queries, :bad_count, :bad_time
 
       def reset
-        self.count = 0
-        self.time = 0
+        self.queries = []
       end
 
-      def log(query, &execution)
+      def log(query)
         result = nil
-        seconds = Benchmark.realtime do
-          result = execution.call
-        end
-        if log_query?(query)
-          self.time += (seconds * 1000).to_i
-          self.count += 1
+        time = Benchmark.realtime do
+          result = yield
         end
+        queries << [query, time] if log_query?(query)
         result
       end
 
+      def time
+        (queries.sum(&:last) * 1000).to_i
+      end
+
+      def count
+        queries.size
+      end
+
       def bad?
         count >= bad_count or time >= bad_time
       end
@@ -30,12 +33,10 @@ module QueryDiet
       def log_query?(query)
         query =~ /^(select|create|update|delete|insert)\b/i
       end
-
     end
 
     reset
     self.bad_count = 8
     self.bad_time = 5000
-
   end
 end

data/query_diet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "query_diet"
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch"]
-  s.date = "2012-07-12"
+  s.date = "2012-09-18"
   s.description = "Rails database query counter that stays out of your way"
   s.email = "github@makandra.de"
   s.extra_rdoc_files = [
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/makandra/query_diet"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.3.9.3"
+  s.rubygems_version = "1.3.9.5"
   s.summary = "Rails database query counter that stays out of your way"
 
   if s.respond_to? :specification_version then

data/spec/logger_spec.rb

@@ -1,29 +1,50 @@
 require 'spec_helper'
 
 describe QueryDiet::Logger do
-
-  before :each do
+  before do
     QueryDiet::Logger.reset
   end
 
-  describe 'count' do
+  describe "#reset" do
+    it "should reset count/time/queries" do
+      QueryDiet::Logger.count.should == 0
+      QueryDiet::Logger.time.should == 0
+      QueryDiet::Logger.queries.should == []
+
+      Benchmark.should_receive(:realtime).and_return(5)
+      Movie.create
+
+      QueryDiet::Logger.count.should > 0
+      QueryDiet::Logger.time.should > 0
+      QueryDiet::Logger.queries.size.should > 0
+    end
+  end
 
+  describe "#count" do
     it "should return the number of queries since the last reset" do
       Movie.create
       Movie.create
       QueryDiet::Logger.count.should == 2
     end
-
   end
 
-  describe 'time' do
-
+  describe "#time" do
     it "should return the number of miliseconds spent running database queries since the last reset" do
       Benchmark.should_receive(:realtime).and_return(5)
       Movie.create
       QueryDiet::Logger.time.should == 5000
     end
-
   end
 
+  describe "#queries" do
+    it "should return the queries since last reset" do
+      Benchmark.should_receive(:realtime).and_return(5.1234)
+      Movie.create
+      QueryDiet::Logger.queries.size.should == 1
+      query = QueryDiet::Logger.queries.first
+      query.size.should == 2
+      query[0].should include("INSERT INTO \"movies\"")
+      query[1].should == 5.1234
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require 'spec/rails'
 silence_warnings {RAILS_ENV = ENV['RAILS_ENV']}
 
 # Run the migrations
+ActiveRecord::Migration.verbose = false
 ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
 
 Spec::Runner.configure do |config|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: query_diet
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-12 00:00:00 +02:00
+date: 2012-09-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: rails
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +32,12 @@ dependencies:
         - 2
         - 3
         version: "2.3"
-  name: rails
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: rspec
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +47,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  name: rspec
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: rspec-rails
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +62,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  name: rspec-rails
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: sqlite3
+  type: :runtime
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,12 +76,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: sqlite3
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: jeweler
+  type: :runtime
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,8 +90,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: jeweler
-  version_requirements: *id005
+  requirement: *id005
 description: Rails database query counter that stays out of your way
 email: github@makandra.de
 executables: []
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.3
+rubygems_version: 1.3.9.5
 signing_key: 
 specification_version: 3
 summary: Rails database query counter that stays out of your way