moneta 0.7.5 → 0.7.6

data/CHANGES

@@ -1,3 +1,9 @@
+0.7.6
+
+* Adapters::Daybreak: api changed
+* Adapters::File: flock fix for jruby
+* Transformer: add to_s key transformer
+
 0.7.5
 
 * OptionsSupport#with: Add support to insert additional proxies

data/README.md

@@ -1,6 +1,6 @@
 # Moneta: A unified interface for key/value stores
 
-[![Build Status](https://secure.travis-ci.org/minad/moneta.png?branch=master)](http://travis-ci.org/minad/moneta) [![Dependency Status](https://gemnasium.com/minad/moneta.png?travis)](https://gemnasium.com/minad/moneta) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/minad/moneta)
+[![Gem Version](https://badge.fury.io/rb/moneta.png)](http://rubygems.org/gems/moneta) [![Build Status](https://secure.travis-ci.org/minad/moneta.png?branch=master)](http://travis-ci.org/minad/moneta) [![Dependency Status](https://gemnasium.com/minad/moneta.png?travis)](https://gemnasium.com/minad/moneta) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/minad/moneta)
 
 Moneta provides a standard interface for interacting with various kinds of key/value stores. A short overview of the features:
 
@@ -41,38 +41,38 @@ Out of the box, it supports the following backends:
 * Memory:
     * In-memory store (`:Memory`)
     * LRU hash - prefer this over :Memory! (`:LRUHash`)
-    * LocalMemCache (`:LocalMemCache`)
-    * Memcached store (`:Memcached`, `:MemcachedNative` and `:MemcachedDalli`)
+    * [LocalMemCache](http://localmemcache.rubyforge.org/) (`:LocalMemCache`)
+    * [Memcached](http://memcached.org/) store (`:Memcached`, `:MemcachedNative` and `:MemcachedDalli`)
 * Relational Databases:
-    * DataMapper (`:DataMapper`)
-    * ActiveRecord (`:ActiveRecord`)
-    * Sequel (`:Sequel`)
-    * Sqlite3 (`:Sqlite`)
+    * [DataMapper](http://datamapper.org/) (`:DataMapper`)
+    * [ActiveRecord](https://rubygems.org/gems/activerecord) (`:ActiveRecord`)
+    * [Sequel](http://sequel.rubyforge.org/) (`:Sequel`)
+    * [Sqlite3](http://sqlite.org/) (`:Sqlite`)
 * Filesystem:
-    * PStore (`:PStore`)
-    * YAML store (`:YAML`)
+    * [PStore](http://ruby-doc.org/stdlib/libdoc/pstore/rdoc/PStore.html) (`:PStore`)
+    * [YAML](http://www.ruby-doc.org/stdlib/libdoc/yaml/rdoc/YAML/Store.html) store (`:YAML`)
     * Filesystem directory store (`:File`)
     * Filesystem directory store which spreads files in subdirectories using md5 hash (`:HashFile`)
 * Key/value databases:
-    * Berkeley DB (`:DBM`)
-    * Cassandra (`:Cassandra`)
-    * Daybreak (`:Daybreak`)
-    * GDBM (`:GDBM`)
-    * HBase (`:HBase`)
-    * LevelDB (`:LevelDB`)
-    * Redis (`:Redis`)
-    * Riak (`:Riak`)
-    * SDBM (`:SDBM`)
-    * TokyoCabinet (`:TokyoCabinet`)
-    * Simple Samba database TDB (`:TDB`)
+    * [Berkeley DB](http://www.ruby-doc.org/stdlib/libdoc/dbm/rdoc/DBM.html) (`:DBM`)
+    * [Cassandra](http://cassandra.apache.org/) (`:Cassandra`)
+    * [Daybreak](http://propublica.github.com/daybreak/) (`:Daybreak`)
+    * [GDBM](http://www.ruby-doc.org/stdlib/libdoc/gdbm/rdoc/GDBM.html) (`:GDBM`)
+    * [HBase](http://hbase.apache.org/) (`:HBase`)
+    * [LevelDB](http://code.google.com/p/leveldb/) (`:LevelDB`)
+    * [Redis](http://redis.io/) (`:Redis`)
+    * [Riak](http://docs.basho.com/) (`:Riak`)
+    * [SDBM](http://www.ruby-doc.org/stdlib/libdoc/sdbm/rdoc/SDBM.html) (`:SDBM`)
+    * [TokyoCabinet](http://fallabs.com/tokyocabinet/) (`:TokyoCabinet`)
+    * [Simple Samba database TDB](http://tdb.samba.org/) (`:TDB`)
 * Document databases:
-    * CouchDB (`:Couch`)
-    * MongoDB (`:Mongo`)
+    * [CouchDB](http://couchdb.apache.org/) (`:Couch`)
+    * [MongoDB](http://www.mongodb.org/) (`:Mongo`)
 * Moneta network protocols:
     * Moneta key/value client (`:Client` works with `Moneta::Server`)
     * Moneta HTTP/REST client (`:RestClient` works with `Rack::MonetaRest`)
 * Other
-    * Fog cloud storage which supports Amazon S3, Rackspace, etc. (`:Fog`)
+    * [Fog](http://fog.io/) cloud storage which supports Amazon S3, Rackspace, etc. (`:Fog`)
     * Storage which doesn't store anything (`:Null`)
 
 Some of the backends are not exactly based on key/value stores, e.g. the relational ones. These
@@ -85,46 +85,47 @@ to upgrade to a real key/value store.
 <table>
 <thead style="font-weight:bold"><tr><th>Adapter</th><th>Required gems</th><th>Multi-thread safe<sup>[1]</sup></th><th>Multi-process safe<sup>[2]</sup></th><th>Atomic increment</th><th>Native expires<sup>[3]</sup></th><th>Persistent</th><th>Description</th></tr></thead>
 <tbody>
-<tr><td>ActiveRecord</td><td>activerecord</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>ActiveRecord ORM</td></tr>
-<tr><td>Cassandra</td><td>cassandra</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:green">✓</td><td>Cassandra distributed database</td></tr>
+<tr><td>ActiveRecord</td><td>activerecord</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="https://rubygems.org/gems/activerecord">ActiveRecord</a> ORM</td></tr>
+<tr><td>Cassandra</td><td>cassandra</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:green">✓</td><td><a href="http://cassandra.apache.org/">Cassandra</a> distributed database</td></tr>
 <tr><td>Client</td><td>-</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:blue">?<sup>[5]</sup></td><td style="color:blue">?<sup>[5]</sup></td><td style="color:blue">?<sup>[5]</sup></td><td>Moneta client adapter</td></tr>
 <tr><td>Cookie</td><td>-</td><td style="color:red">✗</td><td style="color:blue">(✓)<sup>[6]</sup></td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td>Cookie in memory store</td></tr>
-<tr><td>Couch</td><td>couchrest</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td>CouchDB database</td></tr>
-<tr><td>DataMapper</td><td>dm-core, dm-migrations</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td>DataMapper ORM</td></tr>
-<tr><td>Daybreak</td><td>daybreak</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Daybreak ruby key/value store</td></tr>
-<tr><td>DBM</td><td>-</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Berkeley DB</td></tr>
+<tr><td>Couch</td><td>couchrest</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://couchdb.apache.org/">CouchDB</a> database</td></tr>
+<tr><td>DataMapper</td><td>dm-core, dm-migrations</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://datamapper.org/">DataMapper</a> ORM</td></tr>
+<tr><td>Daybreak</td><td>daybreak</td><td style="color:red">✗</td><td style="color:blue">(✓)<sup>[7]</sup></td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Incredibly fast pure-ruby key/value store <a href="http://propublica.github.com/daybreak/">Daybreak</a></td></tr>
+<tr><td>DBM</td><td>-</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://www.ruby-doc.org/stdlib/libdoc/dbm/rdoc/DBM.html">Berkeley DB</a></td></tr>
 <tr><td>File</td><td>-</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>File store</td></tr>
-<tr><td>Fog</td><td>fog</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Fog cloud store</td></tr>
-<tr><td>GDBM</td><td>-</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>GDBM database</td></tr>
-<tr><td>HBase</td><td>hbase</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td>HBase database</td></tr>
-<tr><td>LevelDB</td><td>leveldb</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>LevelDB database</td></tr>
-<tr><td>LocalMemCache</td><td>localmemcache</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td>LocalMemCache database</td></tr>
+<tr><td>Fog</td><td>fog</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://fog.io/">Fog</a> cloud store</td></tr>
+<tr><td>GDBM</td><td>-</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://www.ruby-doc.org/stdlib/libdoc/gdbm/rdoc/GDBM.html">GDBM</a> database</td></tr>
+<tr><td>HBase</td><td>hbase</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://hbase.apache.org/">HBase</a> database</td></tr>
+<tr><td>LevelDB</td><td>leveldb</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://code.google.com/p/leveldb/">LevelDB</a> database</td></tr>
+<tr><td>LocalMemCache</td><td>localmemcache</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://localmemcache.rubyforge.org/">LocalMemCache</a> database</td></tr>
 <tr><td>LRUHash</td><td>-</td><td style="color:red">✗</td><td style="color:blue">(✓)<sup>[6]</sup></td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td>LRU memory store</td></tr>
-<tr><td>Memcached</td><td>dalli or memcached</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗<sup>[4]</sup></td><td>Memcached database</td></tr>
-<tr><td>MemcachedDalli</td><td>dalli</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗<sup>[4]</sup></td><td>Memcached database</td></tr>
-<tr><td>MemcachedNative</td><td>memcached</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗<sup>[4]</sup></td><td>Memcached database</td></tr>
+<tr><td>Memcached</td><td>dalli or memcached</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗<sup>[4]</sup></td><td><a href="http://memcached.org/">Memcached</a> database</td></tr>
+<tr><td>MemcachedDalli</td><td>dalli</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗<sup>[4]</sup></td><td><a href="http://memcached.org/">Memcached</a> database with Dalli library</td></tr>
+<tr><td>MemcachedNative</td><td>memcached</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗<sup>[4]</sup></td><td>Memcached database with native library</td></tr>
 <tr><td>Memory</td><td>-</td><td style="color:red">✗</td><td style="color:blue">(✓)<sup>[6]</sup></td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td>Memory store</td></tr>
-<tr><td>Mongo</td><td>mongo</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td>MongoDB database</td></tr>
+<tr><td>Mongo</td><td>mongo</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td><a href="http://www.mongodb.org/">MongoDB</a> database</td></tr>
 <tr><td>Null</td><td>-</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:red">✗</td><td>No database</td></tr>
-<tr><td>PStore</td><td>-</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>PStore store</td></tr>
-<tr><td>Redis</td><td>redis</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td>Redis database</td></tr>
+<tr><td>PStore</td><td>-</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://ruby-doc.org/stdlib/libdoc/pstore/rdoc/PStore.html">PStore</a> store</td></tr>
+<tr><td>Redis</td><td>redis</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td><a href="http://redis.io/">Redis</a> database</td></tr>
 <tr><td>RestClient</td><td>-</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:blue">?<sup>[5]</sup></td><td>Moneta REST client adapter</td></tr>
-<tr><td>Riak</td><td>riak-client</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Riak database</td></tr>
-<tr><td>SDBM</td><td>-</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>SDBM database</td></tr>
-<tr><td>Sequel</td><td>sequel</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Sequel ORM</td></tr>
-<tr><td>Sqlite</td><td>sqlite3</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Sqlite3 database</td></tr>
-<tr><td>TDB</td><td>tdb</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>TDB database</td></tr>
-<tr><td>TokyoCabinet</td><td>tokoycabinet</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>TokyoCabinet database</td></tr>
-<tr><td>YAML</td><td>-</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>YAML store</td></tr>
+<tr><td>Riak</td><td>riak-client</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://docs.basho.com/">Riak</a> database</td></tr>
+<tr><td>SDBM</td><td>-</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://www.ruby-doc.org/stdlib/libdoc/sdbm/rdoc/SDBM.html">SDBM</a> database</td></tr>
+<tr><td>Sequel</td><td>sequel</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://sequel.rubyforge.org/">Sequel</a> ORM</td></tr>
+<tr><td>Sqlite</td><td>sqlite3</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://sqlite.org/">Sqlite3</a> database</td></tr>
+<tr><td>TDB</td><td>tdb</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://tdb.samba.org/">TDB</a> database</td></tr>
+<tr><td>TokyoCabinet</td><td>tokoycabinet</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://fallabs.com/tokyocabinet/">TokyoCabinet</a> database</td></tr>
+<tr><td>YAML</td><td>-</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td><a href="http://www.ruby-doc.org/stdlib/libdoc/yaml/rdoc/YAML/Store.html">YAML</a> store</td></tr>
 </tbody>
 </table>
 
-* [1]: Make adapters thread-safe by using `Moneta::Lock` or by passing the option `:threadsafe => true` to `Moneta#new`. There is also `Moneta::Pool` which can be used to share a store between multiple threads if the store is multi-process safe.
+* [1]: Make adapters thread-safe by using `Moneta::Lock` or by passing the option `:threadsafe => true` to `Moneta#new`. There is also `Moneta::Pool` which can be used to share a store between multiple threads if the store is multi-process safe. I recommend to add the option `:threadsafe` to ensure thread-safety since for example under JRuby and Rubinius even the basic datastructures are not thread safe due to the lack of a global interpreter lock (GIL). This differs from MRI where some adapters might appear thread safe already but only due to the GIL.
 * [2]: Share a Moneta store between multiple processes using `Moneta::Shared` (See below).
 * [3]: Add expiration support by using `Moneta::Expires` or by passing the option `:expires => true` to `Moneta#new`.
 * [4]: There are some servers which use the memcached protocol but which are persistent (e.g. MemcacheDB, Kai, IronCache, ...)
 * [5]: Depends on server
 * [6]: Store is multi-process safe because it is an in-memory store, values are not shared between multiple processes
+* [7]: Store is multi-process safe, but not synchronized automatically between multiple processes
 
 ## Proxies
 
@@ -592,6 +593,6 @@ on top of the different stores.
 
 ## Authors
 
-* Daniel Mendler (@minad)
-* Hannes Georg (@hannesg)
-* Originally by Yehuda Katz (@wycats) and contributors
+* [Daniel Mendler](https://github.com/minad)
+* [Hannes Georg](https://github.com/hannesg)
+* Originally by [Yehuda Katz](https://github.com/wycats) and contributors

data/Rakefile

@@ -24,11 +24,9 @@ task :test do
   #   QuickLZ is also not maintained on Github, but on Bitbucket
   #   and I don't know where the issue tracker is.
   #
-  # * Daybreak leads to a segfault
-  #
   # * Cassandra and Mongo show spurious failures
   if ENV['TEST_GROUP']
-    unstable = specs.select {|s| s =~ /quicklz|cassandra|mongo|daybreak/ }
+    unstable = specs.select {|s| s =~ /quicklz|cassandra|mongo/ }
     specs -= unstable
   end
 

data/lib/moneta/adapters/daybreak.rb

@@ -5,23 +5,21 @@ module Moneta
     # Daybreak backend
     # @api public
     class Daybreak < Memory
-      # Disable serialization, we have `Moneta::Transformer` for that
-      class DB < ::Daybreak::DB
-        def serialize(value) value; end
-        def parse(value) value; end
-      end
-
       # @param [Hash] options
       # @option options [String] :file Database file
       def initialize(options = {})
         raise ArgumentError, 'Option :file is required' unless options[:file]
-        @hash = DB.new(options[:file])
+        @hash = ::Daybreak::DB.new(options[:file], :serializer => ::Daybreak::Serializer::None)
+      end
+
+      # (see Proxy#increment)
+      def increment(key, amount = 1, options = {})
+        @hash.lock { return super }
       end
 
       # (see Proxy#close)
       def close
-        @hash.close!
-        nil
+        @hash.close
       end
     end
   end

data/lib/moneta/adapters/file.rb

@@ -72,10 +72,10 @@ module Moneta
         return yield unless ::File.exist?(path)
         ::File.open(path, 'r+') do |f|
           begin
-            f.flock ::File::LOCK_EX
+            Thread.pass until f.flock(::File::LOCK_EX)
             yield
           ensure
-            f.flock ::File::LOCK_UN
+            f.flock(::File::LOCK_UN)
           end
         end
       end

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

@@ -45,6 +45,7 @@ module Moneta
       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
+	# See https://github.com/mperham/dalli/issues/309
         result = if amount >= 0
                    @cache.incr(key, amount, expires_value(options) || nil, nil)
                  else

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

@@ -58,6 +58,7 @@ module Moneta
           @cache.decrement(key, -amount)
         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
         result
       rescue ::Memcached::NotFound => ex

data/lib/moneta/transformer.rb

@@ -153,9 +153,9 @@ module Moneta
 
       # Compile transformer validator regular expression
       def compile_validator(s)
-        Regexp.new(s.gsub(/\w+/) do
+        Regexp.new('\A' + s.gsub(/\w+/) do
                      '(' + TRANSFORMER.select {|k,v| v.first.to_s == $& }.map {|v| ":#{v.first}" }.join('|') + ')'
-                   end.gsub(/\s+/, '').sub(/\A/, '\A').sub(/\Z/, '\Z'))
+                   end.gsub(/\s+/, '') + '\Z')
       end
 
       # Returned compiled transformer code string
@@ -173,8 +173,8 @@ module Moneta
       end
 
       def class_name(keys, values)
-        (keys.empty? ? '' : keys.map(&:to_s).map(&:capitalize).join << 'Key') <<
-          (values.empty? ? '' : values.map(&:to_s).map(&:capitalize).join << 'Value')
+        (keys.empty? ? '' : keys.map(&:to_s).map(&:capitalize).join + 'Key') +
+          (values.empty? ? '' : values.map(&:to_s).map(&:capitalize).join + 'Value')
       end
     end
   end

data/lib/moneta/transformer/config.rb

@@ -33,12 +33,13 @@ module Moneta
       :sha512   => [ :digest,    nil,                              '::Digest::SHA512.hexdigest(%s)', 'digest/sha2'   ],
       :prefix   => [ :prefix,    nil,                              '(options[:prefix]||@prefix)+%s'                  ],
       :spread   => [ :spread,    nil,                              'Helper.spread(%s)'                               ],
+      :to_s     => [ :to_s,      nil,                              '%s.to_s'                                         ],
     }
 
     # Allowed value transformers (Read it like a regular expression!)
     VALUE_TRANSFORMER = 'serialize? compress? hmac? encode?'
 
     # Allowed key transformers (Read it like a regular expression!)
-    KEY_TRANSFORMER = 'serialize? prefix? ((encode? truncate?) | (digest spread?))?'
+    KEY_TRANSFORMER = '(serialize | to_s)? prefix? ((encode? truncate?) | (digest spread?))?'
   end
 end

data/lib/moneta/version.rb

@@ -1,5 +1,5 @@
 module Moneta
   # Moneta version number
   # @api public
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
 end

data/script/benchmarks

@@ -16,6 +16,15 @@ class Array
     inject(0, &:+)
   end
 
+  def mean
+    sum / size
+  end
+
+  def stddev
+    m = mean
+    Math.sqrt(map {|s| (s - m) ** 2 }.mean)
+  end
+
   def randomize
     rest, result = dup, []
     result << rest.slice!(rand(rest.size)) until result.size == size
@@ -63,68 +72,68 @@ class MonetaBenchmarks
     :uniform_small => {
       :runs => 3,
       :keys => 1000,
-      :min_key_length => 1,
-      :max_key_length => 32,
+      :min_key_len => 1,
+      :max_key_len => 32,
       :key_dist => :uniform,
-      :min_val_length => 0,
-      :max_val_length => 256,
+      :min_val_len => 0,
+      :max_val_len => 256,
       :val_dist => :uniform
     },
     :uniform_medium => {
       :runs => 3,
-      :keys => 100,
-      :min_key_length => 3,
-      :max_key_length => 200,
+      :keys => 1000,
+      :min_key_len => 3,
+      :max_key_len => 200,
       :key_dist => :uniform,
-      :min_val_length => 0,
-      :max_val_length => 1024,
+      :min_val_len => 0,
+      :max_val_len => 1024,
       :val_dist => :uniform
     },
     :uniform_large => {
       :runs => 3,
       :keys => 100,
-      :min_key_length => 3,
-      :max_key_length => 200,
+      :min_key_len => 3,
+      :max_key_len => 200,
       :key_dist => :uniform,
-      :min_val_length => 0,
-      :max_val_length => 10240,
+      :min_val_len => 0,
+      :max_val_len => 10240,
       :val_dist => :uniform
     },
     :normal_small => {
       :runs => 3,
       :keys => 1000,
-      :min_key_length => 1,
-      :max_key_length => 32,
+      :min_key_len => 1,
+      :max_key_len => 32,
       :key_dist => :normal,
-      :min_val_length => 0,
-      :max_val_length => 256,
+      :min_val_len => 0,
+      :max_val_len => 256,
       :val_dist => :normal
     },
     :normal_medium => {
       :runs => 3,
-      :keys => 100,
-      :min_key_length => 3,
-      :max_key_length => 200,
+      :keys => 1000,
+      :min_key_len => 3,
+      :max_key_len => 200,
       :key_dist => :normal,
-      :min_val_length => 0,
-      :max_val_length => 1024,
+      :min_val_len => 0,
+      :max_val_len => 1024,
       :val_dist => :normal
     },
     :normal_large => {
       :runs => 3,
       :keys => 100,
-      :min_key_length => 3,
-      :max_key_length => 200,
+      :min_key_len => 3,
+      :max_key_len => 200,
       :key_dist => :normal,
-      :min_val_length => 0,
-      :max_val_length => 10240,
+      :min_val_len => 0,
+      :max_val_len => 10240,
       :val_dist => :normal
     },
   }
 
   DICT = 'ABCDEFGHIJKLNOPQRSTUVWXYZabcdefghijklnopqrstuvwxyz123456789'.freeze
-  HEADER = "\n                         Minimum  Maximum    Total  Average    Ops/s"
-  SEPARATOR = '=' * 68
+  HEADER = "\n                         Minimum  Maximum    Total     Mean   Stddev    Ops/s"
+  SEPARATOR = '=' * 77
 
   module Rand
     extend self
@@ -240,20 +249,20 @@ class MonetaBenchmarks
 
   def generate_data
     until @data.size == @config[:keys]
-      key = DICT.random(Rand.send(@config[:key_dist], @config[:min_key_length], @config[:max_key_length]))
-      @data[key] = DICT.random(Rand.send(@config[:val_dist], @config[:min_val_length], @config[:max_val_length]))
+      key = DICT.random(Rand.send(@config[:key_dist], @config[:min_key_len], @config[:max_key_len]))
+      @data[key] = DICT.random(Rand.send(@config[:val_dist], @config[:min_val_len], @config[:max_val_len]))
     end
 
-    key_lengths, val_lengths = @data.keys.map(&:size), @data.values.map(&:size)
+    key_lens, val_lens = @data.keys.map(&:size), @data.values.map(&:size)
     @data = @data.to_a
 
-    write_histogram("#{DIR}/key.histogram", key_lengths)
-    write_histogram("#{DIR}/value.histogram", val_lengths)
+    write_histogram("#{DIR}/key.histogram", key_lens)
+    write_histogram("#{DIR}/value.histogram", val_lens)
 
     puts "\n\e[1m\e[34m#{SEPARATOR}\n\e[34mComputing keys and values...\n\e[34m#{SEPARATOR}\e[0m"
-    puts %{                         Minimum  Maximum    Total  Average}
-    puts 'Key Length              % 8d % 8d % 8d % 8d ' % [key_lengths.min, key_lengths.max, key_lengths.sum, key_lengths.sum / @data.size]
-    puts 'Value Length            % 8d % 8d % 8d % 8d ' % [val_lengths.min, val_lengths.max, val_lengths.sum, val_lengths.sum / @data.size]
+    puts %{                         Minimum  Maximum    Total     Mean   Stddev}
+    puts 'Key Length              % 8d % 8d % 8d % 8d % 8d' % [key_lens.min, key_lens.max, key_lens.sum, key_lens.mean, key_lens.stddev]
+    puts 'Value Length            % 8d % 8d % 8d % 8d % 8d' % [val_lens.min, val_lens.max, val_lens.sum, val_lens.mean, val_lens.stddev]
   end
 
   def print_config
@@ -266,11 +275,10 @@ class MonetaBenchmarks
   def print_store_stats(name)
     puts HEADER
     [:write, :read, :sum].each do |i|
-      total = @stats[name][i].sum
-      ops = (@config[:runs] * @data.size) / total
-      line = '%-17.17s %-5s % 8d % 8d % 8d % 8d % 8d' %
-        [name, i, @stats[name][i].min * 1000, @stats[name][i].max * 1000,
-         total * 1000, total * 1000 / @config[:runs], ops]
+      ops = (1000 * @config[:runs] * @data.size) / @stats[name][i].sum
+      line = '%-17.17s %-5s % 8d % 8d % 8d % 8d % 8d % 8d' %
+        [name, i, @stats[name][i].min, @stats[name][i].max, @stats[name][i].sum,
+         @stats[name][i].mean, @stats[name][i].stddev, ops]
       @summary << [-ops, line << "\n"] if i == :sum
       puts line
     end
@@ -320,10 +328,10 @@ class MonetaBenchmarks
         end
 
         if type == 'Measure'
-          @stats[name][:write] << m1.real
+          @stats[name][:write] << m1.real * 1000
           @stats[name][:error] << error
-          @stats[name][:read] << m2.real
-          @stats[name][:sum] << (m1.real + m2.real)
+          @stats[name][:read] << m2.real * 1000
+          @stats[name][:sum] << (m1.real + m2.real) * 1000
         end
       end
     end