moneta 0.7.3 → 0.7.4

data/.travis.yml

@@ -1,7 +1,6 @@
 rvm:
   - 1.8.7
   - 1.9.3
-#  - ruby-head
   - jruby
   - rbx-18mode
   - rbx-19mode
@@ -13,60 +12,27 @@ services:
   - memcached
   - mongodb
 before_install:
-  - sudo apt-get install -qq libtokyocabinet8 libtokyocabinet-dev liblzo2-dev
+  - sudo apt-get install -qq libtokyocabinet8 libtokyocabinet-dev liblzo2-dev libtdb-dev
+  - script/install-bundle.rb
 env:
-  - "TASK=test:parallel"
-  - "TASK=test:non_parallel"
-  - "TASK=benchmarks CONFIG=uniform_small"
-  - "TASK=benchmarks CONFIG=uniform_medium"
-  - "TASK=benchmarks CONFIG=uniform_large"
-  - "TASK=benchmarks CONFIG=normal_small"
-  - "TASK=benchmarks CONFIG=normal_medium"
-  - "TASK=benchmarks CONFIG=normal_large"
+  global:
+    - secure: "bNtinRuxS/FLP1fKj7KtHweIP/fG94CusdYKH/sBL6P0aqL3mr/dkbC34pSk\nNGkLKs/FAzvLkOo7aIOcCLx1WnL9yaZ12tmHgH8Ztf8ci2S52HSfqYwQw/dE\nq7euNMZVjvWfVu+15+Xpn6+t2XSubSO/TELfymDFGbhivmKAo5M="
+    - secure: "Pv/MUnoaZMbPNB3vx4Hw2ASQBsUO7HIjJsfGHAQa5VbWlX3qEfMdezlYzNbf\nDPdpeabQwEwCUcINT7x10XKH5M4nZn6bBGfpvmNMxvZ8De1Et7mrwvb5/o73\n5EkyvYuUu8FB/LQmjB/4zZcjLQWNCtcfPlYPs7YcADBt0gIwn8M="
+  matrix:
+    - "TASK=test"
+    - "TASK=benchmarks CONFIG=uniform_small"
+    - "TASK=benchmarks CONFIG=uniform_medium"
+    - "TASK=benchmarks CONFIG=uniform_large"
+    - "TASK=benchmarks CONFIG=normal_small"
+    - "TASK=benchmarks CONFIG=normal_medium"
+    - "TASK=benchmarks CONFIG=normal_large"
 matrix:
   allow_failures:
-#    - rvm: ruby-head
     - rvm: jruby
     - rvm: rbx-18mode
     - rvm: rbx-19mode
-  # Parallel tests do not work on jruby
-  exclude:
-    - rvm: jruby
-      env: "TASK=test:parallel"
-    - rvm: jruby
-      env: "TASK=benchmarks CONFIG=uniform_small"
-    - rvm: jruby
-      env: "TASK=benchmarks CONFIG=uniform_medium"
-    - rvm: jruby
-      env: "TASK=benchmarks CONFIG=uniform_large"
-    - rvm: jruby
-      env: "TASK=benchmarks CONFIG=normal_small"
-    - rvm: jruby
-      env: "TASK=benchmarks CONFIG=normal_medium"
-    - rvm: jruby
-      env: "TASK=benchmarks CONFIG=normal_large"
-    - rvm: rbx-18mode
-      env: "TASK=benchmarks CONFIG=uniform_small"
-    - rvm: rbx-18mode
-      env: "TASK=benchmarks CONFIG=uniform_medium"
-    - rvm: rbx-18mode
-      env: "TASK=benchmarks CONFIG=uniform_large"
-    - rvm: rbx-18mode
-      env: "TASK=benchmarks CONFIG=normal_small"
-    - rvm: rbx-18mode
-      env: "TASK=benchmarks CONFIG=normal_medium"
-    - rvm: rbx-18mode
-      env: "TASK=benchmarks CONFIG=normal_large"
-    - rvm: rbx-19mode
-      env: "TASK=benchmarks CONFIG=uniform_small"
-    - rvm: rbx-19mode
-      env: "TASK=benchmarks CONFIG=uniform_medium"
-    - rvm: rbx-19mode
-      env: "TASK=benchmarks CONFIG=uniform_large"
-    - rvm: rbx-19mode
-      env: "TASK=benchmarks CONFIG=normal_small"
-    - rvm: rbx-19mode
-      env: "TASK=benchmarks CONFIG=normal_medium"
-    - rvm: rbx-19mode
-      env: "TASK=benchmarks CONFIG=normal_large"
 script: "bundle exec rake $TASK"
+branches:
+  only:
+    - master
+    - travis

data/CHANGES

@@ -1,3 +1,16 @@
+0.7.4
+
+* Transformer: fix truncate
+* Adapters::RestClient: raise error if store fails
+* Adapters::TDB added
+* Adapters::Daybreak added
+* Adapters::Mongo - Expiration and increment support added
+* Pool proxy added
+* Mixin ExpiresSupport added
+  * Expiration value handling unified
+  * 0 and false are interpreted as persist value
+* Adapters::RestClient uses net/http now
+
 0.7.3
 
 * Added Adapters::RestClient

data/Gemfile

@@ -12,7 +12,6 @@ end
 # Testing
 gem 'rake'
 gem 'rspec'
-gem 'parallel_tests'
 
 # Serializer used by Transformer
 gem 'tnetstring'
@@ -28,10 +27,11 @@ alternatives :mri => 'bzip2-ruby'
 alternatives :mri => 'ruby-lzma'
 alternatives :mri => 'lzoruby'
 alternatives :mri => 'snappy'
-# QuickLZ segfaults because of an assertion, fix this before activating it again
-# alternatives :mri => 'qlzruby'
+# WARNING: QuickLZ segfaults because of an assertion
+alternatives :mri => 'qlzruby'
 
 # Backends
+gem 'daybreak', :github => 'propublica/daybreak'
 gem 'dm-core'
 gem 'dm-migrations'
 gem 'dm-sqlite-adapter'
@@ -44,9 +44,9 @@ gem 'sequel'
 gem 'dalli'
 gem 'riak-client'
 gem 'cassandra'
-gem 'httpi'
 #gem 'hbaserb'
 #gem 'localmemcache'
+alternatives :mri => 'tdb'
 alternatives :mri => 'leveldb-ruby'
 alternatives :mri => 'tokyocabinet'
 alternatives :mri => 'memcached', :jruby => 'jruby-memcached'

data/README.md

@@ -14,6 +14,16 @@ Moneta provides a standard interface for interacting with various kinds of key/v
 * Includes a very simple key/value server (`Moneta::Server`) and client (`Moneta::Adapters::Client`)
 * Integration with [Rails](http://rubyonrails.org/), [Rack](http://rack.github.com/), [Sinatra](http://sinatrarb.com/) and [Rack-Cache](https://github.com/rtomayko/rack-cache)
 
+If you are not yet convinced, you might ask why? What are the goals of the project?
+
+* Get people started quickly with key/value stores! Therefore all the adapters are included in the gem and you are ready to go. [Tilt](https://github.com/rtomayko/tilt) does the
+same for template languages.
+* Make it easy to compare different key/value stores and benchmark them
+* To hide a lot of different and maybe complex APIs behind one well-designed and simple Moneta API
+* Give people a starting point or example code to start working with their favourite key/value store. Feel free to copy code, please mention Moneta then :)
+* Create a reusable piece of code, since similar things are solved over and over again ([Rails](http://rubyonrails.org/ brings its own cache stores, and many frameworks do the same...)
+* See also http://yehudakatz.com/2009/02/12/whats-the-point/
+
 Moneta is tested thoroughly using [Travis-CI](http://travis-ci.org/minad/moneta).
 
 ## Links
@@ -33,6 +43,7 @@ Out of the box, it supports the following backends:
     * LRU hash - prefer this over :Memory! (`:LRUHash`)
     * LocalMemCache (`:LocalMemCache`)
     * Memcached store (`:Memcached`, `:MemcachedNative` and `:MemcachedDalli`)
+    * Daybreak database (`:Daybreak`)
 * Relational Databases:
     * DataMapper (`:DataMapper`)
     * ActiveRecord (`:ActiveRecord`)
@@ -46,6 +57,7 @@ Out of the box, it supports the following backends:
 * Key/value databases:
     * Berkeley DB (`:DBM`)
     * Cassandra (`:Cassandra`)
+    * Daybreak (`:Daybreak`)
     * GDBM (`:GDBM`)
     * HBase (`:HBase`)
     * LevelDB (`:LevelDB`)
@@ -53,6 +65,7 @@ Out of the box, it supports the following backends:
     * Riak (`:Riak`)
     * SDBM (`:SDBM`)
     * TokyoCabinet (`:TokyoCabinet`)
+    * Simple Samba database TDB (`:TDB`)
 * Document databases:
     * CouchDB (`:Couch`)
     * MongoDB (`:Mongo`)
@@ -68,6 +81,52 @@ are useful if you already use the corresponding backend in your application. You
 store for free then without installing any additional services and you still have the possibility
 to upgrade to a real key/value store.
 
+### Backend feature matrix
+
+<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:blue">?</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>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:blue">?</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>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:blue">?</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>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>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>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>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:blue">?</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>
+</tbody>
+</table>
+
+* [1]: Make adapters thread-safe by using `Moneta::Lock`, `Moneta::Pool` or by passing the option `:threadsafe => true` to `Moneta#new`.
+* [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
+
 ## Proxies
 
 In addition it supports proxies (Similar to [Rack middlewares](http://rack.github.com/)) which
@@ -75,14 +134,15 @@ add additional features to storage backends:
 
 * `Moneta::Proxy` and `Moneta::Wrapper` proxy base classes
 * `Moneta::Expires` to add expiration support to stores which don't support it natively. Add it in the builder using `use :Expires`.
-* `Moneta::Stack` to stack multiple stores (Read returns result from first where the key is found, writes go to all stores). Add it in the builder using `use :Stack`.
+* `Moneta::Stack` to stack multiple stores (Read returns result from first where the key is found, writes go to all stores). Add it in the builder using `use(:Stack) {}`.
 * `Moneta::Transformer` transforms keys and values (Marshal, YAML, JSON, Base64, MD5, ...). Add it in the builder using `use :Transformer`.
-* `Moneta::Cache` combine two stores, one as backend and one as cache (e.g. `Moneta::Adapters::File` + `Moneta::Adapters::Memory`). Add it in the builder using `use :Cache`.
+* `Moneta::Cache` combine two stores, one as backend and one as cache (e.g. `Moneta::Adapters::File` + `Moneta::Adapters::Memory`). Add it in the builder using `use(:Cache) {}`.
 * `Moneta::Lock` to make store thread safe. Add it in the builder using `use :Lock`.
+* `Moneta::Pool` to create a pool of stores as a means of making the store thread safe. Add it in the builder using `use(:Pool) {}`.
 * `Moneta::Logger` to log database accesses. Add it in the builder using `use :Logger`.
-* `Moneta::Shared` to share a store between multiple processes. Add it in the builder using `use :Shared`.
+* `Moneta::Shared` to share a store between multiple processes. Add it in the builder using `use(:Shared) {}`.
 
-## Supported serializers and compressors (`Moneta::Transformer`)
+### Serializers and compressors (`Moneta::Transformer`)
 
 Supported serializers:
 
@@ -172,7 +232,7 @@ end
 
 ### Expiration
 
-The Cassandra, Memcached and Redis backends supports expires values directly:
+The Cassandra, Memcached, Redis and Mongo backends supports expires values natively.
 
 ~~~ ruby
 cache = Moneta::Adapters::Memcached.new
@@ -185,12 +245,21 @@ end
 # Expires in 60 seconds
 cache.store(key, value, :expires => 60)
 
+# Never expire
+cache.store(key, value, :expires => 0)
+cache.store(key, value, :expires => false)
+
 # Update expires time if value is found
 cache.load(key, :expires => 30)
 cache.key?(key, :expires => 30)
+
+# Or remove the expiration if found
+cache.load(key, :expires => false)
+cache.key?(key, :expires => 0)
 ~~~
 
-You can add the expires feature to other backends using the Expires proxy:
+You can add the expires feature to other backends using the `Moneta::Expires` proxy. But be aware
+that expired values are not deleted automatically if they are not looked up.
 
 ~~~ ruby
 # Using the :expires option
@@ -257,32 +326,6 @@ counters['counter'] = '10'
 counters.increment('counter') # returns 11
 ~~~
 
-Stores which support incrementation (you have to use `Moneta::Lock` if you want to use the store in a multithreading environment.)
-
-* ActiveRecord
-* File
-* HBase
-* LRUHash
-* LevelDB
-* Memcached
-* Memory
-* Redis
-* SDBM/DBM/GDBM
-* Sequel
-* Sqlite
-* TokyoCabinet
-* YAML/PStore
-
-Stores which don't support incrementation:
-
-* Cassandra
-* Couch
-* DataMapper
-* Fog
-* LocalMemCache
-* Mongo
-* Riak
-
 ### Syntactic sugar and option merger
 
 For raw data access as described before the class `Moneta::OptionMerger` is used. It works like this:
@@ -524,19 +567,15 @@ to compare the speed of the different key value stores for different key/value s
 Feel free to add your own configurations! The impact of Moneta should be minimal since it is only a thin layer
 on top of the different stores.
 
-## More information
-
-* http://yehudakatz.com/2009/02/12/whats-the-point/
-* http://yehudakatz.com/2009/02/12/initial-release-of-moneta-unified-keyvalue-store-api/
-
 ## Alternatives
 
 * [Horcrux](https://github.com/technoweenie/horcrux): Used at github, supports batch operations but only Memcached backend
+* [ActiveSupport::Cache::Store](http://api.rubyonrails.org/classes/ActiveSupport/Cache/Store.html): The Rails cache store abstraction
 * [ToyStore](https://github.com/jnunemaker/toystore): ORM mapper for key/value stores
 * [ToyStore Adapter](https://github.com/jnunemaker/adapter): Adapter to key/value stores used by ToyStore, Moneta can be used directly with the ToyStore Memory adapter
 
 ## Authors
 
-* Daniel Mendler
-* Hannes Georg
-* Originally by Yehuda Katz and contributors
+* Daniel Mendler (@minad)
+* Hannes Georg (@hannesg)
+* Originally by Yehuda Katz (@wycats) and contributors

data/Rakefile

@@ -1,32 +1,47 @@
-begin
-  require 'bundler'
-  Bundler::GemHelper.install_tasks
-rescue Exception
-end
-
-task :test => %w(test:parallel test:non_parallel)
-
-# memcached and redis specs cannot be used in parallel
-# because of flushing and namespace lacking in redis
-
-namespace :test do
-  task :parallel do
-    if defined?(JRUBY_VERSION)
-      puts 'No tests executed in parallel in JRuby'
-    else
-      specs = Dir['spec/*/*_spec.rb'].reject {|s| s =~ /memcached|redis|client|shared|riak/ }
-      sh("parallel_rspec -m 5 #{specs.join(' ')}")
+def rspec(spec)
+  sh("rspec #{spec}")
+  true
+rescue Exception => ex
+  if $?.termsig
+    sig = nil
+    Signal.list.each do |name, id|
+      if id == $?.termsig
+        sig = name
+        break
+      end
     end
+    puts "\e[31m########## SIG#{sig} rspec #{spec} ##########\e[0m"
   end
+  false
+end
 
-  task :non_parallel do
-    if defined?(JRUBY_VERSION)
-      # Run all tests in jruby non-parallel
-      sh('rspec spec/*/*_spec.rb')
-    else
-      specs = Dir['spec/*/*_spec.rb'].select {|s| s =~ /memcached|redis|client|shared|riak/ }
-      sh("rspec #{specs.join(' ')}")
+task :test do
+  # memcached and redis specs cannot be used in parallel
+  # because of flushing and namespace lacking in redis
+  specs = Dir['spec/*/*_spec.rb']
+  parallel = specs.reject {|s| s =~ /memcached|redis|client|shared|riak/ }
+  serial = specs - parallel
+  threads = []
+  failed = false
+  parallel.each do |spec|
+    threads << Thread.new do
+      begin
+        failed = true unless rspec(spec)
+      ensure
+        threads.delete Thread.current
+      end
     end
+    sleep 0.1
+    sleep 0.1 while threads.size >= 20
+  end
+  sleep 0.1 until threads.empty?
+  serial.each do |spec|
+    failed = true unless rspec(spec)
+  end
+  if failed
+    fail "\e[31m########## MONETA TESTSUITE FAILED ##########\e[0m"
+  else
+    puts "\e[32m########## MONETA TESTSUITE SUCCEDED ##########\e[0m"
   end
 end
 

data/benchmarks/run.rb

@@ -5,12 +5,17 @@ require 'benchmark'
 require 'moneta'
 
 STORES = {
+  # SDBM is unstable
+  # :SDBM => { :file => 'bench.sdbm' },
+  # YAML is so fucking slow
+  # :YAML => { :file => 'bench.yaml' },
   :ActiveRecord => { :connection => { :adapter  => 'sqlite3', :database => ':memory:' } },
   :Cassandra => {},
   :Client => {},
   :Couch => {},
   :DBM => { :file => 'bench.dbm' },
   :DataMapper => { :setup => 'sqlite3:bench.datamapper' },
+  :Daybreak => { :file => 'bench.daybreak' },
   :File => { :dir => 'bench.file' },
   :GDBM => { :file => 'bench.gdbm' },
   :HBase => {},
@@ -24,13 +29,11 @@ STORES = {
   :Mongo => {},
   :PStore => { :file => 'bench.pstore' },
   :Redis => {},
+  :RestClient => { :url => 'http://localhost:8808/' },
   :Riak => {},
-  # SDBM is unstable
-  # :SDBM => { :file => 'bench.sdbm' },
   :Sequel => { :db => 'sqlite:/' },
   :Sqlite => { :file => ':memory:' },
-  # YAML is so fucking slow
-  # :YAML => { :file => 'bench.yaml' },
+  :TDB => { :file => 'bench.tdb' },
 }
 
 CONFIGS = {
@@ -129,7 +132,31 @@ Process.fork do
     puts "\e[31mFailed to start Moneta server - #{ex.message}\e[0m"
   end
 end
-sleep 1 # Wait for server
+
+Process.fork do
+  require 'rack'
+  require 'webrick'
+  require 'httpi'
+  require 'rack/moneta_rest'
+
+  # Keep webrick quiet
+  ::WEBrick::HTTPServer.class_eval do
+    def access_log(config, req, res); end
+  end
+  ::WEBrick::BasicLog.class_eval do
+    def log(level, data); end
+  end
+
+  Rack::Server.start(:app => Rack::Builder.app do
+                       use Rack::Lint
+                       run Rack::MonetaRest.new(:store => :Memory)
+                     end,
+                     :environment => :none,
+                     :server => :webrick,
+                     :Port => 8808)
+end
+
+sleep 1 # Wait for servers
 
 STORES.each do |name, options|
   begin
@@ -143,6 +170,9 @@ STORES.each do |name, options|
     elsif name == :Riak
       require 'riak'
       Riak.disable_list_keys_warnings = true
+    elsif name == :RestClient
+      require 'httpi'
+      HTTPI.log = false
     end
 
     cache = Moneta.new(name, options.dup)