sequeloutputter.rb in log4r-sequel-0.0.2

- old
+ new

@@ -1,25 +1,13 @@
 require 'log4r'
 require 'log4r/yamlconfigurator'
 require 'sequel'
 require 'yaml'
 
-# TODO  should we move this to ../logger.rb
-# TODO .. or should we remove this entirely? it was implemented to let us call connect/configure, but since we do that in initiliaze now, maybe we just pull it
 class Log4r::Logger
-  # +method+ String or Symbol representing the name of the method in the Log4r::Outputter::SequelOutputter class you want to use
-  # +parameters+ arbitrary data type to be passed to :methods
-  def sequel(method, parameters = { })
-    # TODO support methods that take more than one parameter
-    self.outputters.each do |op|
-      next unless op.is_a?(SequelOutputter)
-      return op.send(method.to_sym, parameters)
-    end
-  end
 
   # no parameters, returns the first Log4r::Outputter::Sequel object
-  # TODO is there ever a case where there would be more than one?
   def get_outputter
     self.outputters.each do |op|
       next unless op.is_a?(SequelOutputter)
       return op
     end
@@ -55,28 +43,33 @@
     config = new_config
 
     @engine = config[:engine].to_sym
 
     # error checking on table/column settings
-    @table = config[:table].to_sym
-    @map = config[:map]
+    @table     = Time.now.strftime(config[:table]).to_sym
+    @map       = config[:map]
     @delimiter = config[:delimiter]
-    [@delimiter, @map, @table].each do |required|
-      raise Log4r::ConfigError.new(sprintf("required '%s' key missing from configuration", required)) if required.nil?
+
+    {
+      :delimiter => @delimiter,
+      :map       => @map,
+      :table     => @table,
+    }.each_pair do |key, value|
+      raise Log4r::ConfigError.new(sprintf('required key[%s] missing from configuration', key)) if value.nil?
     end
 
     if @engine.eql?(:postgres)
-      @database = config[:database]
-      @file     = nil
+      @database = Time.now.strftime(config[:database])
+      @file     = @table # this is technically the.. table, but maintaining interface cleanliness
       server    = config[:server]
       port      = config[:port]
       username  = config[:username]
       password  = config[:password]
       @dbh = Sequel.connect(sprintf('postgres://%s:%s@%s:%s/%s', username, password, server, port, @database))
     elsif @engine.eql?(:sqlite)
       @database = nil # sqlite has one DB per file
-      @file = config[:file]
+      @file = Time.now.strftime(config[:file])
       @dbh = Sequel.connect(sprintf('sqlite://%s', @file))
     else
       raise Log4r::ConfigError.new(sprintf('unable to use engine[%s], allowed[%s]', @engine, KNOWN_ENGINES))
     end
 
@@ -88,11 +81,11 @@
   def connect(dbh)
     raise StandardError.new(sprintf('invalid parameter class[%s] expecting[Sequel::Database]', dbh.class)) unless dbh.is_a?(Sequel::Database)
 
     @dbh = dbh
 
-    # idempotently create table/columns
+    # idempotently create database/table
     initialize_db
   end
 
   def connected?
     # this is sufficient since we throw an exception during #connect if we don't get a good handle
@@ -101,12 +94,11 @@
 
   private
 
   def write(data)
     raise StandardError.new(sprintf('%s is not connected, run %s.connect(yaml_file)', self.class, self.class)) unless connected?
-     # INSERT INTO `logs`(`id`,`date`,`level`,`class`,`message`) VALUES (1,NULL,NULL,NULL,NULL);
-    tokens = data.split(@delimiter)
-    hash = Hash.new
+    tokens = data.chomp.split(@delimiter)
+    hash   = Hash.new
 
     tokens.each_with_index do |token, i|
       hash[@map[i].to_sym] = token
     end
 