odba 1.1.8 → 1.2.0

data/lib/odba/marshal.rb

@@ -2,20 +2,21 @@
 #-- Marshal -- odba -- 29.04.2004 -- hwyss@ywesee.com rwaltert@ywesee.com mwalder@ywesee.com
 
 module ODBA
-	# Marshal is a simple extension of ::Marshal. To be able to store our data
-	# using the DBI-Interface, we need to escape invalid characters from the
-	# standard binary dump.
-	module Marshal
-		def Marshal.dump(obj)
-			binary = ::Marshal.dump(obj)
-			binary.unpack('H*').first
-		end
-		def Marshal.load(hexdump)
-			binary = [hexdump].pack('H*')
-			::Marshal.load(binary)
+  # Marshal is a simple extension of ::Marshal. To be able to store our data
+  # using the DBI-Interface, we need to escape invalid characters from the
+  # standard binary dump.
+  module Marshal
+    def self.dump(obj)
+      binary = ::Marshal.dump(obj)
+      binary.unpack1("H*")
+    end
+
+    def self.load(hexdump)
+      binary = [hexdump].pack("H*")
+      ::Marshal.load(binary)
     rescue => error
-      $stderr.puts "#{error}: hexdump is #{hexdump.inspect} #{error.backtrace.join("\n")}"
+      warn "#{error}: hexdump is #{hexdump.inspect} #{error.backtrace.join("\n")}"
       Date.new
-		end
-	end
+    end
+  end
 end

data/lib/odba/odba.rb

@@ -2,44 +2,52 @@
 # ODBA -- odba -- 26.01.2007 -- hwyss@ywesee.com
 
 module ODBA
-	# reader for the Cache server. Defaults to ODBA::Cache.instance
-	def ODBA.cache
-		@cache ||= ODBA::Cache.instance
-	end
-	# writer for the Cache server. You will probably never need this.
-	def ODBA.cache=(cache_server)
-		@cache = cache_server
-	end
-	# reader for the Marshaller. Defaults to ODBA.Marshal
-	def ODBA.marshaller
-		@marshaller ||= ODBA::Marshal
-	end
-	# writer for the Marshaller. Example: override the default Marshaller to
-	# serialize your objects in a custom format (yaml, xml, ...).
-	def ODBA.marshaller=(marshaller)
-		@marshaller = marshaller
-	end
+  # reader for the Cache server. Defaults to ODBA::Cache.instance
+  def self.cache
+    @cache ||= ODBA::Cache.instance
+  end
+
+  # writer for the Cache server. You will probably never need this.
+  def self.cache=(cache_server)
+    @cache = cache_server
+  end
+
+  # reader for the Marshaller. Defaults to ODBA.Marshal
+  def self.marshaller
+    @marshaller ||= ODBA::Marshal
+  end
+
+  # writer for the Marshaller. Example: override the default Marshaller to
+  # serialize your objects in a custom format (yaml, xml, ...).
+  def self.marshaller=(marshaller)
+    @marshaller = marshaller
+  end
+
   # peer two instances of ODBA::Cache
-  def ODBA.peer peer
+  def self.peer peer
     peer.register_peer ODBA.cache
     ODBA.cache.register_peer peer
   end
-	# reader for the Storage Server. Defaults to ODBA::Storage.instance
-	def ODBA.storage
-		@storage ||= ODBA::Storage.instance
-	end
-	# writer for the Storage Server. Example: override the default Storage Server
-	# to dump all your data in a flatfile.
-	def ODBA.storage=(storage)	
-		@storage = storage
-	end
+
+  # reader for the Storage Server. Defaults to ODBA::Storage.instance
+  def self.storage
+    @storage ||= ODBA::Storage.instance
+  end
+
+  # writer for the Storage Server. Example: override the default Storage Server
+  # to dump all your data in a flatfile.
+  def self.storage=(storage)
+    @storage = storage
+  end
+
   # unpeer two instances of ODBA::Cache
-  def ODBA.unpeer peer
+  def self.unpeer peer
     peer.unregister_peer ODBA.cache
     ODBA.cache.unregister_peer peer
   end
-	# Convenience method. Delegates the transaction-call to the Cache server.
-	def ODBA.transaction(&block)
-		ODBA.cache.transaction(&block)
-	end
+
+  # Convenience method. Delegates the transaction-call to the Cache server.
+  def self.transaction(&block)
+    ODBA.cache.transaction(&block)
+  end
 end

data/lib/odba/odba_error.rb

@@ -2,11 +2,13 @@
 #-- OdbaError -- odba -- 29.04.2004 -- hwyss@ywesee.com rwaltert@ywesee.com mwalder@ywesee.com
 
 module ODBA
-	class OdbaError < RuntimeError
-	end
+  class OdbaError < RuntimeError
+  end
+
   class OdbaResultLimitError < OdbaError
     attr_accessor :limit, :size, :index, :search_term, :meta
   end
+
   class OdbaDuplicateIdError < OdbaError
   end
 end