lib/openwfe/extras/engine/db_persisted_engine.rb in ruote-0.9.19 vs lib/openwfe/extras/engine/db_persisted_engine.rb in ruote-0.9.20

@@ -1,76 +1,61 @@
-#
 #--
-# Copyright (c) 2007-2008, Tomaso Tosolini and John Mettraux, OpenWFE.org
-# All rights reserved.
+# Copyright (c) 2007-2009, Tomaso Tosolini and John Mettraux, OpenWFE.org
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# . Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# . Neither the name of the "OpenWFE" nor the names of its contributors may be
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# Made in Italy.
 #++
-#
 
-#
-# "made in Italy"
-#
-# Tomaso Tosolini
-# John Mettraux at openwfe.org
-#
 
 require 'openwfe/engine/engine'
-require 'openwfe/extras/expool/dbexpstorage'
-require 'openwfe/extras/expool/dberrorjournal'
+require 'openwfe/extras/expool/db_expstorage'
+require 'openwfe/extras/expool/db_errorjournal'
 
 
 module OpenWFE::Extras
 
   #
-  # A simple DbPersistedEngine, pure storage, no caching, no optimization.
-  # For tests only.
+  # A simple DbPersistedEngine.
   #
   class DbPersistedEngine < OpenWFE::Engine
 
     protected
 
-      #
-      # Overrides the method already found in Engine with a persisted
-      # expression storage
-      #
-      def build_expression_storage
+    #
+    # Overrides the method already found in Engine with a persisted
+    # expression storage
+    #
+    def build_expression_storage
 
-        init_service :s_expression_storage, DbExpressionStorage
-      end
+      #init_service(:s_expression_storage, DbExpressionStorage)
+      init_storage(DbExpressionStorage)
+    end
 
-      #
-      # Uses a file persisted error journal.
-      #
-      def build_error_journal
+    #
+    # Uses a file persisted error journal.
+    #
+    def build_error_journal
 
-        init_service :s_error_journal, DbErrorJournal
-      end
+      init_service(:s_error_journal, DbErrorJournal)
+    end
   end
 
   #
   # This OpenWFEru engine features database persistence (thanks to
   # ActiveRecord), with a cache (for faster read operations) and a
@@ -79,16 +64,11 @@
   #
   class CachedDbPersistedEngine < DbPersistedEngine
 
     protected
 
-      def build_expression_storage
+    def build_expression_storage
 
-        @application_context[:expression_cache_size] ||= 1000
-
-        init_service(:s_expression_storage, OpenWFE::CacheExpressionStorage)
-
-        #init_service(:s_expression_storage__1, DbExpressionStorage)
-        init_service(:s_expression_storage__1, ThreadedDbExpressionStorage)
-      end
+      init_storage(ThreadedDbExpressionStorage)
+    end
   end
 end