log4r-sequel 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e2df9143f88d2565644c34dd200a0c66a4d49f5
-  data.tar.gz: c76ec6079a80db159faac195d8890e8757794e25
+  metadata.gz: bbcb59ef938e2f81f26cc69a2d19499eab310e5b
+  data.tar.gz: 1a44bf191adb4e188142e2ddc4e3002ecbc0ee97
 SHA512:
-  metadata.gz: 6fbd50621319256bad2e8c8ca51a88e3df425c02da1abdcdfb525f0fa98474b0743aafa60427a081c4f43d503e4ad02b51abc63f27105c0cfa0655866acd3551
-  data.tar.gz: bc46f2fd5e8ef4a268f6ff5151e8f70ca21f03656ec7c720a51d556757ab2a1c8e2298661f669bc72772e66999c8c3f58116f1aa0bf051a1e0bc7cba98f1ba30
+  metadata.gz: dc8530fafb4a599c17eeab549cae77f9ed055dac763b237534a8fc3d0bf0cf2cc58cfc2b1311eb2889e4fdeaa99234a50d4be5eaea1781d9f4ef772af935f3d9
+  data.tar.gz: c9801a3ea103a0d0a3663e30a48e524594dc21b3dddb7fb297f36ceaa7906395ee54189c42168975fb698d6f2742791c52f1707458afbd0455505fb763511650

data/Gemfile

@@ -5,11 +5,6 @@ source 'https://rubygems.org'
 
 gem 'log4r', '~> 1.1.9', '> 1.1'
 
-# ugh this is so stupid - jeweler pulls in the latest version of this -
-# through it's own dependency, causing a hard requirement on ruby 2.3.x,
-# locking it down this way
-gem 'rack', '= 1.6.4'
-
 gem 'sequel', '~> 4.6', '>= 4.6.0'
 
 # making ruby 2.3.0 happy
@@ -18,6 +13,11 @@ gem 'hoe', '~> 3.15', '>= 3.15.1'
 group :development do
   gem 'jeweler', '~> 2.0', '>= 2.0.0'
   gem 'test-unit', '~> 2.0', '>= 2.0.0'
+
+  # ugh this is so stupid - jeweler pulls in the latest version of this -
+  # through it's own dependency, causing a hard requirement on ruby 2.3.x,
+  # locking it down this way
+  gem 'rack', '= 1.6.4'
 end
 
 group :sqlite do

data/Gemfile.lock

@@ -8,18 +8,17 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     git (1.3.0)
-    github_api (0.13.1)
+    github_api (0.14.5)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
       hashie (>= 3.4)
-      multi_json (>= 1.7.5, < 2.0)
-      oauth2
-    hashie (3.4.4)
+      oauth2 (~> 1.0)
+    hashie (3.4.6)
     highline (1.7.8)
     hoe (3.15.1)
       rake (>= 0.8, < 12.0)
-    jeweler (2.0.1)
+    jeweler (2.1.1)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
@@ -28,29 +27,33 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
+      semver
     json (1.8.3)
-    jwt (1.5.1)
+    jwt (1.5.6)
     log4r (1.1.10)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    oauth2 (1.1.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     pg (0.18.4)
+    pkg-config (1.1.7)
     rack (1.6.4)
     rake (11.2.2)
     rdoc (4.2.2)
       json (~> 1.4)
-    sequel (4.37.0)
+    semver (1.0.1)
+    sequel (4.38.0)
     sqlite3 (1.3.11)
-    test-unit (2.0.0.0)
+    test-unit (2.5.5)
     thread_safe (0.3.5)
 
 PLATFORMS

data/README.md

@@ -6,9 +6,9 @@ Log4r outputter to a Sequel database handle
   - [from-source installation (latest)](#from-source-installation-latest)
   - [demo](#demo)
 - [supported databases](#supported-databases)
-- [TODO](#todo)
+- [notes](#notes)
 
-the de-facto standard library for logging in Ruby, [log4r](https://github.com/colbygk/log4r) works very well for a wide array of logging targets:
+the de-facto standard library for logging in Ruby, [log4r](https://github.com/colbygk/log4r), works very well for a wide array of logging targets:
   * STDOUT / STDERR
   * file
   * email
@@ -16,6 +16,8 @@ the de-facto standard library for logging in Ruby, [log4r](https://github.com/co
 
 and so on, but didn't have a way to output directly to a database - enter `log4r-sequel`
 
+this project was inspired/motivated by the fact that [chainsaw](http://log4r.rubyforge.org/manual.html#chainsaw) isn't supported on recent versions of OSX.
+
 ## usage
 
 ### pre-built gem installation (stable)
@@ -51,7 +53,7 @@ irb(main):001:0> require 'log4r/outputter/sequeloutputter'
 ### demo
 
 ```
-$ ruby example/log2postgres.rb
+$ ruby example/log2sqlite.rb
 2016/08/27 17:08.1472342938 | bar | DEBUG | this is a debug message
 2016/08/27 17:08.1472342938 | bar | INFO | this is an info message
 2016/08/27 17:08.1472342938 | bar | WARN | this is a warning
@@ -73,11 +75,6 @@ sqlite>
   * sqlite3
   * Postgres
 
-## TODO
-  * tests
-    * unit tests
-
-
 ## notes
   * `:database`, `:table`, and `:file` options are passed through `Time.now.strftime(%s)`
   * sqlite filenames cannot contain underscores (`the scheme sqlite does not accept registry part`)

data/Rakefile

@@ -15,7 +15,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors     = ['Conor Horan-Kates']
   gem.licenses    =  'MIT'
 
-  gem.files.exclude 'examples/*'
+  gem.files.exclude 'example/*'
   gem.files.exclude 'pkg/*'
 end
 Jeweler::RubygemsDotOrgTasks.new
@@ -26,9 +26,16 @@ namespace :test do
     t.name = 'functional'
     t.libs << 'lib'
     t.test_files = FileList['test/functional/**/test_*.rb']
-    #t.verbose = true
+    t.verbose = false
+  end
+
+  Rake::TestTask.new do |t|
+    t.name = 'unit'
+    t.libs << 'lib'
+    t.test_files = FileList['test/unit/**/test_*.rb']
+    t.verbose = false
   end
 
 end
 desc 'run all tests'
-task :test => ['clean', 'test:functional'] do; end
+task :test => ['clean', 'test:functional', 'test:unit'] do; end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/log4r/outputter/sequeloutputter.rb

@@ -3,18 +3,6 @@ require 'log4r/yamlconfigurator'
 require 'sequel'
 require 'yaml'
 
-class Log4r::Logger
-
-  # no parameters, returns the first Log4r::Outputter::Sequel object
-  def get_outputter
-    self.outputters.each do |op|
-      next unless op.is_a?(SequelOutputter)
-      return op
-    end
-  end
-
-end
-
 class SequelOutputter < Log4r::Outputter
 
   KNOWN_ENGINES = [
@@ -51,6 +39,8 @@ class SequelOutputter < Log4r::Outputter
 
     {
       :delimiter => @delimiter,
+      :engine    => @engine,
+      :formatter => config[:formatter], # feels a bit weird mixing instance variables and referencing the hash directly
       :map       => @map,
       :table     => @table,
     }.each_pair do |key, value|
@@ -108,6 +98,7 @@ class SequelOutputter < Log4r::Outputter
 
   def initialize_db
     map = @map # we're in a different class in the block below, can't access
+    # TODO would be better to check to see if the DB is good rather than just throw an exception here
     @dbh.create_table? @table do
       primary_key :id
       map.values.each do |v|

data/log4r-sequel.gemspec

@@ -0,0 +1,69 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: log4r-sequel 0.0.3 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "log4r-sequel"
+  s.version = "0.0.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["Conor Horan-Kates"]
+  s.date = "2016-09-20"
+  s.description = "Log4r::Outputter that writes to a Sequel database"
+  s.email = ["conor.code@gmail.com"]
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    ".travis.yml",
+    "Gemfile",
+    "Gemfile.lock",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/log4r/outputter/sequeloutputter.rb",
+    "log4r-sequel.gemspec",
+    "test/config/log4r-postgres.yaml",
+    "test/config/log4r-sqlite.yaml",
+    "test/functional/test_postgres.rb",
+    "test/functional/test_sqlite.rb",
+    "test/helper.rb",
+    "test/unit/test_postgres.rb",
+    "test/unit/test_sqlite.rb"
+  ]
+  s.homepage = "http://github.com/chorankates/log4r-sequel"
+  s.licenses = ["MIT"]
+  s.rubygems_version = "2.4.8"
+  s.summary = "Log4r::Outputter::Sequel"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<log4r>, ["> 1.1", "~> 1.1.9"])
+      s.add_runtime_dependency(%q<sequel>, [">= 4.6.0", "~> 4.6"])
+      s.add_runtime_dependency(%q<hoe>, [">= 3.15.1", "~> 3.15"])
+      s.add_development_dependency(%q<jeweler>, [">= 2.0.0", "~> 2.0"])
+      s.add_development_dependency(%q<test-unit>, [">= 2.0.0", "~> 2.0"])
+      s.add_development_dependency(%q<rack>, ["= 1.6.4"])
+    else
+      s.add_dependency(%q<log4r>, ["> 1.1", "~> 1.1.9"])
+      s.add_dependency(%q<sequel>, [">= 4.6.0", "~> 4.6"])
+      s.add_dependency(%q<hoe>, [">= 3.15.1", "~> 3.15"])
+      s.add_dependency(%q<jeweler>, [">= 2.0.0", "~> 2.0"])
+      s.add_dependency(%q<test-unit>, [">= 2.0.0", "~> 2.0"])
+      s.add_dependency(%q<rack>, ["= 1.6.4"])
+    end
+  else
+    s.add_dependency(%q<log4r>, ["> 1.1", "~> 1.1.9"])
+    s.add_dependency(%q<sequel>, [">= 4.6.0", "~> 4.6"])
+    s.add_dependency(%q<hoe>, [">= 3.15.1", "~> 3.15"])
+    s.add_dependency(%q<jeweler>, [">= 2.0.0", "~> 2.0"])
+    s.add_dependency(%q<test-unit>, [">= 2.0.0", "~> 2.0"])
+    s.add_dependency(%q<rack>, ["= 1.6.4"])
+  end
+end
+

data/test/{log4r-sqlite_test.yaml → config/log4r-sqlite.yaml}

@@ -32,4 +32,4 @@ log4r_config:
       0: 'date'
       1: 'level'
       2: 'class'
-      3: 'message'
+      3: 'message'

data/test/functional/test_postgres.rb

@@ -1,12 +1,12 @@
-$LOAD_PATH << sprintf('%s/../../lib', File.dirname(__FILE__))
-require 'log4r/outputter/sequeloutputter'
+$LOAD_PATH << sprintf('%s/../', File.dirname(__FILE__))
 
-require 'test/unit'
+require 'helper'
 
 class TestPostgres < Test::Unit::TestCase
 
   def setup
-    @good_config = sprintf('%s/../log4r-postgres_test.yaml', File.expand_path(File.dirname(__FILE__)))
+    # TODO move this to a helper class - or a function that returns one based on .. criteria
+    @good_config = sprintf('%s/../config/log4r-postgres.yaml', File.expand_path(File.dirname(__FILE__)))
     @table = Time.now.strftime('logs-%Y/%m/%d-%H:%M').to_sym
 
     begin
@@ -44,10 +44,6 @@ class TestPostgres < Test::Unit::TestCase
 
   end
 
-  def test_sad_yaml
-    # TODO pass in bad configs as hashes
-  end
-
   def test_happy_hash
     logger = nil
 

data/test/functional/test_sqlite.rb

@@ -1,12 +1,12 @@
-$LOAD_PATH << sprintf('%s/../../lib', File.dirname(__FILE__))
-require 'log4r/outputter/sequeloutputter'
+$LOAD_PATH << sprintf('%s/../', File.dirname(__FILE__))
+
+require 'helper'
 
-require 'test/unit'
 
 class TestSqlite < Test::Unit::TestCase
 
   def setup
-    @good_config = sprintf('%s/../log4r-sqlite_test.yaml', File.expand_path(File.dirname(__FILE__)))
+    @good_config = sprintf('%s/../config/log4r-sqlite.yaml', File.expand_path(File.dirname(__FILE__)))
     @table = :logs
 
     begin
@@ -20,7 +20,6 @@ class TestSqlite < Test::Unit::TestCase
     # TODO remove the database.. assume it's just '*.sqlite' in this path?
   end
 
-
   def test_happy_yaml
     file = @good_config
     Log4r::YamlConfigurator.load_yaml_file(file)
@@ -46,10 +45,6 @@ class TestSqlite < Test::Unit::TestCase
 
   end
 
-  def test_sad_yaml
-    # TODO pass in bad configs as hashes
-  end
-
   def test_happy_hash
     logger = nil
 

data/test/helper.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+## helper.rb sets up pathing and common requires for tests
+
+$LOAD_PATH << sprintf('%s/../lib', File.dirname(__FILE__))
+require 'log4r/outputter/sequeloutputter'
+
+require 'test/unit'
+
+class Log4r::Logger
+
+  # no parameters, returns the first SequelOutputter object
+  def get_outputter
+    self.outputters.each do |op|
+      next unless op.is_a?(SequelOutputter)
+      return op
+    end
+  end
+
+end

data/test/unit/test_postgres.rb

@@ -0,0 +1,119 @@
+$LOAD_PATH << sprintf('%s/../', File.dirname(__FILE__))
+
+require 'helper'
+
+class TestPostgresUnit < Test::Unit::TestCase
+
+  def setup
+    # TODO should this be a constant?
+    @good_config     = File.expand_path(sprintf('%s/../config/log4r-postgres.yaml', File.dirname(__FILE__)))
+    @good_loggername = :test.to_s
+    @table           = :logs
+
+    begin
+      require 'sqlite3'
+    rescue LoadError
+      omit('[sqlite3] not installed/configured') # TODO this really needs to omit the entire test
+    end
+  end
+
+  def teardown
+    # TODO decide what we're doing here
+  end
+
+  def test_happy_yaml
+    file = @good_config
+    Log4r::YamlConfigurator.load_yaml_file(file)
+
+    logger = nil
+
+    assert_nothing_raised do
+      logger = Log4r::Logger.get(@good_loggername)
+    end
+
+    assert_not_nil(logger)
+  end
+
+  def test_sad_yaml
+    good_yaml = YAML.load_file(@good_config)
+    sad_yamls = Hash.new
+
+    # delete vital keys here and create an array of sad yamls, but cheating a little to find our config
+    fail(sprintf('invalid input to generate sad yaml[%s]', good_yaml)) unless good_yaml.has_key?('log4r_config') and
+        good_yaml['log4r_config'].has_key?('outputters') and
+        good_yaml['log4r_config']['outputters'].last['type'].eql?('SequelOutputter')
+
+    {
+        :formatter.to_s => Hash.new.class,
+        :map.to_s       => Hash.new.class,
+
+        :delimiter.to_s => String.new.class,
+        :engine.to_s    => String.new.class,
+        :table.to_s     => String.new.class,
+    }.each_pair do |key, _klass|
+      candidate = Marshal.load(Marshal.dump(good_yaml))
+      candidate['log4r_config']['outputters'].last.delete(key)
+      sad_yamls[key] = candidate
+    end
+
+    sad_yamls.each_pair do |name, config|
+
+      logger = nil
+
+      e = assert_raises Log4r::ConfigError do
+        Log4r::YamlConfigurator.load_yaml_string(config.to_yaml) # it's valid YAML, just missing required options
+        logger = Log4r::Logger.get(@good_loggername)
+      end
+
+      assert_match(Regexp.new(sprintf('[%s]', name)), e.message)
+      assert_nil(logger)
+
+    end
+
+  end
+
+  def test_happy_hash
+    logger = Log4r::Logger.new(@good_loggername)
+
+    table = 'logs-%Y/%m/%d-%H:%M'
+    fmt_table = Time.now.strftime(table)
+
+    hash = {
+        :type => 'SequelOutputter',
+        :name => 'sequel',
+        :formatter => Log4r::Formatter.new({
+           :type         => 'PatternFormatter',
+           :date_pattern => '%Y/%m/%d %H:%M.%s',
+           :pattern      => '%d!@#$%C!@#$%l!@#$%m',
+         }),
+
+        :engine => 'postgres',
+        :server => 'localhost',
+        :port   => 5432,
+        :database => 'logs',
+        :table    => table,
+        :username => 'postgres',
+        :password => 'postgres',
+
+        :delimiter => '!@#$',
+        :map => {
+            0 => 'date',
+            1 => 'level',
+            2 => 'class',
+            3 => 'message',
+        },
+    }
+
+    assert_nothing_raised do
+      outputter = Log4r::Outputter::SequelOutputter.new(
+          'sequel',
+          hash,
+      )
+      logger.add(outputter)
+    end
+
+    assert_not_equal(hash[:file], logger.get_outputter.file)
+    assert_not_equal(hash[:table], logger.get_outputter.table)
+  end
+
+end

data/test/unit/test_sqlite.rb

@@ -0,0 +1,111 @@
+$LOAD_PATH << sprintf('%s/../', File.dirname(__FILE__))
+
+require 'helper'
+
+class TestSqliteUnit < Test::Unit::TestCase
+
+  def setup
+    # TODO should this be a constant?
+    @good_config     = File.expand_path(sprintf('%s/../config/log4r-sqlite.yaml', File.dirname(__FILE__)))
+    @good_loggername = :test.to_s
+    @table           = :logs
+
+    begin
+      require 'sqlite3'
+    rescue LoadError
+      omit('[sqlite3] not installed/configured') # TODO this really needs to omit the entire test
+    end
+  end
+
+  def teardown
+    # TODO remove the database.. assume it's just '*.sqlite' in this path?
+  end
+
+  def test_happy_yaml
+    file = @good_config
+    Log4r::YamlConfigurator.load_yaml_file(file)
+
+    logger = nil
+
+    assert_nothing_raised do
+      logger = Log4r::Logger.get(@good_loggername)
+    end
+
+    assert_not_nil(logger)
+  end
+
+  def test_sad_yaml
+    good_yaml = YAML.load_file(@good_config)
+    sad_yamls = Hash.new
+
+    # delete vital keys here and create an array of sad yamls, but cheating a little to find our config
+    fail(sprintf('invalid input to generate sad yaml[%s]', good_yaml)) unless good_yaml.has_key?('log4r_config') and
+      good_yaml['log4r_config'].has_key?('outputters') and
+      good_yaml['log4r_config']['outputters'].last['type'].eql?('SequelOutputter')
+
+    {
+      :formatter.to_s => Hash.new.class,
+      :map.to_s       => Hash.new.class,
+
+      :delimiter.to_s => String.new.class,
+      :engine.to_s    => String.new.class,
+      :table.to_s     => String.new.class,
+    }.each_pair do |key, _klass|
+      candidate = Marshal.load(Marshal.dump(good_yaml))
+      candidate['log4r_config']['outputters'].last.delete(key)
+      sad_yamls[key] = candidate
+    end
+
+    sad_yamls.each_pair do |name, config|
+
+      logger = nil
+
+      e = assert_raises Log4r::ConfigError do
+        Log4r::YamlConfigurator.load_yaml_string(config.to_yaml) # it's valid YAML, just missing required options
+        logger = Log4r::Logger.get(@good_loggername)
+      end
+
+      assert_match(Regexp.new(sprintf('[%s]', name)), e.message)
+      assert_nil(logger)
+
+    end
+
+  end
+
+  def test_happy_hash
+    logger = Log4r::Logger.new(@good_loggername)
+
+    hash = {
+      :type => 'SequelOutputter',
+      :name => 'sequel',
+      :formatter => Log4r::Formatter.new({
+        :type         => 'PatternFormatter',
+        :date_pattern => '%Y/%m/%d %H:%M.%s',
+        :pattern      => '%d!@#$%C!@#$%l!@#$%m',
+      }),
+
+      :engine => 'sqlite',
+      :file => 'log-%y-%m-%d-%H-%M.sqlite',
+      :table => 'logs_%y-%m-%d', # use the non-strftimed format here
+      :delimiter => '!@#$',
+      :map => {
+        0 => 'date',
+        1 => 'level',
+        2 => 'class',
+        3 => 'message',
+      },
+    }
+
+    assert_nothing_raised do
+      outputter = Log4r::Outputter::SequelOutputter.new(
+        'sequel',
+        hash,
+      )
+      logger.add(outputter)
+    end
+
+    assert_not_equal(hash[:file], logger.get_outputter.file)
+    assert_not_equal(hash[:table], logger.get_outputter.table)
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log4r-sequel
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Conor Horan-Kates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -30,20 +30,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.9
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +110,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 description: Log4r::Outputter that writes to a Sequel database
 email:
 - conor.code@gmail.com
@@ -138,15 +138,15 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- example/log2postgres.rb
-- example/log2sqlite.rb
-- example/log4r-postgres.yaml
-- example/log4r-sqlite.yaml
 - lib/log4r/outputter/sequeloutputter.rb
+- log4r-sequel.gemspec
+- test/config/log4r-postgres.yaml
+- test/config/log4r-sqlite.yaml
 - test/functional/test_postgres.rb
 - test/functional/test_sqlite.rb
-- test/log4r-postgres_test.yaml
-- test/log4r-sqlite_test.yaml
+- test/helper.rb
+- test/unit/test_postgres.rb
+- test/unit/test_sqlite.rb
 homepage: http://github.com/chorankates/log4r-sequel
 licenses:
 - MIT

data/example/log2postgres.rb

@@ -1,18 +0,0 @@
-$LOAD_PATH << sprintf('%s/../lib', File.dirname(__FILE__))
-require 'log4r/outputter/sequeloutputter'
-
-require 'pg'
-
-file = sprintf('%s/log4r-postgres.yaml', File.dirname(__FILE__))
-Log4r::YamlConfigurator.load_yaml_file(file)
-
-logger  = Log4r::Logger.get('bar')
-
-[logger].each do |l|
-  ## log some garbage
-  l.debug('this is a debug message')
-  l.info('this is an info message')
-  l.warn('this is a warning')
-  l.error('this is an error')
-  l.fatal('this is a fatal')
-end

data/example/log2sqlite.rb

@@ -1,19 +0,0 @@
-$LOAD_PATH << sprintf('%s/../lib', File.dirname(__FILE__))
-require 'log4r/outputter/sequeloutputter'
-
-require 'sqlite3'
-
-## instantiate a logger following the log4r pattern
-file = sprintf('%s/log4r-sqlite.yaml', File.dirname(__FILE__))
-Log4r::YamlConfigurator.load_yaml_file(file)
-
-logger  = Log4r::Logger.get('foo')
-
-[logger].each do |l|
-  ## log some garbage
-  l.debug('this is a debug message')
-  l.info('this is an info message')
-  l.warn('this is a warning')
-  l.error('this is an error')
-  l.fatal('this is a fatal')
-end

data/example/log4r-postgres.yaml

@@ -1,53 +0,0 @@
----
-log4r_config:
-  loggers:
-  - name: 'bar'
-    outputters:
-      - sequel
-      - stdout
-  outputters:
-  # not needed, but feedback is useful
-  - type: StdoutOutputter
-    name: stdout
-    formatter:
-      type: PatternFormatter
-      date_pattern: '%Y/%m/%d %H:%M.%s'
-      pattern: '%d | %C | %l | %m'
-
-  - type: SequelOutputter
-    # traditional Log4r settings
-    name: sequel
-    level: DEBUG
-    formatter:
-      type: PatternFormatter
-      date_pattern: '%Y/%m/%d %H:%M.%s'
-      pattern: '%d!@#$%l!@#$%C!@#$%c!@#$%h!@#$%p!@#$%m' # kitchen sink
-    # log4r-sequel settings
-    engine: postgres
-    server: localhost
-    port: 5432
-    database: logs
-    table: logs-%Y/%m/%d-%H:%M.%s
-    username: postgres
-    password: postgres
-    delimiter: '!@#$' # this is used to determine columns needed based on log4 configuration
-    map:
-      0: 'date'
-      1: 'level'
-      2: 'class'
-      3: 'relative_class'
-      4: 'thread'
-      5: 'pid'
-      6: 'message'
-
-# truncated map from http://log4r.rubyforge.org/rdoc/Log4r/PatternFormatter.html
-#  %c - event short name
-#  %C - event fullname
-#  %d - date
-#  %g - Global Diagnostic Context (GDC)
-#  %t - trace
-#  %m - message
-#  %h - thread name
-#  %p - process ID aka PID
-#  %M - formatted message
-#  %l - Level in string form

data/example/log4r-sqlite.yaml

@@ -1,46 +0,0 @@
----
-log4r_config:
-  loggers:
-  - name: 'foo'
-    outputters:
-      - sequel
-      - stdout
-  outputters:
-  # not needed, but feedback is useful
-  - type: StdoutOutputter
-    name: stdout
-    formatter:
-      type: PatternFormatter
-      date_pattern: '%Y/%m/%d %H:%M.%s'
-      pattern: '%d | %C | %l | %m'
-
-  - type: SequelOutputter
-    # traditional Log4r settings
-    name: sequel
-    level: DEBUG
-    formatter:
-      type: PatternFormatter
-      date_pattern: '%Y/%m/%d %H:%M.%s'
-      pattern: '%d!@#$%C!@#$%l!@#$%m' # date|level|event/class fullname|message
-    # log4r-sequel settings
-    engine: sqlite
-    file: log-%Y-%m-%d-%H-%M-%s.sqlite
-    table: logs
-    delimiter: '!@#$' # this is used to determine columns needed based on log4 configuration
-    map:
-      0: 'date'
-      1: 'level'
-      2: 'class'
-      3: 'message'
-
-# truncated map from http://log4r.rubyforge.org/rdoc/Log4r/PatternFormatter.html
-#  %c - event short name
-#  %C - event fullname
-#  %d - date
-#  %g - Global Diagnostic Context (GDC)
-#  %t - trace
-#  %m - message
-#  %h - thread name
-#  %p - process ID aka PID
-#  %M - formatted message
-#  %l - Level in string form