moneta 0.7.6 → 0.7.8

data/lib/moneta/adapters/cassandra.rb

@@ -36,7 +36,7 @@ module Moneta
             begin
               @client.add_keyspace(ks_def)
             rescue Exception => ex
-              warn "Cassandra: #{ex.message}"
+              warn "Moneta::Adapters::Cassandra - #{ex.message}"
             end
             break if @client.keyspaces.include?(keyspace)
             sleep 0.1

data/lib/moneta/adapters/client.rb

@@ -11,9 +11,9 @@ module Moneta
       # @param [Hash] options
       # @option options [Integer] :port (9000) TCP port
       # @option options [String] :host ('127.0.0.1') Hostname
-      # @option options [String] :file Unix socket file name as alternative to `:port` and `:host`
+      # @option options [String] :socket Unix socket file name as alternative to `:port` and `:host`
       def initialize(options = {})
-        @socket = options[:file] ? UNIXSocket.open(options[:file]) :
+        @socket = options[:socket] ? UNIXSocket.open(options[:socket]) :
           TCPSocket.open(options[:host] || '127.0.0.1', options[:port] || DEFAULT_PORT)
       end
 
@@ -48,6 +48,12 @@ module Moneta
         read_result
       end
 
+      # (see Proxy#create)
+      def create(key, value, options = {})
+        write(@socket, [:create, key, value, options])
+        read_result
+      end
+
       # (see Proxy#clear)
       def clear(options = {})
         write(@socket, [:clear, options])

data/lib/moneta/adapters/cookie.rb

@@ -1,6 +1,6 @@
 module Moneta
   module Adapters
-    # Cookie backend used by the middleware `Rack::MonetaCookies`
+    # Cookie backend used by the middleware {Rack::MonetaCookies}
     # @api public
     class Cookie < Memory
       attr_reader :cookies

data/lib/moneta/adapters/couch.rb

@@ -40,7 +40,8 @@ module Moneta
         @db.save_doc(doc)
         value
       rescue ::RestClient::RequestFailed
-        value
+        tries ||= 0
+        (tries += 1) < 10 ? retry : raise
       end
 
       # (see Proxy#delete)

data/lib/moneta/adapters/datamapper.rb

@@ -12,6 +12,7 @@ module Moneta
         include ::DataMapper::Resource
         property :k, Text, :key => true
         property :v, Text, :lazy => false
+        self.raise_on_save_failure = true
       end
 
       # @param [Hash] options
@@ -49,6 +50,21 @@ module Moneta
           end
           value
         end
+      rescue
+        tries ||= 0
+        (tries += 1) < 10 ? retry : raise
+      end
+
+      # (see Proxy#create)
+      def create(key, value, options = {})
+        context do
+          Store.create(:k => key, :v => value)
+          true
+        end
+      rescue
+        # FIXME: This catches too many errors
+        # it should only catch a not-unique-exception
+        false
       end
 
       # (see Proxy#delete)

data/lib/moneta/adapters/daybreak.rb

@@ -12,9 +12,27 @@ module Moneta
         @hash = ::Daybreak::DB.new(options[:file], :serializer => ::Daybreak::Serializer::None)
       end
 
+      # (see Proxy#load)
+      def load(key, options = {})
+        @hash.load if options[:sync]
+        @hash[key]
+      end
+
+      # (see Proxy#store)
+      def store(key, value, options = {})
+        @hash[key] = value
+        @hash.flush if options[:sync]
+        value
+      end
+
       # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
-        @hash.lock { return super }
+        @hash.lock { super }
+      end
+
+      # (see Proxy#create)
+      def create(key, value, options = {})
+        @hash.lock { super }
       end
 
       # (see Proxy#close)

data/lib/moneta/adapters/file.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'fcntl'
 
 module Moneta
   module Adapters
@@ -65,6 +66,17 @@ module Moneta
         lock(key) { super }
       end
 
+      # (see Proxy#create)
+      def create(key, value, options = {})
+        path = store_path(key)
+        FileUtils.mkpath(::File.dirname(path))
+        fd = ::File.sysopen(path, Fcntl::O_WRONLY | Fcntl::O_EXCL | Fcntl::O_CREAT)
+        ::File.open(fd, 'wb') {|file| file.write(value) }
+        true
+      rescue Errno::EEXIST
+        false
+      end
+
       protected
 
       def lock(key, &block)

data/lib/moneta/adapters/hbase.rb

@@ -6,7 +6,6 @@ module Moneta
     # @api public
     class HBase
       include Defaults
-      include IncrementSupport
 
       # @param [Hash] options
       # @option options [String] :host ('127.0.0.1') Server host name
@@ -47,7 +46,7 @@ module Moneta
       def increment(key, amount = 1, options = {})
         result = @table.atomic_increment(key, @column, amount)
         # HACK: Throw error if applied to invalid value
-        convert_for_increment(load(key)) if result == 0
+        Utils.to_int(load(key)) if result == 0
         result
       end
 

data/lib/moneta/adapters/lruhash.rb

@@ -8,11 +8,14 @@ module Moneta
     class LRUHash
       include Defaults
       include IncrementSupport
+      include CreateSupport
 
       # @param [Hash] options
       # @option options [Integer] :max_size (1024000) Maximum total byte size of hash values
+      # @option options [Integer] :max_count (10240) Maximum number of hash values
       def initialize(options = {})
         @max_size = options[:max_size] || 1024000
+        @max_count = options[:max_count] || 10240
         clear
       end
 
@@ -40,7 +43,7 @@ module Moneta
         entry.value = value
         @size += entry.value.bytesize
         entry.insert_after(@list)
-        delete(@list.prev.key) while @list.next != @list.prev && @size > @max_size
+        delete(@list.prev.key) while @list.next != @list.prev && (@size > @max_size || @entry.size > @max_count)
         value
       end
 

data/lib/moneta/adapters/memcached.rb

@@ -1,11 +1,15 @@
 module Moneta
   module Adapters
+    # Prefer Dalli over native Memcached!
+    #
+    # I measure no performance gain over the Dalli backend
+    # using the Moneta backends.
     begin
-      require 'moneta/adapters/memcached/native'
-      Memcached = MemcachedNative
-    rescue LoadError
       require 'moneta/adapters/memcached/dalli'
       Memcached = MemcachedDalli
+    rescue LoadError
+      require 'moneta/adapters/memcached/native'
+      Memcached = MemcachedNative
     end
   end
 end

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

@@ -53,9 +53,10 @@ module Moneta
                  end
         if result
           result
-        else
-          store(key, amount, options)
+        elsif create(key, amount.to_s, options)
           amount
+        else
+          increment(key, amount, options)
         end
       end
 
@@ -65,6 +66,11 @@ module Moneta
         self
       end
 
+      # (see Defaults#create)
+      def create(key, value, options = {})
+        @cache.add(key, value, expires_value(options) || nil, :raw => true)
+      end
+
       # (see Proxy#close)
       def close
         @cache.close

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

@@ -6,7 +6,6 @@ module Moneta
     # @api public
     class MemcachedNative
       include Defaults
-      include IncrementSupport
       include ExpiresSupport
 
       # @param [Hash] options
@@ -59,13 +58,21 @@ module Moneta
         end
         # HACK: Throw error if applied to invalid value
 	# see https://github.com/evan/memcached/issues/110
-        convert_for_increment((@cache.get(key, false) rescue nil)) if result == 0
+        Utils.to_int((@cache.get(key, false) rescue nil)) if result == 0
         result
       rescue ::Memcached::NotFound => ex
-        store(key, amount.to_s, options)
+        retry unless create(key, amount.to_s, options)
         amount
       end
 
+      # (see Defaults#create)
+      def create(key, value, options = {})
+        @cache.add(key, value, expires_value(options) || 0, false)
+        true
+      rescue ::Memcached::ConnectionDataExists
+        false
+      end
+
       # (see Proxy#clear)
       def clear(options = {})
         @cache.flush

data/lib/moneta/adapters/memory.rb

@@ -6,6 +6,7 @@ module Moneta
       include Defaults
       include HashAdapter
       include IncrementSupport
+      include CreateSupport
 
       # @param [Hash] options Options hash
       def initialize(options = {})

data/lib/moneta/adapters/mongo.rb

@@ -5,7 +5,7 @@ module Moneta
     # MongoDB backend
     #
     # Supports expiration, documents will be automatically removed starting
-    # with mongodb >= 2.2 (see http://docs.mongodb.org/manual/tutorial/expire-data/).
+    # with mongodb >= 2.2 (see {http://docs.mongodb.org/manual/tutorial/expire-data/}).
     #
     # @api public
     class Mongo
@@ -15,6 +15,8 @@ module Moneta
       # @param [Hash] options
       # @option options [String] :collection ('moneta') MongoDB collection name
       # @option options [String] :host ('127.0.0.1') MongoDB server host
+      # @option options [String] :user Username used to authenticate
+      # @option options [String] :password Password used to authenticate
       # @option options [Integer] :port (MongoDB default port) MongoDB server port
       # @option options [String] :db ('moneta') MongoDB database
       # @option options [Integer] :expires Default expiration time
@@ -24,12 +26,16 @@ module Moneta
         host = options.delete(:host) || '127.0.0.1'
         port = options.delete(:port) || ::Mongo::MongoClient::DEFAULT_PORT
         db = options.delete(:db) || 'moneta'
-        connection = ::Mongo::MongoClient.new(host, port, options)
-        @collection = connection.db(db).collection(collection)
-        if connection.server_version >= '2.2'
+        user = options.delete(:user)
+        password = options.delete(:password)
+        client = ::Mongo::MongoClient.new(host, port, options)
+        db = client.db(db)
+        db.authenticate(user, password, true) if user && password
+        @collection = db.collection(collection)
+        if client.server_version >= '2.2'
           @collection.ensure_index([['expiresAt', ::Mongo::ASCENDING]], :expireAfterSeconds => 0)
         else
-          warn 'You are using MongoDB version < 2.2, expired documents will not be deleted'
+          warn 'Moneta::Adapters::Mongo - You are using MongoDB version < 2.2, expired documents will not be deleted'
         end
       end
 
@@ -74,11 +80,32 @@ module Moneta
                                     :upsert => true)['value']
       end
 
+      # (see Proxy#create)
+      def create(key, value, options = {})
+        key = ::BSON::Binary.new(key)
+        intvalue = value.to_i
+        @collection.insert('_id' => key,
+                           'value' => intvalue.to_s == value ? intvalue : ::BSON::Binary.new(value),
+                           # expiresAt must be a Time object (BSON date datatype)
+                           'expiresAt' => expires_at(options) || nil)
+        true
+      rescue ::Mongo::OperationFailure
+        # FIXME: This catches too many errors
+        # it should only catch a not-unique-exception
+        false
+      end
+
       # (see Proxy#clear)
       def clear(options = {})
         @collection.remove
         self
       end
+
+      # (see Proxy#close)
+      def close
+        @collection.db.connection.close
+        nil
+      end
     end
   end
 end

data/lib/moneta/adapters/pstore.rb

@@ -6,7 +6,6 @@ module Moneta
     # @api public
     class PStore
       include Defaults
-      include IncrementSupport
 
       # @param [Hash] options
       # @option options [String] :file PStore file
@@ -39,12 +38,24 @@ module Moneta
       # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
         @pstore.transaction do
-          value = convert_for_increment(@pstore[key]) + amount
+          value = Utils.to_int(@pstore[key]) + amount
           @pstore[key] = value.to_s
           value
         end
       end
 
+      # (see Proxy#create)
+      def create(key, value, options = {})
+        @pstore.transaction do
+          if @pstore.root?(key)
+            false
+          else
+            @pstore[key] = value
+            true
+          end
+        end
+      end
+
       # (see Proxy#clear)
       def clear(options = {})
         @pstore.transaction do

data/lib/moneta/adapters/redis.rb

@@ -17,6 +17,9 @@ module Moneta
       end
 
       # (see Proxy#key?)
+      #
+      # This method considers false and 0 as "no-expire" and every positive
+      # number as a time to live in seconds.
       def key?(key, options = {})
         if @redis.exists(key)
           update_expires(key, options, nil)
@@ -64,6 +67,22 @@ module Moneta
         self
       end
 
+      # (see Defaults#create)
+      def create(key, value, options = {})
+        if @redis.setnx(key, value)
+          update_expires(key, options)
+          true
+        else
+          false
+        end
+      end
+
+      # (see Proxy#close)
+      def close
+        @redis.quit
+        nil
+      end
+
       protected
 
       def update_expires(key, options, default = @default_expires)

data/lib/moneta/adapters/restclient.rb

@@ -2,7 +2,7 @@ require 'net/http'
 
 module Moneta
   module Adapters
-    # Moneta rest client backend which works together with `Rack::MonetaRest`
+    # Moneta rest client backend which works together with {Rack::MonetaRest}
     # @api public
     class RestClient
       include Defaults

data/lib/moneta/adapters/sequel.rb

@@ -6,7 +6,6 @@ module Moneta
     # @api public
     class Sequel
       include Defaults
-      include IncrementSupport
 
       # @param [Hash] options
       # @option options [String] :db Sequel database
@@ -37,13 +36,28 @@ module Moneta
       # (see Proxy#store)
       def store(key, value, options = {})
         @db.transaction do
-          if key?(key, options)
-            @table.update(:k => key, :v => value)
-          else
+          begin
             @table.insert(:k => key, :v => value)
+          rescue ::Sequel::DatabaseError
+            @table.update(:k => key, :v => value)
           end
-          value
         end
+        value
+      rescue ::Sequel::DatabaseError
+        tries ||= 0
+        (tries += 1) < 10 ? retry : raise
+      end
+
+      # (see Proxy#store)
+      def create(key, value, options = {})
+        @db.transaction do
+          @table.insert(:k => key, :v => value)
+        end
+        true
+      rescue ::Sequel::DatabaseError
+        # FIXME: This catches too many errors
+        # it should only catch a not-unique-exception
+        false
       end
 
       # (see Proxy#increment)
@@ -51,7 +65,7 @@ module Moneta
         @db.transaction do
           locked_table = @table.for_update
           if record = locked_table[:k => key]
-            value = convert_for_increment(record[:v]) + amount
+            value = Utils.to_int(record[:v]) + amount
             locked_table.update(:k => key, :v => value.to_s)
             value
           else