rdo 0.1.0 → 0.1.1

data/lib/rdo/colored_logger.rb

@@ -10,16 +10,28 @@ require "logger"
 module RDO
   # A Logger that outputs using color to highlight errors etc.
   class ColoredLogger < Logger
-    def initialize(*)
-      super
-      self.formatter =
+    def formatter
+      @formatter ||=
         Proc.new do |severity, time, prog, msg|
           case severity
-          when "DEBUG" then "\033[35mSQL\033[0m \033[36m~\033[0m %s\n" % msg
-          when "FATAL" then "\033[31mERROR ~ %s\033[0m\n" % msg
-          else "%s ~ %s\n" % [severity, msg]
-          end
+          when "DEBUG"
+            format_sql(msg)
+          when "FATAL"
+            format_err(msg)
+          else
+            "%s ~ %s" % [severity, msg]
+          end + $/
         end
     end
+
+    private
+
+    def format_sql(sql)
+      "\033[35mSQL\033[0m \033[36m~\033[0m %s" % sql
+    end
+
+    def format_err(msg)
+      "\033[31mERROR ~ %s\033[0m" % msg
+    end
   end
 end

data/lib/rdo/connection.rb

@@ -95,9 +95,17 @@ module RDO
     # @return [Result]
     #   the result of the query
     def execute(statement, *bind_values)
-      @driver.execute(statement, *bind_values).tap do
+      t = Time.now
+      @driver.execute(statement, *bind_values).tap do |rs|
+        rs.info[:execution_time] ||= Time.now - t
         if logger.debug?
-          logger.debug("#{statement}#{" <Bind: #{bind_values.inspect}>" unless bind_values.empty?}")
+          logger.debug(
+            "(%.6fs) %s%s" % [
+              rs.execution_time,
+              statement,
+              ("<Bind: #{bind_values.inspect}>" unless bind_values.empty?)
+            ]
+          )
         end
       end
     rescue RDO::Exception => e

data/lib/rdo/result.rb

@@ -85,6 +85,14 @@ module RDO
       end
     end
 
+    # Get the time spent processing the statement.
+    #
+    # @return [Float]
+    #   the time in seconds spent executing the query
+    def execution_time
+      info[:execution_time].to_f
+    end
+
     # Iterate over all rows returned by the connection.
     #
     # For each row, a Symbol-keyed Hash is yielded into the block.

data/lib/rdo/statement.rb

@@ -31,9 +31,17 @@ module RDO
     # @param [Object...] args
     #   bind parameters to use in place of '?'
     def execute(*bind_values)
-      @executor.execute(*bind_values).tap do
+      t = Time.now
+      @executor.execute(*bind_values).tap do |rs|
+        rs.info[:execution_time] ||= Time.now - t
         if logger.debug?
-          logger.debug("#{command}#{" <Bind: #{bind_values.inspect}>" unless bind_values.empty?}")
+          logger.debug(
+            "(%.6fs) %s %s" % [
+              rs.execution_time,
+              command,
+              ("<Bind: #{bind_values.inspect}>" unless bind_values.empty?)
+            ]
+          )
         end
       end
     rescue RDO::Exception => e

data/lib/rdo/version.rb

@@ -6,5 +6,5 @@
 ##
 
 module RDO
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/rdo/statement_spec.rb

@@ -17,7 +17,7 @@ describe RDO::Statement do
 
   describe "#execute" do
     let(:executor) { double(command: "SELECT * FROM bob WHERE ?", execute: result) }
-    let(:result)   { stub(:result) }
+    let(:result)   { stub(:result, info: {}, execution_time: 0.0) }
 
     it "delegates to the executor" do
       executor.should_receive(:execute).with(1, 2).and_return(result)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec