dohruby 0.1.27 → 0.1.28

data/CHANGELOG

@@ -82,3 +82,5 @@
  * fixed unit_test_logging invalid require
 *0.1.27* (May 30th, 2008)
  * rework DohApp stuff to be simpler and more flexible
+*0.1.28* (May 30th, 2008)
+ * add configuration ability to DohApp framework

data/bin/run_tests.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'doh/app/init'
+require 'doh/app/init_unit_test'
 
 what_to_run = ARGV[0] || '.'
 if File.directory?(what_to_run)
@@ -7,7 +7,7 @@ if File.directory?(what_to_run)
 else
   start_dir = File.dirname(what_to_run)
 end
-DohApp::init(start_dir)
+DohApp::init_unit_test(start_dir)
 
 if File.directory?(what_to_run)
   require 'doh/util/run_tests'

data/lib/doh/app/activate_database.rb

@@ -0,0 +1,26 @@
+require 'doh/app/config'
+
+module DohApp
+
+def self.activate_database
+  root_cfg = DohApp::config
+  return unless root_cfg.fetch('enable_database', true)
+  return unless root_cfg.key?('database')
+  db_cfg = root_cfg['database']
+  require 'doh/mysql'
+  conn = DohDb::CacheConnector.new(db_cfg['host'], db_cfg['username'], db_cfg['password'], db_cfg['database'] || root_cfg['primary_database'])
+  row_builder = db_cfg['row_builder'] || root_cfg['row_builder'] || 'typed'
+  if row_builder.is_a?(Class)
+    conn.row_builder = row_builder
+  elsif row_builder == 'typed'
+    require 'doh/mysql/typed_row_builder'
+    conn.row_builder = DohDb::TypedRowBuilder
+  elsif row_builder == 'raw'
+    # that's the default for the CacheConnector, don't need to do anything
+  else
+    raise "unrecognized database row_builder: #{row_builder.inspect}"
+  end
+  DohDb::set_connector_instance(conn)
+end
+
+end

data/lib/doh/app/activate_logger.rb

@@ -0,0 +1,64 @@
+require 'doh/app/config'
+require 'doh/logger/severity'
+
+module DohApp
+
+def self.translate_logger_level(str)
+  return DohLogger::DEBUG if str == 'debug' || str.empty?
+  return DohLogger::INFO if str == 'info'
+  return DohLogger::WARN if str == 'warn'
+  return DohLogger::NOTIFY if str == 'notify'
+  return DohLogger::ERROR if str == 'error'
+  return DohLogger::FATAL if str == 'fatal'
+end
+
+def self.activate_logger
+  root_cfg = DohApp::config
+  return unless root_cfg.fetch('enable_logger', true)
+  return unless root_cfg.key?('logger')
+  logger_cfg = root_cfg['logger']
+  require 'doh/logger_configure'
+
+  scheduler = DohLogger::DirectScheduler.new
+  intrfc = DohLogger::StandardInterface.new(scheduler)
+  Doh::set_logger_interface(intrfc)
+
+  # initialize logfile_name here, so it can be used later in the email acceptors below
+  logfile_name = 'none'
+  if acceptor_cfg = logger_cfg['file_acceptor']
+    if acceptor_cfg.fetch('unique_filename', false)
+      logfile_name = File.basename($PROGRAM_NAME, '.rb') + ".#{Process.pid}" + '.log'
+    else
+      logfile_name = File.basename($PROGRAM_NAME, '.rb') + '.log'
+    end
+    logfile = File.new(logfile_name, "w+")
+    logfile.sync = true if acceptor_cfg.fetch('flush', false)
+    file_acceptor = DohLogger::IOStreamAcceptor.new(logfile)
+    file_acceptor.flush_always if acceptor_cfg.fetch('flush', false)
+    Doh::log.add_acceptor(translate_logger_level(acceptor_cfg.fetch('severity', 'debug')), file_acceptor)
+  end
+
+  if acceptor_cfg = logger_cfg['stdout_acceptor']
+    Doh::log.add_acceptor(translate_logger_level(acceptor_cfg.fetch('severity', 'debug')), DohLogger::IOStreamAcceptor.new)
+  end
+
+  if acceptor_cfg = logger_cfg['notify_acceptor']
+    require 'doh/logger/email_acceptor'
+    mail_server = root_cfg['mail_server'] || 'mail.' + root_cfg['domain_name']
+    from_address = acceptor_cfg['from_address'] || 'notify@' + root_cfg['domain_name']
+    to_address_list = acceptor_cfg['to_address_list'] || ['notify@' + root_cfg['domain_name']]
+    notify_acceptor = DohLogger::EmailAcceptor.new(mail_server, from_address, to_address_list, logfile_name, nil, DohLogger::exceptionless_email_format)
+    Doh::log.add_acceptor(DohLogger::NOTIFY, notify_acceptor, true)
+  end
+
+  if acceptor_cfg = logger_cfg['error_acceptor']
+    require 'doh/logger/email_acceptor'
+    mail_server = root_cfg['mail_server'] || 'mail.' + root_cfg['domain_name']
+    from_address = acceptor_cfg['from_address'] || 'error@' + root_cfg['domain_name']
+    to_address_list = acceptor_cfg['to_address_list'] || ['error@' + root_cfg['domain_name']]
+    error_acceptor = DohLogger::EmailAcceptor.new(mail_server, from_address, to_address_list, logfile_name)
+    Doh::log.add_acceptor(DohLogger::ERROR, error_acceptor)
+  end
+end
+
+end

data/lib/doh/app/config.rb

@@ -0,0 +1,17 @@
+require 'doh/app/home'
+
+module DohApp
+
+def self.load_config_file(name)
+  path = File.join(DohApp::home, 'config', name) + '.rb'
+  return false unless File.exist?(path)
+  require(path)
+  true
+end
+
+@@config = {}
+def self.config
+  @@config
+end
+
+end

data/lib/doh/app/init.rb

@@ -1,4 +1,5 @@
 require 'doh/app/home'
+require 'doh/app/config'
 
 module DohApp
 
@@ -9,6 +10,8 @@ def self.init(file_or_directory)
     find_home(File.dirname(file_or_directory))
   end
   $LOAD_PATH.push(File.join(DohApp::home, 'lib'))
+  DohApp::load_config_file('system')
+  DohApp::load_config_file('development_environment') unless DohApp::load_config_file('active_environment')
   require 'doh/app_util'
 end
 

data/lib/doh/app/init_runnable.rb

@@ -0,0 +1,36 @@
+require 'doh/app/init'
+require 'doh/app/activate_logger'
+require 'doh/app/activate_database'
+
+module DohApp
+
+def self.use_default_runnable_production_config
+  file_acceptor_cfg = {'unique_filename' => true, 'flush' => false, 'severity' => 'debug'}
+  logger_cfg = {'file_acceptor' => file_acceptor_cfg, 'notify_acceptor' => {}, 'error_acceptor' => {}}
+  DohApp::config['logger'] = logger_cfg
+  DohApp::config['enable_logger'] = true
+end
+
+def self.use_default_runnable_development_config
+  root_cfg = DohApp::config
+  file_acceptor_cfg = {'unique_filename' => false, 'flush' => true, 'severity' => 'debug'}
+  stdout_acceptor_cfg = {'severity' => 'debug'}
+  logger_cfg = {'file_acceptor' => file_acceptor_cfg, 'stdout_acceptor' => stdout_acceptor_cfg}
+  root_cfg['logger'] = logger_cfg
+  root_cfg['enable_logger'] = true
+
+  root_cfg['database'] = {'username' => 'root', 'host' => 'localhost'}
+end
+
+def self.init_runnable(file_or_directory)
+  DohApp::init(file_or_directory)
+  unless DohApp::load_config_file('active_runnable')
+    unless DohApp::load_config_file('development_runnable')
+      DohApp::use_default_runnable_development_config
+    end
+  end
+  DohApp::activate_logger
+  DohApp::activate_database
+end
+
+end

data/lib/doh/app/init_unit_test.rb

@@ -0,0 +1,18 @@
+require 'doh/app/init'
+
+module DohApp
+
+def self.use_default_unit_test_development_config
+  DohApp::config['database'] = {'username' => 'root', 'host' => 'localhost'}
+end
+
+def self.init_unit_test(file_or_directory)
+  DohApp::init(file_or_directory)
+  unless DohApp::load_config_file('active_unit_test')
+    unless DohApp::load_config_file('development_unit_test')
+      DohApp::use_default_unit_test_development_config
+    end
+  end
+end
+
+end

data/lib/doh/app.rb

@@ -1,2 +1,2 @@
-require 'doh/app/init'
-DohApp::init($PROGRAM_NAME)
+require 'doh/app/init_runnable'
+DohApp::init_runnable($PROGRAM_NAME)

data/lib/doh/util/source_ip.rb

@@ -1,5 +1,3 @@
-require 'socket'
-
 module Doh
 
 @@source_ip = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dohruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors: 
 - Makani & Kem Mason
@@ -37,8 +37,13 @@ files:
 - bin/run_tests.rb
 - lib/doh
 - lib/doh/app
+- lib/doh/app/activate_database.rb
+- lib/doh/app/activate_logger.rb
+- lib/doh/app/config.rb
 - lib/doh/app/home.rb
 - lib/doh/app/init.rb
+- lib/doh/app/init_runnable.rb
+- lib/doh/app/init_unit_test.rb
 - lib/doh/app/options.rb
 - lib/doh/app.rb
 - lib/doh/app_util.rb