moneta 0.7.1 → 0.7.2

data/lib/moneta/adapters/null.rb

@@ -2,26 +2,33 @@ module Moneta
   module Adapters
     # Null backend which doesn't store anything
     # @api public
-    class Null < Base
+    class Null
+      include Defaults
+
       def initialize(options = {})
       end
 
+      # (see Proxy#key?)
       def key?(key, options = {})
         false
       end
 
+      # (see Proxy#load)
       def load(key, options = {})
         nil
       end
 
+      # (see Proxy#store)
       def store(key, value, options = {})
         value
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         nil
       end
 
+      # (see Proxy#clear)
       def clear(options = {})
         self
       end

data/lib/moneta/adapters/pstore.rb

@@ -4,9 +4,9 @@ module Moneta
   module Adapters
     # PStore backend
     # @api public
-    class PStore < Base
-      # Constructor
-      #
+    class PStore
+      include Defaults
+
       # @param [Hash] options
       # @option options [String] :file PStore file
       def initialize(options = {})
@@ -15,22 +15,27 @@ module Moneta
         @pstore = new_store(options)
       end
 
+      # (see Proxy#key?)
       def key?(key, options = {})
         @pstore.transaction(true) { @pstore.root?(key) }
       end
 
+      # (see Proxy#load)
       def load(key, options = {})
         @pstore.transaction(true) { @pstore[key] }
       end
 
+      # (see Proxy#store)
       def store(key, value, options = {})
         @pstore.transaction { @pstore[key] = value }
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         @pstore.transaction { @pstore.delete(key) }
       end
 
+      # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
         @pstore.transaction do
           value = @pstore[key]
@@ -42,6 +47,7 @@ module Moneta
         end
       end
 
+      # (see Proxy#clear)
       def clear(options = {})
         @pstore.transaction do
           @pstore.roots.each do |key|

data/lib/moneta/adapters/redis.rb

@@ -4,17 +4,18 @@ module Moneta
   module Adapters
     # Redis backend
     # @api public
-    class Redis < Base
-      # Constructor
-      #
+    class Redis
+      include Defaults
+
       # @param [Hash] options
-      # @option options [String] :expires Default expiration time
+      # @option options [Integer] :expires Default expiration time
       # @option options Other options passed to `Redis#new`
       def initialize(options = {})
         @expires = options.delete(:expires)
         @redis = ::Redis.new(options)
       end
 
+      # (see Proxy#key?)
       def key?(key, options = {})
         if @redis.exists(key)
           if expires = options[:expires]
@@ -26,6 +27,7 @@ module Moneta
         end
       end
 
+      # (see Proxy#load)
       def load(key, options = {})
         value = @redis.get(key)
         if value && (expires = options[:expires])
@@ -34,6 +36,7 @@ module Moneta
         value
       end
 
+      # (see Proxy#store)
       def store(key, value, options = {})
         if expires = (options[:expires] || @expires)
           @redis.setex(key, expires, value)
@@ -43,6 +46,7 @@ module Moneta
         value
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         if value = load(key, options)
           @redis.del(key)
@@ -50,6 +54,7 @@ module Moneta
         end
       end
 
+      # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
         value = @redis.incrby(key, amount)
         expires = (options[:expires] || @expires)
@@ -57,6 +62,7 @@ module Moneta
         value
       end
 
+      # (see Proxy#clear)
       def clear(options = {})
         @redis.flushdb
         self

data/lib/moneta/adapters/riak.rb

@@ -7,9 +7,9 @@ module Moneta
   module Adapters
     # Riak backend
     # @api public
-    class Riak < Base
-      # Constructor
-      #
+    class Riak
+      include Defaults
+
       # @param [Hash] options
       # @option options [String] :bucket ('moneta') Bucket name
       # @option options [String] :content_type ('application/octet-stream') Default content type
@@ -20,30 +20,35 @@ module Moneta
         @bucket = ::Riak::Client.new(options).bucket(bucket)
       end
 
+      # (see Proxy#key?)
       def key?(key, options = {})
-        @bucket.exists?(key, options)
+        @bucket.exists?(key, options.dup)
       end
 
+      # (see Proxy#load)
       def load(key, options = {})
-        @bucket.get(key, options).raw_data
+        @bucket.get(key, options.dup).raw_data
       rescue ::Riak::FailedRequest => ex
         nil
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         value = load(key, options)
-        @bucket.delete(key, options)
+        @bucket.delete(key, options.dup)
         value
       end
 
+      # (see Proxy#store)
       def store(key, value, options = {})
         obj = ::Riak::RObject.new(@bucket, key)
         obj.content_type = options[:content_type] || @content_type
         obj.raw_data = value
-        obj.store(options)
+        obj.store(options.dup)
         value
       end
 
+      # (see Proxy#clear)
       def clear(options = {})
         @bucket.keys do |keys|
           keys.each{ |key| @bucket.delete(key) }

data/lib/moneta/adapters/sdbm.rb

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

data/lib/moneta/adapters/sequel.rb

@@ -4,9 +4,9 @@ module Moneta
   module Adapters
     # Sequel backend
     # @api public
-    class Sequel < Base
-      # Constructor
-      #
+    class Sequel
+      include Defaults
+
       # @param [Hash] options
       # @option options [String] :db Sequel database
       # @option options [String/Symbol] :table (:moneta) Table name
@@ -22,15 +22,18 @@ module Moneta
         @table = @db[table]
       end
 
+      # (see Proxy#key?)
       def key?(key, options = {})
         @table[:k => key] != nil
       end
 
+      # (see Proxy#load)
       def load(key, options = {})
         record = @table[:k => key]
         record && record[:v]
       end
 
+      # (see Proxy#store)
       def store(key, value, options = {})
         @db.transaction do
           if key?(key, options)
@@ -42,6 +45,7 @@ module Moneta
         end
       end
 
+      # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
         @db.transaction do
           locked_table = @table.for_update
@@ -59,6 +63,7 @@ module Moneta
         end
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         @db.transaction do
           if value = load(key, options)
@@ -68,6 +73,7 @@ module Moneta
         end
       end
 
+      # (see Proxy#clear)
       def clear(options = {})
         @table.delete
         self

data/lib/moneta/adapters/sqlite.rb

@@ -4,11 +4,10 @@ module Moneta
   module Adapters
     # Sqlite3 backend
     # @api public
-    class Sqlite < Base
-      include Mixins::IncrementSupport
+    class Sqlite
+      include Defaults
+      include IncrementSupport
 
-      # Constructor
-      #
       # @param [Hash] options
       # @option options [String] :file Database file
       # @option options [String] :table ('moneta') Table name
@@ -24,35 +23,42 @@ module Moneta
            @clear = @db.prepare("delete from #{table}")]
       end
 
+      # (see Proxy#key?)
       def key?(key, options = {})
         !@select.execute!(key).empty?
       end
 
+      # (see Proxy#load)
       def load(key, options = {})
         rows = @select.execute!(key)
         rows.empty? ? nil : rows.first.first
       end
 
+      # (see Proxy#store)
       def store(key, value, options = {})
         @replace.execute!(key, value)
         value
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         value = load(key, options)
         @delete.execute!(key)
         value
       end
 
+      # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
         @db.transaction(:exclusive) { return super }
       end
 
+      # (see Proxy#clear)
       def clear(options = {})
         @clear.execute!
         self
       end
 
+      # (see Proxy#close)
       def close
         @stmts.each {|s| s.close }
         @db.close

data/lib/moneta/adapters/tokyocabinet.rb

@@ -5,8 +5,6 @@ module Moneta
     # TokyoCabinet backend
     # @api public
     class TokyoCabinet < Memory
-      # Constructor
-      #
       # @param [Hash] options
       # @option options [String] :file Database file
       # @option options [Symbol] :type (:hdb) Database type (:bdb and :hdb possible)
@@ -22,6 +20,7 @@ module Moneta
         end or raise @hash.errmsg(@hash.ecode)
       end
 
+      # (see Proxy#delete)
       def delete(key, options = {})
         value = load(key, options)
         if value
@@ -30,6 +29,7 @@ module Moneta
         end
       end
 
+      # (see Proxy#close)
       def close
         @hash.close
         nil

data/lib/moneta/builder.rb

@@ -2,7 +2,15 @@ module Moneta
   # Builder implements the DSL to build a stack of Moneta store proxies
   # @api private
   class Builder
-    # @api private
+    def initialize(&block)
+      raise ArgumentError, 'No block given' unless block_given?
+      @proxies = []
+      instance_eval(&block)
+    end
+
+    # Build proxy stack
+    # @return [Object] Generated Moneta proxy stack
+    # @api public
     def build
       klass, options, block = @proxies.first
       @proxies[1..-1].inject([klass.new(options, &block)]) do |stores, proxy|
@@ -11,16 +19,11 @@ module Moneta
       end
     end
 
-    def initialize(&block)
-      raise ArgumentError, 'No block given' unless block_given?
-      @proxies = []
-      instance_eval(&block)
-    end
-
     # Add proxy to stack
     #
     # @param [Symbol or Class] proxy Name of proxy class or proxy class
     # @param [Hash] options Options hash
+    # @api public
     def use(proxy, options = {}, &block)
       proxy = Moneta.const_get(proxy) if Symbol === proxy
       raise ArgumentError, 'You must give a Class or a Symbol' unless Class === proxy
@@ -32,6 +35,7 @@ module Moneta
     #
     # @param [Symbol] name Name of adapter class
     # @param [Hash] options Options hash
+    # @api public
     def adapter(name, options = {}, &block)
       use(Adapters.const_get(name), options, &block)
     end

data/lib/moneta/cache.rb

@@ -10,7 +10,9 @@ module Moneta
   #   end
   #
   # @api public
-  class Cache < Base
+  class Cache
+    include Defaults
+
     # @api private
     class DSL
       def initialize(options, &block)
@@ -18,12 +20,14 @@ module Moneta
         instance_eval(&block)
       end
 
+      # @api public
       def backend(store = nil, &block)
         raise 'Backend already set' if @backend
         raise ArgumentError, 'Only argument or block allowed' if store && block
         @backend = store || Moneta.build(&block)
       end
 
+      # @api public
       def cache(store = nil, &block)
         raise 'Cache already set' if @cache
         raise ArgumentError, 'Only argument or block allowed' if store && block
@@ -41,41 +45,47 @@ module Moneta
       @cache, @backend = DSL.new(options, &block).result
     end
 
+    # (see Proxy#key?)
     def key?(key, options = {})
       @cache.key?(key, options) || @backend.key?(key, options)
     end
 
+    # (see Proxy#load)
     def load(key, options = {})
       value = @cache.load(key, options)
-      unless value
+      if value == nil
         value = @backend.load(key, options)
-        @cache.store(key, value, options) if value
+        @cache.store(key, value, options) if value != nil
       end
       value
     end
 
+    # (see Proxy#store)
     def store(key, value, options = {})
       @cache.store(key, value, options)
       @backend.store(key, value, options)
     end
 
+    # (see Proxy#increment)
     def increment(key, amount = 1, options = {})
-      value = @backend.increment(key, amount, options)
-      @cache.store(key, value.to_s, options)
-      value
+      @cache.delete(key, options)
+      @backend.increment(key, amount, options)
     end
 
+    # (see Proxy#delete)
     def delete(key, options = {})
       @cache.delete(key, options)
       @backend.delete(key, options)
     end
 
+    # (see Proxy#clear)
     def clear(options = {})
       @cache.clear(options)
       @backend.clear(options)
       self
     end
 
+    # (see Proxy#close)
     def close
       @cache.close
       @backend.close