mojo_logger 0.1.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc5077befcd1a3215bfc2bc080e94e1ab3810479
-  data.tar.gz: f63f06a080617ba976d3b8270b3809d6ed58bf9f
+  metadata.gz: b542540d5e724fed35f873cc7e639b35fc27ed60
+  data.tar.gz: e9559ef49e62808e55adb5e8da62f3c7c1a517aa
 SHA512:
-  metadata.gz: 14b21d9122cebc7b95d94a577c4dc761ade4abfc6ab78b54b357a51f854ede05afb05ee31fa71872aa92ef81e471673b8fae61e81035bf0d43bf66e492019087
-  data.tar.gz: e84d470a60e7d395b2e9b938957ca80a6cffbe4b56392075f141de37a21b399d150b50204e99c8c41e83d139e4ef290bb58a34183298528ee7665fbb28c4267d
+  metadata.gz: ac210ac71c04b8590d8f94e42349f636244a6ee3ad0eee8b9879e1a30d899fff6ab50cc019a673764ca409e73eeaea1b2171fb9c6795af04468d078b9681402e
+  data.tar.gz: 80ce95be39775bf75c9383866ced7d64349987f3c3010d19864c7afa7adcf07cf701e89bd9d2d219b833f6b2d2be5f7adf0d0e51ec547c904c6afc441405a010

data/.ruby-version

@@ -0,0 +1 @@
+jruby-9.1.2.0

data/Gemfile

@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mojo_logger.gemspec
 gemspec
-
-group :test do
-  gem 'rspec'
-end

data/README.md

@@ -1,8 +1,9 @@
 # MojoLogger
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/mojo_logger`. To experiment with that code, run `bin/console` for an interactive prompt.
+This gem is a wrapper around log4j and is primarily meant to be used in the Mojo framework. It will standardize logs accross Mojo applications and provide a single location to edit the Mojo Logger code base. It comes with a few benefits:
 
-TODO: Delete this and the text above, and describe your gem
+* **JSON** Logs will be printed for nice splunk logging when the mojo_* methods are called.
+* No need for a log4j.properties file (although you can use one if you prefer). You can configure the logger on the fly and this gem will build a StringIO object to mock the log4j.properties file
 
 ## Installation
 
@@ -22,7 +23,129 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+#### Simple access to a CONSOLE appender:
+
+```ruby
+require 'mojo_logger'
+
+MojoLogger.debug "This is a message"
+#=> This is a message
+
+```
+
+#### Mojo Formatted JSON logs
+```ruby
+require 'mojo_logger'
+
+api_request = {
+    session_id: '111111-11111',
+    reference_id: 'client',
+    api: 'get-user-info'
+}
+
+MojoLogger.mojo_warn(api_request, "Oops", "Some Warn Message")
+#=> {"time":"08-25-2015 19:22:59.940 +0000","app":"Mojo","session_id":"111111-11111","reference_id":"client","api":"get-user-info","category":"Oops","message":"Some Warn Message"}
+
+```
+
+#### Mojo Formatted JSON logs with cusom keys
+```ruby
+require 'mojo_logger'
+
+api_request = {
+    session_id: '111111-11111',
+    reference_id: 'client',
+    api: 'get-user-info'
+}
+
+MojoLogger.mojo_warn(api_request, "Oops", "Some Warn Message", {my_key: "Some value", my_other_key: :another_val})
+#=> {"time":"08-25-2015 19:24:57.575 +0000","app":"Mojo","session_id":"111111-11111","reference_id":"client","api":"get-user-info","category":"Oops","message":"Some Warn Message","my_key":"Some value","my_other_key":"another_val"} 
+
+```
+
+
+## Configuration
+
+#### CONSOLE appender with "WARN" log level
+```ruby
+require 'mojo_logger'
+
+MojoLogger.config do |config|
+  config.default_log_level = :warn
+end
+
+MojoLogger.debug "This won't show up"
+#=> nil
+
+MojoLogger.warn "This will show up"
+#=> This will show up
+
+```
+
+
+#### Rolling File appender
+This will create a rolling file logger rather than a console logger with the following settings:
+Max File Size = 10MB
+Max Backup Index = 10
+Pattern = '%n %m %n'  (I need to change this but this is what it is for now.)
+
+```ruby
+require 'mojo_logger'
+
+MojoLogger.config do |config|
+  config.log_file = '/var/log/my_log.log'
+end
+
+```
+
+#### Add Custom lines to the generated log4j.properties 'file'
+
+```ruby
+require 'mojo_logger'
+
+MojoLogger.config do |config|
+  config.custom_line("log4j.logger.org.apache.zookeeper.ClientCnxn=INFO")
+end
+
+```
+
+#### Add Custom adapter for format your logs
+Add an adapter that will accept whatever fields you want to input and output a hash.
+This hash will be converted to json by MojoLogger.
+
+```ruby
+require 'mojo_logger'
+include MojoLogger
+
+ENV['RACK_ENV'] = 'development'
+
+# by default you use the standard adapter
+
+mojo_debug({}, 'category', 'this is my message', { custom: :field })
+# => {"time":"04-01-2016 22:25:33.019 +0000","app":"Mojo","env":"development","session_id":null,"reference_id":null,"api":null,"category":"category","message":"this is my message","custom":"field"}
+
+class CustomLogAdapter
+  # an adapter must repond to #format() and return a Hash
+  def format(message)
+    {
+      'message'     => message,
+      'constant'    => 'Hello!'
+    }
+  end
+end
+
+
+MojoLogger.config do |config|
+  config.adapter = CustomLogAdapter.new
+end
+
+# now you can call the #mojo_* methods with the parameter you define
+
+mojo_debug('my message')
+# => {"time":"04-01-2016 22:26:43.441 +0000","app":"Mojo","env":"development","message":"my message","constant":"Hello!"}
+
+```
+
 
 ## Development
 

data/bench/gen.rb

@@ -0,0 +1,27 @@
+require 'pry'
+require 'benchmark'
+require 'mojo_logger'
+
+MojoLogger.config do |c|
+  c.default_log_level= :info
+  c.log_file = '/dev/null'
+end
+
+@mojo_args = [{}, "Category", "Test Message", { key: "This is a string", key2: "this is some other thing", 'key2' => "Third thing" }]
+
+5.times do
+
+  Benchmark.bmbm do |x|
+    x.report("debug")  { 100000.times { MojoLogger.debug "Log message" }  }
+    x.report("info")   { 100000.times { MojoLogger.info "Log message"  }  }
+  end
+
+
+  Benchmark.bmbm do |x|
+    x.report("mojo_debug")  { 100000.times { MojoLogger.mojo_debug(*@mojo_args) }  }
+    x.report("mojo_info")   { 100000.times { MojoLogger.mojo_info(*@mojo_args)  }  }
+  end
+
+end
+
+

data/bench/results-optimize-4-apr-2016.txt

@@ -0,0 +1,80 @@
+Rehearsal -----------------------------------------
+debug   1.420000   0.040000   1.460000 (  0.446000)
+info    1.160000   0.050000   1.210000 (  0.416000)
+-------------------------------- total: 2.670000sec
+
+            user     system      total        real
+debug   0.280000   0.010000   0.290000 (  0.117000)
+info    0.120000   0.050000   0.170000 (  0.166000)
+Rehearsal ----------------------------------------------
+mojo_debug   0.360000   0.010000   0.370000 (  0.107000)
+mojo_info    6.740000   0.070000   6.810000 (  2.873000)
+------------------------------------- total: 7.180000sec
+
+                 user     system      total        real
+mojo_debug   0.020000   0.000000   0.020000 (  0.022000)
+mojo_info    1.880000   0.030000   1.910000 (  1.871000)
+Rehearsal -----------------------------------------
+debug   0.080000   0.000000   0.080000 (  0.073000)
+info    0.160000   0.030000   0.190000 (  0.175000)
+-------------------------------- total: 0.270000sec
+
+            user     system      total        real
+debug   0.080000   0.000000   0.080000 (  0.075000)
+info    0.150000   0.010000   0.160000 (  0.171000)
+Rehearsal ----------------------------------------------
+mojo_debug   0.020000   0.000000   0.020000 (  0.021000)
+mojo_info    1.820000   0.040000   1.860000 (  1.803000)
+------------------------------------- total: 1.880000sec
+
+                 user     system      total        real
+mojo_debug   0.020000   0.000000   0.020000 (  0.018000)
+mojo_info    1.870000   0.020000   1.890000 (  1.872000)
+Rehearsal -----------------------------------------
+debug   0.070000   0.000000   0.070000 (  0.065000)
+info    0.150000   0.010000   0.160000 (  0.160000)
+-------------------------------- total: 0.230000sec
+
+            user     system      total        real
+debug   0.080000   0.000000   0.080000 (  0.069000)
+info    0.150000   0.020000   0.170000 (  0.164000)
+Rehearsal ----------------------------------------------
+mojo_debug   0.020000   0.000000   0.020000 (  0.018000)
+mojo_info    1.850000   0.020000   1.870000 (  1.820000)
+------------------------------------- total: 1.890000sec
+
+                 user     system      total        real
+mojo_debug   0.030000   0.000000   0.030000 (  0.020000)
+mojo_info    1.840000   0.030000   1.870000 (  1.824000)
+Rehearsal -----------------------------------------
+debug   0.080000   0.000000   0.080000 (  0.067000)
+info    0.150000   0.010000   0.160000 (  0.157000)
+-------------------------------- total: 0.240000sec
+
+            user     system      total        real
+debug   0.060000   0.000000   0.060000 (  0.068000)
+info    0.160000   0.010000   0.170000 (  0.157000)
+Rehearsal ----------------------------------------------
+mojo_debug   0.040000   0.000000   0.040000 (  0.022000)
+mojo_info    1.760000   0.020000   1.780000 (  1.758000)
+------------------------------------- total: 1.820000sec
+
+                 user     system      total        real
+mojo_debug   0.030000   0.000000   0.030000 (  0.022000)
+mojo_info    1.940000   0.010000   1.950000 (  1.893000)
+Rehearsal -----------------------------------------
+debug   0.070000   0.000000   0.070000 (  0.072000)
+info    0.180000   0.010000   0.190000 (  0.173000)
+-------------------------------- total: 0.260000sec
+
+            user     system      total        real
+debug   0.070000   0.000000   0.070000 (  0.075000)
+info    0.160000   0.020000   0.180000 (  0.174000)
+Rehearsal ----------------------------------------------
+mojo_debug   0.020000   0.000000   0.020000 (  0.021000)
+mojo_info    1.940000   0.030000   1.970000 (  1.941000)
+------------------------------------- total: 1.990000sec
+
+                 user     system      total        real
+mojo_debug   0.020000   0.000000   0.020000 (  0.020000)
+mojo_info    1.840000   0.020000   1.860000 (  1.819000)

data/bench/results.txt

@@ -0,0 +1,80 @@
+Rehearsal -----------------------------------------
+debug   1.040000   0.000000   1.040000 (  0.313000)
+info    1.020000   0.020000   1.040000 (  0.333000)
+-------------------------------- total: 2.080000sec
+
+            user     system      total        real
+debug   0.250000   0.000000   0.250000 (  0.101000)
+info    0.390000   0.010000   0.400000 (  0.196000)
+Rehearsal ----------------------------------------------
+mojo_debug   5.740000   0.060000   5.800000 (  2.513000)
+mojo_info    1.850000   0.030000   1.880000 (  1.632000)
+------------------------------------- total: 7.680000sec
+
+                 user     system      total        real
+mojo_debug   1.530000   0.000000   1.530000 (  1.425000)
+mojo_info    1.620000   0.030000   1.650000 (  1.591000)
+Rehearsal -----------------------------------------
+debug   0.070000   0.000000   0.070000 (  0.062000)
+info    0.260000   0.030000   0.290000 (  0.187000)
+-------------------------------- total: 0.360000sec
+
+            user     system      total        real
+debug   0.060000   0.000000   0.060000 (  0.060000)
+info    0.130000   0.020000   0.150000 (  0.149000)
+Rehearsal ----------------------------------------------
+mojo_debug   1.460000   0.000000   1.460000 (  1.419000)
+mojo_info    1.630000   0.030000   1.660000 (  1.615000)
+------------------------------------- total: 3.120000sec
+
+                 user     system      total        real
+mojo_debug   1.460000   0.010000   1.470000 (  1.424000)
+mojo_info    1.620000   0.030000   1.650000 (  1.607000)
+Rehearsal -----------------------------------------
+debug   0.060000   0.000000   0.060000 (  0.062000)
+info    0.130000   0.020000   0.150000 (  0.145000)
+-------------------------------- total: 0.210000sec
+
+            user     system      total        real
+debug   0.070000   0.000000   0.070000 (  0.062000)
+info    0.140000   0.000000   0.140000 (  0.147000)
+Rehearsal ----------------------------------------------
+mojo_debug   1.440000   0.010000   1.450000 (  1.411000)
+mojo_info    1.590000   0.030000   1.620000 (  1.602000)
+------------------------------------- total: 3.070000sec
+
+                 user     system      total        real
+mojo_debug   1.540000   0.000000   1.540000 (  1.423000)
+mojo_info    1.610000   0.030000   1.640000 (  1.607000)
+Rehearsal -----------------------------------------
+debug   0.060000   0.000000   0.060000 (  0.061000)
+info    0.130000   0.020000   0.150000 (  0.145000)
+-------------------------------- total: 0.210000sec
+
+            user     system      total        real
+debug   0.070000   0.000000   0.070000 (  0.061000)
+info    0.120000   0.020000   0.140000 (  0.147000)
+Rehearsal ----------------------------------------------
+mojo_debug   1.480000   0.000000   1.480000 (  1.413000)
+mojo_info    1.640000   0.020000   1.660000 (  1.613000)
+------------------------------------- total: 3.140000sec
+
+                 user     system      total        real
+mojo_debug   1.440000   0.000000   1.440000 (  1.409000)
+mojo_info    1.610000   0.030000   1.640000 (  1.608000)
+Rehearsal -----------------------------------------
+debug   0.060000   0.000000   0.060000 (  0.060000)
+info    0.140000   0.010000   0.150000 (  0.144000)
+-------------------------------- total: 0.210000sec
+
+            user     system      total        real
+debug   0.070000   0.000000   0.070000 (  0.062000)
+info    0.130000   0.010000   0.140000 (  0.145000)
+Rehearsal ----------------------------------------------
+mojo_debug   1.440000   0.010000   1.450000 (  1.414000)
+mojo_info    1.620000   0.030000   1.650000 (  1.608000)
+------------------------------------- total: 3.100000sec
+
+                 user     system      total        real
+mojo_debug   1.430000   0.010000   1.440000 (  1.408000)
+mojo_info    1.610000   0.020000   1.630000 (  1.609000)

data/lib/mojo_logger.rb

@@ -1,5 +1,6 @@
 require_relative 'mojo_logger/version'
 require_relative 'mojo_logger/mojo_logger'
+require_relative 'mojo_logger/default_adapter'
 require_relative 'mojo_logger/configurator'
 require_relative 'mojo_logger/appender'
 

data/lib/mojo_logger/appender.rb

@@ -24,19 +24,22 @@ module MojoLogger
     end
 
     def file=(file)
-      #raise "FileNotFound" unless File.exist?(file)
       @type = :file
       @file = file #File.expand_path(file)
     end
 
     def generate_properties_string
       properties = generate_generic_properties
-      properties += generate_file_properties if @file
+      properties << generate_file_properties if @file
       properties
     end
 
+
+
     private
 
+
+
     def valid_log_level?(lvl)
       ACCEPTABLE_LOG_LEVELS.include?(lvl)
     end
@@ -45,7 +48,7 @@ module MojoLogger
       @type = :console
       @max_file_size    = opts[:max_file_size]    || '10MB'
       @max_backup_index = opts[:max_backup_index] || '10'
-      @pattern          = opts[:pattern]          || '%n %m %n'
+      @pattern          = opts[:pattern]          || '%m %n'
 
       self.level=(opts[:level]) if opts[:level]
       self.file=(opts[:file]) if opts[:file]
@@ -57,16 +60,16 @@ module MojoLogger
 
     def generate_generic_properties
       properties = "#{property_header}=#{log4j_type}\n"
-      properties += "#{property_header}.layout=org.apache.log4j.PatternLayout\n"
-      properties += "#{property_header}.layout.ConversionPattern=#{@pattern}\n"
-      properties += "#{property_header}.Threshold=#{@level}\n" if @level
+      properties << "#{property_header}.layout=org.apache.log4j.PatternLayout\n"
+      properties << "#{property_header}.layout.ConversionPattern=#{@pattern}\n"
+      properties << "#{property_header}.Threshold=#{@level}\n" if @level
       properties
     end
 
     def generate_file_properties
       properties = "#{property_header}.file=#{@file}\n"
-      properties += "#{property_header}.MaxFileSize=#{@max_file_size}\n"
-      properties += "#{property_header}.MaxBackupIndex=#{@max_backup_index}\n"
+      properties << "#{property_header}.MaxFileSize=#{@max_file_size}\n"
+      properties << "#{property_header}.MaxBackupIndex=#{@max_backup_index}\n"
       properties
     end
 

data/lib/mojo_logger/configurator.rb

@@ -1,20 +1,29 @@
-
+require 'forwardable'
 
 module MojoLogger
   class Configurator
-    # stringio = StringIO.new(s)
-    # jstrinio = org.jruby.util.IOInputStream.new(stringio)
-    # logger = Java::org.apache.log4j.PropertyConfigurator.configure(jstringio)
-    # logger = Java::org.apache.log4j.Logger.getLogger('Mojo')
-    #
+    extend Forwardable
+
+    ENV_MAPPING = {
+      'development' => 'dev',
+      'stage'       => 'stg',
+      'production'   => 'prd'
+    }
 
-    attr_reader :properties_file
+    attr_reader :properties_file, :env
+    attr_accessor :application_name
+    def_delegators :@default_appender, :pattern, :pattern=
+    def_delegators :@default_appender, :max_file_size, :max_file_size=
+    def_delegators :@default_appender, :max_backup_index, :max_backup_index=
 
     def initialize()
-      @default_appender = MojoLogger::Appender.new("MojoLogger")
+      @default_appender       = MojoLogger::Appender.new("MojoLogger")
       @default_appender.level = "DEBUG"
-      @use_default_appender = true
-      @appenders = []
+      @use_default_appender   = true
+      @appenders              = []
+      @application_name       = "Mojo"
+      @adapter                = DefaultAdapter.new
+      @env                    = environment
     end
 
     def default_log_level
@@ -47,11 +56,20 @@ module MojoLogger
 
     def generate_properties_string
       properties = "#{generate_root_logger_line}\n"
-      properties += "#{generate_custom_lines}\n"
-      properties += "#{generate_appender_lines}\n"
+      properties << "#{generate_custom_lines}\n"
+      properties << "#{generate_appender_lines}\n"
       properties
     end
 
+
+    def adapter=(adapter)
+      @adapter = adapter
+    end
+
+    def adapter
+      @adapter
+    end
+
     private
 
     def generate_root_logger_line
@@ -70,11 +88,16 @@ module MojoLogger
 
     def generate_appender_lines
       lines = ''
-      lines += @default_appender.generate_properties_string if @use_default_appender
-      lines += "#{@appenders.map { |a| a.generate_properties_string }.join("\n") }"
+      lines << @default_appender.generate_properties_string if @use_default_appender
+      lines << "#{@appenders.map { |a| a.generate_properties_string }.join("\n") }"
 
       lines
     end
 
+    def environment
+      env_var = ENV['RAILS_ENV'] || ENV['RACK_ENV']
+      ENV_MAPPING.fetch(env_var, env_var)
+    end
+
   end
 end

data/lib/mojo_logger/default_adapter.rb

@@ -0,0 +1,29 @@
+module MojoLogger
+  class DefaultAdapter
+
+    def format(api_request, category, message, options=nil)
+      msg = {
+        'session_id'   => api_request[:session_id],
+        'reference_id' => api_request[:reference_id],
+        'api'          => api_request[:api],
+        'category'     => category,
+        'message'      => message
+      }
+
+      msg.merge!(process_options(options)) if options
+      msg
+    end
+
+    private
+
+    def process_options(options)
+      if options.is_a?(Hash)
+        options
+      else
+        { 'options' => options }
+      end
+    end
+
+  end
+end
+

data/lib/mojo_logger/mojo_logger.rb

@@ -1,9 +1,17 @@
-require 'java'
 require 'time'
 require 'json'
-require_relative '../../jars/log4j-1.2.17.jar'
+require 'stringio'
+require 'forwardable'
+
+# Making this work with mri ruby
+require 'java'                              if RUBY_PLATFORM == 'java'
+require_relative '../jars/log4j-1.2.17.jar' if RUBY_PLATFORM == 'java'
+
+require 'logger'                            if RUBY_PLATFORM != 'java'
 
 module MojoLogger
+  extend SingleForwardable
+  def_delegators :logger, :debug, :info, :warn, :error, :fatal
 
   def mojo_debug(*args)
     MojoLogger.mojo_debug(*args)
@@ -21,68 +29,116 @@ module MojoLogger
     MojoLogger.mojo_error(*args)
   end
 
+  def mojo_fatal(*args)
+    MojoLogger.mojo_fatal(*args)
+  end
+
   def logger
     MojoLogger.logger
   end
 
+  def level
+    MojoLogger.level
+  end
+
   class << self
 
     def logger
       @@logger ||= configure_logger
     end
 
-    def mojo_msg(api_request, category, message, options=nil)
+    def mojo_msg(*args)
       msg = {
         'time' => Time.now.utc.strftime("%m-%d-%Y %H:%M:%S.%L %z"),
-        'app' => "Mojo",
-        'session_id' => api_request[:session_id],
-        'reference_id' => api_request[:reference_id],
-        'api' => api_request[:api],
-        'category' => category,
-        'message' => message
-      }
-
-      msg.merge!(options) if options
+        'app'  => configurator.application_name,
+        'env'  => configurator.env
+      }.merge!(configurator.adapter.format(*args))
+
       msg.to_json
     end
 
     def mojo_debug(*args)
-      logger.debug(mojo_msg(*args))
+      if level == :debug
+        logger.debug(mojo_msg(*args))
+      end
     end
 
     def mojo_info(*args)
-      logger.info(mojo_msg(*args))
+      if level == :debug || level == :info
+        logger.info(mojo_msg(*args))
+      end
     end
 
     def mojo_warn(*args)
-      logger.warn(mojo_msg(*args))
+      unless level == :error || level == :fatal
+        logger.warn(mojo_msg(*args))
+      end
     end
 
     def mojo_error(*args)
-      logger.error(mojo_msg(*args))
+      unless level == :fatal
+        logger.error(mojo_msg(*args))
+      end
     end
 
+    def mojo_fatal(*args)
+      logger.fatal(mojo_msg(*args))
+    end
 
-    def config
-      @@config = MojoLogger::Configurator.new
+    def default_log_level
+      configurator.default_log_level
+    end
 
-      yield(@@config) if block_given?
+    def level
+      @level ||= configurator.default_log_level.downcase.to_sym
+    end
 
+    def level=(lvl)
+      configurator.default_log_level = lvl
       @@logger = configure_logger
-      @@config
+      @level   = configurator.default_log_level.downcase.to_sym
     end
 
+    def config
+      if block_given?
+        @@config = MojoLogger::Configurator.new
+        yield(@@config)
+        @@logger = configure_logger
+      end
+
+      @level = configurator.default_log_level.downcase.to_sym
+      configurator
+    end
 
-  private
+    private
 
-    def configure_logger
+    def configurator
       @@config ||= MojoLogger::Configurator.new
+    end
 
-      stringio = StringIO.new(@@config.generate_properties_string)
-      java_stringio = org.jruby.util.IOInputStream.new(stringio)
+    def configure_logger
+      if RUBY_PLATFORM == 'java'
+        stringio = StringIO.new(configurator.generate_properties_string)
+        java_stringio = org.jruby.util.IOInputStream.new(stringio)
+
+        Java::org.apache.log4j.PropertyConfigurator.configure(java_stringio)
+        Java::org.apache.log4j.Logger.getLogger('MojoLogger')
+      else
+        l = Logger.new(STDOUT)
+        l.level = configurator.default_log_level.downcase.to_sym
+        l
+      end
+    end
 
-      Java::org.apache.log4j.PropertyConfigurator.configure(java_stringio)
-      Java::org.apache.log4j.Logger.getLogger('MojoLogger')
+    def process_options(options=nil)
+      case options
+      when Hash
+        options
+      when String
+        { 'options' => options }
+      else
+        nil
+      end
     end
 
   end # End 'class' methods

data/lib/mojo_logger/version.rb

@@ -1,3 +1,3 @@
 module MojoLogger
-  VERSION = "0.1.0"
+  VERSION = "0.6.0"
 end

data/mojo_logger.gemspec

@@ -22,11 +22,10 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: mojo_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.6.0
 platform: ruby
 authors:
 - John Thomas
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
   name: bundler
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '10.0'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
+  name: rspec
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: pry
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
    This gem is a wrapper around log4j that allow you to
     construct a log4j.properties file from a config block, rather than actually
@@ -62,20 +76,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bench/gen.rb
+- bench/results-optimize-4-apr-2016.txt
+- bench/results.txt
 - bin/console
 - bin/setup
 - conf/log4j.properties
-- jars/log4j-1.2.17.jar
+- lib/jars/log4j-1.2.17.jar
 - lib/mojo_logger.rb
 - lib/mojo_logger/appender.rb
 - lib/mojo_logger/configurator.rb
+- lib/mojo_logger/default_adapter.rb
 - lib/mojo_logger/mojo_logger.rb
 - lib/mojo_logger/version.rb
 - mojo_logger.gemspec
@@ -89,17 +108,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.6.4
 signing_key:
 specification_version: 4
 summary: log4j wrapper that handles logging in the Mojo framework.