0
@@ -1,6 +1,6 @@
0
 #
0
 #--
0
-# Copyright (c) 2007, John Mettraux, OpenWFE.org
0
+# Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
0
 # All rights reserved.
0
 #
0
 # Redistribution and use in source and binary forms, with or without
0
@@ -37,8 +37,6 @@
0
 # John Mettraux at openwfe.org
0
 #
0
 
0
-#require 'date'
0
-
0
 require 'openwfe/service'
0
 require 'openwfe/omixins'
0
 require 'openwfe/rudefinitions'
0
@@ -50,7 +48,8 @@ module OpenWFE
0
   # A Mixin for history modules
0
   #
0
   module HistoryMixin
0
-    include ServiceMixin, OwfeServiceLocator
0
+    include ServiceMixin
0
+    include OwfeServiceLocator
0
 
0
     def service_init (service_name, application_context)
0
 
0
@@ -70,11 +69,10 @@ module OpenWFE
0
   #
0
   # A base implementation for InMemoryHistory and FileHistory.
0
   #
0
-  class BaseHistory
0
+  class History
0
     include HistoryMixin
0
     include FeiMixin
0
 
0
-    attr_reader :entries
0
 
0
     def initialize (service_name, application_context)
0
 
0
@@ -113,9 +111,10 @@ module OpenWFE
0
   #
0
   # Is only used for unit testing purposes.
0
   #
0
-  class InMemoryHistory < BaseHistory
0
+  class InMemoryHistory < History
0
 
0
     def initialize (service_name, application_context)
0
+
0
       super
0
 
0
       @output = []
0
@@ -132,11 +131,7 @@ module OpenWFE
0
     # Returns all the entries as a String.
0
     #
0
     def to_s
0
-      s = ""
0
-      @output.each do |entry|
0
-        s << entry.to_s
0
-      end
0
-      s
0
+      @output.inject("") { |r, entry| r << entry.to_s }
0
     end
0
   end
0
 
0
@@ -145,7 +140,7 @@ module OpenWFE
0
   # "history.log"
0
   # Warning : no fancy rotation or compression implemented here.
0
   #
0
-  class FileHistory < BaseHistory
0
+  class FileHistory < History
0
 
0
     def initialize (service_name, application_context)
0
 

0
@@ -39,13 +39,13 @@ class FlowTest22 < Test::Unit::TestCase
0
 
0
   def test_history_0
0
 
0
-    @engine.init_service("history", InMemoryHistory)
0
+    @engine.init_service "history", OpenWFE::InMemoryHistory
0
 
0
     history = @engine.application_context["history"]
0
 
0
     dotest TestDefinition0, %w{ a b c }.join("\n")
0
 
0
-    #puts history.to_s
0
+    puts history.to_s
0
     #puts history.entries.size()
0
 
0
     #f = File.open("history.log", "w")
0
@@ -57,7 +57,7 @@ class FlowTest22 < Test::Unit::TestCase
0
 
0
   def test_history_1
0
 
0
-    @engine.init_service("history", FileHistory)
0
+    @engine.init_service "history", OpenWFE::FileHistory
0
 
0
     dotest TestDefinition0, %w{ a b c }.join("\n")
0