filestore 0.0.7 → 0.0.8

data/lib/filestore.rb

@@ -4,15 +4,12 @@
 # author: Thomas Stätter
 # date: 2012/11/07
 #
+require "../module.rb"
 
-require 'meta_manager.rb'
-require 'log.rb'
-require 'etc'
-require 'yaml'
-require 'fileutils'
-require 'uuidtools'
+include FileStore
 
 module FileStore
+  include OberservedSubject
 	#
 	# Base exception class used for errors occurring in this module
 	#
@@ -23,6 +20,9 @@ module FileStore
 	# arbitrary files
 	#
 	class SimpleFileStore
+	  include Logger
+	  include OberservedSubject
+	  
 		# Name of the lock file
 		STORE_LOCK_FILE = ".locked"
 		# Name of the meta file describing the current file store
@@ -45,7 +45,7 @@ module FileStore
 		# 	metaManager: The meta data manager instance to be used by this store
 		# 	rootPath: The path where the file store resides
 		#
-		def initialize(metaManager, rootPath = '.')
+		def initialize(metaManager, rootPath = '.', logger)
 			raise FileStoreException, "Root path already locked" if SimpleFileStore.is_directory_locked?(rootPath)		
 			raise FileStoreException, "FileStore root path #{rootPath} doesn't exist" if not File.directory?(rootPath)
 			raise FileStoreException, "FileStore root path #{rootPath} isn't writable" if not File.writable?(rootPath)
@@ -59,6 +59,9 @@ module FileStore
 			@rollbackPath = File.join(@rootPath, ROLLBACK_ROOT)
 			@metaFile = File.join(@rootPath, META_FILE)
 			@locked = false
+			@logger = logger
+			
+			self.initialize_obs
 			
 			begin
 				# Try to recover existing store
@@ -79,7 +82,7 @@ module FileStore
 		# 	shouldMove: Determines wether to original file should be deleted
 		#
 		# Returns:
-		#	The newly created ID for the file
+		#	  The newly created ID for the file
 		#
 		def add(file, meta = {}, shouldMove = true)
 			raise FileStoreException, "File #{file} not found" if not File.exists?(file)
@@ -91,14 +94,17 @@ module FileStore
 			
 			begin
 				dir = SimpleFileStore.get_daily_directory(@storePath)
-				Logger.instance.logger.info "Adding file #{file} to directory #{dir}"
+				@logger.info "Adding file #{file} to directory #{dir}"
 				id = SimpleFileStore.get_id(self)
-				Logger.instance.logger.info "Using file id #{id}"
+				@logger.info "Using file id #{id}"
 				dstPath = File.join(dir, id)
-				Logger.instance.logger.info "Created destination path #{dstPath}"
+				@logger.info "Created destination path #{dstPath}"
+				
+				shouldMove ? (@logger.info("Moving file"); FileUtils.mv(file, dstPath)) : 
+					(@logger.info("Copying file"); FileUtils.copy_file(file, dstPath))
 				
-				shouldMove ? (Logger.instance.logger.info("Moving file"); FileUtils.mv(file, dstPath)) : 
-					(Logger.instance.logger.info("Copying file"); FileUtils.copy_file(file, dstPath))
+				self.inform ObserverAction.new(:type => ObserverAction::TYPE_STORE_ADD, 
+          :objects => [file, meta], :msg => "Added file to file store")
 			rescue Exception => e
 				raise FileStoreException, "Couldn't add file #{file} to store.", e.backtrace
 			end
@@ -127,6 +133,9 @@ module FileStore
 
 			raise FileStoreException, "No valid meta data found for ID #{id}" if md.nil? or not File.exists?(path)
 			
+			self.inform ObserverAction.new :type => ObserverAction::TYPE_STORE_GET, 
+        :objects => [id], :msg => "Returning file from file store"
+			
 			return { :path => File.new(path), :data => md }
 		end
 		#
@@ -148,6 +157,9 @@ module FileStore
 				dstPath = File.join(dir, id)
 				
 				FileUtils.move(file, dstPath)
+				
+				self.inform ObserverAction.new :type => ObserverAction::TYPE_STORE_REMOVE, 
+          :objects => [id], :msg => "Deleted file from store"
 			rescue Exception => e
 				raise FileStoreException, "Couldn't move file #{file} to deleted store.\n#{e.message}"
 			end
@@ -161,14 +173,18 @@ module FileStore
 		def restore(id)
 			raise FileStoreException, "No file ID given for restore" if id == '' or id.nil?
 			
-			md = @metaManager.restore(id)
-			file = md[:path]
-			
 			begin
+			  md = @metaManager.restore id
+        @logger.debug "Restoring meta data #{md}"
+        file = md[:path]
+        
 				dir = SimpleFileStore.get_daily_directory(@storePath)
 				dstPath = File.join(dir, id)
 				
 				FileUtils.move(file, dstPath)
+				
+				self.inform ObserverAction.new :type => ObserverAction::TYPE_STORE_RESTORE, 
+          :objects => [id], :msg => "Restored file from store"
 			rescue Exception => e
 				raise FileStoreException, "Couldn't restore file #{file} from deleted store.\n#{e.message}"
 				#
@@ -183,6 +199,9 @@ module FileStore
 			@metaManager.shutdown
 			
 			release_lock
+			
+			self.inform ObserverAction.new :type => ObserverAction::TYPE_STORE_SHUTDOWN, 
+        :msg => "File store shutdown"
 		end
 		#
 		# Determines wether this store is locked
@@ -261,7 +280,6 @@ module FileStore
 		# 	store: The file store instance to set up
 		#
 		def self.create_store(store)
-			Logger.instance.logger.info "Trying to create store in #{store.storePath}"
 			# Try to create needed directories
 			begin
 				FileUtils.mkdir [store.storePath, store.deletedPath, store.rollbackPath]
@@ -297,7 +315,6 @@ module FileStore
 		def self.recover_store(store)
 			# trying to recover existing file store
 			begin
-				Logger.instance.logger.info "Trying to recover store from #{store.metaFile}"
 				meta = YAML.load_file(store.metaFile)
 				
 				raise FileStoreException, "Store directory not found" if not File.directory?(meta[:storePath])

data/lib/log.rb

@@ -1,29 +1,45 @@
 #
 # log.rb
+# @author Thomas Stätter
+# @date 2012/11/26
+# @description
 #
-# author: Thomas Stätter
-# date: 2012/11/07 
-#
-require 'date'
-require 'log4r'
-require 'singleton'
-
 module FileStore
-	#
-	# Singleton logging facility class
-	#
-	class Logger
-		include Singleton
-		
-		attr_reader :logger
-		#
-		# Creates a new logging facility
-		#
-		def initialize
-			@logger = Log4r::Logger.new 'FileStore'
-			@logger.outputters = Log4r::StdoutOutputter.new(:level => Log4r::WARN, 
-                    	:formatter => Log4r::PatternFormatter.new(:pattern => "[%l] %d - %m"))
-		end
-	end
-
+  #
+  # Mix-in module for logging capabilities
+  #
+  module Logger
+    #
+    # Accessor for the logging facility. Any logging facility must
+    # implement the methods 'info', 'warn', 'error' and 'debug'
+    #
+    attr_accessor :logger
+  end
+  #
+  # Simple logger class for stdout logging
+  #
+  class StdoutLogger
+    
+    def StdoutLogger.log(level, msg)
+      puts "[#{level}] #{msg}"
+    end
+    
+    def StdoutLogger.info(msg)
+      StdoutLogger::log("INFO", msg)
+    end
+    
+    def StdoutLogger.warn(msg)
+      StdoutLogger::log("WARN", msg)
+    end
+    
+    def StdoutLogger.error(msg)
+      StdoutLogger::log("ERROR", msg)
+    end
+    
+    def StdoutLogger.debug(msg)
+      StdoutLogger::log("DEBUG", msg)
+    end
+    
+  end
+  
 end

data/lib/memory_meta.rb

@@ -4,16 +4,16 @@
 # author: Thomas Stätter
 # date: 2012/11/08
 #
-require 'yaml'
-require 'filestore.rb'
-require 'meta_manager.rb'
-require 'log.rb'
+require "../module.rb"
 
 module FileStore
 	#
 	# Class implementing a memory based MetaManager
 	#
 	class MemoryMetaManager < MetaManager
+	  include Logger
+	  include OberservedSubject
+	  
 		# Constant defining the default file path
 		FILE = 'meta.yaml'
 		# Accessor for the file to store data to
@@ -24,23 +24,26 @@ module FileStore
 		# Arguments:
 		# 	persistentFile: The file where the manager class is persisted to
 		#
-		def initialize(persistentFile = '')
+		def initialize(persistentFile = '', logger)
+		  @logger = logger
 			@data = Hash.new
 			@removed = Hash.new
 			@file = (persistentFile.nil? or persistentFile == '')? MemoryMetaManager::FILE : persistentFile
 			
+			self.initialize_obs
+			
 			begin
 				if File.exists?(@file)
-					Logger.instance.logger.info "loading meta yaml from #{@file}"
+					@logger.info "loading meta yaml from #{@file}"
 					@mm = YAML.load_file(@file) if File.exists?(@file)
-					Logger.instance.logger.info "Loaded meta yaml: #{@mm}"
+					@logger.info "Loaded meta yaml: #{@mm}"
 					@data = @mm[:current]
 					@removed = @mm[:removed]
 				else
-					Logger.instance.logger.info "Creating new meta store in #{@file}"
+					@logger.info "Creating new meta store in #{@file}"
 				end
 			rescue Exception => e
-				raise FileStoreException, "Couldn't load meta data from file #{@file}"				
+				raise FileStoreException, "Couldn't load meta data from file #{@file}.\nCause: #{e}"				
 			end
 				
 		end
@@ -60,6 +63,9 @@ module FileStore
 			raise FileStoreException, "Only Strings can be used as keys" if not id.is_a?(String)
 			
 			@data[id] = (@data.key?(id) ? @data[id].merge!(metaData) : @data[id] = metaData)
+			
+			self.inform ObserverAction.new(:type => ObserverAction::TYPE_META_ADD, 
+       :objects => [id, metaData], :msg => "Added/Updated file to meta store")
 		end
 		#
 		# see: MetaManager::remove
@@ -70,6 +76,9 @@ module FileStore
 			
 			@removed[id] = @data[id]
 			@data.delete(id)
+			
+			self.inform ObserverAction.new(:type => ObserverAction::TYPE_META_REMOVE, 
+       :objects => [id], :msg => "Removed file to meta store")
 		end
 		#
 		# see: MetaManager::restore
@@ -80,6 +89,9 @@ module FileStore
 			
 			@data[id] = @removed[id]
 			@removed.delete(id)
+			
+			self.inform ObserverAction.new(:type => ObserverAction::TYPE_META_RESTORE, 
+       :objects => [id], :msg => "Restored file in meta store")
 		end
 		#
 		# see: MetaManager::shutdown
@@ -91,6 +103,9 @@ module FileStore
 				end
 				
 				@data = nil
+				
+				self.inform ObserverAction.new(:type => ObserverAction::TYPE_META_SHUTDOWN, 
+          :msg => "Restored file in meta store")
 			rescue Exception => e
 				raise FileStoreException, "Couldn't serialize meta manager to file #{@file}.\n#{e.message}"
 			end

data/lib/multitenant_filestore.rb

@@ -4,20 +4,15 @@
 # author: Thomas Stätter
 # date: 2012/11/21
 #
-
-require 'filestore.rb'
-require 'memory_meta.rb'
-require 'log.rb'
-require 'uuidtools'
-require 'fileutils'
-require 'yaml'
-require 'singleton'
+require "../module.rb"
 
 module FileStore
 	#
 	# Singleton class implementing a multitenant file store
 	#
 	class MultiTenantFileStore
+	  include Logger
+	  include OberservedSubject
 		# Make this class a singleton class
 		include Singleton
 		# Accessors
@@ -28,6 +23,8 @@ module FileStore
 		def initialize()
 			@rootPath = Dir.getwd
 			@stores = {}
+			
+			self.initialize_obs
 		end
 		#
 		# Sets the root path of the multitenant store. As FileStore::MultiTenantFileStore
@@ -58,10 +55,13 @@ module FileStore
 			begin
 				path = File.join(@rootPath, id)
 				FileUtils.mkdir path if not File.directory?(path)
-				mm = MemoryMetaManager.new(File.join(path, "meta.yaml"))
-				sfs = SimpleFileStore.new(mm, path)
+				mm = MemoryMetaManager.new(File.join(path, "meta.yaml"), self.logger)
+				sfs = SimpleFileStore.new(mm, path, self.logger)
 			
 				@stores[id] = sfs
+				
+				self.inform ObserverAction.new(:type => ObserverAction::TYPE_MSTORE_CREATE, 
+          :msg => "Created new tenant store")
 			rescue Exception => e
 				raise FileStoreException, "Couldn't create multitenant store.\n#{e.message}"
 			end
@@ -110,6 +110,9 @@ module FileStore
 			raise FileStoreException, "Tenant #{tenant} not registered. File #{file} can't be added." if not @stores.key?(tenant)
 			
 			@stores[tenant].add(file, md)
+			
+			self.inform ObserverAction.new(:type => ObserverAction::TYPE_MSTORE_ADD, 
+          :objects => [tenant, file], :msg => "Added file to tenant")
 		end
 		#
 		# Removes a file from the tenant's store
@@ -180,7 +183,7 @@ module FileStore
 						stores[tenant] = sfs
 					end
 				rescue Exception => e
-					Logger.instance.logger.error "Couldn't create store for tenant #{tenant}.\n#{e.message}"
+					@logger.error "Couldn't create store for tenant #{tenant}.\n#{e.message}"
 				end
 			}
 			

data/lib/observer.rb

@@ -0,0 +1,147 @@
+#
+# observer.rb
+#
+# author: Thomas Stätter
+# date: 2014/01/05
+#
+require "../module.rb"
+
+module FileStore
+  #
+  # Class FileStore::ObserverAction is used to encapsulate information 
+  # describing actions occurring in an observed subject 
+  #
+  class ObserverAction
+    TYPE_DEFAULT        = "DEFAULT"
+    TYPE_STORE_ADD      = "STORE_ADD_FILE"
+    TYPE_STORE_REMOVE   = "STORE_REMOVE_FILE"
+    TYPE_STORE_GET      = "STORE_GET_FILE"
+    TYPE_STORE_RESTORE  = "STORE_RESTORE_FILE"
+    TYPE_STORE_SHUTDOWN = "STORE_SHUTDOWN"
+    TYPE_MSTORE_CREATE  = "MSTORE_CREATE_TENANT"
+    TYPE_MSTORE_ADD     = "MSTORE_ADD_FILE"
+    TYPE_MSTORE_REMOVE  = "MSTORE_REMOVE_TENANT"
+    TYPE_META_ADD       = "META_ADD_FILE"
+    TYPE_META_REMOVE    = "META_REMOVE_FILE"
+    TYPE_META_RESTORE   = "META_RESTORE_FILE"
+    TYPE_META_SHUTDOWN  = "META_SHUTDOWN"
+    #
+    # Attribute accessors for instance variable defining the type of
+    # action
+    #
+    attr_accessor :type
+    #
+    # Attribute accessors for instance variable containing references
+    # to affected objects
+    #
+    attr_accessor :objects
+    #
+    # Attribute accessors for instance variable containing a message
+    # providing useful information
+    #
+    attr_accessor :message
+    
+    def initialize(type = TYPE_DEFAULT, objects = [], message = "")
+      @type = type
+      @objects = objects
+      @message = message
+    end
+    
+    def to_s
+      return "(ActionType) #{@type} || (Objects) #{@objects} || (Message) #{@message}"
+    end
+  end
+  #
+  # Module FileStore::OberservedSubject can be mixed in to implement an 
+  # observed object. 
+  #
+  module OberservedSubject
+    #
+    # Reader for collection of observers
+    #
+    attr_reader :observers
+    #
+    # Module hook executed after the inclusion. Currently nothing
+    # happens here
+    #
+    def self.included(klass)
+    end
+    #
+    # Initializes needed attributes for implementing observer. Should
+    # be called in any constructor including this module
+    #
+    def initialize_obs
+      @observers = []
+      self.logger.debug "Initialized ObservedStore, added observers array" if not self.logger.nil?
+    end
+    #
+    # Registers an concrete observer
+    #
+    # Arguments:
+    #   obj: The object added as an observer. Must be an instance of
+    #       FileStore::Observer
+    #
+    def register(obj)
+      if obj.is_a?(Observer) and not obj.nil? and not @observers.include?(obj) then
+        @observers << obj
+        self.logger.debug "Added #{obj} to observers" if not self.logger.nil?
+      else
+        raise FileStoreException, "Only instances of FileStore::Observer can be registered"
+      end
+    end
+    #
+    # Removes a concrete observer
+    #
+    # Arguments:
+    #   obj: The observer to be removed. Obviously, it needs to be
+    #       registered before-hand 
+    #
+    def unregister(obj)
+      if @observers.include?(obj) then 
+        @observers.delete_at(@observers.index(obj))
+        self.logger.debug "Removed observing object #{obj} from the list" if not self.logger.nil?
+      else
+        raise FileStoreException, "Object #{obj} isn't a registered observer"
+      end
+    end
+    #
+    # Informs registered observers about an action 
+    #
+    # Arguments:
+    #   msg: Some information sent to all registered observers
+    #
+    def inform(msg)
+      @observers.each do |o|
+        o.notify msg, self
+      end
+    end
+    
+  end
+  #
+  # Module FileStore::Observer can be mixed in to implement a 
+  # observer. Observers are notified about actions occurring
+  # in the observed subject, an instance of FileStore::SimpleStore
+  # or FileStore::MultiTenantFileStore, respectively.
+  #
+  module Observer
+    #
+    # Module hook executed after the inclusion. Currently nothing
+    # happens here
+    #
+    def self.included(klass)
+    end
+    #
+    # Method called via the observed subject to inform observers
+    # about an action occurred in the observed subject. Override
+    # this method to fit your needs.
+    #
+    # Arguments:
+    #   msg: Some information about the action
+    #   subject: A reference to the observed object
+    #
+    def notify(msg, subject)
+    end
+    
+  end
+  
+end

data/module.rb

@@ -0,0 +1,40 @@
+#
+# filestore.rb
+# @author Thomas Stätter
+# @date 2012/11/26
+# @description
+#
+module FileStore
+	VERSION = '0.0.8'
+	LIB_FILES = [
+    #
+    # Required 3rd party libs
+    #
+    'uuidtools',
+    'fileutils',
+    'yaml',
+    'singleton',
+    'etc',
+    #
+    # FileStore specific libraries. Order matters!
+    #
+    'lib/meta_manager.rb',
+    'lib/log.rb',
+    'lib/observer.rb',
+    'lib/filestore.rb',
+    'lib/multitenant_filestore.rb',
+    'lib/memory_meta.rb'
+  ]
+	#
+  # Loads required libs as defined in FileStore::LIB_FILES
+  #  
+  def self.load_required
+    $LOAD_PATH << File.dirname(File.new(__FILE__))
+    
+    LIB_FILES.each do |l| 
+      require l
+    end
+  end
+end
+
+FileStore::load_required

data/test/classes.rb

@@ -0,0 +1,43 @@
+require 'test/unit'
+
+class FileStoreTest < Test::Unit::TestCase
+  
+  def setup
+    # create test directory and file
+    @basePath = "#{Dir.getwd}/store_test"
+    @testFile = File.join(@basePath, "testfile.txt")
+     
+    FileUtils.mkdir(@basePath) if not File.exists?(@basePath)
+    FileUtils.touch(@testFile) if not File.exists?(@testFile)
+  end
+  
+  def teardown
+    # remove test directory and file
+    FileUtils.remove_dir(@basePath, true) if File.exists?(@basePath)
+  end
+  
+end
+
+class ObserverClass
+  include Observer
+  include Logger
+  
+  def initialize()
+  end
+  
+  def notify(msg, obj)
+    self.logger.info "[ObserverClass] received msg '#{msg.to_s}' from observed object #{obj}"
+  end
+end
+
+class OtherObserverClass
+  include Observer
+  include Logger
+  
+  def initialize
+  end
+  
+  def notify(msg, obj)
+    self.logger.info "[OtherObserverClass] received msg '#{msg.to_s}' from observed object #{obj}"
+  end
+end

data/test/tc_filestore.rb

@@ -2,31 +2,73 @@
 # tc_filestore.rb
 # @author Thomas Stätter
 # @date 2012/11/14
-# @description Test script
 #
-# call: ruby -I ../lib/ tc_filestore.rb
-#
-require_relative '../lib/filestore.rb'
-require_relative '../lib/memory_meta.rb'
+require_relative '../module.rb'
+require './classes.rb'
+require 'test/unit'
 
 include FileStore
 
-basePath = "#{Dir.getwd}/store_test"
-testFile = $*[0]
-
-begin
-	puts "Using file: #{testFile}"
-	mm = MemoryMetaManager.new(File.join(basePath, "meta.yaml"))
-	sfs = SimpleFileStore.new(mm, basePath)
-	id = sfs.add(testFile, {:original_file => testFile}, false)
-
-	puts id
-	puts "Enter something to finish"
-	enter = gets 
-
-	sfs.remove(id)
-rescue Exception => e
-	puts e
-ensure
-	sfs.shutdown if not sfs.nil?
+class TestFileStore < FileStoreTest
+  
+  def test_init_shutdown
+    puts "=" * 80
+    puts "TestFileStore::test_init_shutdown"
+    puts "=" * 80
+    
+    mm = MemoryMetaManager.new File.join(@basePath, "meta.yaml"), StdoutLogger
+    sfs = nil
+    
+    assert_nothing_raised(FileStoreException) {
+      sfs = SimpleFileStore.new mm, @basePath, StdoutLogger
+    }
+    assert_not_nil(sfs)
+    assert_nothing_raised(FileStoreException) {
+      sfs.shutdown
+    }
+  end
+  
+  def test_registration_observer
+    puts "=" * 80
+    puts "TestFileStorage::test_registration_observer"
+    puts "=" * 80
+    
+    mm = MemoryMetaManager.new File.join(@basePath, "meta.yaml"), StdoutLogger
+    sfs = SimpleFileStore.new mm, @basePath, StdoutLogger
+    o1 = OtherObserverClass.new
+    o2 = ObserverClass.new
+    
+    assert_nothing_raised(FileStoreException) { 
+      sfs.register o1
+      sfs.register o2
+    }
+    assert_raise(FileStoreException) { sfs.register o1 }
+    assert_nothing_raised(FileStoreException) { 
+      sfs.unregister o1
+      sfs.unregister o2
+    }
+  end
+  
+  def test_actions_with_observer
+    puts "=" * 80
+    puts "TestFileStorage::test_actions_with_observer"
+    puts "=" * 80
+    
+    o1 = ObserverClass.new    
+    o1.logger = StdoutLogger
+    mm = MemoryMetaManager.new File.join(@basePath, "meta.yaml"), StdoutLogger
+    sfs = SimpleFileStore.new mm, @basePath, StdoutLogger
+    id = nil
+    
+    sfs.register o1
+    
+    assert_nothing_raised(FileStoreException) { 
+      id = sfs.add @testFile, { :original_file => @testFile }, false
+    }
+    assert_nothing_raised(FileStoreException) { file = sfs.get id }
+    assert_not_nil(sfs.get(id))
+    assert_nothing_raised(FileStoreException) { sfs.remove id }
+    assert_nothing_raised(FileStoreException) { sfs.shutdown }
+  end
+  
 end

data/test/tc_meta.rb

@@ -0,0 +1,69 @@
+#
+# tc_meta.rb
+# @author Thomas Stätter
+# @date 2014/01/05
+#
+require_relative '../module.rb'
+require './classes.rb'
+require 'test/unit'
+
+include FileStore
+
+class TestMetaManager < FileStoreTest
+    
+  def test_init_shutdown
+    puts "=" * 80
+    puts "TestMetaManager::test_init_shutdown"
+    puts "=" * 80
+    assert_nothing_raised(FileStoreException) {
+      MemoryMetaManager.new File.join(@basePath, "meta.yaml"), StdoutLogger
+    }
+    assert_nothing_raised(FileStoreException) {
+      mm = MemoryMetaManager.new File.join(@basePath, "meta.yaml"), StdoutLogger
+      
+      mm.shutdown
+    }
+  end
+  
+  def test_registration_observer
+    puts "=" * 80
+    puts "TestMetaManager::test_registration_observer"
+    puts "=" * 80
+    
+    o1 = ObserverClass.new
+    o2 = OtherObserverClass.new
+    
+    o1.logger = StdoutLogger
+    o2.logger = StdoutLogger
+    
+    mm = MemoryMetaManager.new(File.join(@basePath, "meta.yaml"), StdoutLogger)
+    
+    assert_nothing_raised(FileStoreException) {
+      mm.register o1
+      mm.register o2
+    }
+    assert_raise(FileStoreException) { mm.register o1 }
+    assert_nothing_raised(FileStoreException) {
+      mm.unregister(o1)
+      mm.unregister(o2)
+    }
+  end
+  
+  def test_actions_with_observer
+    puts "=" * 80
+    puts "TestMetaManager::test_actions_with_observer"
+    puts "=" * 80
+    
+    o1 = ObserverClass.new    
+    o1.logger = StdoutLogger
+    mm = MemoryMetaManager.new(File.join(@basePath, "meta.yaml"), StdoutLogger)
+    
+    mm.register o1
+    
+    assert_nothing_raised(Exception) { mm.add_or_update "1", {} }
+    assert_nothing_raised(Exception) { mm.add_or_update "1", {} }
+    assert_nothing_raised(Exception) { mm.remove "1" }
+    assert_nothing_raised(Exception) { mm.restore "1" }
+    assert_nothing_raised(Exception) { mm.shutdown }
+  end
+end

data/test/tc_module.rb

@@ -0,0 +1,26 @@
+#
+# tc_module.rb
+# @author Thomas Stätter
+# @date 2014/01/05
+#
+require 'test/unit'
+require '../module.rb'
+
+include FileStore
+
+class TestModule < Test::Unit::TestCase
+    
+  def test_inclusion
+    puts "=" * 80
+    puts "TestModule::test_inclusion"
+    puts "=" * 80
+    assert_nothing_raised(NameError) { ObserverAction }
+    assert_nothing_raised(NameError) { OberservedSubject }
+    assert_nothing_raised(NameError) { Observer }
+    assert_nothing_raised(NameError) { SimpleFileStore }
+    assert_nothing_raised(NameError) { MultiTenantFileStore }
+    assert_nothing_raised(NameError) { MemoryMetaManager }
+    assert_nothing_raised(NameError) { MetaManager }
+    assert_nothing_raised(NameError) { FileStoreException }
+  end
+end

data/test/tc_multitenant.rb

@@ -1,29 +1,51 @@
 #
 # tc_multitenant.rb
+#
 # @author Thomas Stätter
 # @date 2012/11/21
 # @description Test script
 #
-# call: ruby -I ../lib/ tc_multitenant.rb
-#
-require_relative '../lib/multitenant_filestore.rb'
-require 'fileutils'
+require_relative '../module.rb'
+require './classes.rb'
+require 'test/unit'
 
 include FileStore
 
-basePath = "#{Dir.getwd}/multi_store_test"
-testFile = "#{Dir.getwd}/testfile.txt"
-
-begin
-	MultiTenantFileStore.instance.set_root_path basePath
-	tenant = MultiTenantFileStore.instance.create_tenant_store
-	MultiTenantFileStore.instance.add_to_tenant tenant, testFile, { :original_file => testFile }
-	
-	puts MultiTenantFileStore.instance.stores
-	MultiTenantFileStore.instance.shutdown
-rescue Exception => e
-	puts e
-	puts e.backtrace
-end
-
-FileUtils.touch testFile
+class TestMultiTenantFileStore < FileStoreTest
+  
+  def test_registration_observer
+    puts "=" * 80
+    puts "TestMultiTenantFileStore::test_registration_observer"
+    puts "=" * 80
+    
+    MultiTenantFileStore.instance.set_root_path @basePath
+    MultiTenantFileStore.instance.logger = StdoutLogger
+    tenant = MultiTenantFileStore.instance.create_tenant_store
+    o1 = OtherObserverClass.new
+    o2 = ObserverClass.new
+    
+    assert_nothing_raised(FileStoreException) {
+      MultiTenantFileStore.instance.register o1
+      MultiTenantFileStore.instance.register o2
+    }
+  end
+  
+  def test_actions_with_observer
+    puts "=" * 80
+    puts "TestMultiTenantFileStore::test_actions_with_observer"
+    puts "=" * 80
+    
+    MultiTenantFileStore.instance.set_root_path @basePath
+    MultiTenantFileStore.instance.logger = StdoutLogger
+    o1 = OtherObserverClass.new
+    o1.logger = StdoutLogger
+    MultiTenantFileStore.instance.register o1
+    
+    assert_nothing_raised(FileStoreException) {
+      tenant = MultiTenantFileStore.instance.create_tenant_store
+      MultiTenantFileStore.instance.add_to_tenant tenant, 
+        @testFile, { :original_file => @testFile }
+    }
+  end
+  
+end

data/test/ts_all.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+#
+# ts_all.rb
+#
+# @author Thomas Stätter
+# @date 2014-01-05
+#
+require 'test/unit'
+
+Dir['./tc_*.rb'].each do |tc|
+  require tc
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filestore
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-06 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
@@ -61,15 +61,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- filestore.rb
+- module.rb
 - lib/filestore.rb
 - lib/memory_meta.rb
 - lib/log.rb
 - lib/meta_manager.rb
 - lib/multitenant_filestore.rb
+- lib/observer.rb
+- test/classes.rb
+- test/tc_meta.rb
+- test/tc_module.rb
 - test/tc_filestore.rb
 - test/tc_multitenant.rb
-- test/testfile.txt
+- test/ts_all.rb
 homepage: https://github.com/tstaetter/filestore-gem
 licenses: []
 post_install_message: 
@@ -96,6 +100,9 @@ signing_key:
 specification_version: 3
 summary: Simple file storage
 test_files:
+- test/classes.rb
+- test/tc_meta.rb
+- test/tc_module.rb
 - test/tc_filestore.rb
 - test/tc_multitenant.rb
-- test/testfile.txt
+- test/ts_all.rb

data/filestore.rb

@@ -1,15 +0,0 @@
-#
-# filestore.rb
-# @author Thomas Stätter
-# @date 2012/11/26
-# @description
-#
-
-require 'lib/meta_manager.rb'
-require 'lib/log.rb'
-require 'lib/filestore.rb'
-require 'lib/multitenant_filestore.rb'
-
-module FileStore
-	VERSION = '0.0.5'
-end