sappho-basics 0.0.7 → 0.1.0

data/lib/sappho-basics/auto_flush_log.rb

@@ -11,8 +11,6 @@ module Sappho
 
   class AutoFlushLog
 
-    include Singleton
-
     LOG_LEVELS = {
         'debug' => Logger::DEBUG,
         'info' => Logger::INFO,
@@ -24,23 +22,11 @@ module Sappho
         'message' => proc { |severity, datetime, progname, message| "#{message}\n" },
         'test' => proc { |severity, datetime, progname, message| "#{severity} #{message}\n" }
     }
-    @@file = nil
-
-    def AutoFlushLog.file file
-      @@file = file
-    end
 
-    def initialize
+    def initialize file, level, detail
       @mutex = Mutex.new
-      unless @@file
-        filename = ENV['application.log.filename']
-        mode = File.exists?(filename) ? 'a' : 'w' if filename
-        @@file = filename ? File.open(filename, mode) : $stdout
-      end
-      @log = Logger.new @@file
-      level = ENV['application.log.level']
+      @log = Logger.new file
       @log.level = LOG_LEVELS.has_key?(level) ? LOG_LEVELS[level] : Logger::INFO
-      detail = ENV['application.log.detail']
       @log.formatter = LOG_DETAIL[detail] if LOG_DETAIL.has_key?(detail)
     end
 
@@ -87,6 +73,27 @@ module Sappho
 
   end
 
+  class ApplicationAutoFlushLog < AutoFlushLog
+
+    include Singleton
+
+    @@file = nil
+
+    def AutoFlushLog.file file
+      @@file = file
+    end
+
+    def initialize
+      unless @@file
+        filename = ENV['application.log.filename']
+        mode = File.exists?(filename) ? 'a' : 'w' if filename
+        @@file = filename ? File.open(filename, mode) : $stdout
+      end
+      super @@file, ENV['application.log.level'], ENV['application.log.detail']
+    end
+
+  end
+
   module LogUtilities
 
     def hexString bytes

data/lib/sappho-basics/module_register.rb

@@ -10,10 +10,8 @@ module Sappho
 
   class ModuleRegister
 
-    include Singleton
-
-    def initialize
-      @modules = { :log => AutoFlushLog.instance }
+    def initialize modules = {}
+      @modules = modules
     end
 
     def set name, mod
@@ -34,14 +32,28 @@ module Sappho
 
     def each
       @modules.each do |name, mod|
-        begin
-          yield mod
-        rescue
-          # do nothing here - modules must report if they need to
+        if mod.instance_of? ModuleRegister
+          mod.each { |mod| yield mod }
+        else
+          begin
+            yield mod
+          rescue
+            # do nothing here - modules must report if they need to
+          end
         end
       end
     end
 
   end
 
+  class ApplicationModuleRegister < ModuleRegister
+
+    include Singleton
+
+    def initialize
+      super :log => ApplicationAutoFlushLog.instance
+    end
+
+  end
+
 end

data/lib/sappho-basics/version.rb

@@ -5,7 +5,7 @@
 
 module Sappho
   NAME = 'sappho-basics'
-  VERSION = '0.0.7'
+  VERSION = '0.1.0'
   AUTHORS = ['Andrew Heald']
   EMAILS = ['andrew@heald.co.uk']
   HOMEPAGE = 'https://github.com/sappho/sappho-basics/wiki'

data/test/ruby/auto_flush_log_test.rb

@@ -13,13 +13,13 @@ class AutoFlushLogTest < Test::Unit::TestCase
 
   def test_logging
     file = StringIO.new
-    Sappho::AutoFlushLog.file file
+    Sappho::ApplicationAutoFlushLog.file file
     assert_raises NoMethodError do
-      Sappho::AutoFlushLog.new
+      Sappho::ApplicationAutoFlushLog.new
     end
     ENV['application.log.level'] = 'debug'
     ENV['application.log.detail'] = 'test'
-    log = Sappho::AutoFlushLog.instance
+    log = Sappho::ApplicationAutoFlushLog.instance
     assert log.debug?
     log.debug 'Test 1'
     log.info 'Test 2'

data/test/ruby/module_register_test.rb

@@ -10,38 +10,45 @@ class ModuleRegisterTest < Test::Unit::TestCase
 
   def test_module_register
     assert_raises NoMethodError do
-      Sappho::ModuleRegister.new
+      Sappho::ApplicationModuleRegister.new
     end
-    modules = Sappho::ModuleRegister.instance
+    modules = Sappho::ApplicationModuleRegister.instance
     assert_nil modules.get(:missing)
     assert !modules.set?(:missing)
     assert modules.set?(:log)
-    assert_instance_of Sappho::AutoFlushLog, modules.get(:log)
+    assert_instance_of Sappho::ApplicationAutoFlushLog, modules.get(:log)
     test1 = TestModule.new
     test2 = TestModule.new
+    test3 = TestModule.new
+    test4 = TestModule.new
+    test5 = Sappho::ModuleRegister.new
+    test5.set :test3, test3
+    test5.set :test4, test4
     modules.set :test1, test1
     modules.set :test2, test2
     modules.set :test1, test1
+    modules.set :test5, test5
     assert_equal test1, modules.get(:test1)
     assert_equal test2, modules.get(:test2)
+    assert_equal test5, modules.get(:test5)
     assert modules.set?(:test1)
     assert modules.set?(:test2)
+    assert !modules.set?(:test4)
     assert test1.alive
     assert test2.alive
+    assert test3.alive
+    assert test4.alive
     modules.shutdown
     assert !test1.alive
     assert !test2.alive
-    assert_instance_of Sappho::AutoFlushLog, modules.get(:log)
+    assert !test3.alive
+    assert !test4.alive
+    assert_instance_of Sappho::ApplicationAutoFlushLog, modules.get(:log)
     assert_equal test1, modules.get(:test1)
-    assert_equal test2, modules.get(:test2)
-    test1.alive = true
-    test2.alive = true
+    test4.alive = true
+    modules.set :notmod, 42
     modules.shutdown
-    assert !test1.alive
-    assert !test2.alive
-    assert_instance_of Sappho::AutoFlushLog, modules.get(:log)
-    assert_equal test1, modules.get(:test1)
-    assert_equal test2, modules.get(:test2)
+    assert !test4.alive
   end
 
   class TestModule

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sappho-basics
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 7
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors: 
 - Andrew Heald
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 Z
+date: 2012-03-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake