moneta 0.7.1 → 0.7.2

data/lib/moneta/adapters/file.rb

@@ -4,11 +4,10 @@ module Moneta
   module Adapters
     # Filesystem backend
     # @api public
-    class File < Base
-      include Mixins::IncrementSupport
+    class File
+      include Defaults
+      include IncrementSupport
 
-      # Constructor
-      #
       # @param [Hash] options
       # @option options [String] :dir Directory where files will be stored
       def initialize(options = {})
@@ -17,15 +16,18 @@ module Moneta
         raise "#{@dir} is not a directory" unless ::File.directory?(@dir)
       end
 
+      # (see Proxy#key?)
       def key?(key, options = {})
         ::File.exist?(store_path(key))
       end
 
+      # (see Proxy#load)
       def load(key, options = {})
         ::File.read(store_path(key))
       rescue Errno::ENOENT
       end
 
+      # (see Proxy#store)
       def store(key, value, options = {})
         path = store_path(key)
         temp_file = ::File.join(@dir, "value-#{$$}-#{Thread.current.object_id}")
@@ -39,6 +41,7 @@ module Moneta
         value
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         value = load(key, options)
         ::File.unlink(store_path(key))
@@ -46,6 +49,7 @@ module Moneta
       rescue Errno::ENOENT
       end
 
+      # (see Proxy#clear)
       def clear(options = {})
         temp_dir = "#{@dir}-#{$$}-#{Thread.current.object_id}"
         ::File.rename(@dir, temp_dir)
@@ -56,6 +60,7 @@ module Moneta
         self
       end
 
+      # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
         lock(key) { super }
       end

data/lib/moneta/adapters/fog.rb

@@ -4,9 +4,9 @@ module Moneta
   module Adapters
     # Fog backend (Cloud storage services)
     # @api public
-    class Fog < Base
-      # Constructor
-      #
+    class Fog
+      include Defaults
+
       # @param [Hash] options
       # @option options [String] :dir Fog directory
       # @option options Other options passed to `Fog::Storage#new`
@@ -16,15 +16,18 @@ module Moneta
         @directory = storage.directories.create(:key => dir)
       end
 
+      # (see Proxy#key?)
       def key?(key, options = {})
         @directory.files.head(key) != nil
       end
 
+      # (see Proxy#load)
       def load(key, options = {})
         value = @directory.files.get(key)
         value && value.body
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         if value = @directory.files.get(key)
           body = value.body
@@ -33,11 +36,13 @@ module Moneta
         end
       end
 
+      # (see Proxy#store)
       def store(key, value, options = {})
         @directory.files.create(:key => key, :body => value)
         value
       end
 
+      # (see Proxy#clear)
       def clear(options = {})
         @directory.files.all.each do |file|
           file.destroy

data/lib/moneta/adapters/gdbm.rb

@@ -5,8 +5,6 @@ module Moneta
     # GDBM backend
     # @api public
     class GDBM < Memory
-      # Constructor
-      #
       # @param [Hash] options
       # @option options [String] :file Database file
       def initialize(options = {})
@@ -14,6 +12,7 @@ module Moneta
         @hash = ::GDBM.new(options[:file])
       end
 
+      # (see Proxy#close)
       def close
         @hash.close
         nil

data/lib/moneta/adapters/hbase.rb

@@ -4,9 +4,9 @@ module Moneta
   module Adapters
     # HBase thrift backend
     # @api public
-    class HBase < Base
-      # Constructor
-      #
+    class HBase
+      include Defaults
+
       # @param [Hash] options
       # @option options [String] :host ('127.0.0.1') Server host name
       # @option options [Integer] :port (9090) Server port
@@ -25,20 +25,24 @@ module Moneta
         @column = "#{cf}:#{options[:column]}"
       end
 
+      # (see Proxy#key?)
       def key?(key, options = {})
         @table.get(key, @column).first != nil
       end
 
+      # (see Proxy#load)
       def load(key, options = {})
         cell = @table.get(key, @column).first
         cell && unpack(cell.value)
       end
 
+      # (see Proxy#store)
       def store(key, value, options = {})
         @table.mutate_row(key, @column => pack(value))
         value
       end
 
+      # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
         result = @table.atomic_increment(key, @column, amount)
         # HACK: Throw error if applied to invalid value
@@ -49,6 +53,7 @@ module Moneta
         result
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         if value = load(key, options)
           @table.delete_row(key)
@@ -56,6 +61,7 @@ module Moneta
         end
       end
 
+      # (see Proxy#clear)
       def clear(options = {})
         @table.create_scanner do |row|
           @table.delete_row(row.row)
@@ -63,6 +69,7 @@ module Moneta
         self
       end
 
+      # (see Proxy#close)
       def close
         @db.close
         nil

data/lib/moneta/adapters/leveldb.rb

@@ -5,8 +5,6 @@ module Moneta
     # LevelDB backend
     # @api public
     class LevelDB < Memory
-      # Constructor
-      #
       # @param [Hash] options
       # @option options [String] :dir - Database path
       # @option options All other options passed to `LevelDB::DB#new`
@@ -15,15 +13,18 @@ module Moneta
         @hash = ::LevelDB::DB.new(options[:dir])
       end
 
+      # (see Proxy#key?)
       def key?(key, options = {})
         @hash.includes?(key)
       end
 
+      # (see Proxy#clear)
       def clear(options = {})
         @hash.each {|k,v| delete(k, options) }
         self
       end
 
+      # (see Proxy#close)
       def close
         @hash.close
         nil

data/lib/moneta/adapters/localmemcache.rb

@@ -4,11 +4,10 @@ module Moneta
   module Adapters
     # LocalMemCache backend
     # @api public
-    class LocalMemCache < Base
-      include Mixins::HashAdapter
+    class LocalMemCache
+      include Defaults
+      include HashAdapter
 
-      # Constructor
-      #
       # @param [Hash] options
       # @option options [String] :file Database file
       def initialize(options = {})
@@ -16,6 +15,7 @@ module Moneta
         @hash = ::LocalMemCache.new(:filename => options[:file])
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         value = load(key, options)
         @hash.delete(key)

data/lib/moneta/adapters/lruhash.rb

@@ -5,11 +5,10 @@ module Moneta
     # Based on Hashery::LRUHash but simpler and measures memory usage instead of hash size.
     #
     # @api public
-    class LRUHash < Base
-      include Mixins::IncrementSupport
+    class LRUHash
+      include Defaults
+      include IncrementSupport
 
-      # Constructor
-      #
       # @param [Hash] options
       # @option options [Integer] :max_size (1024000) Maximum total byte size of hash values
       def initialize(options = {})
@@ -17,10 +16,12 @@ module Moneta
         clear
       end
 
+      # (see Proxy#key?)
       def key?(key, options = {})
         @entry.key?(key)
       end
 
+      # (see Proxy#load)
       def load(key, options = {})
         if entry = @entry[key]
           entry.insert_after(@list)
@@ -28,6 +29,7 @@ module Moneta
         end
       end
 
+      # (see Proxy#store)
       def store(key, value, options = {})
         if entry = @entry[key]
           @size -= entry.value.bytesize
@@ -42,6 +44,7 @@ module Moneta
         value
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         if entry = @entry.delete(key)
           @size -= entry.value.bytesize
@@ -50,6 +53,7 @@ module Moneta
         end
       end
 
+      # (see Proxy#clear)
       def clear(options = {})
         @entry, @size = {}, 0
         @list = Entry.new

data/lib/moneta/adapters/memcached/dalli.rb

@@ -4,12 +4,12 @@ module Moneta
   module Adapters
     # Memcached backend (using gem dalli)
     # @api public
-    class MemcachedDalli < Base
-      # Constructor
-      #
+    class MemcachedDalli
+      include Defaults
+
       # @param [Hash] options
       # @option options [String] :server ('127.0.0.1:11211') Memcached server
-      # @option options [String] :expires Default expiration time
+      # @option options [Integer] :expires Default expiration time
       # @option options Other options passed to `Dalli::Client#new`
       def initialize(options = {})
         options[:expires_in] = options.delete(:expires)
@@ -17,6 +17,7 @@ module Moneta
         @cache = ::Dalli::Client.new(server, options)
       end
 
+      # (see Proxy#load)
       def load(key, options = {})
         value = @cache.get(key)
         if value && options.include?(:expires)
@@ -26,17 +27,20 @@ module Moneta
         end
       end
 
+      # (see Proxy#store)
       def store(key, value, options = {})
         @cache.set(key, value, options[:expires], :raw => true)
         value
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         value = @cache.get(key)
         @cache.delete(key)
         value
       end
 
+      # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
         # FIXME: There is a Dalli bug, load(key) returns a wrong value after increment
         # therefore we set default = nil and create the counter manually
@@ -53,11 +57,13 @@ module Moneta
         end
       end
 
+      # (see Proxy#clear)
       def clear(options = {})
         @cache.flush_all
         self
       end
 
+      # (see Proxy#close)
       def close
         @cache.close
         nil

data/lib/moneta/adapters/memcached/native.rb

@@ -4,13 +4,13 @@ module Moneta
   module Adapters
     # Memcached backend (using gem memcached)
     # @api public
-    class MemcachedNative < Base
-      # Constructor
-      #
+    class MemcachedNative
+      include Defaults
+
       # @param [Hash] options
       # @option options [String] :server ('127.0.0.1:11211') Memcached server
       # @option options [String] :namespace Key namespace
-      # @option options [String] :expires (604800) Default expiration time
+      # @option options [Integer] :expires (604800) Default expiration time
       # @option options Other options passed to `Memcached#new`
       def initialize(options = {})
         server = options.delete(:server) || '127.0.0.1:11211'
@@ -22,6 +22,7 @@ module Moneta
         @cache = ::Memcached.new(server, options)
       end
 
+      # (see Proxy#load)
       def load(key, options = {})
         value = @cache.get(key, false)
         if value && options.include?(:expires)
@@ -32,12 +33,14 @@ module Moneta
       rescue ::Memcached::NotFound
       end
 
+      # (see Proxy#store)
       def store(key, value, options = {})
         # TTL must be Fixnum
         @cache.set(key, value, options[:expires] || @expires, false)
         value
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         value = @cache.get(key, false)
         @cache.delete(key)
@@ -45,6 +48,7 @@ module Moneta
       rescue ::Memcached::NotFound
       end
 
+      # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
         result = if amount >= 0
           @cache.increment(key, amount)
@@ -62,6 +66,7 @@ module Moneta
         amount
       end
 
+      # (see Proxy#clear)
       def clear(options = {})
         @cache.flush
         self

data/lib/moneta/adapters/memory.rb

@@ -2,9 +2,14 @@ module Moneta
   module Adapters
     # Memory backend using a hash to store the entries
     # @api public
-    class Memory < Base
-      include Mixins::IncrementSupport
-      include Mixins::HashAdapter
+    class Memory
+      include Defaults
+      include HashAdapter
+      include IncrementSupport
+
+      def initialize(options = {})
+        @hash = {}
+      end
     end
   end
 end

data/lib/moneta/adapters/mongo.rb

@@ -4,9 +4,9 @@ module Moneta
   module Adapters
     # MongoDB backend
     # @api public
-    class Mongo < Base
-      # Constructor
-      #
+    class Mongo
+      include Defaults
+
       # @param [Hash] options
       # @option options [String] :collection ('moneta') MongoDB collection name
       # @option options [String] :host ('127.0.0.1') MongoDB server host
@@ -21,17 +21,20 @@ module Moneta
         @collection = connection.db(db).collection(collection)
       end
 
+      # (see Proxy#load)
       def load(key, options = {})
         value = @collection.find_one('_id' => ::BSON::Binary.new(key))
         value && value['value'].to_s
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         value = load(key, options)
         @collection.remove('_id' => ::BSON::Binary.new(key)) if value
         value
       end
 
+      # (see Proxy#store)
       def store(key, value, options = {})
         key = ::BSON::Binary.new(key)
         @collection.update({ '_id' => key },
@@ -40,6 +43,7 @@ module Moneta
         value
       end
 
+      # (see Proxy#clear)
       def clear(options = {})
         @collection.remove
         self