filestore 0.0.8 → 0.0.9

data/lib/{memory_meta.rb → filestore/memory_meta.rb}

@@ -4,8 +4,6 @@
 # author: Thomas Stätter
 # date: 2012/11/08
 #
-require "../module.rb"
-
 module FileStore
 	#
 	# Class implementing a memory based MetaManager

data/lib/{meta_manager.rb → filestore/meta_manager.rb}

@@ -4,7 +4,6 @@
 # author: Thomas Stätter
 # date: 2012/11/08
 #
-
 module FileStore
 	#
 	# Base class for implementing a meta manager class. This class is used for storing

data/lib/{multitenant_filestore.rb → filestore/multitenant_store.rb}

@@ -4,7 +4,7 @@
 # author: Thomas Stätter
 # date: 2012/11/21
 #
-require "../module.rb"
+require 'filestore'
 
 module FileStore
 	#

data/lib/{observer.rb → filestore/observer.rb}

@@ -4,8 +4,6 @@
 # author: Thomas Stätter
 # date: 2014/01/05
 #
-require "../module.rb"
-
 module FileStore
   #
   # Class FileStore::ObserverAction is used to encapsulate information 

data/lib/filestore/simple_store.rb

@@ -0,0 +1,329 @@
+#
+# filestore.rb
+#
+# author: Thomas Stätter
+# date: 2012/11/07
+#
+module FileStore
+	#
+	# Base exception class used for errors occurring in this module
+	#
+	class FileStoreException < Exception
+	end
+	#
+	# Main library class implementing a simple file store used for storing and managing 
+	# 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
+		META_FILE = "filestore.yaml"
+		# The base name of the file store directory
+		STORE_ROOT = 'filestore'
+		# The base name of the directory for storing deleted files
+		DELETED_ROOT = 'deleted'
+		# The base name of the directory storing files extracted from file store by a 
+		# rollback action 
+		ROLLBACK_ROOT = 'rollback'
+		#
+		# Accessors for important properties
+		#
+		attr_reader :metaManager, :rootPath, :storePath, :deletedPath, :rollbackPath, :metaFile
+		#
+		# Initializes a new instance of SimpleFileStore
+		#
+		# Arguments:
+		# 	metaManager: The meta data manager instance to be used by this store
+		# 	rootPath: The path where the file store resides
+		#
+		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)
+			raise FileStoreException, "No meta data manager given" if metaManager.nil?
+			raise FileStoreException, "Meta data manager must be of type FileStore::MetaManager" if not metaManager.is_a?(MetaManager)
+			
+			@metaManager = metaManager
+			@rootPath = rootPath
+			@storePath = File.join(@rootPath, STORE_ROOT)
+			@deletedPath = File.join(@rootPath, DELETED_ROOT)
+			@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
+				SimpleFileStore.recover_store(self)
+			rescue FileStoreException => e
+				# Recovery failed, trying to create the store
+				SimpleFileStore.create_store(self)
+			end
+			
+			lock
+		end
+		#
+		# Adds a file to the store
+		#
+		# Arguments:
+		# 	file: The file to be stored
+		# 	meta: Optional meta data to be stored along with the physical file
+		# 	shouldMove: Determines wether to original file should be deleted
+		#
+		# Returns:
+		#	  The newly created ID for the file
+		#
+		def add(file, meta = {}, shouldMove = true)
+			raise FileStoreException, "File #{file} not found" if not File.exists?(file)
+			raise FileStoreException, "File #{file} isn't readable" if not File.readable?(file)
+			raise FileStoreException, "File #{file} can't be removed" if not File.writable?(file)
+			
+			meta = {} if meta.nil?
+			id = ""
+			
+			begin
+				dir = SimpleFileStore.get_daily_directory(@storePath)
+				@logger.info "Adding file #{file} to directory #{dir}"
+				id = SimpleFileStore.get_id(self)
+				@logger.info "Using file id #{id}"
+				dstPath = File.join(dir, id)
+				@logger.info "Created destination path #{dstPath}"
+				
+				shouldMove ? (@logger.info("Moving file"); FileUtils.mv(file, dstPath)) : 
+					(@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
+			
+			meta[:path] = dstPath
+			@metaManager.add_or_update(id, meta)
+			
+			return id
+		end
+		#
+		# Retrieves a file identified by it's ID
+		#
+		# Arguments:
+		# 	id: The files ID to retrieve
+		#
+		# Returns: 
+		#	A hash of file object (:path) and corresponding meta data (:data)
+		#			representing the file in the store
+		#
+		def get(id)
+			raise FileStoreException, "No ID given" if id.nil? or id == ''
+			raise FileStoreException, "No file for ID #{id} found" if not @metaManager.has_id?(id)
+			
+			md = @metaManager.get_data(id)
+			path = md[:path]
+
+			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
+		#
+		# Moves a file from the current to the deleted store
+		#
+		# Arguments:
+		# 	id: The ID identifying the file to be moved
+		#
+		def remove(id)
+			raise FileStoreException, "No file ID given for removal" if id == '' or id.nil?
+			raise FileStoreException, "File ID for removal not found in store" if not @metaManager.has_id?(id)
+			
+			file = @metaManager.get_data(id)[:path]
+			
+			begin
+				@metaManager.remove(id)
+				
+				dir = SimpleFileStore.get_daily_directory(@deletedPath)
+				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
+		end
+		#
+		# Restores a file identified by it's id
+		#
+		# Arguments:
+		# 	id: The file ID
+		#
+		def restore(id)
+			raise FileStoreException, "No file ID given for restore" if id == '' or id.nil?
+			
+			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}"
+				#
+				# Delete restored entry from metaManager
+				@metaManager.delete(id)
+			end
+		end
+		#
+		# Shuts down the file store
+		#
+		def shutdown
+			@metaManager.shutdown
+			
+			release_lock
+			
+			self.inform ObserverAction.new :type => ObserverAction::TYPE_STORE_SHUTDOWN, 
+        :msg => "File store shutdown"
+		end
+		#
+		# Determines wether this store is locked
+		#
+		def locked?
+			return @locked
+		end
+		
+		private
+		
+		#
+		# Release the lock from the store
+		#
+		def release_lock
+			begin
+				File.delete File.join(@rootPath, STORE_LOCK_FILE)
+				@locked = false
+			rescue Exception => e
+				raise FileStoreException, "Couldn't release lock from #{@storePath}.\n#{e.message}"
+			end
+		end
+		#
+		# Locks the current instance of file store as well as the corresponding path on
+		# the file system using a hidden file
+		#
+		def lock
+			begin
+				FileUtils.touch File.join(@rootPath, STORE_LOCK_FILE)
+				@locked = true
+			rescue Exception => e
+				raise FileStoreException, "Couldn't lock the store in path #{@storePath}.\n#{e.message}"
+			end
+		end
+		#
+		# Determines wether the store path is already locked by another instance
+		# of SimpleFileStore
+		#
+		def self.is_directory_locked?(rootPath)
+			return File.exists?(File.join(rootPath, SimpleFileStore::STORE_LOCK_FILE))
+		end
+		#
+		# Creates a new file ID
+		#
+		# Returns:
+		# 	A string representing the file's ID
+		#
+		def self.get_id(store)
+			for i in 0..2 do	
+				id = UUIDTools::UUID.random_create.to_s
+				
+				return id if not store.metaManager.has_id?(id) 
+			end
+			
+			raise FileStoreException, "Couldn't find unique ID"
+		end
+		#
+		# Returns the currently used directory
+		#
+		def self.get_daily_directory(base)
+			date = Date.today
+			dir = File.join(base, date.year.to_s, date.month.to_s, date.day.to_s)
+			
+			begin
+				FileUtils.mkdir_p(dir) if not File.directory?(dir)
+			rescue Exception => e
+				raise FileStoreException, "Can't create daily directory #{dir}.\n#{e.message}"
+			end
+			
+			raise FileStoreException, "Daily directory #{dir} isn't writable" if not File.writable?(dir)
+			return dir
+		end
+		#
+		# Setup for a new file store directory
+		#
+		# Arguments:
+		# 	store: The file store instance to set up
+		#
+		def self.create_store(store)
+			# Try to create needed directories
+			begin
+				FileUtils.mkdir [store.storePath, store.deletedPath, store.rollbackPath]
+			rescue Errno::ENOENT => e
+				raise FileStoreException, "One ore more system directories couldn't be created.\n#{e.message}"
+			end
+			# Try to create hidden meta file
+			begin
+				meta = { :created_at => Date.today.strftime('%d.%m.%Y %H:%M:%S:%L'), 
+					:storePath => store.storePath,
+					:deletedPath => store.deletedPath,
+					:rollbackPath => store.rollbackPath,
+					:created_by => Etc.getlogin
+				}
+				
+				File.open(store.metaFile, "w+") do |fh|
+					YAML.dump(meta, fh)
+				end
+				
+				#
+				# Creation was successful
+				#
+			rescue Exception => e
+				raise FileStoreException, "Meta file #{store.metaFile} couldn't be created.\n#{e.message}"
+			end
+		end
+		#
+		# Recover an existing file store
+		#
+		# Arguments:
+		# 	store: The file store instance to recover
+		#
+		def self.recover_store(store)
+			# trying to recover existing file store
+			begin
+				meta = YAML.load_file(store.metaFile)
+				
+				raise FileStoreException, "Store directory not found" if not File.directory?(meta[:storePath])
+				raise FileStoreException, "Deleted directory not found" if not File.directory?(meta[:deletedPath])
+				raise FileStoreException, "Rollback directory not found" if not File.directory?(meta[:rollbackPath])
+				
+				#
+				# Recovery was successful
+				#
+			rescue Exception => e
+				raise FileStoreException, "Unable to recover file store from path #{store.rootPath}.\n#{e.message}"
+			end
+		end
+		
+	end
+
+end

data/lib/filestore.rb

@@ -1,334 +1,41 @@
 #
 # filestore.rb
+# @author Thomas Stätter
+# @date 2012/11/26
+# @description
 #
-# author: Thomas Stätter
-# date: 2012/11/07
+LIBS = [
+  #
+  # Required 3rd party libs
+  #
+  'uuidtools',
+  'fileutils',
+  'yaml',
+  'etc',
+  'singleton'
+]
+FILESTORE_FILES = [
+  #
+  # FileStore specific libraries. Order matters!
+  #
+  'observer',
+  'meta_manager',
+  'log',
+  'memory_meta',
+  'simple_store',
+  'multitenant_store'
+]
 #
-require "../module.rb"
-
-include FileStore
-
-module FileStore
-  include OberservedSubject
-	#
-	# Base exception class used for errors occurring in this module
-	#
-	class FileStoreException < Exception
-	end
-	#
-	# Main library class implementing a simple file store used for storing and managing 
-	# 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
-		META_FILE = "filestore.yaml"
-		# The base name of the file store directory
-		STORE_ROOT = 'filestore'
-		# The base name of the directory for storing deleted files
-		DELETED_ROOT = 'deleted'
-		# The base name of the directory storing files extracted from file store by a 
-		# rollback action 
-		ROLLBACK_ROOT = 'rollback'
-		#
-		# Accessors for important properties
-		#
-		attr_reader :metaManager, :rootPath, :storePath, :deletedPath, :rollbackPath, :metaFile
-		#
-		# Initializes a new instance of SimpleFileStore
-		#
-		# Arguments:
-		# 	metaManager: The meta data manager instance to be used by this store
-		# 	rootPath: The path where the file store resides
-		#
-		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)
-			raise FileStoreException, "No meta data manager given" if metaManager.nil?
-			raise FileStoreException, "Meta data manager must be of type FileStore::MetaManager" if not metaManager.is_a?(MetaManager)
-			
-			@metaManager = metaManager
-			@rootPath = rootPath
-			@storePath = File.join(@rootPath, STORE_ROOT)
-			@deletedPath = File.join(@rootPath, DELETED_ROOT)
-			@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
-				SimpleFileStore.recover_store(self)
-			rescue FileStoreException => e
-				# Recovery failed, trying to create the store
-				SimpleFileStore.create_store(self)
-			end
-			
-			lock
-		end
-		#
-		# Adds a file to the store
-		#
-		# Arguments:
-		# 	file: The file to be stored
-		# 	meta: Optional meta data to be stored along with the physical file
-		# 	shouldMove: Determines wether to original file should be deleted
-		#
-		# Returns:
-		#	  The newly created ID for the file
-		#
-		def add(file, meta = {}, shouldMove = true)
-			raise FileStoreException, "File #{file} not found" if not File.exists?(file)
-			raise FileStoreException, "File #{file} isn't readable" if not File.readable?(file)
-			raise FileStoreException, "File #{file} can't be removed" if not File.writable?(file)
-			
-			meta = {} if meta.nil?
-			id = ""
-			
-			begin
-				dir = SimpleFileStore.get_daily_directory(@storePath)
-				@logger.info "Adding file #{file} to directory #{dir}"
-				id = SimpleFileStore.get_id(self)
-				@logger.info "Using file id #{id}"
-				dstPath = File.join(dir, id)
-				@logger.info "Created destination path #{dstPath}"
-				
-				shouldMove ? (@logger.info("Moving file"); FileUtils.mv(file, dstPath)) : 
-					(@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
-			
-			meta[:path] = dstPath
-			@metaManager.add_or_update(id, meta)
-			
-			return id
-		end
-		#
-		# Retrieves a file identified by it's ID
-		#
-		# Arguments:
-		# 	id: The files ID to retrieve
-		#
-		# Returns: 
-		#	A hash of file object (:path) and corresponding meta data (:data)
-		#			representing the file in the store
-		#
-		def get(id)
-			raise FileStoreException, "No ID given" if id.nil? or id == ''
-			raise FileStoreException, "No file for ID #{id} found" if not @metaManager.has_id?(id)
-			
-			md = @metaManager.get_data(id)
-			path = md[:path]
-
-			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
-		#
-		# Moves a file from the current to the deleted store
-		#
-		# Arguments:
-		# 	id: The ID identifying the file to be moved
-		#
-		def remove(id)
-			raise FileStoreException, "No file ID given for removal" if id == '' or id.nil?
-			raise FileStoreException, "File ID for removal not found in store" if not @metaManager.has_id?(id)
-			
-			file = @metaManager.get_data(id)[:path]
-			
-			begin
-				@metaManager.remove(id)
-				
-				dir = SimpleFileStore.get_daily_directory(@deletedPath)
-				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
-		end
-		#
-		# Restores a file identified by it's id
-		#
-		# Arguments:
-		# 	id: The file ID
-		#
-		def restore(id)
-			raise FileStoreException, "No file ID given for restore" if id == '' or id.nil?
-			
-			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}"
-				#
-				# Delete restored entry from metaManager
-				@metaManager.delete(id)
-			end
-		end
-		#
-		# Shuts down the file store
-		#
-		def shutdown
-			@metaManager.shutdown
-			
-			release_lock
-			
-			self.inform ObserverAction.new :type => ObserverAction::TYPE_STORE_SHUTDOWN, 
-        :msg => "File store shutdown"
-		end
-		#
-		# Determines wether this store is locked
-		#
-		def locked?
-			return @locked
-		end
-		
-		private
-		
-		#
-		# Release the lock from the store
-		#
-		def release_lock
-			begin
-				File.delete File.join(@rootPath, STORE_LOCK_FILE)
-				@locked = false
-			rescue Exception => e
-				raise FileStoreException, "Couldn't release lock from #{@storePath}.\n#{e.message}"
-			end
-		end
-		#
-		# Locks the current instance of file store as well as the corresponding path on
-		# the file system using a hidden file
-		#
-		def lock
-			begin
-				FileUtils.touch File.join(@rootPath, STORE_LOCK_FILE)
-				@locked = true
-			rescue Exception => e
-				raise FileStoreException, "Couldn't lock the store in path #{@storePath}.\n#{e.message}"
-			end
-		end
-		#
-		# Determines wether the store path is already locked by another instance
-		# of SimpleFileStore
-		#
-		def self.is_directory_locked?(rootPath)
-			return File.exists?(File.join(rootPath, SimpleFileStore::STORE_LOCK_FILE))
-		end
-		#
-		# Creates a new file ID
-		#
-		# Returns:
-		# 	A string representing the file's ID
-		#
-		def self.get_id(store)
-			for i in 0..2 do	
-				id = UUIDTools::UUID.random_create.to_s
-				
-				return id if not store.metaManager.has_id?(id) 
-			end
-			
-			raise FileStoreException, "Couldn't find unique ID"
-		end
-		#
-		# Returns the currently used directory
-		#
-		def self.get_daily_directory(base)
-			date = Date.today
-			dir = File.join(base, date.year.to_s, date.month.to_s, date.day.to_s)
-			
-			begin
-				FileUtils.mkdir_p(dir) if not File.directory?(dir)
-			rescue Exception => e
-				raise FileStoreException, "Can't create daily directory #{dir}.\n#{e.message}"
-			end
-			
-			raise FileStoreException, "Daily directory #{dir} isn't writable" if not File.writable?(dir)
-			return dir
-		end
-		#
-		# Setup for a new file store directory
-		#
-		# Arguments:
-		# 	store: The file store instance to set up
-		#
-		def self.create_store(store)
-			# Try to create needed directories
-			begin
-				FileUtils.mkdir [store.storePath, store.deletedPath, store.rollbackPath]
-			rescue Errno::ENOENT => e
-				raise FileStoreException, "One ore more system directories couldn't be created.\n#{e.message}"
-			end
-			# Try to create hidden meta file
-			begin
-				meta = { :created_at => Date.today.strftime('%d.%m.%Y %H:%M:%S:%L'), 
-					:storePath => store.storePath,
-					:deletedPath => store.deletedPath,
-					:rollbackPath => store.rollbackPath,
-					:created_by => Etc.getlogin
-				}
-				
-				File.open(store.metaFile, "w+") do |fh|
-					YAML.dump(meta, fh)
-				end
-				
-				#
-				# Creation was successful
-				#
-			rescue Exception => e
-				raise FileStoreException, "Meta file #{store.metaFile} couldn't be created.\n#{e.message}"
-			end
-		end
-		#
-		# Recover an existing file store
-		#
-		# Arguments:
-		# 	store: The file store instance to recover
-		#
-		def self.recover_store(store)
-			# trying to recover existing file store
-			begin
-				meta = YAML.load_file(store.metaFile)
-				
-				raise FileStoreException, "Store directory not found" if not File.directory?(meta[:storePath])
-				raise FileStoreException, "Deleted directory not found" if not File.directory?(meta[:deletedPath])
-				raise FileStoreException, "Rollback directory not found" if not File.directory?(meta[:rollbackPath])
-				
-				#
-				# Recovery was successful
-				#
-			rescue Exception => e
-				raise FileStoreException, "Unable to recover file store from path #{store.rootPath}.\n#{e.message}"
-			end
-		end
-		
-	end
-
-end
+# Loads required 3rd party libs as defined in FileStore::LIBS
+#
+LIBS.each do |l|
+  require l
+end
+#
+# Loads required files as defined in FileStore::FILESTORE_FILES
+#
+FILESTORE_FILES.each do |l|
+  require File.join('filestore', l)
+  
+  puts "Required file #{File.join('filestore', l)}"
+end

data/test/classes.rb

@@ -1,4 +1,12 @@
+#
+# Expand load path to the 'lib' directory
+#
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
+
 require 'test/unit'
+require 'filestore'
+
+include FileStore
 
 class FileStoreTest < Test::Unit::TestCase
   

data/test/tc_filestore.rb

@@ -3,7 +3,7 @@
 # @author Thomas Stätter
 # @date 2012/11/14
 #
-require_relative '../module.rb'
+# require 'filestore'
 require './classes.rb'
 require 'test/unit'
 

data/test/tc_meta.rb

@@ -3,7 +3,6 @@
 # @author Thomas Stätter
 # @date 2014/01/05
 #
-require_relative '../module.rb'
 require './classes.rb'
 require 'test/unit'
 

data/test/tc_module.rb

@@ -4,9 +4,7 @@
 # @date 2014/01/05
 #
 require 'test/unit'
-require '../module.rb'
-
-include FileStore
+require './classes.rb'
 
 class TestModule < Test::Unit::TestCase
     

data/test/tc_multitenant.rb

@@ -5,7 +5,6 @@
 # @date 2012/11/21
 # @description Test script
 #
-require_relative '../module.rb'
 require './classes.rb'
 require 'test/unit'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filestore
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -33,45 +33,23 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: log4r
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.10
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.10
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Organizes a file storage using the file system and some meta data
 email: thomas.staetter@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- module.rb
+- lib/filestore/log.rb
+- lib/filestore/memory_meta.rb
+- lib/filestore/meta_manager.rb
+- lib/filestore/multitenant_store.rb
+- lib/filestore/observer.rb
+- lib/filestore/simple_store.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_filestore.rb
 - test/tc_meta.rb
 - test/tc_module.rb
-- test/tc_filestore.rb
 - test/tc_multitenant.rb
 - test/ts_all.rb
 homepage: https://github.com/tstaetter/filestore-gem
@@ -101,8 +79,8 @@ specification_version: 3
 summary: Simple file storage
 test_files:
 - test/classes.rb
+- test/tc_filestore.rb
 - test/tc_meta.rb
 - test/tc_module.rb
-- test/tc_filestore.rb
 - test/tc_multitenant.rb
 - test/ts_all.rb

data/module.rb

@@ -1,40 +0,0 @@
-#
-# 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