rdo 0.1.1 → 0.1.2

data/lib/rdo.rb

@@ -53,12 +53,4 @@ module RDO
 
     alias_method :open, :connect
   end
-
-  # A suitable NULL device for writing nothing
-  DEV_NULL =
-    if defined? IO::NULL
-      IO::NULL
-    else
-      ENV["OS"] =~ /Windows/ ? "NUL" : "/dev/null"
-    end
 end

data/lib/rdo/colored_logger.rb

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

data/lib/rdo/connection.rb

@@ -7,7 +7,6 @@
 
 require "uri"
 require "cgi"
-require "logger"
 require "forwardable"
 
 module RDO
@@ -65,7 +64,9 @@ module RDO
     #   a Connection for the given options
     def initialize(uri, options = {})
       @options = normalize_options(uri).merge(normalize_options(options))
-      @logger  = @options.fetch(:logger, null_logger)
+
+      @logger       = @options.fetch(:logger, default_logger)
+      @logger.level = @options[:log_level] if @options.key?(:log_level)
 
       unless self.class.drivers.key?(@options[:driver])
         raise RDO::Exception,
@@ -186,8 +187,8 @@ module RDO
       str.nil? ? {} : Hash[CGI.parse(str).map{|k,v| [k, v.size == 1 ? v.first : v]}]
     end
 
-    def null_logger
-      Logger.new(RDO::DEV_NULL).tap{|l| l.level = Logger::UNKNOWN}
+    def default_logger
+      ColoredLogger.new(STDOUT).tap{|l| l.level = Logger::UNKNOWN}
     end
   end
 end

data/lib/rdo/util.rb

@@ -14,6 +14,14 @@ module RDO
   # Performing these operations in C would not be any cheaper, since the data
   # must first be converted into Ruby types anyway.
   module Util
+    # A suitable NULL device for writing nothing
+    DEV_NULL =
+      if defined? IO::NULL
+        IO::NULL
+      else
+        ENV["OS"] =~ /Windows/ ? "NUL" : "/dev/null"
+      end
+
     class << self
       # Convert a String to a Float, taking into account Infinity and NaN.
       #

data/lib/rdo/version.rb

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

data/spec/rdo/statement_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 require "logger"
 
 describe RDO::Statement do
-  let(:logger)   { Logger.new(RDO::DEV_NULL) }
+  let(:logger)   { Logger.new(RDO::Util::DEV_NULL) }
   let(:executor) { double(:executor) }
   let(:stmt)     { RDO::Statement.new(executor, logger) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: